Commit Graph

35 Commits

Author SHA1 Message Date
e4724f2d3e Merge branch 'DefaultUserSorting-#52' into Release0.1.4 2017-02-27 15:17:29 +00:00
63a96e77cf Merge branch 'HomePageIndicator-#47' into Release0.1.4 2017-02-27 15:17:11 +00:00
e41f15eec8 reformat/reorder SQLiteProcedures file. 2017-02-27 15:16:23 +00:00
66def93ff1 added the order by arguments for GET_ALL_USERS_PAGINATE and GET_ALL_USERS procedures.
this will now order the users by LastName, then FirstName in alphabetical order (startint with a).
#52
2017-02-27 15:15:54 +00:00
e4f987cc0b add GetUserState to decide whether the user is currently In or Out.
#47
2017-02-27 10:24:23 +00:00
49235288d7 add implementation of the UserInformation property to populate it with the deftails for the given User
#46
2017-02-24 22:17:33 +00:00
fa38512c9a change code to only check the time log gap if the card is associated to a user.
This will ensure that multiple new users swiping their cards will definitely be added to the system.
#41
2017-02-23 21:02:37 +00:00
9fa97e2fc9 added extra logging to trace blocked swipe data events.
#39
2017-02-23 16:56:10 +00:00
67eed43160 fix ticks property for SwipeTimeGap.
#36
2017-02-22 22:47:38 +01:00
f5513ce122 change all versions to 0.1.2.0 2017-02-22 22:31:31 +01:00
0e1e23a770 create GET_LOGS_IN_LAST_X_MINUTES procedure.
implement logs in last x minute check.
can be configured from app.config file using "SwipeTimeGap" configuration. defaults to 3 minutes if configuration is not there.
#36
2017-02-22 21:17:53 +00:00
ebfced87ee fix relative file paths (file not found errors).
added razor engine to WindowsDataCenter project.
fixed odd logCount errors in spa.js/index.html
2017-02-16 17:07:48 +00:00
59e27c2991 Flatten the TimeLogsList object.
put DayOfWeek and Day into the DailyLogs object to help flatten.
changed GetTimeLogList to return List<DailyLogs>.
#15
2017-02-15 16:51:19 +00:00
8756964f0b add get user contracted hours procedure to supply the TimeLogList object HoursPerWeekMinutes property.
started databinding the timelogs page.

#15
2017-02-14 22:50:47 +00:00
69aaf53bb4 Added method to calculate the daily logs.
extended TimeLogList object:
 > to group logs into days with the "DailyLogs" object
 > to calculate the WeeklyTotal hours automatically based on the TimeLogs.DailyLogs object for each day.

Created DailyLogs object:
 > holds the number of entries for a day.
 > holds the time "in"/"at work" for that day (dailytotal).

