From 7402869cb893abd0a986494ee78b3721413a5711 Mon Sep 17 00:00:00 2001 From: "chris.watts90@outlook.com" Date: Mon, 10 Apr 2017 22:25:36 +0100 Subject: [PATCH] update the datepicker initialisation for new datetimepicker. updated editLog method to initialise the datetimepicker to be relevant to the selected date. limit the min and max date of editor dialog to be appropriate to the selected week on the calendar. #29 --- .../WindowsDataCenter/www/spa.js | 51 ++++++++++--------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js index cdc8192..bfa1444 100644 --- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js +++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js @@ -236,30 +236,29 @@ console.log(url); }; self.initDatePicker = function (selectedDate) { - $("#weeklyDatePicker").datepicker({ - weekStart: 1, - maxViewMode: 2, - endDate: "+0d", - todayBtn: "linked", - format: "yyyy-mm-dd", - todayHighlight: true, - calendarWeeks: true - }); if (!selectedDate) { selectedDate = new Date(); } else { selectedDate = new Date(selectedDate); } - $("#weeklyDatePicker").datepicker("setDate", selectedDate); + moment.locale("en", { week: { dow: 1 } }); + $("#weeklyDatePicker").datetimepicker({ + format: 'DD/MM/YYYY', + inline: true, + showTodayButton: true, + calendarWeeks: true, + maxDate: 'now', + date: selectedDate + }); }; self.assignHandler = function () { var elem = $("#weeklyDatePicker")[0]; var data = jQuery.hasData(elem) && jQuery._data(elem); - if (!data.events.changeDate) { - $("#weeklyDatePicker").on("changeDate", function (e) { - var kk = e.date; - self.selectedCalendarWeek(moment(kk).isoWeek()); - self.goToTimeLogs(self.chosenTimeLogUserId, null, [{ key: "selectedDate", value: moment(kk).format("MM-DD-YYYY") }]); + if (!data.events) { + $('#weeklyDatePicker').on('dp.change', function (e) { + var value = e.date; + self.selectedCalendarWeek(moment(value).isoWeek()); + self.goToTimeLogs(self.chosenTimeLogUserId, null, [{ key: "selectedDate", value: moment(value).format("MM-DD-YYYY") }]); }); } } @@ -387,13 +386,18 @@ { text: "Create", action: createlog } ]); self.editContextMenu = ko.observableArray([ - { text: "text", action: clicked }, { text: "Edit", action: editlog }, { text: "Create", action: createlog } ]); function editlog (data) { - alert("edit"); - } + self.manualLog(data); + $('#manualLogDialog').modal("show"); + $('#datetimepicker1').datetimepicker({ + date: new Date(data.EventTime), + minDate: moment(new Date(data.EventTime)).startOf('week'), + maxDate: moment(new Date(data.EventTime)).endOf('week') + }); + }; function createlog(data) { self.manualLog({ CalendarWeek:-1, @@ -401,14 +405,15 @@ EventTime: "2017-03-01T07:44:41.0861152+00:00", Id: -1, IdentifierId: -1, - UserId: self.chosenTimeLogUserId(), + UserId: self.chosenTimeLogUserId, Year: 0 }); $('#manualLogDialog').modal("show"); - } - function clicked(data) { - alert('oh, you clicked me! ah, and you typed "' + data.value() + '"'); - } + $('#datetimepicker1').datetimepicker({ + minDate: moment(new Date()).startOf('week'), + maxDate: moment(new Date()).endOf('week') + }); + }; Sammy(function () { this.get("#users", function () { var query = this.params.query;