ChenKaiLiuG/life_generators
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix(Fortune): Calculate the time difference for events that have already occurred based on the next year

Browse Source 
For example, if today is January 2nd, then the New Year's Day on January 1st should be calculated using January 1st of the next year.
This commit is contained in:
tobiichi3227
2024-12-25 11:35:26 +08:00
parent 7852572f26
commit e80f077ae3
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fortune_generator/js/fortune.js
View File

@@ -133,12 +133,14 @@ function daysDiff(eventIndex) {
} }
const triggerDate = event.triggerDate; const triggerDate = event.triggerDate;
let isCustomEvent = false;
eventYear = year; eventYear = year;
if ('year' in triggerDate) { if ('year' in triggerDate) {
eventYear = validateNumber(triggerDate.year, 1, maxDate.getFullYear(), 'triggerDate.year', event); eventYear = validateNumber(triggerDate.year, 1, maxDate.getFullYear(), 'triggerDate.year', event);
if (eventYear === null) { if (eventYear === null) {
return -1; return -1;
} }
isCustomEvent = true;
} }
if (!('month' in triggerDate)) { if (!('month' in triggerDate)) {
@@ -179,12 +181,17 @@ function daysDiff(eventIndex) {
eventDate = firstTargetDay + (triggerDate.week - 1) * 7; eventDate = firstTargetDay + (triggerDate.week - 1) * 7;
} }
if (!isCustomEvent && (month > eventMonth || (month == eventMonth && date > eventDate))) {
eventYear += 1;
}
const endDate = new Date( const endDate = new Date(
eventYear, eventYear,
eventMonth - 1, eventMonth - 1,
eventDate, eventDate,
); );
// calculate the difference in milliseconds and convert it to days // calculate the difference in milliseconds and convert it to days
const timeDiff = Math.ceil((endDate - startDate) / (1000 * 60 * 60 * 24)); const timeDiff = Math.ceil((endDate - startDate) / (1000 * 60 * 60 * 24));
return timeDiff; return timeDiff;