krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-16 22:27:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix schedule using wrong month at the beginning hours of month (#15290)

Browse Source 
* Fix schedule using wrong month at the beginning hours of month

* fix broken test

* fix switchover for time based matchers

* Fix scheduling issue related to timezones

* Fix end date creating issues
This commit is contained in:
Phillip Thelen
2024-08-06 19:35:05 +02:00
committed by GitHub
parent 6293a4b936
commit 63918b3c20
4 changed files with 67 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
website/common/script/content/constants/schedule.js
View File

@@ -809,7 +809,9 @@ function getMonth (date) {
if (date === undefined) {
return 0;
}
return date instanceof moment ? date.month() : date.getMonth();
const checkDate = new Date(date.getTime());
checkDate.setHours(checkDate.getHours() - SWITCHOVER_TIME);
return checkDate.getMonth();
}
function getGalaIndex (date) {
@@ -892,7 +894,7 @@ function makeEndDate (checkedDate, matcher) {
end.year(checkedDate.getFullYear() + 1);
}
end.month(matcher.endMonth);
} else if (end.date() <= checkedDate.getDate()) {
} else if (end.valueOf() <= checkedDate.getTime()) {
end = moment(end).add(1, 'months');
}
return end.toDate();
@@ -904,7 +906,7 @@ export function clearCachedMatchers () {
}
export function getAllScheduleMatchingGroups (date) {
const checkedDate = date || new Date();
const checkedDate = date || moment.utc().toDate();
if (cacheDate !== null && (getDay(checkedDate) !== getDay(cacheDate)
|| getMonth(checkedDate) !== getMonth(cacheDate))) {
// Clear cached matchers, since they are old
@@ -914,9 +916,14 @@ export function getAllScheduleMatchingGroups (date) {
// No matchers exist, make new ones
cacheDate = new Date();
cachedScheduleMatchers = {};
// subtract switchover time for the matcher classes, but
// NOT to decide which matchers to assemble.
// assembly uses getDate and getMonth which already adjust for switchover time
const adjustedDate = new Date(checkedDate.getTime());
adjustedDate.setHours(adjustedDate.getHours() - SWITCHOVER_TIME);
assembleScheduledMatchers(checkedDate).forEach(matcher => {
if (!cachedScheduleMatchers[matcher.type]) {
cachedScheduleMatchers[matcher.type] = makeMatcherClass(checkedDate);
cachedScheduleMatchers[matcher.type] = makeMatcherClass(adjustedDate);
}
cachedScheduleMatchers[matcher.type].end = makeEndDate(checkedDate, matcher);
if (matcher.matcher instanceof Function) {