WV-861 add next page UI [TEAM REVIEW] #2821
Conversation
itcreativeusa
force-pushed
the
WV-861-add-next-page-ui
branch
from
37806d0 to
daddbd9
Compare
DaleMcGrew
changed the title
[WV-861]Add 'Next Page' UI on Politician Admin page
itcreativeusa
force-pushed
the
WV-861-add-next-page-ui
branch
from
daddbd9 to
de1f17e
Compare
| @@ -336,5 +367,6 @@ <h1>Politicians</h1> | |||
| }); | |||
|
|
|||
| </script> | |||
| <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script> | |||
There was a problem hiding this comment.
Hi Katerenya, we shouldn't have to include this here because jquery is already included in WeVoteServer/templates/template_base.html on line 24. You can upgrade that version in that file if you need a newer version.
| template_values = { | ||
| "start_index": start_index, | ||
| 'politician_list': politician_list, |
There was a problem hiding this comment.
Please add these template variables in alphabetical order, because that helps us make sure we don't duplicate existing variables. (I see "politician_list" and "politician_search" for example are already passed in further down in this template_values dict.)
| end_index = start_index + items_per_page | ||
|
|
||
| # Fetch only the items for the current page | ||
| politician_list = politician_query.order_by("politician_name")[start_index:end_index] |
There was a problem hiding this comment.
We have already retrieved politician_list above, and augmented it with data from the Representative table. This replaces that work with a brand new query. I think this pagination logic should be included up around lines 992-996 where the current retrieve is happening:
if not positive_value_exists(show_all):
politician_list = politician_query.order_by('politician_name')[:25]
else:
# We still want to limit to 200
politician_list = politician_query.order_by('politician_name')[:200]
| @@ -51,22 +51,24 @@ <h1>Politicians</h1> | |||
|
|
|||
| <form name="state_code_form" method="get" action="{% url 'politician:politician_list' %}"> | |||
| {% csrf_token %} | |||
| <input type="hidden" name="politician_search" value="{{ politician_search|default_if_none:'' }}" /> | |||
There was a problem hiding this comment.
politician_search is already being included in the form down below on your line 74 in an input, and doesn't need to be added here as a hidden value.
| @@ -51,22 +51,24 @@ <h1>Politicians</h1> | |||
|
|
|||
| <form name="state_code_form" method="get" action="{% url 'politician:politician_list' %}"> | |||
| {% csrf_token %} | |||
| <input type="hidden" name="politician_search" value="{{ politician_search|default_if_none:'' }}" /> | |||
| <input type="hidden" name="show_all" value="{{ show_all|default_if_none:0 }}" /> | |||
There was a problem hiding this comment.
show_all is already included below as a checkbox, and doesn't need to be included here as a hidden value.
| @@ -51,22 +51,24 @@ <h1>Politicians</h1> | |||
|
|
|||
| <form name="state_code_form" method="get" action="{% url 'politician:politician_list' %}"> | |||
| {% csrf_token %} | |||
| <input type="hidden" name="politician_search" value="{{ politician_search|default_if_none:'' }}" /> | |||
| <input type="hidden" name="show_all" value="{{ show_all|default_if_none:0 }}" /> | |||
| <input type="hidden" name="exclude_politician_analysis_done" value="{{ exclude_politician_analysis_done|default_if_none:0 }}" /> | |||
There was a problem hiding this comment.
exclude_politician_analysis_done is already included below as a checkbox, and doesn't need to be included here as a hidden value.
1)Implemented backend logic to support pagination with total_count, items_per_page, start_index, and end_index.
2) Added previous_page_url and next_page_url for navigation.
3) Conditionally hid pagination UI when items fit on a single page.
4)Updated the frontend to display "Previous" and "Next" links with the current page number.