From d2035a776d1130dc0a375603d4a0d978b38fecd5 Mon Sep 17 00:00:00 2001 From: "chris.watts90@outlook.com" Date: Fri, 10 Feb 2017 16:55:58 +0000 Subject: [PATCH] fixed selected date for the datepicker. will now highlight the selected date that it is showing time logs for. #5 --- .../WindowsDataCenter/WindowsDataCenter/www/spa.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js index 1f3a31d..0630b75 100644 --- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js +++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js @@ -56,7 +56,7 @@ if (xmlHttpRequest.readyState === 4) { return { errorCode: xmlHttpRequest.status, - errorMessage: error.statusText, + errorMessage: xmlHttpRequest.statusText, errorSource: "" }; } @@ -149,13 +149,16 @@ todayBtn: true, format: "yyyy-mm-dd", todayHighlight: true, - calendarWeeks: true + calendarWeeks: true, + //defaultViewDate: { year: selectedDate.getFullYear(), month: selectedDate.getMonth(), day: selectedDate.getDate() } }); + if (!selectedDate) { - selectedDate = new Date().toDateString("yyyy-mm-dd"); + selectedDate = new Date(); } else { - selectedDate = new Date(selectedDate).toDateString("yyyy-mm-dd"); + selectedDate = new Date(selectedDate); } + console.log("setting date to: " + selectedDate); $("#weeklyDatePicker").datepicker("setDate", selectedDate); console.log("finished init"); }; @@ -181,7 +184,7 @@ self.userList(res); }).fail(function (response, status, error) { console.log("error - getusers"); - var errObj = self.processRequestFailure(resp, status, error); + var errObj = self.processRequestFailure(response, status, error); self.assignErrorObject(errObj.errorCode, errObj.errorMessage, "getUserList"); }); };