From 7557a293500234eac9fc5a13676729090ca7cc47 Mon Sep 17 00:00:00 2001 From: "chris.watts90@outlook.com" Date: Tue, 25 Feb 2020 16:07:03 +0000 Subject: [PATCH] fix issue with pre-setting the date for the dialog when in manual log creation screen. still not great as its still an issue with context menu getting relevant context.. its like when there is 1 data entry, columns get created and when you right click an empty cell, then it cannot get the context for the cell. #82 --- .../WindowsDataCenter/www/spa.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js index 94e05f4..c5bfddb 100644 --- a/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js +++ b/DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js @@ -410,18 +410,27 @@ function DataVM() { self.assignUpdateHandler(); }; function createlog(data, event) { - var logDateInitVal = moment(self.selectedTimeLogDate()).add((data.Day - 1), 'days').toISOString(); + var createDate = ""; + if (data && data.UserId && data.IdentifierId) { + createDate = data.EventTime; + } else if (data && data.Day) { + var mondayDate = moment(moment(self.userTimeLogData().SelectedDate).day("Monday").toISOString()); + createDate = mondayDate.add(data.Day-1, 'days').toISOString(); + } else { + createDate = self.userTimeLogData().SelectedDate; + } + self.manualLog({ CalendarWeek:-1, Direction:-1, - EventTime: logDateInitVal, + EventTime: createDate, Id: -1, IdentifierId: -1, UserId: self.chosenTimeLogUserId, Year: 0 }); $('#manualLogDialog').modal("show"); - self.initialiseManualLogDateTimePicker(logDateInitVal); + self.initialiseManualLogDateTimePicker(createDate); self.assignUpdateHandler(); }; function deleteLog(data) {