c92ed064fc
move private methods to end of class.
...
change LogEventTime implementation to return a LogEventResponse object.
#17
2017-04-16 19:40:33 +01:00
094afc2903
change the interface to return a LogEventResponse object
...
#17
2017-04-16 19:39:51 +01:00
d50331fc04
create EventLogResponse to hold the direction of the user and the operational response.
...
#17
2017-04-16 19:39:13 +01:00
8d7b027b8c
remove spa.min.* files.
2017-04-16 19:35:20 +01:00
e7b7538986
Merge branch 'BundleInstaller' into Release0.2
2017-04-15 20:30:13 +01:00
Watts
97240bd752
added configuration gui elements for the bootstrapper to enable configuration of the port and IP on install.
...
#26 #31
2017-04-15 20:26:13 +01:00
Watts
3e2a19c0e4
added properties to configure the ip and port of the data center.
...
added code to pass the configuration properties through to the msi installers.
#31 #26
2017-04-15 20:24:54 +01:00
Watts
def593d3a5
exposed properties for configuring data center endpoint ip and port. defaults to localhost/127.0.0.1
...
implemented the code to configure the app.config file on install.
#31
2017-04-15 20:23:57 +01:00
Watts
cdbf543562
Exposed properties for setting the port in the data center installer
...
#31
2017-04-15 20:22:50 +01:00
Watts
54b6094a43
added debug and release installers build configuration to projects/solution to enable building installers in a complete/single step, to save building them individually.
2017-04-15 20:21:28 +01:00
Watts
640ef5f2bf
added debug and release installers build configuration to projects/solution to enable building installers in a complete/single step, to save building them individually.
2017-04-15 20:21:09 +01:00
Watts
f572760df1
add missing wix reference.
2017-04-13 21:11:06 +01:00
Watts
42114580ec
code formatting changes.
2017-04-13 21:02:01 +01:00
Watts
8ea257e68b
tidy code.
...
ensure all observables controlling pages are cleared on re-navigate
2017-04-13 21:01:33 +01:00
Watts
2fc036e7c3
fixed dual page showing issue after creating manual log.
...
#29
2017-04-13 21:01:07 +01:00
Watts
0a947af22f
removed preload as not needed.
2017-04-13 21:00:23 +01:00
Watts
ea6945fbda
correct missing closing tag in comments.
2017-04-13 21:00:11 +01:00
Watts
f1371f1f99
added cache control attributes.
...
tidied code. removed commenting for now. need to add this in shortly.
#29
2017-04-13 20:59:40 +01:00
Watts
64018ef8db
moved update group and update user details procedures to SQLiteProcedures
2017-04-13 20:58:52 +01:00
Watts
b8074af57e
Add updated flexitime database
2017-04-13 10:04:22 +01:00
Watts
6e278d1478
added LogDirection array for dropdown list to bind to.
...
referenced helpers.js/Helpers() class
added "selectedTimeLogDate" observable to make manual log creation filtering easier.
added api endpoints for create/delete logs.
removed processRequestFailure and createRequestUrl as been replaced by using Helpers.js
refactored the returnButtonClick method to use Helpers.js method.
updated assignHandler function for new bootstrap datetimepicker control.
created assignUpdateHandler to register to change when the datetimepicker is being used for creating/editing logs.
added the createManualLog and deleteManualLog methods to interact with the API.
added deleteLog method, with user Confirm.
added sammy route for "manualLog" for form submission in the manual log dialog.
#29
2017-04-12 22:08:45 +01:00
Watts
46ff1a232f
remove table from ManualLog Dialog
...
Extend form to include a drop down list with Log Directions on, (In/Out) databound to array in viewmodel and selected value bound to the TimeLog Direction field.
#29
2017-04-12 22:03:47 +01:00
Watts
2cd11b4a65
project update to include LogsController
...
#29
2017-04-12 22:02:19 +01:00
Watts
c2de9a0575
created LogsController with
...
Create/Edit/Delete Logs methods on it.
#29
2017-04-12 22:01:48 +01:00
Watts
2342aef8f9
update TimeLogDb to use LogSourceDb
...
#29
2017-04-12 22:01:10 +01:00
Watts
101c19e4f4
Implement CreateLog, DeleteLog, UpdateLog methods from interface.
...
include LogSourceDb in project
#29
2017-04-12 22:00:40 +01:00
Watts
4f4d247dc6
Add Log Source Identification to determine if a log has been created/updated from the UI/Other Applications
...
#29
2017-04-12 22:00:08 +01:00
Watts
a3432e0281
Add the methods necessary for updating/creating and deleteing logs
...
#29
2017-04-12 21:58:17 +01:00
7402869cb8
update the datepicker initialisation for new datetimepicker.
...
updated editLog method to initialise the datetimepicker to be relevant to the selected date.
limit the min and max date of editor dialog to be appropriate to the selected week on the calendar.
#29
2017-04-10 22:25:36 +01:00
ea2fd640e4
changed row highlight for datetime picker.
2017-04-10 22:21:54 +01:00
55a761f285
reference bootstrap datetime picker, remove bootstrap datepicker
...
update edit/create dialog to pull in datetime picker editor to the create edit dialog.
#29
2017-04-10 22:21:27 +01:00
86e0b60386
added create and create+edit context menus with options.
...
created stub methods for performing the edit/create actions.
#29
2017-04-09 22:05:18 +01:00
0bbbd76253
add references to knockout.contextmenu files.
...
add data bindings to timelog table to create the correct create+edit or create only context menus.
#29
2017-04-09 22:04:03 +01:00
6061b79033
proj update for new files
...
#29
2017-04-09 22:02:40 +01:00
8fdbb909b4
add knockout contextmenu plugin code to support data bound context menus
...
#29
2017-04-09 22:02:08 +01:00
c6eab48f04
fix tooltip display to show the date, rather than the day of the week.
...
updated minified version.
#70
2017-03-24 21:45:01 +00:00
092f116218
change minifier to run minimised.
2017-03-24 21:40:47 +00:00
bb05dd9828
create initial bundle installer using wix bootstrapper
...
added custom ui elements to conditionally install the card reader and data center services.
#26
2017-03-21 22:29:26 +00:00
3acb51ff91
changed the main DataCenterService thread name to make it useful/relevant.
2017-03-21 21:44:23 +00:00
b20a506d3a
removed hardcoded string for WebApp endpoint (previously " http://*:8800 ")
...
The app now pulls in the port from the app.config file.
Also added some commented out code to load a config file in a different directory (i.e.: to allow config files in "configs" directory to be pulled in).
If the port isnt specified in the app.config, will default to 8800.
#27
2017-03-21 21:44:23 +00:00
119c60a0be
update all dll versions to 0.1.5.0
2017-03-19 07:57:35 +00:00
e88a904fac
add missing ConfigurationHandler dll
...
#66
2017-03-19 07:49:53 +00:00
56b5a39fc0
update installers to version 0.1.5.0
...
#66
2017-03-18 23:12:29 +00:00
016a70eb2b
included new admin pages and its respective js files.
...
included the new Minified css/js files to the installer.
removed Bootstrap v4 alpha files.
added the bootstrap v3.3.7 files (fonts and css).
2017-03-18 23:12:08 +00:00
ed3720fee3
proj update to include the minified resources and copy to output
...
#65
2017-03-18 23:07:41 +00:00
82b95c3018
referenced the new Minified resources in the html pages.
...
#65
2017-03-18 23:06:58 +00:00
37b3ea9110
added the new minified resources.
...
#65
2017-03-18 23:06:22 +00:00
d1f03ac8b3
added Minify.bat and MinifierConfig.xml to specify the files and their required outputs to minify using AjaxMinifier.exe
...
added build event to run AjaxMinifier with the correct arguments.
#65
2017-03-18 23:05:24 +00:00
f72ee9c794
add viewmodel methods for disabling/enabling controls in conditions:
...
disable group in dropdown using getCurrentGroupFilter()
enable clear filter button if the user has selected a group filter, or search term has been entered.
changed users route to compensate for an undefined groupId.
#64
2017-03-18 16:21:14 +00:00
d97343409c
--- Admin.html ----
...
remove hide link on groups form.
fix widths of columns for "User Count" and delete button.
--- admin.js ----
removed unused params from methods.
removed auto adding a blank group item to form on startup (assign null/hide form on load).
fix issues with page flickering in certain conditions (on group delete).
#64
2017-03-18 16:14:20 +00:00
8d51f3545f
change bootstrap files to use v3.3.7 instead of v4 (for intellisense purposes only)
2017-03-18 16:11:13 +00:00
550b15a2f9
implement group filtering.
...
when going to the overview page, the groups will be retrieved, populating the dropdown list of group filters.
#64
2017-03-17 23:56:12 +00:00
6034d55f03
fill the group filter drop down with the list of groups.
...
disable drop down option if it is applied.
#64
2017-03-17 23:54:54 +00:00
4e3319ef69
implement GetUsers with a groupId filter applied.
...
implement GetGroup by Id method.
#64
2017-03-17 23:53:47 +00:00
eb239d0458
add code in to handle group filtering.
...
if a groupId is present, then get the user list by the group Id.
#64
2017-03-17 23:53:02 +00:00
290cad75c5
add GroupFilter property for UI drop down etc to show the active/applied filter
...
#64
2017-03-17 23:51:36 +00:00
199c5e965a
extend interface to retrieve a single group by Id.
...
extend GetUsers to accept a groupId parameter.
#64
2017-03-17 23:50:37 +00:00
88b62a23a3
moved processRequestFailure and other multi-use methods into Helpers.js
2017-03-17 22:38:33 +00:00
398e61a36d
set the Name/UserCount data fields to be vertically aligned.
...
add delete button/link to each group.
#30
2017-03-17 22:37:59 +00:00
ce6ac53e8f
move goToMenuOption to Helpers.js
...
fix refresh groups list issue when groups are deleted/edited etc.
added ajax delete to delete the group from the db when delete is clicked on ui.
group form is hidden on new page.
#30
2017-03-17 22:35:03 +00:00
62e2aa1136
implement delete group api method.
...
#30
2017-03-17 22:32:18 +00:00
631c205f1a
add no caching attribute for group data.
...
change UpdateGroup method so that it can create a group as well as update it.
#30
2017-03-16 23:06:49 +00:00
33f1769d66
implement sql to get the AssignedUserCounts from the db.
...
change UpdateGroup to convert Group object to GroupDb for database update.
#30
2017-03-16 23:05:52 +00:00
7564127c18
implement the create/add button.
...
#30
2017-03-15 23:23:50 +00:00
3945789ee6
added editGroup endpoint.
...
added goToMenuOption function to enable navigation and posting (edit, create etc, on the homepage).
created submitGroupEdit function to post the changed/new object to the server.
#30
2017-03-15 23:16:17 +00:00
f27a124751
create add button to enable an expanding side panel to edit/add groups to the system.
...
add button to hide side panel.
#30
2017-03-15 23:13:17 +00:00
8b8bd9e808
include files.. trying to pop the stash.. can i hell.
...
#30
2017-03-14 22:50:17 +00:00
05436c2faf
return GroupList from GroupController
...
#30
2017-03-14 22:46:20 +00:00
3e4a6839ee
create GroupList object.
...
#30
2017-03-14 22:45:50 +00:00
0cbc9dffbb
index on AddUserGroups-#59: 1e01271 add doctype tag.
2017-03-14 22:40:28 +00:00
1e01271276
add doctype tag.
2017-03-14 22:38:10 +00:00
dc80fd9ba4
stubbed GroupController to include Update and Delete endpoints
...
#59
2017-03-09 16:05:01 +00:00
6cddabba38
removed unnecessary code.
...
#59
2017-03-08 16:56:26 +00:00
ae3ffdfc27
fix missing argument in procedure for getting user groups.
...
#59
2017-03-08 16:55:39 +00:00
c35c47f092
added getGroups endpoint definition.
...
added getGroups function to retrieve a list of groups from the API.
made sure new user page gets the groups and stubs out the Groups object for use later on.
#59
2017-03-08 16:30:01 +00:00
090c2ddead
added group section to the UI, binding to the Groups array in the user object returned by the api.
...
#59
2017-03-08 16:28:50 +00:00
4e8b988ac5
add GroupController to proj.
...
#59
2017-03-08 16:28:16 +00:00
cf3a099314
created/padded out the GroupController to simply Get and Create groups.
...
#59
2017-03-08 16:28:06 +00:00
b4eb179c8f
implemented the CreateGroup, GetGroups, UpdateGroup, DeleteGroup methods.
...
updated GetUsers and GetUser to populate the User object with groups list.
modified UpdateUser to link the User to the Group items in the DB
#59
2017-03-08 16:27:31 +00:00
a047c20aea
removed old getUSers method.
...
Added CreateGroup, GetGroups, UpdateGroup, DeleteGroup methods.
#59
2017-03-08 16:25:59 +00:00
ca5a5ca4cb
Created Group object.
...
added Group list to User object for UI to bind to in order to show list of associated groups etc.
#59
2017-03-08 16:25:20 +00:00
a23bec7a5d
added files to proj
...
#59
2017-03-08 16:24:20 +00:00
4a9a526e36
Add Joining table object to link users to groups.
...
#59
2017-03-08 16:23:57 +00:00
d2ff905afd
create GroupDb object to hold group information
...
#59
2017-03-08 16:23:14 +00:00
fae6ca3244
Add Process.Start call to start browser on start (hardcoded to the 8800 localhost port and is for debug only)
2017-03-06 14:59:20 +00:00
d36645de2b
Change FavIcon to a content resource type - from Resource. Will now copy to output dir.
...
#61
2017-03-06 14:58:36 +00:00
72799981b6
moved the string update sql statement to a constant with the other procedures in SQLiteProcedures
...
#56
2017-03-03 21:48:09 +00:00
abf8833ba6
add UI display for LastUsed property to show the LastUsed time on the UI with the UniqueId.
...
format the date at the same time
#56
2017-03-03 21:41:48 +00:00
d41b5c528c
change SQLiteRepository to update last used property against the Identifiers in database (CardUniqueId table).
...
updated LogEventTime method to update the last used time in the db.
changed LogEventTime method to not store timelogs against unassigned cards.
updated GetUnassignedIdentifierList method to populate the Identifier LastUsed property.
#56
2017-03-03 21:39:31 +00:00
d55a1ed817
add LastUsed property
...
#56
2017-03-03 21:36:22 +00:00
0f7c4e62ad
Add property LastUsed
...
#56
2017-03-03 21:36:02 +00:00
50e9d3d182
correct data binding for LastEventDateTime property
...
added method to convert the datetime to a display format.
created padNumber to ensure numbers below 10 get shown as two digits.
#53
2017-03-03 20:48:12 +00:00
b0b1fd4576
Refactor code to simplify methods.
2017-03-03 13:01:31 +00:00
7110e3e2fe
add data bound tooltip to show the last event date time when hovering over the In/Out indicator
...
#53
2017-03-03 13:00:49 +00:00
69f3e502e0
Add LastEventDateTime property to User object
...
Add Code to populate the LastEventDateTime property in SQLiteRepository - getting the last TimeLogEvent datetime. will return min value if no logs available.
#53
2017-03-03 13:00:01 +00:00
309e8c093d
added sqlite test data db
2017-03-03 12:57:52 +00:00
a367cc1375
Merge remote-tracking branch 'origin/ChangeTimeDisplayUnits-_58' into Release0.1.5
2017-03-03 10:23:26 +00:00
bb1eeed231
reference ConfigurationHandler and update calls to get configurations.
...
removed ConfigMonitor.cs.
#54
2017-03-02 22:04:58 +00:00
bd54511d70
remove ConfigMonitor project.
...
#54
2017-03-02 22:01:46 +00:00
4a976f59f4
create ConfigurationHandler project to retrieve configuration settings from the app.config
...
#54
2017-03-02 22:00:25 +00:00
