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) {