From 7f107fc378c98e91e819818324e20d27110017d6 Mon Sep 17 00:00:00 2001
From: yyc12345 <yyc12321@outlook.com>
Date: Wed, 10 Feb 2021 21:55:16 +0800
Subject: [PATCH] fix week generator bug

---
 src/static/js/datetime.js      | 2 +-
 src/static/js/page/calendar.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/static/js/datetime.js b/src/static/js/datetime.js
index 879f672..d3c0eb5 100644
--- a/src/static/js/datetime.js
+++ b/src/static/js/datetime.js
@@ -201,7 +201,7 @@ function ccn_datetime_ResolveLoopRules4Event(loopRules, loopDateTimeStart, loopD
         if (remainFullSpanCount != 0) {
             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) {
             if (weekOption[(weekCounter + originalWeek) % 7])
diff --git a/src/static/js/page/calendar.js b/src/static/js/page/calendar.js
index db8cc84..edb123d 100644
--- a/src/static/js/page/calendar.js
+++ b/src/static/js/page/calendar.js
@@ -157,6 +157,7 @@ function ccn_calendar_calendar_Analyse() {
                     eventItem.end = eventDateTime.toLocaleTimeString();
                     ccn_calendar_calendar_displayCache[count].events.push(eventItem);
                     if (exitFlag) break;
+                    else eventDateTime.setMinutes(eventDateTime.getMinutes() + 1, 0, 0);
                     count++;
                 }
             }