6f9966e426
Merge branch 'InvestigateUnassociatedCardsGapBehaviour-_41' into Release0.1.3
2017-02-23 21:03:49 +00:00
fa38512c9a
change code to only check the time log gap if the card is associated to a user.
...
This will ensure that multiple new users swiping their cards will definitely be added to the system.
#41
2017-02-23 21:02:37 +00:00
ded664cdd0
corrected rounding issue so that UI will always show hours/mins (3:32 hrs) to two dp.
...
#43
2017-02-23 20:54:46 +00:00
4025663db9
Change table column titles,
...
add data-binding for Contractor boolean to show a tick on the UI
#44
2017-02-23 21:38:40 +01:00
1560623460
Merge branch 'APIUI500Error-#39' into Release0.1.3
2017-02-23 17:04:07 +00:00
6e11ca0d2c
Merge branch 'ChangeCardServicePort-#40' into Release0.1.3
2017-02-23 17:03:50 +00:00
09e74af168
add dispose for reader in monitor event. to prevent memory leak.
2017-02-23 17:03:14 +00:00
1be6465901
change port to default 8800
...
#40
2017-02-23 17:02:18 +00:00
9fa97e2fc9
added extra logging to trace blocked swipe data events.
...
#39
2017-02-23 16:56:10 +00:00
caa7408465
add mapping for ManuallyPostData method (housekeeping)
...
correct 20 minute swipe event blocker and change to 3 min.
2017-02-23 16:55:13 +00:00
71bb5b70af
update ninject packages to fix 500 internal server error.
...
removed dependency resolver configuration line, seemed to be duplicating bindings.
#39
2017-02-23 16:54:15 +00:00
0591407567
Merge branch 'Release0.1.2'
2017-02-22 22:48:22 +01:00
67eed43160
fix ticks property for SwipeTimeGap.
...
#36
2017-02-22 22:47:38 +01:00
5f91c1afce
Merge branch 'Release0.1.2' into 'master'
...
0.1.2
See merge request !4
2017-02-22 21:44:18 +00:00
f5513ce122
change all versions to 0.1.2.0
2017-02-22 22:31:31 +01:00
0e1e23a770
create GET_LOGS_IN_LAST_X_MINUTES procedure.
...
implement logs in last x minute check.
can be configured from app.config file using "SwipeTimeGap" configuration. defaults to 3 minutes if configuration is not there.
#36
2017-02-22 21:17:53 +00:00
4c18778a79
remove test error message code, plus some additional tidying, removing old comments.
...
plus removed unnecessary menu options.
#38
2017-02-22 20:53:10 +00:00
b8cd5792cf
Set the default page size to a config value - "DefaultPageSize", defaults to 10 if the config value is missing.
...
#37
2017-02-22 20:43:48 +00:00
0713f41ebb
Merge branch 'CardReaderNLogLogger-#34' into 'master'
...
0.1.1 - CardReaderService Logging fixes
See merge request !3
2017-02-22 13:22:54 +00:00
eb7736bafa
add Ninject.Extensions.Xml to the installer components.
...
add Ninject.Extensions.Xml to the packages list for CardReaderService.
add NLogConfigFilePath configuration setting to the App.config file.
added extra logging around Ninject loading.
#34
2017-02-22 13:19:39 +00:00
8f24fca75a
Merge branch 'UnbrokenSQLiteImplementation' into 'master'
...
merge work for version 0.1
See merge request !2
2017-02-20 14:12:31 +00:00
dbd400dbb1
add start service on install component.
...
made conditional based on STARTSERVICEONINSTALL property (defaults to false).
#24
2017-02-19 21:05:52 +00:00
dd788790c0
update solution.
...
#23
2017-02-18 21:55:56 +00:00
874ae5a22a
Merge branch 'InstallerDev' of https://gitlab.com/WattsC/FlexiTimeTrackerTool into InstallerDev
2017-02-18 21:44:26 +00:00
3b7ac4aa4e
fixup! rename Service1 to DataCenterService
...
#23
2017-02-18 21:43:59 +00:00
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
