5ba22c2fd3
Merge branch '#99-CannotAssociateGroupsOnCreation' into Release0.2
2018-05-30 13:28:57 +01:00
22712d7cd2
Found issue with the groups, corrected the binding, was assigning the entire object (data) to the groups observableArray rather than the groups property (data.Groups)
...
#99
2018-05-30 13:28:02 +01:00
1f67b3c84e
Merge branch '#100-EditLogReturnToUserPage' into Release0.2
2018-05-30 10:11:09 +01:00
a1aa4fcce0
Change createManualLog and deleteLog to refresh page rather than go to user list page.
...
#100
2018-05-30 10:10:53 +01:00
0653fb60d2
Merge branch '#102-MakeLinksCursorTheSame' into Release0.2
2018-05-29 13:56:55 +01:00
7e214cbab3
Fix cursor when hovering over any hyperlink. Made it a pointer (finger)
...
#102
2018-05-29 13:55:07 +01:00
11a212a635
remove commented out code
...
#89
2018-05-25 12:28:41 +01:00
a2925872d0
Merge branch '#89-UpdateLogDirectionForManualLog' into Release0.2
2018-05-25 12:28:10 +01:00
17e80975d9
Add code to update the directions for logs on the days where you are creating or deleting an entry from.
...
The code will change in> out and vice versa when an entry is created or deleted from the UI.
Does not affect the automatic TimeLog system (swipe cards etc)
#89
2018-05-25 12:27:09 +01:00
2601ea04f5
Merge branch 'CardReaderStartIssue-90' into Release0.2
2018-03-08 09:22:34 +00:00
28d9b14983
remove console.writelines from code.
...
Add trace log output to DataCenterHelper.
#90
2018-03-08 09:21:04 +00:00
9ba44d273e
added console target to NLogConfig.xml, to help debugging on console, rather than using console.writelines.
2018-03-08 09:18:20 +00:00
fb068cbdf2
update card reader service to meet changes made to wrong code base for issue #90
2018-03-08 09:17:43 +00:00
552abaac49
Merge branch 'ClearUnassignedCards-#69' into Release0.2
2018-03-07 10:11:08 +00:00
50863b937c
Add section to the Admin page that will allow administrator to clear all unassigned identifiers.
...
#69
2018-03-07 09:03:31 +00:00
153876d6a1
Add API method to CardsController for clearing all unassigned identifiers from system.
...
#69
2018-03-07 09:02:19 +00:00
b266fbf8e0
Remove 0.3 upgrade script.
...
Implement Clear Unassigned Card method to remove all cards/identifiers from the database not assigned to a user.
Add procedure to delete cards from the db.
#69
2018-03-07 09:01:02 +00:00
7a27bba95e
add method to clear unassigned card identifiers.
...
#69
2018-03-07 08:59:29 +00:00
a60a637877
Merge branch 'Handle_DB_Upgrade/Migration' into Release0.2
2018-03-07 08:02:55 +00:00
55955b0e1b
added extra logging for upgrades #85
2018-03-07 08:01:52 +00:00
c56144d9b3
create db version object for table to hold our db version.
...
update assemblyinfo so that it uses static const properties.
Create 0.2 upgrade script.
Add code to repository class that will check version of the database currently being referenced. IT will then proceed to run upgrade scripts (in order) from the oldest to newest version on the database, before finally setting the db version number.
#85
2018-03-06 17:07:05 +00:00
9a2ff37004
Merge branch 'CardReaderServiceAlwaysStart-Issue90' into Release0.2
2018-03-06 15:11:05 +00:00
901e9190a4
Improve code to handle disconnected card reader during runtime.
...
Correct thread/memory leak issue where two main threads were created/running. (bad juju!)
#90
2018-03-06 15:10:10 +00:00
e52e9327ac
Merge branch 'CardReaderServiceAlwaysStart-Issue90' of https://gitlab.com/WattsC/FlexiTimeTrackerTool into CardReaderServiceAlwaysStart-Issue90
2018-03-06 14:48:10 +00:00
d443ecb24c
fixup! Fix memory leak issue, where we would create a duplicate cardmonitor for an "unaware" card reader state. #90
2018-03-06 14:47:34 +00:00
3eef3017a0
Fix memory leak issue, where we would create a duplicate cardmonitor for an "unaware" card reader state.
2018-03-06 14:45:27 +00:00
7ec0db9ebb
Set service so that it will always start, not exit early if there is no card reader attached.
...
WIP #90
2018-03-06 14:31:31 +00:00
5639724390
make saturday sunday only visible if theres hours on them #92
...
refine styling of dialog for create/edit of timelogs to remove dropdown entry and remove issue of deleting text in input control from before.
2018-03-06 11:54:21 +00:00
5ff1ad5a5a
Merge branch 'ArchiveUsers-#67' into Release0.2
2017-04-25 14:45:55 +01:00
a768be9e9c
update GET_ALL_USERS and GET_ALL_USERS_PAGINATE to retrieve users not archived.
...
#67
2017-04-25 14:39:16 +01:00
c45716e796
consolidate code for datetime picker to ensure consistency in setup for create/edit dialogs.
2017-04-25 12:00:13 +01:00
5e86dae944
Merge branch 'TodayButtonNotWorking-_83' into Release0.2
2017-04-21 09:22:07 +01:00
67fc6a12ae
add js script types.
...
add manual Today button, databound to the goToToday method in viewmodel.
#83
2017-04-21 09:21:48 +01:00
205d8e30dc
refine the goToToday function.
...
#83
2017-04-21 09:20:56 +01:00
4cab3932fa
added goToToday click handler for viewModel.
...
this is to change the date on the picker control to todays date as the bootstrap datepicker control today button doesnt appear to be working.
#83
2017-04-21 09:19:26 +01:00
76ac93493d
Merge branch 'MissingInstallFiles-_78' into Release0.2
2017-04-21 08:17:11 +01:00
06e3dbcdee
add missing knockout context menu css and js files.
...
#78
2017-04-21 08:16:38 +01:00
54c86b41ed
Add reference to ConfigurationHandler project.
...
Add component tag for ConfigurationHandler dll
#78
2017-04-21 08:16:10 +01:00
5dbd7a7ded
change card reader decision code to prevent null ref in main app.
...
#79
2017-04-21 08:15:27 +01:00
111bbd99e4
Merge branch 'ConfigHandlerNullRef-_79' into Release0.2
2017-04-21 08:06:41 +01:00
20f0ccb211
fix null reference error when configuration setting specified by "keyName" parameter doesnt exist.
...
#79
2017-04-21 08:03:32 +01:00
23ade491e6
Merge branch 'SeparateDBInstaller-#25' into Release0.2
2017-04-18 16:21:12 +01:00
0e709267d2
stop labels being tab stops.
...
Add label for Database Type option selection and make radio button for SQLite conform to ui layout.
#25
2017-04-18 16:18:23 +01:00
10c2763b48
added Database configuration radio button to UI.
...
tied to property that conditionally installs the SQLite Database provider.
#25
2017-04-18 11:17:17 +01:00
ede5a70beb
Added SQLiteRepositoryInstaller Chain entry to install SQLite provider if chosen.
...
Added INSTALLFOLDER configuration to set a single install directory for both data service and plugins.
#25
2017-04-18 11:16:12 +01:00
95c3d260cd
add reference to SQLiteRepositoryInstaller project
...
#25
2017-04-18 11:11:06 +01:00
ef46bb176c
remove SQLite Component group reference.
...
#25
2017-04-18 11:10:46 +01:00
1b5b1a86c8
rename install directory
2017-04-18 11:10:31 +01:00
4665a72414
removed SQLiteRepository.wxs file from bundle installer (now got its own installer)
...
#25
2017-04-18 11:10:09 +01:00
040ad59922
created SQLiteRepositoryInstaller project
...
#25
2017-04-18 11:09:25 +01:00
