8d7eceb7f7
Found that the createLog context menu passes in the row context to the method, but with basic info e.g.: "day: 2, dayOfWeek:'tuesday'" etc.
...
Now use this "day:2" to add to the selected timelog date interval (the date of the monday of the selected week). To now calculate the period. This is then used to update the log date picker when manually creating a log.
#82
2020-02-24 14:34:41 +00:00
5b10b5d546
Merge branch '#94-FlexitimePolicyTab' into Release0.2
2020-02-24 07:47:07 +00:00
1e072ec62b
removed hard coded string names in favour of using nameof(..)
2020-02-24 07:42:40 +00:00
695c88521d
Add new Javascript object for the policy entity. This will help with databinding for the relevant properties.
...
updated admin.html to pull in new policy object
updated admin.js to use new observables in the object.
#94
2020-02-24 07:40:52 +00:00
5e0d716ed5
Merge branch '#94-FlexitimePolicyTab' of https://gitlab.com/WattsC/FlexiTimeTrackerTool into #94-FlexitimePolicyTab
2019-10-18 11:56:21 +01:00
62e21c1ceb
Add Save Dialog with Change Author, Version, Date and description boxes.
...
Just need to fix the return code from API to ensure that when it saves, and returns OK, it will refresh the page..
#94
2019-10-18 11:55:58 +01:00
f9e1e44dd6
Add Save Dialog with Change Author, Version, Date and description boxes.
...
Just need to fix the return code from API to ensure that when it saves, and returns OK, it will refresh the page..
2019-10-18 11:55:32 +01:00
4f8d79c926
fix bug where policy would continue to be shown after changing screens
2019-10-18 10:58:48 +01:00
880ba8e16f
split Idenfitier Converter out into its own file
2019-10-18 10:58:30 +01:00
43353da2f4
compilation update for min.js
2019-10-18 09:53:51 +01:00
cec1bee1f2
Add Screen/page for showing the policyData on the spa #94
2019-10-18 09:53:35 +01:00
acfc9ef6fe
Add policy tab menu option (for top of screen)
...
Added methods to get the policy data
#94
2019-10-18 09:53:04 +01:00
22d142204d
Add policy editor to the admin screen
...
WIP - Adding save dialog to enter description of change, version, author etc.
admin.js
Added Markdown custom renderer
Added policy reload and policy save
2019-10-18 09:51:24 +01:00
d5c822c143
weird formatting changes again
2019-10-18 09:42:49 +01:00
7a779b81b8
more weird formatting changes
2019-10-18 09:31:12 +01:00
dc2210b5b3
Add Api Endpoint to save/retrieve the active policy.Policy
...
Add SQLite code to save the policy html/markdown scripts from the user
#94
2019-10-18 09:30:57 +01:00
f286498540
unknown formatting changes?
2019-10-18 09:27:27 +01:00
9f41286708
Add third party JS to support MarkDown editing/conversion to HTML
...
#94
2019-10-18 09:26:25 +01:00
98be55ced1
unknown formatting change (must have changed git settings in update for gitextensions)
2019-10-18 09:21:11 +01:00
3404001d06
Add install and uninstall scripts to card reader project for the sole purpose of deploying to Linux.
...
#103
2019-10-18 09:18:35 +01:00
81975559e2
Merge branch 'LinuxCardReaderService' into Release0.2
...
# Conflicts:
# DataCenter_Windows/WindowsDataCenter/SQLiteRepository/SQLiteRepository.cs
# DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/App.config
Merged Branch for linux work. Now Deploying Card Reader on RPI.
2019-09-12 09:15:34 +01:00
380b976f3d
add code to support nodes providing their own time (in support of satellite modes)
...
#72
2019-09-11 17:38:43 +01:00
1943895eec
Add support for card reader to provide its own date time.
...
#103
2019-09-11 17:37:26 +01:00
4c99dfba71
Fix install/uninstall files to use correct path for installation on rpi.
...
Fix CardReaderService.conf for supervisorctl to ensure correct pathing as per install directories.
Correct MessageLogger to ensure it appends log messages, previously overwrote the logs.
Add manual Reset event in Service1.cs to ensure that we exit when we stop.
Add configurationmanager/config property, to allow DataCenterHelper to pull updated configurations at runtime.
Add TimeStamp to CardDataPost object
#103
2019-09-11 17:28:34 +01:00
e49111ebfc
Merge branch 'LinuxCardReaderService' of https://gitlab.com/WattsC/FlexiTimeTrackerTool into LinuxCardReaderService
...
# Conflicts:
# CardReaderService/CardReaderService/CardReaderService.csproj
# CardReaderService/CardReaderService/Service1.cs
# CardReaderService/CardReaderService/packages.config
# CardReaderService/Logger/MessageLogger.cs
Add missing property from commit.
update nuget packages
2019-09-03 15:43:49 +01:00
9f617fdf0a
Fix Card UID retrieval for Raspberry PI/linux systems.
...
It appears that the issue was also relevant to windows, but windows somehow compensated?
#103
2019-09-03 15:31:07 +01:00
e97b0217ce
Merge branch '#77-DisableCardReaderInstallIfSmartCardServiceIsDisabled' into Release0.2
2019-03-29 09:19:37 +00:00
230db99d5d
fix installer so that it starts the Windows Smart Card Service and sets it to automatic.
...
also added a service dependency from the Card Reader service to the Smart Card Service
#77
2019-03-29 09:16:56 +00:00
9a84ec0be9
Merge branch '#105-AddValidationForLogCreationDialog' into Release0.2
2019-03-28 11:00:47 +00:00
b584fa7f94
Add required attribute to the in/out drop down.
...
#105
2019-03-28 10:59:52 +00:00
53b4499d37
Merge branch '#98-AssignIdentFromUserCreateFails' into Release0.2
2018-06-06 13:50:23 +01:00
6e18b3461c
add extension method for excluding the contents of one list from another.
...
fix UpdateUser to use Exclude rather than Except method for linq.
#98
2018-06-06 13:38:49 +01:00
5413b2e63a
Merge branch '#95-RefactorSQLiteRepository' into Release0.2
2018-06-06 10:55:45 +01:00
ebbc8c0fde
removing todo - return userId from CreateUser API method
...
#95
2018-06-06 10:51:24 +01:00
7552390bec
correct script so it wont create duplicate groups, will check for existing prior to creating and only create if it doesnt exist.
...
#95
2018-06-06 10:50:47 +01:00
72e98bdd2e
optimise code to reduce code complexity on UpdateUser method in particular.
...
code has been split into smaller methods, and queries on db have been optimised to make fewer, larger queries than lots of small queries. (using IN sql queries).
restructured UpdateUser to be more logical which has reduced some of the complexity of the method.
When deleting unassociated cards, the system will ensure all timelogs associated to those Ids are deleted also.
CreateGroup will now not allow duplicate groups, but will return the ID of the existing Group found in the DB.
pulled out GetUserCount method to simplify the GetUsers method.
removed empty quotes in favour of string.empty
#95
2018-06-06 10:50:06 +01:00
b329fd6e5a
add method to use SQL In queries to retrieve lists.
...
add queries DELETE_TIMELOG_ENTRIES and GET_CARDS_BY_UNIQUE_ID_LIST that use the IN command.
this will delete all timelog entries where the ids exist in the list, or get cards in the db where the unique Id exists in the DB respectively.
GET_GROUP_BY_NAME is to be used for checking whether a group already exists on create and is designed to only return one record.
#95
2018-06-06 10:45:22 +01:00
f871c23631
add converters to help convert from/to data transfer objects.
...
removed conversion code from SQLiteRepository.cs in favour of new converters.
pulled out string queries from SQLiteRepository and moved to SQLiteProcedures.cs.
#95
2018-06-04 11:07:29 +01:00
a9d8e4c015
Set versions to 0.2.1.0 for release.
...
update bug tracking url for gitlab bug reports
2018-06-01 10:34:34 +01:00
492314a956
beginnings of refactor for repository project.
...
#95
2018-06-01 10:08:43 +01:00
b557174ef9
set .net versions to .net 4.5 for interfaces, ConfigurationHandler, CardReaderService projects in order to target mono framework.
...
update ninject to 3.3.1 to attempt compatibility with mono framework.
switch ninject config to use logfile logger not nlog..for now..
2018-05-31 14:08:41 +01:00
1395172142
created install and uninstall shell scripts - tested on ubuntu.
...
created dependencies text file to explain what is required.
created CardReaderService.conf file for supervisor configuration.
2018-05-30 13:39:44 +01:00
01436b2940
moved sln to root.
...
updated packages references to match this.
2018-05-30 13:39:44 +01:00
d55ee663b8
retarget for .net 4.5 (from 4.5.2) for mono support.
...
reference logger.
add calls to logger to help trace the service on start/stop.
2018-05-30 13:39:44 +01:00
cbfeecd608
add logger project.
2018-05-30 13:36:44 +01:00
cfec829d96
minor tidy up
2018-05-30 13:32:24 +01:00
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
