0.8.357

2023-11-18 16:30:27 +03:00
parent bd4a2e7507
commit 8f76b484ba
7 changed files with 127 additions and 24 deletions
--- a/RoutesApp/views.py
+++ b/RoutesApp/views.py
@@ -32,6 +32,7 @@ def route_search_results_View(request):
            'show_filter_and_results': True,
            'owner_type': data['owner_type'],
            'last_el': routes_Dict['last_el'],
+            'page_type': 'routes'
        }
    if 'from_address_point_txt' in routes_Dict:
        data.update({'from_address_point_txt': routes_Dict['from_address_point_txt']})
--- a/static/css/mobile_styles.css
+++ b/static/css/mobile_styles.css
@@ -534,6 +534,16 @@
        position: absolute;
        width: 320px;
    }
+    .menu_buttons.left.close.filters{
+        left: -347px;
+        transition: 200ms;
+        position: absolute;
+        width: 320px;
+    }
+    .block_w_paging.routes {
+        width: 100%;
+        float: right;
+    }
    .menu_buttons.left .handler_menu{
        transform: rotate(90deg);
        left: -48px;
@@ -618,6 +628,7 @@

     .text_f_curtain{
         display: inline-block;
+         font-size: 13px;
     }

    .menu_profile{
@@ -643,6 +654,9 @@
        top: 0;
        right: 0;
    }
+    .block_overlay.show.routes{
+        display: block;
+    }
    #customer>a, #mover>a{
        left: 5%;
    }
--- a/static/css/styles(boris).css
+++ b/static/css/styles(boris).css
@@ -2300,6 +2300,20 @@
    position: absolute;
    width: 320px;
 }
+
+.menu_buttons.left.close.filters{
+    width: 294px;
+    background: #FFFFFF;
+    border-radius: 10px;
+    max-height: 83vh;
+    left: 0;
+    padding: 13px;
+    transition: 200ms;
+    /* position: fixed; */
+    float: left;
+    text-align: left;
+    top: 0;
+}
 .menu_buttons.right.open{
    right: 0;
    transition: 200ms;
@@ -2326,15 +2340,16 @@
 }

 .menu_buttons.left.open.filters{
-    width: 300px;
+    width: 294px;
    background: #FFFFFF;
    border-radius: 10px;
    max-height: 83vh;
    left: 0;
-    padding: 10px;
+    padding: 13px;
    transition: 200ms;
    /* position: fixed; */
    float: left;
+    text-align: left;
 }

 .support .menu_buttons.left.open{
@@ -2526,3 +2541,68 @@
    padding-bottom: 20px;
 }

