fix(clans): fix 31 days account report via account new 31 method

Hojagulyyev · Dec 13, 2023 · 15187fd · 15187fd
1 parent 1d79d25
commit 15187fd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/apps/accounts/models.py b/apps/accounts/models.py
@@ -17,10 +17,16 @@ class Account(models.Model):
     def __str__(self):
         return self.user.username
 
-    def get_xp_daily_report(self):
+    def get_xp_10daily_report(self):
         return [
             diary.get_earned_xp()
-            for diary in self.diaries.order_by("-created_date")[:30]
+            for diary in self.diaries.order_by("-created_date")[:10]
+        ][::-1]
+
+    def get_xp_31daily_report(self):
+        return [
+            diary.get_earned_xp()
+            for diary in self.diaries.order_by("-created_date")[:31]
         ][::-1]
 
     def get_full_name(self):

diff --git a/templates/clans/overview.html b/templates/clans/overview.html
@@ -289,7 +289,7 @@ <h2 class="section-title">Overview</h2>
             <!-- WIDGET BOX ACTION -->
             <div class="widget-box-action">
                 <!-- WIDGET BOX TITLE -->
-                <p class="widget-box-title">Reports for the last 30 days by Diary's XP</p>
+                <p class="widget-box-title">Reports for the last 31 days by Diary's XP</p>
                 <!-- /WIDGET BOX TITLE -->
             </div>
             <!-- /WIDGET BOX ACTION -->
@@ -327,7 +327,7 @@ <h2 class="section-title">Overview</h2>
             <div class="chart-wrap">
                 <!-- CHART -->
                 <div class="chart">
-                    <canvas id="accounts-30day-report-chart"></canvas>
+                    <canvas id="accounts-31day-report-chart"></canvas>
                 </div>
                 <!-- /CHART -->
             </div>
@@ -388,7 +388,7 @@ <h2 class="section-title">Overview</h2>
 app.querySelector('#accounts-10day-report-chart', function (el) {
     const
         {% for account in top_accounts %}
-        datasetData{{ forloop.counter }} = {{ account.get_xp_daily_report }},
+        datasetData{{ forloop.counter }} = {{ account.get_xp_10daily_report }},
         {% endfor %}
 
     canvas = el[0],
@@ -494,10 +494,10 @@ <h2 class="section-title">Overview</h2>
 });
 
 
-app.querySelector('#accounts-30day-report-chart', function (el) {
+app.querySelector('#accounts-31day-report-chart', function (el) {
     const
         {% for account in top_accounts %}
-        datasetData{{ forloop.counter }} = {{ account.get_xp_daily_report }},
+        datasetData{{ forloop.counter }} = {{ account.get_xp_31daily_report }},
         {% endfor %}
 
     canvas = el[0],