Skip to content

Commit

Permalink
Merge pull request #2583 from drgrice1/datepicker-group-update-tweak
Browse files Browse the repository at this point in the history
Change behavior when changing dates in a datepicker group to be more intuitive.
  • Loading branch information
somiaj authored Nov 13, 2024
2 parents 378c4ed + fc659e1 commit edbf4e2
Showing 1 changed file with 32 additions and 14 deletions.
46 changes: 32 additions & 14 deletions htdocs/js/DatePicker/datepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,36 @@
).getTime();

for (const rule of groupRules) {
const value =
rule[0].value || document.getElementsByName(`${rule[0].name}.class_value`)[0]?.dataset.classValue;
const classValue = document.getElementsByName(`${rule[0].name}.class_value`)[0]?.dataset.classValue;
const value = rule[0].value || classValue;
rule.push(value ? parseInt(value) * 1000 - timezoneAdjustment : 0);
if (classValue) rule.push(parseInt(classValue) * 1000 - timezoneAdjustment);
}

const update = () => {
for (let i = 1; i < groupRules.length; ++i) {
const prevFieldDate =
groupRules[i - 1][0]?.parentNode._flatpickr.selectedDates[0]?.getTime() || groupRules[i - 1][1];
const update = (input) => {
const activeIndex = groupRules.findIndex((r) => r[0] === input);
if (activeIndex == -1) return;
const activeFieldDate =
groupRules[activeIndex][0]?.parentNode._flatpickr.selectedDates[0]?.getTime() ||
groupRules[activeIndex][2] ||
groupRules[activeIndex][1];

for (let i = 0; i < groupRules.length; ++i) {
if (i == activeIndex) continue;
const thisFieldDate =
groupRules[i][0]?.parentNode._flatpickr.selectedDates[0]?.getTime() || groupRules[i][1];
if (prevFieldDate && thisFieldDate && prevFieldDate > thisFieldDate) {
groupRules[i][0].parentNode._flatpickr.setDate(prevFieldDate, true);
}
groupRules[i][0]?.parentNode._flatpickr.selectedDates[0]?.getTime() ||
groupRules[i][2] ||
groupRules[i][1];
if (i < activeIndex && thisFieldDate > activeFieldDate)
groupRules[i][0].parentNode._flatpickr.setDate(
activeFieldDate === groupRules[i][2] ? undefined : activeFieldDate,
true
);
else if (i > activeIndex && thisFieldDate < activeFieldDate)
groupRules[i][0].parentNode._flatpickr.setDate(
activeFieldDate === groupRules[i][2] ? undefined : activeFieldDate,
true
);
}
};

Expand Down Expand Up @@ -104,9 +120,9 @@
selectedDate.setFullYear(today.getFullYear());
selectedDate.setMonth(today.getMonth());
selectedDate.setDate(today.getDate());
fp.setDate(selectedDate);
fp.setDate(selectedDate, true);
} else if (index === 1) {
fp.setDate(new Date());
fp.setDate(new Date(), true);
}
}
})
Expand All @@ -115,7 +131,9 @@
if (this.input.value === orig_value) this.altInput.classList.remove('changed');
else this.altInput.classList.add('changed');
},
onClose: update,
onClose() {
return update(this.input);
},
onReady() {
// Flatpickr hides the original input and adds the alternate input after it. That messes up the
// bootstrap input group styling. So move the now hidden original input after the created alternate
Expand All @@ -133,7 +151,7 @@
// Make the alternate input left-to-right even for right-to-left languages.
this.altInput.dir = 'ltr';

this.altInput.addEventListener('blur', update);
this.altInput.addEventListener('blur', () => update(this.input));
},
parseDate(datestr, format) {
// Deal with the case of a unix timestamp. The timezone needs to be adjusted back as this is for
Expand Down

0 comments on commit edbf4e2

Please sign in to comment.