fix: upcoming loans

dashboards/templates/dashboard/near_overdue_loan.html

@@ -11,7 +11,7 @@
       </tr>
     </thead>
     <tbody>
-      {% if near_overdue_loans %} {% for loan in near_overdue_loans %}
+      {% if upcoming_loans %} {% for loan in upcoming_loans %}
       <tr>
         <td>{{ loan.book.title }}</td>
         <td>{{ loan.due_date }}</td>

dashboards/templates/dashboard/overdue_loan.html

@@ -7,6 +7,7 @@
       <tr class="table-primary">
         <th scope="col">Book Title</th>
         <th scope="col">Due Date</th>
+        <th scope="col">Loan Date</th>
       </tr>
     </thead>
     <tbody>
@@ -14,9 +15,11 @@
       <tr>
         <td>{{ loan.book.title }}</td>
         <td>{{ loan.due_date }}</td>
+        <td>{{ loan.loan_date }}</td>
       </tr>
       {% endfor %} {% else %}
       <tr>
+        <td></td>
         <td>No Data</td>
         <td></td>
       </tr>

dashboards/views.py

@@ -20,22 +20,23 @@ def index(request):
         due_date__lte=now, return_date=None
     ).order_by("created_at")
 
+    due_date_treshold = now.today() + timedelta(days=3)
+
+    upcoming_loans = BookLoans.objects.filter(due_date__lte=due_date_treshold).filter(
+        due_date__gte=now.today()
+    )
+
     context = {
         "login_histories": latest_login_history,
         "total_book": total_book,
         "total_member": total_member,
         "total_book_loans": total_book_loans,
         "total_overdue": overdue_loans.count(),
+        "overdue_loans": overdue_loans,
+        "upcoming_loans": upcoming_loans,
     }
 
     if overdue_loans.exists():
         context["overdue_loans"] = overdue_loans
-        due_date_threshold = now - timedelta(days=3)
-        upcoming_loan = (
-            BookLoans.objects.filter(due_date__gte=now)
-            .filter(due_date__gte=due_date_threshold)
-            .order_by("-due_date")
-        )
-        context["near_overdue_loans"] = upcoming_loan
 
     return render(request, "dashboard/index.html", context)