From c45716e796e9021a4ffda3926abc866ff337f80a Mon Sep 17 00:00:00 2001 From: "chris.watts90@outlook.com" Date: Tue, 25 Apr 2017 12:00:13 +0100 Subject: [PATCH] consolidate code for datetime picker to ensure consistency in setup for create/edit dialogs. --- .../WindowsDataCenter/www/spa.js | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js index fcd0081..254c8d6 100644 --- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js +++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js @@ -375,16 +375,10 @@ function editlog (data) { self.manualLog(data); $("#manualLogDialog").modal("show"); - $("#datetimepicker1").datetimepicker({ - format: "YYYY-DD-MM HH:mm:ss", - date: new Date(data.EventTime), - sideBySide: true, - minDate: moment(new Date(data.EventTime)).startOf("week"), - maxDate: moment(new Date(data.EventTime)).endOf("week") - }); + self.initialiseManualLogDateTimePicker(data.EventTime); self.assignUpdateHandler(); }; - function createlog(data) { + function createlog(data, event) { self.manualLog({ CalendarWeek:-1, Direction:-1, @@ -395,11 +389,7 @@ Year: 0 }); $('#manualLogDialog').modal("show"); - $('#datetimepicker1').datetimepicker({ - format: "YYYY-DD-MM HH:mm:ss", - minDate: moment(self.selectedTimeLogDate()).startOf("week"), - maxDate: moment(self.selectedTimeLogDate()).endOf("week") - }); + self.initialiseManualLogDateTimePicker(self.selectedTimeLogDate()); self.assignUpdateHandler(); }; function deleteLog(data) { @@ -407,6 +397,16 @@ self.deleteManualLog(data); } }; + self.initialiseManualLogDateTimePicker = function (date) { + $('#datetimepicker1') + .datetimepicker({ + format: "YYYY-DD-MM HH:mm:ss", + date: new Date(date), + sideBySide:true, + minDate: moment(date).startOf("week"), + maxDate: moment(date).endOf("week") + }); + }; Sammy(function () { this.get("#users", function () { var query = this.params.query;