Commit Graph

219 Commits

Author SHA1 Message Date
0ce9626622 added BugSubmissionEmailAddress config for gitlab bug email.
#48
2017-02-27 16:54:04 +00:00
be6a529afb Add modal 'about' dialog, databind to appDetails observable.
triggered off an about button in the navbar.
#48
2017-02-27 16:53:29 +00:00
c8c915d4e6 Added getAppDetails function to retrieve the application details object from the api.
Added getAppDetails endpoint to apiEndpoints object.
Set Homepage (users) to get the appdetails if the appDetails observable returns null.
#48
2017-02-27 16:52:41 +00:00
6f3c5931f4 created ApplicationController which returns an AppDetails object with the properties filled.
#48
2017-02-27 16:48:44 +00:00
f4e8f0a76f updated the AssemblyInfo properties to be the right version. 2017-02-27 16:47:51 +00:00
cb6c595c8c created AppDetails object
#48
2017-02-27 16:47:16 +00:00
e4724f2d3e Merge branch 'DefaultUserSorting-#52' into Release0.1.4 2017-02-27 15:17:29 +00:00
63a96e77cf Merge branch 'HomePageIndicator-#47' into Release0.1.4 2017-02-27 15:17:11 +00:00
e41f15eec8 reformat/reorder SQLiteProcedures file. 2017-02-27 15:16:23 +00:00
66def93ff1 added the order by arguments for GET_ALL_USERS_PAGINATE and GET_ALL_USERS procedures.
this will now order the users by LastName, then FirstName in alphabetical order (startint with a).
#52
2017-02-27 15:15:54 +00:00
eb1cb7a1b4 change in/out formatting to make uniform width
#47
2017-02-27 14:54:21 +00:00
e17568bdc5 update the html page to show the IN/OUT state as per the UI suggestion on the issue. Will conditionally show IN (green text)/OUT (red text) based on whether the system reports the user to be in or out.
#47
2017-02-27 10:25:31 +00:00
e4f987cc0b add GetUserState to decide whether the user is currently In or Out.
#47
2017-02-27 10:24:23 +00:00
07bcb40315 Added state to User object to support UI showing whether the user is in or out.
#47
2017-02-27 10:23:33 +00:00
978744896f add data binding and labels to display the user name on the TimeLog page.
#46
2017-02-24 22:20:58 +00:00
49235288d7 add implementation of the UserInformation property to populate it with the deftails for the given User
#46
2017-02-24 22:17:33 +00:00
0c88194db4 add new property to TimeLogList object to contain the user details - UserInformation
#46
2017-02-24 22:13:44 +00:00
da01f6670e Merge branch 'Release0.1.3' into 'master'
0.1.3

See merge request !5
2017-02-23 21:27:07 +00:00
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