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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
ArtemB
2023-08-17 14:32:11 +03:00
parent 5c3bffdda4 dd8551c0c6
commit 7dc7ead417
7 changed files with 240 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
templates/pages/p_results_find_route.html
View File

@@ -2,10 +2,19 @@
{% load static %}
{% block meta %}
<script src="{% static "js/ion.rangeSlider.min.js" %}"></script>
<link rel="stylesheet" href="{% static "css/ion.rangeSlider.min.css" %}">
<script src='{% static "js/find_route.js" %}'></script>
<script src="{% static "js/serch_town.js" %}"></script>
{# <script src="{% static "js/serch_town.js" %}"></script>#}
<script src="{% static "js/user_profile.js" %}"></script>
<script src="{% static "js/user_profile(boris).js" %}"></script>
<script src="{% static "js/range_slider_double.js" %}"></script>
{% endblock %}
{% block content %}
<div class="cut-width">
<div class="text-align-center">
@@ -16,22 +25,75 @@
{% csrf_token %}
<div class="cont-el-form-search-carrier first abbreviation">
<label>Откуда</label>
{# <input onfocus="focus_el_ins(this)" onclick="show_list_w_places(this)" oninput="searchTown(this)" class="inp_form_find_route_w_abbreviation first" id="inp_form_find_route_w_abbreviation_1" type="text">#}
{# <div class="insert-airports-place" id="insert-airports-place_1">#}
{# {% include "widgets/w_places_input.html" %}#}
{# </div>#}
<div class="container_inp_w_abr">
<input onfocus="focus_el_ins(this)" onclick="show_list_w_places(this)" oninput="searchTown(this)" class="inp_form_find_route_w_abbreviation first" id="inp_form_find_route_w_abbreviation_1" type="text">
<input
type="number"
name="from_address_point"
id="id_from_address_point"
hidden
class="disp-none"
{% if form.initial.from_address_point %}value="{{ form.initial.from_address_point }}"{% endif %}
/>
<input
oninput="searchTown(this)"
onclick="showSearchList(this)"
onblur="onblurInputField(event, this)"
onFocus="this.select()"
autocomplete="off"
type="text"
minlength="3"
name="from_address_point_txt"
class="from_address_point_txt find_route first"
{% if form.fields.from_address_point.required %} required{% endif %}
id="id_from_address_point_txt"
{% if form.initial.from_address_point_txt %}value="{{ form.initial.from_address_point_txt }}"{% endif %}
/>
<div class="abbreviation_airport_in_search"><text>MSQ</text></div>
<div class="insert-airports-place" id="insert-airports-place_1">
{% include "widgets/w_places_input.html" %}
<div class="input_list find_route" name="from_address_point_txt_list">
</div>
</div>
</div>
<div class="cont-el-form-search-carrier">
<label>Куда</label>
{# <div class="container_inp_w_abr">#}
{# <input onfocus="focus_el_ins(this)" onclick="show_list_w_places(this)" oninput="searchTown(this)" class="inp_form_find_route_w_abbreviation" id="inp_form_find_route_w_abbreviation_2" type="text">#}
{# <div class="insert-airports-place" id="insert-airports-place_2">#}
{# {% include "widgets/w_ac_input_address_point.html" %}#}
{# </div>#}
{# </div>#}
<div class="container_inp_w_abr">
<input onfocus="focus_el_ins(this)" onclick="show_list_w_places(this)" oninput="searchTown(this)" class="inp_form_find_route_w_abbreviation" id="inp_form_find_route_w_abbreviation_2" type="text">
<div class="abbreviation_airport_in_search"><text>WAW</text></div>
<div class="insert-airports-place" id="insert-airports-place_2">
{% include "widgets/w_ac_input_address_point.html" %}
</div>
<input
type="number"
name="to_address_point"
id="id_to_address_point"
hidden
class="disp-none"
{% if form.initial.to_address_point %}value="{{ form.initial.to_address_point}}"{% endif %}/>
<input
oninput="searchTown(this)"
onclick="showSearchList(this)"
onblur="onblurInputField(event, this)"
onFocus="this.select()"
autocomplete="off"
type="text"
name="to_address_point_txt"
{% if form.fields.to_address_point.required %} required{% endif %}
id="id_to_address_point_txt"
class="to_address_point_txt find_route"
{% if form.initial.to_address_point_txt %}value="{{ form.initial.to_address_point_txt}}"{% endif %}/>
<div class="abbreviation_airport_in_search"><text>WAW</text></div>
<div class="input_list find_route" name="to_address_point_txt_list">
</div>
</div>
</div>
<div class="cont-el-form-search-carrier">
@@ -107,9 +169,14 @@
</select>
</div>
<div class="methods_transportation_form_filters">
<div class="slider_methods_transportation"></div>
<input type="number" class="slider_input_form_method_transportation_1" oninput="insert_data_in_slider(this)">
<input type="number" class="slider_input_form_method_transportation_2" oninput="insert_data_in_slider(this)">
<div class="range-slider">
<input type="text" class="js-range-slider" value="" />
</div>
<div class="extra-controls">
<input type="text" class="js-input-from" value="0" />
<input type="text" class="js-input-to" value="0" />
</div>
</div>
</div>
<div class="block-finded-routes">

2
templates/tb_base.html
View File

@@ -12,7 +12,7 @@
<script>
{#var user_id = {{ user.id }}#}
ws_url = `ws://localhost:{% get_ws_port %}/ws/socket-server/?user_id={{ user.id }}`;
ws_url = `ws://{% get_ws_address %}/ws/socket-server/?user_id={{ user.id }}`;
</script>