Chris/FlexitimeTracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update the datepicker initialisation for new datetimepicker.

Browse Source 
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
This commit is contained in:
chris.watts90@outlook.com 2017-04-10 22:25:36 +01:00
parent ea2fd640e4
commit 7402869cb8
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
DataCenter_Windows/WindowsDataCenter/WindowsDataCenter/www/spa.js
View File

@ -236,30 +236,29 @@
console.log(url); console.log(url);
}; };
self.initDatePicker = function (selectedDate) { self.initDatePicker = function (selectedDate) {
$("#weeklyDatePicker").datepicker({
weekStart: 1,
maxViewMode: 2,
endDate: "+0d",
todayBtn: "linked",
format: "yyyy-mm-dd",
todayHighlight: true,
calendarWeeks: true
});
if (!selectedDate) { if (!selectedDate) {
selectedDate = new Date(); selectedDate = new Date();
} else { } else {
selectedDate = new Date(selectedDate); 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 () { self.assignHandler = function () {
var elem = $("#weeklyDatePicker")[0]; var elem = $("#weeklyDatePicker")[0];
var data = jQuery.hasData(elem) && jQuery._data(elem); var data = jQuery.hasData(elem) && jQuery._data(elem);
if (!data.events.changeDate) { if (!data.events) {
$("#weeklyDatePicker").on("changeDate", function (e) { $('#weeklyDatePicker').on('dp.change', function (e) {
var kk = e.date; var value = e.date;
self.selectedCalendarWeek(moment(kk).isoWeek()); self.selectedCalendarWeek(moment(value).isoWeek());
self.goToTimeLogs(self.chosenTimeLogUserId, null, [{ key: "selectedDate", value: moment(kk).format("MM-DD-YYYY") }]); self.goToTimeLogs(self.chosenTimeLogUserId, null, [{ key: "selectedDate", value: moment(value).format("MM-DD-YYYY") }]);
}); });
} }
} }
@ -387,13 +386,18 @@
{ text: "Create", action: createlog } { text: "Create", action: createlog }
]); ]);
self.editContextMenu = ko.observableArray([ self.editContextMenu = ko.observableArray([
{ text: "text", action: clicked },
{ text: "Edit", action: editlog }, { text: "Edit", action: editlog },
{ text: "Create", action: createlog } { text: "Create", action: createlog }
]); ]);
function editlog (data) { 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) { function createlog(data) {
self.manualLog({ self.manualLog({
CalendarWeek:-1, CalendarWeek:-1,
@ -401,14 +405,15 @@
EventTime: "2017-03-01T07:44:41.0861152+00:00", EventTime: "2017-03-01T07:44:41.0861152+00:00",
Id: -1, Id: -1,
IdentifierId: -1, IdentifierId: -1,
UserId: self.chosenTimeLogUserId(), UserId: self.chosenTimeLogUserId,
Year: 0 Year: 0
}); });
$('#manualLogDialog').modal("show"); $('#manualLogDialog').modal("show");
} $('#datetimepicker1').datetimepicker({
function clicked(data) { minDate: moment(new Date()).startOf('week'),
alert('oh, you clicked me! ah, and you typed "' + data.value() + '"'); maxDate: moment(new Date()).endOf('week')
} });
};
Sammy(function () { Sammy(function () {
this.get("#users", function () { this.get("#users", function () {
var query = this.params.query; var query = this.params.query;