Commit Graph

176 Commits

Author SHA1 Message Date
6254a69a5f rename Service1 to DataCenterService 2017-02-18 21:43:15 +00:00
655ac4732d general updates to solutions etc. 2017-02-18 21:38:03 +00:00
693355380d added logging dlls and configs for card reader service.
#22
2017-02-18 21:37:46 +00:00
a63a4923a4 added missing ninject files.
made the starter configuration to start service on install optional, otherwise the services could fail to install.
Also added eventlog creation to the installer so it is ready to go when the service runs.
#24 #22
2017-02-18 21:35:39 +00:00
f1bf9de350 update the names of event log parameters. 2017-02-18 21:32:06 +00:00
9dc4832471 Added Ninject, configuration and default logger.
Made DefaultLogger use the eventlog rather than debug.writeline(..)
renamed service1 to CardReaderService
#22
2017-02-18 09:09:19 +00:00
1335dbddc7 Change Firewall exception name
#7
2017-02-17 13:08:23 +00:00
de4dd18790 create card reader service installer
#21
2017-02-17 13:07:53 +00:00
c81d5be73a Added the missing files from the Ninject cyclic dependency fix.
Added Firewall rule.
Moved URLACL to its own file for ease of reading.
Added auto service start back in now that the service is working correctly.
#7
2017-02-17 10:29:26 +00:00
62b3d07a96 Fixed ninject cyclic dependency deployment issue. 2017-02-16 22:17:48 +00:00
1babd514ce fixed path.combine null exception if the config doesnt exist 2017-02-16 22:16:37 +00:00
ebfced87ee fix relative file paths (file not found errors).
added razor engine to WindowsDataCenter project.
fixed odd logCount errors in spa.js/index.html
2017-02-16 17:07:48 +00:00
aca00e95ed add installer components.
#7
2017-02-16 17:06:22 +00:00
439dcc2154 sln/project file updates 2017-02-15 22:55:30 +00:00
fe7fda42a5 renamed WebApiServerHostInstaller project to DataCenterHostInstaller.
Started adding components.
#7
2017-02-15 22:53:55 +00:00
be37bb41be added nlog config to appsettings. getting annoying adding it into everything..
#9
2017-02-15 20:54:27 +00:00
7b5077ff5b fix data binding for the timelogs to the timelog table.
fixed formatting for convertToHours to correct for one decimal place minutes (less than 10).
added convertToDisplayTime method to convert the timelog timestamp to a logical format (hh:mm).
#15
2017-02-15 20:53:05 +00:00
78acd50ba6 added rounding for WeeklyTotal to 2DP
#15
2017-02-15 20:48:19 +00:00
79f5e392e9 test the databind for some of the timelog properties with the new Flattened TimeLogList object.
added convertToHours method to spa.js to enable WeeklyTotal(mins) to be converted to hours for ui.
#15
2017-02-15 16:53:06 +00:00
59e27c2991 Flatten the TimeLogsList object.
put DayOfWeek and Day into the DailyLogs object to help flatten.
changed GetTimeLogList to return List<DailyLogs>.
#15
2017-02-15 16:51:19 +00:00
8756964f0b add get user contracted hours procedure to supply the TimeLogList object HoursPerWeekMinutes property.
started databinding the timelogs page.

#15
2017-02-14 22:50:47 +00:00
8020cd3801 fixed today button not changing the selected date
#16
2017-02-14 22:22:18 +00:00
1a130b464d ignore csproj.user files.
add missing DailyLog.cs reference file to proj.
2017-02-14 21:03:02 +00:00
21f87c9558 removed braces.
added logging for when the selectedDate parameter is null (for current week).

#9
2017-02-14 17:07:07 +00:00
69aaf53bb4 Added method to calculate the daily logs.
extended TimeLogList object:
 > to group logs into days with the "DailyLogs" object
 > to calculate the WeeklyTotal hours automatically based on the TimeLogs.DailyLogs object for each day.

Created DailyLogs object:
 > holds the number of entries for a day.
 > holds the time "in"/"at work" for that day (dailytotal).

