streamlined the dates more

This commit is contained in:
chark1es 2025-04-02 14:12:53 -07:00
parent e68627f666
commit 10d3f32fbc

View file

@ -891,27 +891,27 @@ const currentPage = eventResponse.page;
let start: Date, end: Date; let start: Date, end: Date;
// Determine quarter (0-based months: 0-11) // Determine quarter (0-based months: 0-11)
// Q1: Sept-Dec (8-11) // Fall: Sept-Dec (8-11)
// Q2: Jan-Mar (0-2) // Winter: Jan-Mar (0-2)
// Q3: Mar-Jun (2-5) // Spring: Apr-Jun (3-5)
// Q4: Jun-Sept (5-8) // Summer: Jul-Sept (6-8)
if (month >= 8) { if (month >= 8) {
// Q1: Sept-Dec // Fall: Sept-Dec
start = new Date(year, 8, 1); start = new Date(year, 8, 1);
end = new Date(year, 11, 31); end = new Date(year, 11, 31);
} else if (month < 2) { } else if (month >= 0 && month < 3) {
// Q2: Jan-Mar // Winter: Jan-Mar
start = new Date(year, 0, 1); start = new Date(year, 0, 1);
end = new Date(year, 2, 31); end = new Date(year, 2, 31);
} else if (month < 5) { } else if (month >= 3 && month < 6) {
// Q3: Mar-Jun // Spring: Apr-Jun
start = new Date(year, 2, 1); start = new Date(year, 3, 1);
end = new Date(year, 5, 30); end = new Date(year, 5, 30);
} else { } else {
// Q4: Jun-Sept // Summer: Jul-Sept
start = new Date(year, 5, 1); start = new Date(year, 6, 1);
end = new Date(year, 8, 0); // End on Aug 31 end = new Date(year, 8, 30);
} }
return { start, end }; return { start, end };
@ -924,14 +924,14 @@ const currentPage = eventResponse.page;
if (month >= 8) { if (month >= 8) {
// Sept-Dec // Sept-Dec
return "Fall"; return "Fall";
} else if (month < 2) { } else if (month >= 0 && month < 3) {
// Jan-Mar // Jan-Mar
return "Winter"; return "Winter";
} else if (month < 5) { } else if (month >= 3 && month < 6) {
// Mar-Jun // Apr-Jun
return "Spring"; return "Spring";
} else { } else {
// Jun-Sept // Jul-Sept
return "Summer"; return "Summer";
} }
} }
@ -979,13 +979,13 @@ const currentPage = eventResponse.page;
isInQuarter = month >= 8 && month <= 11; // Sept-Dec isInQuarter = month >= 8 && month <= 11; // Sept-Dec
break; break;
case "winter": case "winter":
isInQuarter = month >= 0 && month <= 2; // Jan-Mar isInQuarter = month >= 0 && month < 3; // Jan-Mar (0-2)
break; break;
case "spring": case "spring":
isInQuarter = month >= 2 && month <= 5; // Mar-Jun isInQuarter = month >= 3 && month < 6; // Apr-Jun (3-5)
break; break;
case "summer": case "summer":
isInQuarter = month >= 5 && month <= 8; // Jun-Sept isInQuarter = month >= 6 && month < 9; // Jul-Sept (6-8)
break; break;
} }
if (isInQuarter) { if (isInQuarter) {