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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
ArtemB
2023-12-05 13:39:38 +03:00
parent 89b57feb4e fc194d3f85
commit 5c4e715970
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReferenceDataApp/js_views.py
View File

@@ -55,7 +55,7 @@ def get_address_point_ajax(request):
else:
item['city_name'] = item['name']
item['country_name'] = item['country__name']
item['fullname'] = f'{item["country_name"]} / {item["city_name"]}'
item['fullname'] = f'{item["city_name"]} / {item["country_name"]}'
html = f"{html}{render_to_string('widgets/w_ac_input_address_point.html', item)}"
i += 1

4
RoutesApp/models.py
View File

@@ -111,8 +111,8 @@ class Route(BaseModel):
to_address_point_Dict = to_address_point_objs.values(
'id', 'name', 'country__name')[0]
from_address_point_txt = f'{from_address_point_Dict["country__name"]} / {from_address_point_Dict["name"]}'
to_address_point_txt = f'{to_address_point_Dict["country__name"]} / {to_address_point_Dict["name"]}'
from_address_point_txt = f'{from_address_point_Dict["name"]} / {from_address_point_Dict["country__name"]}'
to_address_point_txt = f'{to_address_point_Dict["name"]} / {to_address_point_Dict["country__name"]}'
return {
'from_address_point_obj': from_address_point_objs[0],

16
static/js/filters_functions_find_route.js
View File

@@ -1,6 +1,6 @@
timeout_range_slider = null
function filters_func_find_route_main (el,owner_type=null,win_loc_replace=null,weight=null){
function filters_func_find_route_main (el, owner_type=null, win_loc_replace=null, weight=null){
console.log("asd")
@@ -11,9 +11,9 @@ function filters_func_find_route_main (el,owner_type=null,win_loc_replace=null,w
let list = forloop_func_form(data_d,"get",get_url)
data_d = list[0]
get_url = list[1]
// if (owner_type !== null) {
// data_d['owner_type'] = owner_type
// }
if (owner_type !== null) {
data_d['owner_type'] = owner_type
}
// get_url = get_url + `owner_type=${owner_type}`
window.location.href = `${win_loc_replace}?${get_url}`
@@ -31,10 +31,10 @@ function filters_func_find_route_main (el,owner_type=null,win_loc_replace=null,w
let list = forloop_func_form(data_d,"get",get_url)
data_d = list[0]
get_url = list[1]
// if (owner_type !== null) {
// data_d['owner_type'] = owner_type
// get_url = get_url + `owner_type=${owner_type}`
// }
if (owner_type !== null) {
data_d['owner_type'] = owner_type
// get_url = get_url + `owner_type=${owner_type}`
}
if (weight){

2
templates/forms/f_find_route_form_main_find_routes.html
View File

@@ -101,7 +101,7 @@
<div class="cont-el-form-search-carrier el_form_find_route">
<label style="opacity: 0">test</label>
{% if show_filter_and_results %}
<button class="btn_find_routes" onclick="filters_func_find_route_main(this)" data-owner_type='{{ owner_type }}'>{% translate "Найти" %}</button>
<button class="btn_find_routes" onclick="filters_func_find_route_main(this,'{{ owner_type }}')" data-owner_type='{{ owner_type }}'>{% translate "Найти" %}</button>
{% else %}
<button class="btn_find_routes" onclick="filters_func_find_route_main(this,'{{ owner_type }}','{% url "route_search_results_View" %}')" data-owner_type='{{ owner_type }}'>{% translate "Найти" %}</button>
{% endif %}