#15
2017-02-14 17:06:16 +00:00
eb1ba4157a fixed log formatting.
#9
2017-02-14 16:31:44 +00:00
a2cb93bf83 fixup! add foreach to group logs by the day of the week in which they are entered. #15 2017-02-14 14:04:03 +00:00
906ec10a5b fixed issue where GetLogDirection would return the first log of the day, not the latest in the DB.
fixed issue where clicking timepicker would return an absolute, incorrect url.
2017-02-13 22:23:21 +00:00
36282ee355 added some logging to SQLiteRepository.
#9
2017-02-13 16:57:18 +00:00
cdac61b18d added pagination to the repository GetUser method.
added pagesixe to userlist object.
added total user count to enable PageCount to work correctly.
added GET_TOTAL_USER_COUNT and GET_ALL_USERS_PAGINATE sqlite procedures to support pagination.
updated methods in SQLiteRepository to support pagination procedures and pagination properties of UserList.
updated UsersController to support pagination parameters.
tidied html script tags.
added pagination buttons at the bottom of user page. including drop down to select PageSize
added setPageSize, goToUserPage and setPagination methods to the viewmodel.
updated other methods for sammy etc to work with pagesize and PageNumber params.
#11
2017-02-12 22:26:00 +00:00
5be05ecd5e changed datetime properties to return just the date, ignore the time. 2017-02-10 16:53:44 +00:00
832426608c assign to selectedDate even if date is not supplied.
update initDatePicker to accept date. This date will be the setDate argument for bootstrap datepicker.
error is here, its not assigning the date correctly for the picker.
#5
2017-02-10 12:43:23 +00:00
19b718a946 changed IRepository to accept a DateTime for the arg, instead of an int for calendar week/year.
added SelectedDate to the TimeLog object.
changed the timelog controller to accept a datetime as an arg, instead of the previous calendarweek/year args.
This kills two birds with one arg.
Changed the goToTimeLogs function to accept an args object to allow passing of datetime SelectedDate parameter.
removed console.logs to tidy code a little.
corrected some "undefined" parameter bugs/errors.
#5
2017-02-10 12:07:02 +00:00
38fab21afd renamed TimeLogDB to TimeLogDb.
moved LogDirectionDB to its own file and renamed to LogDirectionDb
2017-02-09 21:33:52 +00:00
24d35d24d2 use nameof compiler method to prevent the SQLiteProcedures constants needing to be rewritten and being too hard-coded. 2017-02-08 22:23:45 +00:00
0867cbd7a6 implemented the GetTimeLogs methods.
re-referenced TimeLog to TimeLogDB
implemented the LogEventTime method, now logs direction user was going.
also logs the CalendarWeek and Year, returns the Id of the time log entry now too.
2017-02-08 22:22:36 +00:00
3d64fc90ff created enum for LogDirection (in, out or unknown) added extra parameters to TimeLog to provide sufficient data on the log event.
renamed TimeLog to TimeLogDb, to create a database Entity.
2017-02-08 22:19:58 +00:00
54d11ddf9d added stub/comment for manual swipe data log submission.
returned user id in user edit
started working on the direction/logtime method
2017-02-08 16:51:23 +00:00
ea6fc3721d fixed update/create where HoursPerWeek/IsContractor info wasnt being updated/changed.
return UserId using the Out Parameter
Added GetLastTimeLog procedure. Added Comments to help figure out procedure steps later on.
2017-02-07 17:23:04 +00:00
0bb6c8bc08 corrected uiPages method to return correct home endpoint.
changed references to User.Id to User.UserId.
added relativePath option to createRequestUrl(..).
added documentation to returnButtonClick and createRequestUrl methods.
changed initDatePicker to have separate assign handler method to make code simpler.
changed all URL references to relative urls, no longer JSONP/crossdomain compatible.
tidied code.
added query parameter to home/users page.
added search getJson method.
changed all property names to match the WebApi endpoint.
added js to conditionally highlight the datepicker row on hover.
changed script and css references to proper CDN urls.
tidied html.
added form for querying user list.
UserController will conditionally choose to GetUsersList or Search, based on Query Parameter.
Add search method to IRepository
Implement Search method on IRepository interface
added search procedure to SQLiteProcedures
added Query property to UserList to allow UI to display the last filter/query parameter.
2017-02-06 22:18:09 +00:00
7596eb7d3f #4 Added IsContractor flag to the UserIdentity and User Object, the Api will now relate that status to the output object. note, notimplemented in the UI yet to control this flag. 2017-02-03 12:39:38 +00:00
4ac6b2475b Added initialisation for User object to set First and Last names to an empty string.
removed line to check if user id is valid, as when creating a user id, it will be -1....
2017-02-03 12:21:21 +00:00
1e8d56ab82 csproj update to reference Interfaces and SQLiteRepository implementation.
Complete IRepository migration into the ApiControllers.
remove any nuget packages from the packages.config which refer to sqlite and entity framework.
missing csproj update for SQLiteRepository project. Sorry..
2017-01-31 22:09:40 +00:00
bc1947a31f Move the database calls/procedures out into the SQLiteRepository, IRepository implementation.
created SQLiteProcedures to hold all the strings for procs. Constants also serves similar purpose.
renamed Class1 to SQLiteRepository.cs
added all the necessary nuget packages for SQLite.Net-PCL
2017-01-31 21:59:42 +00:00
a0d050acd2 Created the SQLiteRepository stub. ready for implementation..
(move to Ninject/Dependency Injection model)
2017-01-31 17:25:01 +00:00