krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Phillip Thelen
2024-04-23 17:24:17 +02:00
parent b0d6f7722b
commit 2d6555fe0f
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -839,7 +839,7 @@ function makeMatcherClass () {
}; };
} }
export function getAllScheduleMatchingGroups (date) { export function getScheduleMatchingGroup (type, date) {
const checkedDate = date || new Date(); const checkedDate = date || new Date();
if (cacheDate !== null && (getDay(checkedDate) !== getDay(cacheDate) if (cacheDate !== null && (getDay(checkedDate) !== getDay(cacheDate)
|| getMonth(checkedDate) !== getMonth(cacheDate))) { || getMonth(checkedDate) !== getMonth(cacheDate))) {
@@ -853,6 +853,7 @@ export function getAllScheduleMatchingGroups (date) {
if (!cachedScheduleMatchers[matcher.type]) { if (!cachedScheduleMatchers[matcher.type]) {
cachedScheduleMatchers[matcher.type] = makeMatcherClass(); cachedScheduleMatchers[matcher.type] = makeMatcherClass();
} }
cachedScheduleMatchers[matcher.type].end = end.toDate();
if (matcher.matcher instanceof Function) { if (matcher.matcher instanceof Function) {
cachedScheduleMatchers[matcher.type].matchers.push(matcher.matcher); cachedScheduleMatchers[matcher.type].matchers.push(matcher.matcher);
} else if (matcher.items instanceof Array) { } else if (matcher.items instanceof Array) {
@@ -861,19 +862,14 @@ export function getAllScheduleMatchingGroups (date) {
}); });
} }
if (!cachedScheduleMatchers[type]) { if (!cachedScheduleMatchers[type]) {
let end = moment(checkedDate).date(TYPE_SCHEDULE[type]);
if (end.date() <= checkedDate.date()) {
end = moment(end).add(1, 'months');
}
return { return {
end: end.toDate(),
items: [], items: [],
match () { match () {
return true; return true;
}, },
}; };
} }
return matchingGroups[type]; return cachedScheduleMatchers[type];
} }
export function getCurrentGalaKey (date) { export function getCurrentGalaKey (date) {