Add date range from date picker

edbourque0 · Apr 19, 2024 · b58c54e · b58c54e
1 parent c6514e7
commit b58c54e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/clashstats/clanranking/templates/clanranking.html b/clashstats/clanranking/templates/clanranking.html
@@ -68,11 +68,11 @@ <h1 class="modal-title fs-5" id="weeklyRankingLabel">Weekly ranking</h1>
                         <form id="dateForm" class='d-flex justify-content-between align-items-end'>
                             <div class="mb-3">
                                 <label for="startDateInput" class="form-label">Start date</label>
-                                <input type="date" class="form-control" id="startDate" name="start_date">
+                                <input type="date" class="form-control" id="startDate" name="start_date" min="2024-03-28" max={{today}}>
                             </div>
                             <div class="mb-3">
                                 <label for="endDateInput" class="form-label">End date</label>
-                                <input type="date" class="form-control" id="endDate" name="end_date">
+                                <input type="date" class="form-control" id="endDate" name="end_date" min="2024-03-28" max={{today}}>
                             </div>
                             <div class='mb-3'>
                                 <button type="submit" class="btn btn-primary">Submit</button>

diff --git a/clashstats/clanranking/views.py b/clashstats/clanranking/views.py
@@ -209,6 +209,7 @@ def clanranking(request, clantag):
         .all(),
         "battles": Battles.objects.all(),
         "lastUpdatedMin": round((tn - tu).total_seconds() / 60),
+        "today": datetime.strftime(timezone.now(), "%Y-%m-%d"),
     }
 
     default_start_date = timezone.now() - timedelta(days=7)
@@ -222,7 +223,7 @@ def clanranking(request, clantag):
         end_date_str = request.POST.get('end_date')
 
         start_date = datetime.strptime(start_date_str, '%Y-%m-%d') if start_date_str else default_start_date
-        end_date = datetime.strptime(end_date_str, '%Y-%m-%d') if end_date_str else default_end_date
+        end_date = datetime.strptime(end_date_str, '%Y-%m-%d').replace(hour=23, minute=59) if end_date_str else default_end_date
 
         contextDates = {
             "start_date": start_date,

diff --git a/clashstats/db.sqlite3 b/clashstats/db.sqlite3
diff --git a/tested.py b/tested.py
@@ -0,0 +1,4 @@
+from datetime import datetime
+today = datetime.strftime(datetime.now(), "%Y-%m-%d")
+
+print(today)