Commit Graph

381 Commits

Author SHA1 Message Date
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
7f410df70b 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.
2017-03-30 22:30:17 +01:00
9927ffc8bd moved sln to root.
updated packages references to match this.
2017-03-30 22:29:17 +01:00
0f3eb1d46b 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.
2017-03-30 16:54:54 +01:00
315580ec65 add logger project. 2017-03-30 16:53:36 +01:00
f381923394 Merge branch 'IncorrectTooltipDate-#70' into Release0.2 2017-03-24 21:45:59 +00: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
f21088d0a0 Merge branch 'Release0.1.5' into 'master'
Release0.1.5

See merge request !7
2017-03-19 08:35:39 +00:00
119c60a0be update all dll versions to 0.1.5.0 2017-03-19 07:57:35 +00:00
e39e36ce7f Merge branch 'UpdateInstaller-#66' into Release0.1.5 2017-03-19 07:50:57 +00:00
e88a904fac add missing ConfigurationHandler dll
#66
2017-03-19 07:49:53 +00:00
735bfb6685 added sentinel to tools directory. 2017-03-19 07:49:28 +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
0eaecbb3e5 Merge branch 'MinifyResources-#65' into Release0.1.5 2017-03-18 23:08:09 +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
f2685ec7e1 add AjaxMinifier and its required components.
#65
2017-03-18 23:03:14 +00:00
405b75f9cd Merge branch 'GroupFiltering-_64' into Release0.1.5 2017-03-18 16:25:29 +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