#15
2017-02-14 17:06:16 +00:00
eb1ba4157a fixed log formatting.
#9
2017-02-14 16:31:44 +00:00
a2cb93bf83 fixup! add foreach to group logs by the day of the week in which they are entered. #15 2017-02-14 14:04:03 +00:00
906ec10a5b fixed issue where GetLogDirection would return the first log of the day, not the latest in the DB.
fixed issue where clicking timepicker would return an absolute, incorrect url.
2017-02-13 22:23:21 +00:00
0b310f29f3 removed all page size, unsure how implementation will work in reality.
#11
2017-02-13 21:12:37 +00:00
36282ee355 added some logging to SQLiteRepository.
#9
2017-02-13 16:57:18 +00:00
00a6894197 added trace logging to the controller classes.
changed nlog config file to output trace logging.
#9
2017-02-13 14:07:09 +00:00
923e4473a9 formatting changes. corrected pagination options at the bottom of users page to be aligned correctly, both horizontally and vertically.
#11
2017-02-13 11:48:57 +00:00
cdac61b18d added pagination to the repository GetUser method.
added pagesixe to userlist object.
added total user count to enable PageCount to work correctly.
added GET_TOTAL_USER_COUNT and GET_ALL_USERS_PAGINATE sqlite procedures to support pagination.
updated methods in SQLiteRepository to support pagination procedures and pagination properties of UserList.
updated UsersController to support pagination parameters.
tidied html script tags.
added pagination buttons at the bottom of user page. including drop down to select PageSize
added setPageSize, goToUserPage and setPagination methods to the viewmodel.
updated other methods for sammy etc to work with pagesize and PageNumber params.
#11
2017-02-12 22:26:00 +00:00
159c0a7625 added postbuild event steps to copy dependencies into the output directory. 2017-02-10 22:42:05 +00:00
cce10f98d1 added sentinel configuration to view any NLog Chainsaw messages output from the system.
#5
2017-02-10 22:40:52 +00:00
24ba9480e9 changed Configuration to bind ninject assemblies from xml file using Ninject.Extentions.Xml
ninject will load DefaultLogger if no logger is found. if no IRepository is found, will exception.
created DefaultLogger which will just log to Debug.WriteLine
#5
2017-02-10 22:40:18 +00:00
f73fb9d345 renamed Class1 to NLogger.cs.
implemented ILogger interface for NLog logger.
added Chainsaw NLogConfig.xml file.
#9
2017-02-10 22:37:57 +00:00
fd015f1070 remove debugging code. tidy code up. 2017-02-10 17:15:28 +00:00
d237c6c00d remove unnecessary code from development.
#5
2017-02-10 17:12:20 +00:00
f1794a2e56 project/sln updates. 2017-02-10 16:56:10 +00:00
d2035a776d fixed selected date for the datepicker. will now highlight the selected date that it is showing time logs for.
#5
2017-02-10 16:55:58 +00:00
8fb6fedc7d updated references to pull in required packages. 2017-02-10 16:54:21 +00:00
5be05ecd5e changed datetime properties to return just the date, ignore the time. 2017-02-10 16:53:44 +00:00
fd257c7bca added missing sqlite nuget package for sqlite interop dlls. 2017-02-10 16:53:16 +00:00
fca8b59c3e merge in Card Reader Service and Service host projects. 2017-02-10 15:59:37 +00:00
832426608c assign to selectedDate even if date is not supplied.
update initDatePicker to accept date. This date will be the setDate argument for bootstrap datepicker.
error is here, its not assigning the date correctly for the picker.
#5
2017-02-10 12:43:23 +00:00
19b718a946 changed IRepository to accept a DateTime for the arg, instead of an int for calendar week/year.
added SelectedDate to the TimeLog object.
changed the timelog controller to accept a datetime as an arg, instead of the previous calendarweek/year args.
This kills two birds with one arg.
Changed the goToTimeLogs function to accept an args object to allow passing of datetime SelectedDate parameter.
removed console.logs to tidy code a little.
corrected some "undefined" parameter bugs/errors.
#5
2017-02-10 12:07:02 +00:00
ced578e05d added wix installer stub project.
#7
2017-02-09 22:28:21 +00:00
7923867c2d hook into the selected week changed event to get timelogs from the api.
needs to change the datetime picker to show the selected date rather than today date.
#5
2017-02-09 22:13:45 +00:00
760f37b14b added manuallog object to allow users to create a sign in/out log for the swipedatacontroller log. 2017-02-09 21:36:22 +00:00