quantum/qcal
1
0
Fork 0
mirror of https://github.com/quantum5/qcal.git synced 2025-07-27 03:34:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

gcal: use jdnWeekDay instead of ad hoc logic

Browse source
This commit is contained in:
Quantum 2025-07-02 01:19:37 -04:00
parent ebe627d5de
commit 4381415fa0
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gcal/src/Calendar.tsx
View file

@ -8,6 +8,7 @@ import {
JulianDay, JulianDay,
JulianMonth, JulianMonth,
monthName, monthName,
jdnWeekDay,
weekdayNames, weekdayNames,
} from '@common/gregorian'; } from '@common/gregorian';
import {formatHaab, formatTzolkin, jdnHaab, jdnTzolkin} from '@common/mayan'; import {formatHaab, formatTzolkin, jdnHaab, jdnTzolkin} from '@common/mayan';
@ -64,7 +65,7 @@ function Day({year, month, day, todayJDN}: DateProps & { todayJDN: number }): JS
const jdn = gregorianJDN(year, month, day); const jdn = gregorianJDN(year, month, day);
return <div className={`Day NormalDay ${jdn === todayJDN ? 'Day-today' : ''}`}> return <div className={`Day NormalDay ${jdn === todayJDN ? 'Day-today' : ''}`}>
<div className="Day-name">{day}</div> <div className="Day-name">{day}</div>
<div className="Day-weekday">{weekdayNames[(jdn + 1) % 7]}</div> <div className="Day-weekday">{weekdayNames[jdnWeekDay(jdn)]}</div>
<DayDetail jdn={jdn}/> <DayDetail jdn={jdn}/>
</div>; </div>;
} }
@ -72,7 +73,7 @@ function Day({year, month, day, todayJDN}: DateProps & { todayJDN: number }): JS
function Month({year, month, todayJDN}: MonthProps & { todayJDN: number }): JSX.Element { function Month({year, month, todayJDN}: MonthProps & { todayJDN: number }): JSX.Element {
const decadeHeads = weekdayNames.map((name, i) => <WeekdayName key={i} name={name}/>); const decadeHeads = weekdayNames.map((name, i) => <WeekdayName key={i} name={name}/>);
const firstJDN = gregorianJDN(year, month, 1); const firstJDN = gregorianJDN(year, month, 1);
const firstWeekday = (firstJDN % 7 + 8) % 7; const firstWeekday = jdnWeekDay(firstJDN);
const daysTotal = gregorianMonthDays(year, month); const daysTotal = gregorianMonthDays(year, month);
return <div className="Month"> return <div className="Month">
<div className="Month-weekdayHead">{decadeHeads}</div> <div className="Month-weekdayHead">{decadeHeads}</div>