fixed selected date for the datepicker. will now highlight the selected date that it is showing time logs for.
#5
This commit is contained in:
parent
8fb6fedc7d
commit
d2035a776d
@ -56,7 +56,7 @@
|
|||||||
if (xmlHttpRequest.readyState === 4) {
|
if (xmlHttpRequest.readyState === 4) {
|
||||||
return {
|
return {
|
||||||
errorCode: xmlHttpRequest.status,
|
errorCode: xmlHttpRequest.status,
|
||||||
errorMessage: error.statusText,
|
errorMessage: xmlHttpRequest.statusText,
|
||||||
errorSource: ""
|
errorSource: ""
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -149,13 +149,16 @@
|
|||||||
todayBtn: true,
|
todayBtn: true,
|
||||||
format: "yyyy-mm-dd",
|
format: "yyyy-mm-dd",
|
||||||
todayHighlight: true,
|
todayHighlight: true,
|
||||||
calendarWeeks: true
|
calendarWeeks: true,
|
||||||
|
//defaultViewDate: { year: selectedDate.getFullYear(), month: selectedDate.getMonth(), day: selectedDate.getDate() }
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!selectedDate) {
|
if (!selectedDate) {
|
||||||
selectedDate = new Date().toDateString("yyyy-mm-dd");
|
selectedDate = new Date();
|
||||||
} else {
|
} else {
|
||||||
selectedDate = new Date(selectedDate).toDateString("yyyy-mm-dd");
|
selectedDate = new Date(selectedDate);
|
||||||
}
|
}
|
||||||
|
console.log("setting date to: " + selectedDate);
|
||||||
$("#weeklyDatePicker").datepicker("setDate", selectedDate);
|
$("#weeklyDatePicker").datepicker("setDate", selectedDate);
|
||||||
console.log("finished init");
|
console.log("finished init");
|
||||||
};
|
};
|
||||||
@ -181,7 +184,7 @@
|
|||||||
self.userList(res);
|
self.userList(res);
|
||||||
}).fail(function (response, status, error) {
|
}).fail(function (response, status, error) {
|
||||||
console.log("error - getusers");
|
console.log("error - getusers");
|
||||||
var errObj = self.processRequestFailure(resp, status, error);
|
var errObj = self.processRequestFailure(response, status, error);
|
||||||
self.assignErrorObject(errObj.errorCode, errObj.errorMessage, "getUserList");
|
self.assignErrorObject(errObj.errorCode, errObj.errorMessage, "getUserList");
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user