+/* checkbox type transport*/
+
+.checkbox_type_transport{
+    width: 100%;
+    display: block;
+    margin-bottom: 25px;
+}
+
+
+
+.input_f_checkbox_type_transport{
+    display: none;
+}
+
+.label_f_checkbox_type_transport{
+    width: 100%;
+    display: block;
+}
+
+.trigger_f_type_transport{
+    width: 30px;
+    height: 30px;
+    border: 1px solid #E6E6E6;
+    float: left;
+    border-radius: 10px;
+}
+
+.input_f_checkbox_type_transport:checked + label > .trigger_f_type_transport{
+    background: #FF613A;
+}
+
+.img_f_checkbox_type_transport{
+    display: inline-block;
+    padding-top: 11px;
+    padding-left: 5px;
+    width: 12px;
+}
+
+.span_f_checkbox_type_transport{
+    color: #000000;
+    float: right;
+    display: block;
+    width: calc(100% - 55px);
+    padding-left: 5px;
+    padding-top: 5px;
+
+}
+
+.block_overlay.show.routes{
+    display: none;
+}
+
+.menu_buttons.left.close.filters{
+    width: 294px;
+    background: #FFFFFF;
+    border-radius: 10px;
+    max-height: 83vh;
+    left: 0;
+    padding: 13px;
+    transition: 200ms;
+    /* position: fixed; */
+    float: left;
+    text-align: left;
+    top: 0;
+}
--- a/static/js/filters_functions_find_route.js
+++ b/static/js/filters_functions_find_route.js
@@ -92,12 +92,11 @@ function ajax_for_filter (data_d,get_url){
            let new_page_routes = document.createElement("div")
            new_page_routes.classList.add("page_paging_elements_" + page_iterator)
            let insert_place_main = document.querySelector(".block-finded-routes")
-            if (insert_place_main){
+            if (insert_place_main) {
                insert_place_main.innerHTML = ''
                insert_place_main.appendChild(new_page_routes)
            }
-
-            // $(new_page_routes).insertAfter(".page_paging_elements_" + old_page_iterator);
+            //             // $(new_page_routes).insertAfter(".page_pagingelements_" + old_page_iterator);
            // let line_separator = document.createElement("div")
            // line_separator.classList.add("line_separator_page_w_el")
            // $(line_separator).insertAfter(".page_paging_elements_" + separator_iterator);
--- a/static/js/user_profile_2.js
+++ b/static/js/user_profile_2.js
@@ -779,7 +779,7 @@ function open_curtain (left=null,right=null,overlay=null,close=null){
            handler_text.style.fontSize = '13px'
        } else {
            handler_text.innerHTML = curtain_name
-            handler_text.style.fontSize = '16px'
+            handler_text.style.fontSize = '13px'
        }

        if (!curtain.classList.contains('open')){
--- a/templates/forms/f_find_route_filters_form.html
+++ b/templates/forms/f_find_route_filters_form.html
@@ -16,19 +16,27 @@
 {#                    </div>#}
        {% for item in route_form.fields.type_transport.choices %}
            {% if forloop.counter0 > 0 %}
-                <div>
-                    <input
-                        class="custom-checkbox el_form_find_route"
-                        type="checkbox"
-                        name="type_transport"
-                        id="id_cargo_type_car_{{ forloop.counter }}"
-                        onchange="filters_func_find_route_main(this,'{{ owner_type }}')"
-                        value="{{ item.0 }}"
-                    />
-
-                    <label for="id_cargo_type_car_{{ forloop.counter }}" >
-                        <img style="display: inline-block;padding-top: 11px;" src="{% static "img/svg/Car.svg" %}">
-                        <span style="display: inline-block;width: 80%;">{{ item.1 }}</span>
+{#                <div>#}
+{#                    <input#}
+{#                        class="custom-checkbox el_form_find_route"#}
+{#                        type="checkbox"#}
+{#                        name="type_transport"#}
+{#                        id="id_cargo_type_car_{{ forloop.counter }}"#}
+{#                        onchange="filters_func_find_route_main(this,'{{ owner_type }}')"#}
+{#                        value="{{ item.0 }}"#}
+{#                    />#}
+{##}
+{#                    <label for="id_cargo_type_car_{{ forloop.counter }}" >#}
+{#                        <img style="display: inline-block;padding-top: 11px;" src="{% static "img/svg/Car.svg" %}">#}
+{#                        <span style="display: inline-block;width: 80%;">{{ item.1 }}</span>#}
+{#                    </label>#}
+{#                </div>#}
+                <div class="checkbox_type_transport">
+                    <input class="input_f_checkbox_type_transport el_form_find_route" type="checkbox" value="{{ item.0 }}" name="type_transport" id="id_cargo_type_car_{{ forloop.counter }}" onchange="filters_func_find_route_main(this,'{{ owner_type }}')">
+                    <label for="id_cargo_type_car_{{ forloop.counter }}" class="label_f_checkbox_type_transport">
+                        <div class="trigger_f_type_transport"></div>
+                        <img class="img_f_checkbox_type_transport" src="{% static "img/svg/Car.svg" %}">
+                        <span class="span_f_checkbox_type_transport">{{ item.1 }}</span>
                    </label>
                </div>
            {% endif %}
--- a/templates/tb_base.html
+++ b/templates/tb_base.html
@@ -42,7 +42,8 @@
    <script src="{% static "js/dynamic_loading_routes.js" %}"></script>
    <script src="{% static "js/user_profile.js" %}"></script>
    <script src="{% static "js/user_profile_2.js" %}"></script>
-
+    <script src="{% static "js/ion.rangeSlider.min.js" %}"></script>
+    <link rel="stylesheet" href="{% static "css/ion.rangeSlider.min.css" %}">


 {#    <script src="{% static "js/range_calendar.js" %}"></script>#}
@@ -53,7 +54,7 @@
 </head>
 <body>

-<div class="block_overlay  {% if page_type == 'profile' %}show{% else %}hidden n_profile{% endif %}" onclick="open_curtain()"></div>
+<div class="block_overlay  {% if page_type == 'profile' %}show{% elif page_type == 'routes' %} show routes n_profile{% else %}hidden n_profile{% endif %}" onclick="open_curtain()"></div>
 <div class="wrapper_main">

    {% include 'blocks/b_header.html' %}
@@ -70,14 +71,14 @@
                </div>
            </div>
        </div>
-    {% if not page_type == 'profile' %}
+    {% if page_type == 'routes' %}
        <div class="cut_width_f_curtain left">
-            <div class="menu_buttons curtain left open filters" data-name="Меню">
+            <div class="menu_buttons curtain left open filters" data-name="Фильтры">

                {% include "forms/f_find_route_filters_form.html" %}
                <div class="handler_menu close" onclick="open_curtain('left')">
                    <img class="btns_f_curtain close left" src="{% static 'img/svg/arrow_f_curtain.svg' %}">
-                    <div class="text_f_curtain left">Меню</div>
+                    <div class="text_f_curtain left">Фильтры</div>
                    <img class="btns_f_curtain close right"  src="{% static 'img/svg/arrow_f_curtain.svg' %}">
                    <div class="clear_both"></div>
                </div>