Commit Graph

357 Commits

Author SHA1 Message Date
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
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