yyc12345/coconut-leaf
1
0
Fork 0
Code Activity

fix week generator bug

Browse Source
This commit is contained in:
yyc12345
2021-02-10 21:55:16 +08:00
parent 6809faf429
commit 7f107fc378
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/static/js/datetime.js
View File

@@ -201,7 +201,7 @@ function ccn_datetime_ResolveLoopRules4Event(loopRules, loopDateTimeStart, loopD
if (remainFullSpanCount != 0) { if (remainFullSpanCount != 0) {
detectDateTime.setUTCDate((loopSpan - remainFullSpanCount) * 7 + detectDateTime.getUTCDate()); detectDateTime.setUTCDate((loopSpan - remainFullSpanCount) * 7 + detectDateTime.getUTCDate());
} }
var weekCounter = (remainDays + 7 - originalWeek) % 7 var weekCounter = remainDays;
while(Math.floor(detectDateTime.getTime() / 60000) + eventOffset - timezoneOffset <= loopDateTimeEnd) { while(Math.floor(detectDateTime.getTime() / 60000) + eventOffset - timezoneOffset <= loopDateTimeEnd) {
if (weekOption[(weekCounter + originalWeek) % 7]) if (weekOption[(weekCounter + originalWeek) % 7])

1
src/static/js/page/calendar.js
View File

@@ -157,6 +157,7 @@ function ccn_calendar_calendar_Analyse() {
eventItem.end = eventDateTime.toLocaleTimeString(); eventItem.end = eventDateTime.toLocaleTimeString();
ccn_calendar_calendar_displayCache[count].events.push(eventItem); ccn_calendar_calendar_displayCache[count].events.push(eventItem);
if (exitFlag) break; if (exitFlag) break;
else eventDateTime.setMinutes(eventDateTime.getMinutes() + 1, 0, 0);
count++; count++;
} }
} }