Commit ab59db25 authored by impfundev's avatar impfundev

fix: empty book loan

parent 76383d43
...@@ -13,4 +13,5 @@ from django.core.asgi import get_asgi_application ...@@ -13,4 +13,5 @@ from django.core.asgi import get_asgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
app = get_asgi_application() application = get_asgi_application()
app = application
...@@ -13,4 +13,6 @@ from django.core.wsgi import get_wsgi_application ...@@ -13,4 +13,6 @@ from django.core.wsgi import get_wsgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings")
app = get_wsgi_application() application = get_wsgi_application()
app = application
...@@ -12,13 +12,13 @@ ...@@ -12,13 +12,13 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for loan in near_overdue_loans %} {% if near_overdue_loans %} {% for loan in near_overdue_loans %}
<tr> <tr>
<td>{{ loan.book.title }}</td> <td>{{ loan.book.title }}</td>
<td>{{ loan.due_date }}</td> <td>{{ loan.due_date }}</td>
<td>{{ loan.loan_date }}</td> <td>{{ loan.loan_date }}</td>
</tr> </tr>
{% endfor %} {% endfor %} {% endif %}
</tbody> </tbody>
</table> </table>
</div> </div>
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for loan in overdue_loans %} {% if overdue_loans %} {% for loan in overdue_loans %}
<tr> <tr>
<td>{{ loan.book.title }}</td> <td>{{ loan.book.title }}</td>
<td>{{ loan.due_date }}</td> <td>{{ loan.due_date }}</td>
</tr> </tr>
{% endfor %} {% endfor %} {% endif %}
</tbody> </tbody>
</table> </table>
</div> </div>
...@@ -18,22 +18,23 @@ def index(request): ...@@ -18,22 +18,23 @@ def index(request):
now = datetime.now() now = datetime.now()
overdue_loans = BookLoans.objects.filter(due_date__lte=now) overdue_loans = BookLoans.objects.filter(due_date__lte=now)
for loan in BookLoans.objects.all():
near_overdue_window = loan.due_date - timedelta(days=7)
due_date = loan.due_date
near_overdue_loans = BookLoans.objects.filter(
due_date__range=(near_overdue_window, due_date)
)
context = { context = {
"login_histories": latest_login_history, "login_histories": latest_login_history,
"total_book": total_book, "total_book": total_book,
"total_member": total_member, "total_member": total_member,
"total_book_loans": total_book_loans, "total_book_loans": total_book_loans,
"total_overdue": overdue_loans.count(), "total_overdue": overdue_loans.count(),
"overdue_loans": overdue_loans,
"near_overdue_loans": near_overdue_loans,
} }
if overdue_loans.exists():
context["overdue_loans"] = overdue_loans
for loan in BookLoans.objects.all():
near_overdue_window = loan.due_date - timedelta(days=7)
due_date = loan.due_date
near_overdue_loans = BookLoans.objects.filter(
due_date__range=(near_overdue_window, due_date)
)
context["near_overdue_loans"] = near_overdue_loans
return render(request, "dashboard/index.html", context) return render(request, "dashboard/index.html", context)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment