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

correct data binding for LastEventDateTime property

Browse Source 
added method to convert the datetime to a display format.
created padNumber to ensure numbers below 10 get shown as two digits.
#53
This commit is contained in:
chris.watts90@outlook.com 2017-03-03 20:48:12 +00:00
parent b0b1fd4576
commit 50e9d3d182
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/index.html
View File

@ -76,10 +76,10 @@
<tr>
<td class="valign text-center">
<!-- ko if: State -->
<span class="label label-success" data-toggle="tooltip" data-placement="top" data-bind="attr:{title: LastEventTime}" style="display: block">IN</span>
<span class="label label-success" data-toggle="tooltip" data-placement="top" title="" data-bind="attr:{'title': $root.convertToDisplayDateTime(LastEventDateTime)}" style="display: block">IN</span>
<!-- /ko -->
<!-- ko if: !State -->
<span class="label label-danger" data-toggle="tooltip" data-placement="top" data-bind="attr:{title: LastEventTime}" style="display: block">OUT</span>
<span class="label label-danger" data-toggle="tooltip" data-placement="top" title="" data-bind="attr:{'title': $root.convertToDisplayDateTime(LastEventDateTime)}" style="display: block">OUT</span>
<!-- /ko -->
</td>
<td class="valign" data-bind="text: FirstName"></td>

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

@ -142,7 +142,7 @@
};
self.convertToDisplayTime = function (dateValue) {
var date = new Date(dateValue);
return date.getHours() + ":" + (date.getMinutes() < 10 ? '0' : '') + date.getMinutes();
return date.getHours() + ":" + self.padNumber(date.getMinutes());
};
self.correctLogOffset = function (logCount) {
if (logCount % 2 !== 0) {
@ -156,6 +156,18 @@
self.getTimeLogEntryArrayLength = function(maxDailyLogs) {
return Math.round(maxDailyLogs/2);
};
self.padNumber = function(number) {
return (number < 10 ? '0' : '') + number;
}
self.convertToDisplayDateTime = function (dateValue) {
var date = new Date(dateValue); // dd MM YY HH:mm:ss e.g.: 01 Mar 17 17:34:02
return date.getDay() + " "
+ date.toLocaleString("en-us", { month: "long" }) + " "
+ (date.getYear()-100) + " "
+ self.padNumber(date.getHours()) + ":"
+ self.padNumber(date.getMinutes()) + ":"
+ self.padNumber(date.getSeconds());
};
self.dismissAlert = function(data, event) {
self.errorData(null);
};
@ -229,6 +241,7 @@
var url = self.createRequestUrl(self.apiEndpoints.getUserList, args, false);
$.getJSON(url, function (res) {
self.userList(res);
$('[data-toggle="tooltip"]').tooltip();
}).fail(function (response, status, error) {
console.log("error - getusers");
var errObj = self.processRequestFailure(response, status, error);