Commit 778a8c5e authored by impfundev's avatar impfundev

feat: search and order member and librarian table

feat: order book loan table
parent 65114b8c
{% extends "layout.html" %} {% block dashboard %} {% extends "layout.html" %} {% block dashboard %}
<div class="w-100 p-4"> <div class="w-100 p-4">
{% include "book_loan_delete_form.html" %} {% include "book_loan_create_form.html" %}
<div class="d-flex flex-column gap-2 mb-4"> <div class="d-flex gap-2 mb-4">
{% include "order_form.html" %}
<button <button
type="button" type="button"
class="btn btn-primary" class="btn btn-primary"
...@@ -10,8 +11,8 @@ ...@@ -10,8 +11,8 @@
> >
<i class="bi bi-plus-circle"></i> Add Book Loan <i class="bi bi-plus-circle"></i> Add Book Loan
</button> </button>
{% include "book_loan_create_form.html" %} {% include "search_form.html" %}
</div> </div>
{% include "book_loan_table_data.html" %} {% include "book_loan_table_data.html" %}
</div> </div>
{% endblock dashboard %} {% include "book_loan_delete_form.html" %} {% endblock dashboard %}
import jwt import jwt
from django.conf import settings from django.conf import settings
from datetime import datetime from datetime import datetime
from django.db.models import Q
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.shortcuts import render, get_object_or_404 from django.shortcuts import render, get_object_or_404
from book_loans.models import Book, BookLoans from book_loans.models import Book, BookLoans
...@@ -49,6 +50,21 @@ def index(request): ...@@ -49,6 +50,21 @@ def index(request):
return_date=return_date, return_date=return_date,
) )
if request.method == "GET":
query = request.GET.get("q")
order = request.GET.get("o")
# if query is not None:
# filtered_book_list = BookLoans.objects.filter(
# Q(member__icontains=query) | Q(book__icontains=query)
# ).order_by("-created_at")[:10]
# context["book_loans"] = filtered_book_list
if order == "new":
context["book_loans"] = BookLoans.objects.all().order_by("-created_at")[:10]
elif order == "old":
context["book_loans"] = BookLoans.objects.all().order_by("created_at")[:10]
return render(request, "loans.html", context) return render(request, "loans.html", context)
......
{% extends "layout.html" %} {% block dashboard %} {% extends "layout.html" %} {% block dashboard %}
<div style="max-width: 80vw" class="w-100 p-4"> <div style="max-width: 80vw" class="w-100 p-4">
{% include "librarians_delete_form.html" %} {% include "librarians_create_form.html" %}
<div class="d-flex flex-column gap-2 mb-4"> <div class="d-flex gap-2 mb-4">
{% include "order_form.html" %}
<button <button
type="button" type="button"
class="btn btn-primary" class="btn btn-primary"
...@@ -10,8 +11,8 @@ ...@@ -10,8 +11,8 @@
> >
<i class="bi bi-plus-circle"></i> Add Librarian <i class="bi bi-plus-circle"></i> Add Librarian
</button> </button>
{% include "librarians_create_form.html" %} {% include "search_form.html" %}
</div> </div>
{% include "librarians_table_data.html" %} {% include "librarians_table_data.html" %}
</div> </div>
{% endblock dashboard %} {% include "librarians_delete_form.html" %} {% endblock dashboard %}
from django.shortcuts import get_object_or_404, render from django.shortcuts import get_object_or_404, render
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.db.models import Q
from datetime import datetime from datetime import datetime
from librarians.models import Librarians from librarians.models import Librarians
...@@ -19,6 +20,23 @@ def index(request): ...@@ -19,6 +20,23 @@ def index(request):
Librarians.objects.create(name=name, email=email, password=password) Librarians.objects.create(name=name, email=email, password=password)
if request.method == "GET":
query = request.GET.get("q")
order = request.GET.get("o")
if query is not None:
filtered_book_list = Librarians.objects.filter(
Q(name__icontains=query) | Q(email__icontains=query)
).order_by("-created_at")[:10]
context["librarians"] = filtered_book_list
if order == "new":
context["librarians"] = Librarians.objects.all().order_by("-updated_at")[
:10
]
elif order == "old":
context["librarians"] = Librarians.objects.all().order_by("updated_at")[:10]
return render(request, "librarians.html", context) return render(request, "librarians.html", context)
......
{% extends "layout.html" %} {% block dashboard %} {% extends "layout.html" %} {% block dashboard %}
<div style="max-width: 80vw" class="w-100 p-4"> <div style="max-width: 80vw" class="w-100 p-4">
{% include "members_delete_form.html" %} {% include "members_create_form.html" %}
<div class="d-flex flex-column gap-2 mb-4"> <div class="d-flex gap-2 mb-4">
{% include "order_form.html" %}
<button <button
type="button" type="button"
class="btn btn-primary" class="btn btn-primary"
...@@ -10,8 +11,8 @@ ...@@ -10,8 +11,8 @@
> >
<i class="bi bi-plus-circle"></i> Add Member <i class="bi bi-plus-circle"></i> Add Member
</button> </button>
{% include "members_create_form.html" %} {% include "search_form.html" %}
</div> </div>
{% include "members_table_data.html" %} {% include "members_table_data.html" %}
</div> </div>
{% endblock dashboard %} {% include "members_delete_form.html" %} {% endblock dashboard %}
from django.shortcuts import get_object_or_404, render from django.shortcuts import get_object_or_404, render
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.db.models import Q
from datetime import datetime from datetime import datetime
from members.models import Members from members.models import Members
...@@ -19,6 +20,21 @@ def index(request): ...@@ -19,6 +20,21 @@ def index(request):
Members.objects.create(name=name, email=email, password=password) Members.objects.create(name=name, email=email, password=password)
if request.method == "GET":
query = request.GET.get("q")
order = request.GET.get("o")
if query is not None:
filtered_book_list = Members.objects.filter(
Q(name__icontains=query) | Q(email__icontains=query)
).order_by("-created_at")[:10]
context["members"] = filtered_book_list
if order == "new":
context["members"] = Members.objects.all().order_by("-updated_at")[:10]
elif order == "old":
context["members"] = Members.objects.all().order_by("updated_at")[:10]
return render(request, "members.html", context) return render(request, "members.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