fix: align analysis defaults to latest completed month
This commit is contained in:
@@ -153,9 +153,9 @@ const seatMapState = {
|
||||
|
||||
let currentView = "project";
|
||||
const globalDateState = {
|
||||
loaded: true,
|
||||
startDate: "2026-01-01",
|
||||
endDate: "2026-01-31",
|
||||
loaded: false,
|
||||
startDate: "",
|
||||
endDate: "",
|
||||
};
|
||||
|
||||
const organizationHistoryState = {
|
||||
@@ -194,6 +194,58 @@ function getTodayDate() {
|
||||
return `${now.getFullYear()}-${padDatePart(now.getMonth() + 1)}-${padDatePart(now.getDate())}`;
|
||||
}
|
||||
|
||||
function parseDateOnly(value) {
|
||||
const raw = String(value || "").trim();
|
||||
if (!raw) return null;
|
||||
const match = raw.match(/^(\d{4})-(\d{2})-(\d{2})$/);
|
||||
if (!match) return null;
|
||||
const year = Number(match[1]);
|
||||
const monthIndex = Number(match[2]) - 1;
|
||||
const day = Number(match[3]);
|
||||
const parsed = new Date(year, monthIndex, day);
|
||||
if (
|
||||
Number.isNaN(parsed.getTime())
|
||||
|| parsed.getFullYear() !== year
|
||||
|| parsed.getMonth() !== monthIndex
|
||||
|| parsed.getDate() !== day
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
return parsed;
|
||||
}
|
||||
|
||||
function formatDateOnly(date) {
|
||||
if (!(date instanceof Date) || Number.isNaN(date.getTime())) return "";
|
||||
return `${date.getFullYear()}-${padDatePart(date.getMonth() + 1)}-${padDatePart(date.getDate())}`;
|
||||
}
|
||||
|
||||
function getMonthRangeForDate(date) {
|
||||
if (!(date instanceof Date) || Number.isNaN(date.getTime())) {
|
||||
return { startDate: "", endDate: "" };
|
||||
}
|
||||
const start = new Date(date.getFullYear(), date.getMonth(), 1);
|
||||
const end = new Date(date.getFullYear(), date.getMonth() + 1, 0);
|
||||
return {
|
||||
startDate: formatDateOnly(start),
|
||||
endDate: formatDateOnly(end),
|
||||
};
|
||||
}
|
||||
|
||||
function getPreviousMonthRange(baseDate = new Date()) {
|
||||
return getMonthRangeForDate(new Date(baseDate.getFullYear(), baseDate.getMonth() - 1, 1));
|
||||
}
|
||||
|
||||
function resolveLatestCompletedMonthRange(maxDateText) {
|
||||
const fallbackRange = getPreviousMonthRange();
|
||||
const latestAvailableDate = parseDateOnly(String(maxDateText || "").slice(0, 10));
|
||||
if (!latestAvailableDate) return fallbackRange;
|
||||
const fallbackStart = parseDateOnly(fallbackRange.startDate);
|
||||
if (fallbackStart && latestAvailableDate >= fallbackStart) {
|
||||
return fallbackRange;
|
||||
}
|
||||
return getMonthRangeForDate(latestAvailableDate);
|
||||
}
|
||||
|
||||
function syncOrganizationHistoryControls() {
|
||||
if (!organizationHistoryControls) return;
|
||||
const visible = currentView === "organization";
|
||||
@@ -324,10 +376,10 @@ async function ensureGlobalDateRangeLoaded() {
|
||||
const payload = await fetchJson("/api/integration/summary");
|
||||
const work = payload?.date_ranges?.work || {};
|
||||
const voucher = payload?.date_ranges?.voucher || {};
|
||||
const starts = [work.min_work_date, voucher.min_voucher_date].filter(Boolean).sort();
|
||||
const ends = [work.max_work_date, voucher.max_voucher_date].filter(Boolean).sort();
|
||||
globalDateState.startDate = starts[0] ? String(starts[0]).slice(0, 10) : "";
|
||||
globalDateState.endDate = ends.length ? String(ends[ends.length - 1]).slice(0, 10) : "";
|
||||
const defaultRange = resolveLatestCompletedMonthRange(ends.length ? ends[ends.length - 1] : "");
|
||||
globalDateState.startDate = defaultRange.startDate;
|
||||
globalDateState.endDate = defaultRange.endDate;
|
||||
globalDateState.loaded = true;
|
||||
syncGlobalDateControlInputs();
|
||||
postGlobalDateRangeToFrame(projectFrame);
|
||||
|
||||
@@ -1564,6 +1564,30 @@
|
||||
}
|
||||
return Math.round(totalTarget);
|
||||
};
|
||||
const formatLocalDate = (date) => {
|
||||
if (!(date instanceof Date) || isNaN(date.getTime())) return '';
|
||||
return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
|
||||
};
|
||||
const getMonthRangeForDate = (date) => {
|
||||
if (!(date instanceof Date) || isNaN(date.getTime())) return { startDate: '', endDate: '' };
|
||||
const start = new Date(date.getFullYear(), date.getMonth(), 1);
|
||||
const end = new Date(date.getFullYear(), date.getMonth() + 1, 0);
|
||||
return {
|
||||
startDate: formatLocalDate(start),
|
||||
endDate: formatLocalDate(end)
|
||||
};
|
||||
};
|
||||
const getDefaultMhDateRange = (dates = []) => {
|
||||
const now = new Date();
|
||||
const previousMonthRange = getMonthRangeForDate(new Date(now.getFullYear(), now.getMonth() - 1, 1));
|
||||
const latestDateText = [...dates].filter(Boolean).sort().slice(-1)[0] || '';
|
||||
const latestDate = latestDateText ? new Date(latestDateText) : null;
|
||||
const previousMonthStart = new Date(now.getFullYear(), now.getMonth() - 1, 1);
|
||||
if (latestDate instanceof Date && !isNaN(latestDate.getTime()) && latestDate < previousMonthStart) {
|
||||
return getMonthRangeForDate(latestDate);
|
||||
}
|
||||
return previousMonthRange;
|
||||
};
|
||||
const findHeaderIndex = (normalizedHeaders, candidates) => {
|
||||
const targets = candidates.map(normalizeHeader);
|
||||
for (let i = 0; i < normalizedHeaders.length; i++) {
|
||||
@@ -2501,8 +2525,9 @@
|
||||
function initTeamTabAfterUpload() {
|
||||
if (teamData.length < 2) return;
|
||||
const dates = teamData.slice(1).map(r => dStr(r[columnMap.date])).filter(Boolean).sort();
|
||||
document.getElementById('start-date').value = dates[0];
|
||||
document.getElementById('end-date').value = dates[dates.length - 1];
|
||||
const defaultRange = getDefaultMhDateRange(dates);
|
||||
document.getElementById('start-date').value = defaultRange.startDate;
|
||||
document.getElementById('end-date').value = defaultRange.endDate;
|
||||
syncScopeButtons();
|
||||
refreshScopedSelections(false);
|
||||
render();
|
||||
@@ -2693,8 +2718,9 @@
|
||||
|
||||
const dates = teamData.slice(1).map(r => dStr(r[columnMap.date])).filter(Boolean).sort();
|
||||
if (dates.length > 0) {
|
||||
startInput.value = dates[0];
|
||||
endInput.value = dates[dates.length - 1];
|
||||
const defaultRange = getDefaultMhDateRange(dates);
|
||||
startInput.value = defaultRange.startDate;
|
||||
endInput.value = defaultRange.endDate;
|
||||
}
|
||||
|
||||
render();
|
||||
|
||||
Reference in New Issue
Block a user