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

tidy code.

Browse Source 
ensure all observables controlling pages are cleared on re-navigate
This commit is contained in:
Watts 2017-04-13 21:01:33 +01:00
parent 2fc036e7c3
commit 8ea257e68b
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,7 @@
return Math.round(maxDailyLogs/2); return Math.round(maxDailyLogs/2);
}; };
self.padNumber = function(number) { self.padNumber = function(number) {
return (number < 10 ? '0' : '') + number; return (number < 10 ? "0" : "") + number;
}; };
self.convertToDisplayDateTime = function (dateValue) { self.convertToDisplayDateTime = function (dateValue) {
var date = new Date(dateValue); // dd MM YY HH:mm:ss e.g.: 01 Mar 17 17:34:02 var date = new Date(dateValue); // dd MM YY HH:mm:ss e.g.: 01 Mar 17 17:34:02
@ -355,6 +355,7 @@
data: logToDelete, data: logToDelete,
success: function (result) { success: function (result) {
console.log("successfully deleted .." + result); console.log("successfully deleted .." + result);
self.goToMenuOption(self.uiPages.home());
} }
}); });
}; };
@ -407,9 +408,11 @@
var pageNumber = this.params.pageNumber; var pageNumber = this.params.pageNumber;
var groupId = this.params.groupId; var groupId = this.params.groupId;
self.chosenMenuItemId("Home"); self.chosenMenuItemId("Home");
self.groupsList(null);
self.chosenUserDetails(null); self.chosenUserDetails(null);
self.userList(null); self.userList(null);
self.userTimeLogData(null); self.userTimeLogData(null);
self.manualLog(null);
if (self.appDetails() === null) { if (self.appDetails() === null) {
self.getAppDetails(); self.getAppDetails();
} }
@ -423,13 +426,15 @@
}); });
this.get("#userData/:userId", function () { this.get("#userData/:userId", function () {
self.chosenMenuItemId("Data"); self.chosenMenuItemId("Data");
self.groupsList(null);
self.chosenUserDetails(null);
self.userList(null); self.userList(null);
self.getUserDetails(this.params.userId);
self.userTimeLogData(null); self.userTimeLogData(null);
self.manualLog(null);
self.getUserDetails(this.params.userId);
self.getUnassignedCardData(); self.getUnassignedCardData();
}); });
this.get("#timelogs/:userId", function () { this.get("#timelogs/:userId", function () {
//var selectedDate = this.params.selectedDate;
if (this.params.selectedDate) { if (this.params.selectedDate) {
self.selectedTimeLogDate(this.params.selectedDate); self.selectedTimeLogDate(this.params.selectedDate);
} else { } else {
@ -437,8 +442,11 @@
} }
self.chosenTimeLogUserId = this.params.userId; self.chosenTimeLogUserId = this.params.userId;
self.chosenMenuItemId("Other"); self.chosenMenuItemId("Other");
self.userList(null); self.groupsList(null);
self.chosenUserDetails(null); self.chosenUserDetails(null);
self.userList(null);
self.userTimeLogData(null);
self.manualLog(null);
self.getTimeLogData(this.params.userId, self.selectedTimeLogDate()); self.getTimeLogData(this.params.userId, self.selectedTimeLogDate());
}); });
this.get("#newUser", function () { this.get("#newUser", function () {
@ -490,9 +498,9 @@
}).run(); }).run();
}; };
ko.applyBindings(new DataVM()); ko.applyBindings(new DataVM());
$(document).on("mouseenter", ".datepicker-days tbody tr", function () { //$(document).on("mouseenter", ".datepicker-days tbody tr", function () {
$(this).addClass("highlight"); // $(this).addClass("highlight");
}); //});
$(document).on("mouseleave", ".datepicker-days tbody tr", function () { //$(document).on("mouseleave", ".datepicker-days tbody tr", function () {
$(this).removeClass("highlight"); // $(this).removeClass("highlight");
}); //});