Chris/FlexitimeTracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/ChangeTimeDisplayUnits-_58' into Release0.1.5

Browse Source
This commit is contained in:
Chris.Watts90@outlook.com 2017-03-03 10:23:26 +00:00
commit a367cc1375
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
View File

@ -136,7 +136,9 @@
if (hrs < 1) {
return value + " mins";
}
return self.round(hrs, 2)+" hrs";
var h = Math.floor(hrs);
var m = Math.floor((hrs % 1) * 60);
return h + " hrs " + m + " minutes";
};
self.convertToDisplayTime = function (dateValue) {
var date = new Date(dateValue);
@ -316,7 +318,7 @@
var query = this.params.query;
var pageSize = this.params.pageSize;
var pageNumber = this.params.pageNumber;
self.chosenMenuItemId("Users");
self.chosenMenuItemId("Home");
self.chosenUserDetails(null);
self.userList(null);
self.userTimeLogData(null);