sysadminix/account_store
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.7.91

Browse Source 
routes paging
This commit is contained in:
SDE
2023-11-29 16:52:20 +03:00
parent dfec56fef9
commit fc1654dedb
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ArticlesApp/funcs.py
View File

@@ -1,7 +1,7 @@
from .models import * from .models import *
elements_on_page = 10 elements_on_page = 4
def get_articles(art_kwargs, request_Data=None, from_el=None, to_el=None): def get_articles(art_kwargs, request_Data=None, from_el=None, to_el=None):
@@ -22,7 +22,7 @@ def get_articles(art_kwargs, request_Data=None, from_el=None, to_el=None):
elif to_el: elif to_el:
arts = arts[:to_el] arts = arts[:to_el]
else: else:
to_el = elements_on_page + 1 to_el = elements_on_page
arts = arts[:to_el] arts = arts[:to_el]
last_block = False last_block = False

13
RoutesApp/funcs.py
View File

@@ -4,6 +4,9 @@ from django.utils.translation import gettext as _
from django.template.loader import render_to_string from django.template.loader import render_to_string
from datetime import datetime from datetime import datetime
elements_on_page = 25
def get_profile_new_route_page_html(request, data): def get_profile_new_route_page_html(request, data):
form = RouteForm() form = RouteForm()
@@ -199,14 +202,17 @@ def get_routes_Dict(user=None, data=None):
elif to_el: elif to_el:
routes = routes[:to_el] routes = routes[:to_el]
else: else:
to_el = 25 to_el = elements_on_page
routes = routes[:to_el] routes = routes[:to_el]
last_block = False last_block = False
if not to_el or to_el >= routes_count: if not to_el or to_el >= routes_count:
last_block = True last_block = True
if routes_count - to_el > elements_on_page:
next_page_els_count = elements_on_page
else:
next_page_els_count = routes_count - to_el
try: try:
@@ -232,7 +238,8 @@ def get_routes_Dict(user=None, data=None):
res_Dict.update({ res_Dict.update({
'routes': routes, 'routes': routes,
'last_block': last_block, 'last_block': last_block,
'last_el': to_el 'last_el': to_el,
'next_page_els_count': next_page_els_count
}) })
return res_Dict return res_Dict

3
RoutesApp/js_views.py
View File

@@ -148,7 +148,8 @@ def find_routes_ajax(request):
res_Dict = { res_Dict = {
'html': html, 'html': html,
'last_block': routes_Dict['last_block'] 'last_block': routes_Dict['last_block'],
'next_page_els_count': routes_Dict['next_page_els_count'],
# 'form': RouteForm(initial=data) # 'form': RouteForm(initial=data)
} }

3
RoutesApp/views.py
View File

@@ -32,7 +32,8 @@ def route_search_results_View(request):
'show_filter_and_results': True, 'show_filter_and_results': True,
'owner_type': data['owner_type'], 'owner_type': data['owner_type'],
'last_el': routes_Dict['last_el'], 'last_el': routes_Dict['last_el'],
'page_type': 'routes' 'page_type': 'routes',
'next_page_els_count': routes_Dict['next_page_els_count'],
} }
if 'from_address_point_txt' in routes_Dict: if 'from_address_point_txt' in routes_Dict:
data.update({'from_address_point_txt': routes_Dict['from_address_point_txt']}) data.update({'from_address_point_txt': routes_Dict['from_address_point_txt']})