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

Fix setting end date

Browse Source
This commit is contained in:
Phillip Thelen
2024-05-07 15:17:22 +02:00
parent fbce5aae32
commit 0089506165
2 changed files with 71 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -873,21 +873,28 @@ function makeMatcherClass (date) {
function makeEndDate (checkedDate, matcher) {
let end = moment(checkedDate);
end.date(TYPE_SCHEDULE[matcher.type]);
end.hour(0);
end.minute(0);
end.second(0);
if (matcher.endMonth !== undefined) {
end.month(matcher.endMonth);
} else if (end.date() <= checkedDate) {
} else if (end.date() <= checkedDate.getDate()) {
end = moment(end).add(1, 'months');
}
return end.toDate();
}
export function clearCachedMatchers () {
cacheDate = null;
cachedScheduleMatchers = null;
}
export function getAllScheduleMatchingGroups (date) {
const checkedDate = date || new Date();
if (cacheDate !== null && (getDay(checkedDate) !== getDay(cacheDate)
|| getMonth(checkedDate) !== getMonth(cacheDate))) {
// Clear cached matchers, since they are old
cacheDate = null;
cachedScheduleMatchers = null;
clearCachedMatchers();
}
if (!cachedScheduleMatchers) {
// No matchers exist, make new ones