added goToToday click handler for viewModel.
this is to change the date on the picker control to todays date as the bootstrap datepicker control today button doesnt appear to be working. #83
This commit is contained in:
parent
76ac93493d
commit
4cab3932fa
@ -52,6 +52,11 @@
|
|||||||
}
|
}
|
||||||
location.hash = url;
|
location.hash = url;
|
||||||
};
|
};
|
||||||
|
self.goToToday = function(a, b, c) {
|
||||||
|
self.goToTimeLogs(self.chosenTimeLogUserId,
|
||||||
|
null,
|
||||||
|
[{ key: "selectedDate", value: moment(new Date()).format("MM-DD-YYYY") }]);
|
||||||
|
};
|
||||||
self.assignErrorObject = function(errCode, errMessage, errorSource) {
|
self.assignErrorObject = function(errCode, errMessage, errorSource) {
|
||||||
var errDat = {
|
var errDat = {
|
||||||
errorCode: errCode,
|
errorCode: errCode,
|
||||||
@ -176,9 +181,9 @@
|
|||||||
}
|
}
|
||||||
moment.locale("en", { week: { dow: 1 } });
|
moment.locale("en", { week: { dow: 1 } });
|
||||||
$("#weeklyDatePicker").datetimepicker({
|
$("#weeklyDatePicker").datetimepicker({
|
||||||
|
//showTodayButton: true,
|
||||||
format: "DD/MM/YYYY",
|
format: "DD/MM/YYYY",
|
||||||
inline: true,
|
inline: true,
|
||||||
showTodayButton: true,
|
|
||||||
calendarWeeks: true,
|
calendarWeeks: true,
|
||||||
maxDate: "now",
|
maxDate: "now",
|
||||||
date: selectedDate
|
date: selectedDate
|
||||||
@ -369,12 +374,13 @@
|
|||||||
]);
|
]);
|
||||||
function editlog (data) {
|
function editlog (data) {
|
||||||
self.manualLog(data);
|
self.manualLog(data);
|
||||||
$('#manualLogDialog').modal("show");
|
$("#manualLogDialog").modal("show");
|
||||||
$('#datetimepicker1').datetimepicker({
|
$("#datetimepicker1").datetimepicker({
|
||||||
format: "YYYY-DD-MM HH:mm:ss",
|
format: "YYYY-DD-MM HH:mm:ss",
|
||||||
date: new Date(data.EventTime),
|
date: new Date(data.EventTime),
|
||||||
minDate: moment(new Date(data.EventTime)).startOf('week'),
|
sideBySide: true,
|
||||||
maxDate: moment(new Date(data.EventTime)).endOf('week')
|
minDate: moment(new Date(data.EventTime)).startOf("week"),
|
||||||
|
maxDate: moment(new Date(data.EventTime)).endOf("week")
|
||||||
});
|
});
|
||||||
self.assignUpdateHandler();
|
self.assignUpdateHandler();
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user