From 8ea257e68b4739054036cfd2bf689d3d0f40ddda Mon Sep 17 00:00:00 2001
From: Watts <Chris.Watts@edwardsvacuum.com>
Date: Thu, 13 Apr 2017 21:01:33 +0100
Subject: [PATCH] tidy code.

ensure all observables controlling pages are cleared on re-navigate
---
 .../WindowsDataCenter/www/spa.js              | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
index f4f2f3a..b7629a1 100644
--- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
+++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
@@ -93,7 +93,7 @@
         return Math.round(maxDailyLogs/2);
     };
     self.padNumber = function(number) {
-        return (number < 10 ? '0' : '') + 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
@@ -355,6 +355,7 @@
             data: logToDelete,
             success: function (result) {
                 console.log("successfully deleted .." + result);
+                self.goToMenuOption(self.uiPages.home());
             }
         });
     };
@@ -407,9 +408,11 @@
             var pageNumber = this.params.pageNumber;
             var groupId = this.params.groupId;
             self.chosenMenuItemId("Home");
+            self.groupsList(null);
             self.chosenUserDetails(null);
             self.userList(null);
             self.userTimeLogData(null);
+            self.manualLog(null);
             if (self.appDetails() === null) {
                 self.getAppDetails();
             }
@@ -423,13 +426,15 @@
         });
         this.get("#userData/:userId", function () {
             self.chosenMenuItemId("Data");
+            self.groupsList(null);
+            self.chosenUserDetails(null);
             self.userList(null);
-            self.getUserDetails(this.params.userId);
             self.userTimeLogData(null);
+            self.manualLog(null);
+            self.getUserDetails(this.params.userId);
             self.getUnassignedCardData();
         });
         this.get("#timelogs/:userId", function () {
-            //var selectedDate = this.params.selectedDate;
             if (this.params.selectedDate) {
                 self.selectedTimeLogDate(this.params.selectedDate);
             } else {
@@ -437,8 +442,11 @@
             }
             self.chosenTimeLogUserId = this.params.userId;
             self.chosenMenuItemId("Other");
-            self.userList(null);
+            self.groupsList(null);
             self.chosenUserDetails(null);
+            self.userList(null);
+            self.userTimeLogData(null);
+            self.manualLog(null);
             self.getTimeLogData(this.params.userId, self.selectedTimeLogDate());
         });
         this.get("#newUser", function () {
@@ -490,9 +498,9 @@
     }).run();
 };
 ko.applyBindings(new DataVM());
-$(document).on("mouseenter", ".datepicker-days tbody tr", function () {
-    $(this).addClass("highlight");
-});
-$(document).on("mouseleave", ".datepicker-days tbody tr", function () {
-    $(this).removeClass("highlight");
-});
\ No newline at end of file
+//$(document).on("mouseenter", ".datepicker-days tbody tr", function () {
+//    $(this).addClass("highlight");
+//});
+//$(document).on("mouseleave", ".datepicker-days tbody tr", function () {
+//    $(this).removeClass("highlight");
+//});
\ No newline at end of file