k4rli/stretch-my-time-off
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add extra sort on holiday naming due to conflict

Browse Source
This commit is contained in:
Zachary
2024-11-22 19:07:48 +01:00
parent 787f846b6a
commit 50fb4f399f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/holidayUtils.ts
View File

@@ -36,6 +36,7 @@ export function getHolidaysForYear(countryCode: string, year: number, stateCode?
// Start/end dates are returned in that country/state's time zone, so we need to provide our time zone to localise // Start/end dates are returned in that country/state's time zone, so we need to provide our time zone to localise
const opts = { languages, timezone: Intl.DateTimeFormat().resolvedOptions().timeZone }; const opts = { languages, timezone: Intl.DateTimeFormat().resolvedOptions().timeZone };
const hd = stateCode ? new Holidays(countryCode, stateCode, opts) : new Holidays(countryCode, opts); const hd = stateCode ? new Holidays(countryCode, stateCode, opts) : new Holidays(countryCode, opts);
console.log(hd.getHolidays(year));
return hd.getHolidays(year) return hd.getHolidays(year)
.filter(holiday => holiday.type === 'public') .filter(holiday => holiday.type === 'public')
.flatMap(holiday => .flatMap(holiday =>
@@ -44,7 +45,8 @@ export function getHolidaysForYear(countryCode: string, year: number, stateCode?
date: new Date(holiday.start.getFullYear(), holiday.start.getMonth(), holiday.start.getDate() + i), date: new Date(holiday.start.getFullYear(), holiday.start.getMonth(), holiday.start.getDate() + i),
name: holiday.name, name: holiday.name,
})) }))
); )
.sort((holiday1, holiday2) => holiday1.date.getTime() - holiday2.date.getTime() || holiday1.name.localeCompare(holiday2.name));
} }
// Optimize days off to create the longest possible chains // Optimize days off to create the longest possible chains