AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-08-16 20:45:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Date Range FlatPickr defaulting to 1970 for All time now default to current month

Browse Source
This commit is contained in:
johnnyq
2026-08-15 13:04:55 -04:00
parent 2375e69f2d
commit 72c037c581
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
css/itflow_custom.css
View File

@@ -508,11 +508,17 @@ a:not(.dropdown-item):not(.btn-app):not(.nav-link):not(.brand-link):not(.page-li
border-radius: .25rem; border-radius: .25rem;
} }
.itflow-fp-range:hover, .itflow-fp-range:hover,
.itflow-fp-range:focus { .itflow-fp-range:focus,
.itflow-fp-range.active {
color: #fff; color: #fff;
background-color: var(--itflow-accent, #007bff); background-color: var(--itflow-accent, #007bff);
border-color: var(--itflow-accent, #007bff); border-color: var(--itflow-accent, #007bff);
} }
/* The preset currently in effect - without this there is nothing on screen
telling you which range you are looking at once the calendar is open. */
.itflow-fp-range.active {
font-weight: 600;
}
/* --- Toast fade --------------------------------------------------------- /* --- Toast fade ---------------------------------------------------------
Bootstrap's .fade is a .15s transition, which next to toastr's old 1s Bootstrap's .fade is a .15s transition, which next to toastr's old 1s

20
js/date_filter.js
View File

@@ -129,10 +129,18 @@
var initialEnd = parseYmd(dtt.value) || parseYmd(ALL_TIME_END); var initialEnd = parseYmd(dtt.value) || parseYmd(ALL_TIME_END);
var initialKey = ymd(initialStart) + '|' + ymd(initialEnd); var initialKey = ymd(initialStart) + '|' + ymd(initialEnd);
// 1970-01-01 / 2099-12-31 are SQL sentinels for "no bound", not dates a
// user picked - and they are also the server's fallback, so most pages
// arrive in this state. Seeding the calendar with them opened it on
// January 1970 every time. Treat it as "nothing selected" instead: the
// calendar opens on the current month with no range highlighted, so the
// first click starts a fresh selection.
var allTimeActive = initialKey === ALL_TIME_START + '|' + ALL_TIME_END;
flatpickr(input, { flatpickr(input, {
mode: 'range', mode: 'range',
dateFormat: 'Y-m-d', dateFormat: 'Y-m-d',
defaultDate: [initialStart, initialEnd], defaultDate: allTimeActive ? null : [initialStart, initialEnd],
locale: { firstDayOfWeek: 1 }, locale: { firstDayOfWeek: 1 },
allowInput: false, allowInput: false,
onReady: function (selectedDates, dateStr, instance) { onReady: function (selectedDates, dateStr, instance) {
@@ -144,6 +152,10 @@
btn.type = 'button'; btn.type = 'button';
btn.className = 'itflow-fp-range'; btn.className = 'itflow-fp-range';
btn.textContent = r.label; btn.textContent = r.label;
if (r.canned === canned.value ||
(allTimeActive && r.canned === 'alltime' && !canned.value)) {
btn.classList.add('active');
}
btn.addEventListener('click', function () { btn.addEventListener('click', function () {
// close() fires onClose synchronously - flag it first // close() fires onClose synchronously - flag it first
// or onClose applies the stale range as a custom one // or onClose applies the stale range as a custom one
@@ -164,7 +176,11 @@
} }
// Abandoned half-selection - put the box back how it was. // Abandoned half-selection - put the box back how it was.
if (selectedDates.length !== 2) { if (selectedDates.length !== 2) {
instance.setDate([initialStart, initialEnd], false); if (allTimeActive) {
instance.clear(false);
} else {
instance.setDate([initialStart, initialEnd], false);
}
setDisplay(initialStart, initialEnd); setDisplay(initialStart, initialEnd);
return; return;
} }