Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
L
library-app-django
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ilham Maulana
library-app-django
Commits
74a763e2
Commit
74a763e2
authored
Jul 16, 2024
by
Ilham Maulana
💻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: upcoming and overdued book loan order list
parent
1a5f445c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
views.py
dashboard/views.py
+8
-8
No files found.
dashboard/views.py
View file @
74a763e2
...
...
@@ -19,7 +19,7 @@ class OverduedLoanView(ListView):
now
=
timezone
.
now
()
queryset
=
queryset
.
filter
(
due_date__lte
=
now
,
return_date
=
None
)
.
order_by
(
"-
due_date
"
"-
created_at
"
)
if
keyword
:
...
...
@@ -27,13 +27,13 @@ class OverduedLoanView(ListView):
Q
(
book__title__icontains
=
keyword
)
|
Q
(
member__name__icontains
=
keyword
)
|
Q
(
librarian__name__icontains
=
keyword
)
)
.
order_by
(
"-
due_date
"
)
)
.
order_by
(
"-
created_at
"
)
if
order
:
if
order
==
"new"
:
queryset
=
queryset
.
order_by
(
"-
due_date
"
)
queryset
=
queryset
.
order_by
(
"-
created_at
"
)
elif
order
==
"old"
:
queryset
=
queryset
.
order_by
(
"
due_date
"
)
queryset
=
queryset
.
order_by
(
"
created_at
"
)
return
queryset
...
...
@@ -54,7 +54,7 @@ class UpcomingLoanView(ListView):
queryset
=
(
queryset
.
filter
(
due_date__lte
=
due_date_treshold
,
return_date
=
None
)
.
filter
(
due_date__gte
=
now
)
.
order_by
(
"-
due_date
"
)
.
order_by
(
"-
created_at
"
)
)
if
keyword
:
...
...
@@ -62,13 +62,13 @@ class UpcomingLoanView(ListView):
Q
(
book__title__icontains
=
keyword
)
|
Q
(
member__name__icontains
=
keyword
)
|
Q
(
librarian__name__icontains
=
keyword
)
)
.
order_by
(
"-
due_date
"
)
)
.
order_by
(
"-
created_at
"
)
if
order
:
if
order
==
"new"
:
queryset
=
queryset
.
order_by
(
"-
due_date
"
)
queryset
=
queryset
.
order_by
(
"-
created_at
"
)
elif
order
==
"old"
:
queryset
=
queryset
.
order_by
(
"
due_date
"
)
queryset
=
queryset
.
order_by
(
"
created_at
"
)
return
queryset
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment