MyFavMirrors/moonfire-nvr
1
0
Fork 0
mirror of https://github.com/scottlamb/moonfire-nvr.git synced 2025-04-23 20:15:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix date picker error east of UTC (#93)

Browse Source
This commit is contained in:
Scott Lamb 2021-01-22 10:46:36 -08:00
parent c140296da2
commit 02a4f1f74e
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui-src/lib/views/CalendarView.js
View File

@ -161,7 +161,10 @@ export default class CalendarView {
const fromPickerView = this.fromPickerView_; const fromPickerView = this.fromPickerView_;
const toPickerView = this.toPickerView_; const toPickerView = this.toPickerView_;
const beforeShowDay = function(date) { const beforeShowDay = function(date) {
const dateStr = date.toISOString().substr(0, 10); const year = date.getYear() + 1900;
const month = (date.getMonth() + 1).toString().padStart(2, '0');
const day = date.getDate().toString().padStart(2, '0');
const dateStr = [year, month, day].join('-');
return [dateSet.has(dateStr), '', '']; return [dateSet.has(dateStr), '', ''];
}; };
@ -170,6 +173,7 @@ export default class CalendarView {
dateFormat: DatePickerView.datepicker.ISO_8601, dateFormat: DatePickerView.datepicker.ISO_8601,
minDate: minDateStr, minDate: minDateStr,
maxDate: maxDateStr, maxDate: maxDateStr,
defaultDate: maxDateStr,
onSelect: (dateStr /* , picker */) => onSelect: (dateStr /* , picker */) =>
this.updateRangeDates_(dateStr, dateStr), this.updateRangeDates_(dateStr, dateStr),
beforeShowDay: beforeShowDay, beforeShowDay: beforeShowDay,
@ -181,6 +185,8 @@ export default class CalendarView {
fromPickerView.option({ fromPickerView.option({
dateFormat: DatePickerView.datepicker.ISO_8601, dateFormat: DatePickerView.datepicker.ISO_8601,
minDate: minDateStr, minDate: minDateStr,
maxDate: maxDateStr,
defaultDate: maxDateStr,
onSelect: (dateStr /* , picker */) => { onSelect: (dateStr /* , picker */) => {
toPickerView.minDate = this.fromDateISO; toPickerView.minDate = this.fromDateISO;
this.updateRangeDates_(dateStr, this.toDateISO); this.updateRangeDates_(dateStr, this.toDateISO);
@ -192,6 +198,7 @@ export default class CalendarView {
dateFormat: DatePickerView.datepicker.ISO_8601, dateFormat: DatePickerView.datepicker.ISO_8601,
minDate: fromPickerView.dateISO, minDate: fromPickerView.dateISO,
maxDate: maxDateStr, maxDate: maxDateStr,
defaultDate: maxDateStr,
onSelect: (dateStr /* , picker */) => { onSelect: (dateStr /* , picker */) => {
fromPickerView.maxDate = this.toDateISO; fromPickerView.maxDate = this.toDateISO;
this.updateRangeDates_(this.fromDateISO, dateStr); this.updateRangeDates_(this.fromDateISO, dateStr);

5
ui-src/lib/views/DatePickerView.js
View File

@ -215,7 +215,10 @@ export default class DatePickerView {
* @return {String} Date portion of ISO-8601 formatted selected date * @return {String} Date portion of ISO-8601 formatted selected date
*/ */
get dateISO() { get dateISO() {
return this.date.toISOString().substr(0, 10); const year = this.date.getYear() + 1900;
const month = (this.date.getMonth() + 1).toString().padStart(2, '0');
const day = this.date.getDate().toString().padStart(2, '0');
return [year, month, day].join('-');
} }
/** /**