Merge pull request #9 from giakinh0823/giakinh0823

fix bug calendar in dashboard
giakinh0823 · Mar 11, 2022 · e0fad1e · e0fad1e
2 parents b3a0c20 + c460ba1
commit e0fad1e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/web/assets/js/dashboard/dashboard.js b/web/assets/js/dashboard/dashboard.js
@@ -27,10 +27,10 @@ const data = {
     labels: labels,
     datasets: [{
             label: 'Event',
-            fill: events,
+            fill: eventCalendars,
             backgroundColor: CHART_COLORS.blue,
             borderColor: CHART_COLORS.blue,
-            data: events,
+            data: eventCalendars,
         },
         {
             label: 'Calendar',

diff --git a/web/views/admin/dashboard/dashboard.jsp b/web/views/admin/dashboard/dashboard.jsp
@@ -84,11 +84,11 @@
         listCategoryQuantity[${category.id}] = 0;
         </c:forEach>
 
-        var events = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
+        var eventCalendars = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
         var calendars = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
         <c:forEach items="${events}" var="event">
         if (new Date("${event.created_at}").getFullYear() == new Date().getFullYear()) {
-            events[new Date("${event.created_at}").getMonth()] += 1;
+            eventCalendars[new Date("${event.created_at}").getMonth()] += 1;
             listCategoryQuantity[${event.additional.category.id}] += 1;
         }
         </c:forEach>