Merge remote-tracking branch 'origin/main'

ChatServiceApp/templatetags/tt_chat.py

@@ -13,8 +13,8 @@ register = template.Library()
 # @register.filter('get_msg_side')
 
 @register.simple_tag
-def get_ws_port():
-    return settings.WS_PORT
+def get_ws_address():
+    return settings.WS_ADDRESS
 
 
 @register.simple_tag

TWB/settings.py

@@ -91,7 +91,7 @@ TEMPLATES = [
 # WSGI_APPLICATION = 'TWB.wsgi.application'
 ASGI_APPLICATION = 'TWB.asgi.application'
 
-WS_PORT = 8000
+WS_ADDRESS = 'localhost:8000'
 
 CHANNEL_LAYERS = {
     'default': {

static/css/styles(boris).css

@@ -6,7 +6,9 @@
     width: 100% !important;
 }
 
-
+.disp-none{
+    display: none !important;
+}
 
 .text-align-center{
     text-align: center;
@@ -689,6 +691,7 @@
     flex-grow: 1;
     flex-shrink: 1;
     flex-basis: 0;
+    position: relative;
 }
 
 
@@ -706,17 +709,58 @@
 
 }
 
-.inp_form_find_route_w_abbreviation.first{
+/*.inp_form_find_route_w_abbreviation.first{*/
+/*    border-top: 1px solid #E6E6E6;*/
+/*    border-right: 0;*/
+/*    border-bottom: 1px solid #E6E6E6;*/
+/*    border-left: 1px solid #E6E6E6;*/
+/*    display: block;*/
+/*    height: 97%;*/
+/*    width: 73%;*/
+/*    border-radius: 10px 0 0 10px;*/
+/*    float: left;*/
+/*}*/
+
+.from_address_point_txt.find_route.first{
+        border-top: 1px solid #E6E6E6;
+    border-right: 0;
+    border-bottom: 1px solid #E6E6E6;
+    border-left: 1px solid #E6E6E6;
+    display: block;
+    height: 31%;
+    width: 58%;
+    float: left;
+    background-image: none !important;
+    margin-top: 0;
+    padding: 10% 6%;
+    border-radius: 10px 0 0 10px;
+}
+
+.to_address_point_txt.find_route{
     border-top: 1px solid #E6E6E6;
     border-right: 0;
     border-bottom: 1px solid #E6E6E6;
     border-left: 1px solid #E6E6E6;
     display: block;
-    height: 97%;
-    width: 73%;
-    border-radius: 10px 0 0 10px;
+    height: 31%;
+    width: 58%;
+    border-radius: 0;
     float: left;
+    background-image: none !important;
+    margin-top: 0;
+    padding: 10% 6%;
+}
 
+.input_list.find_route{
+    width: 100%;
+    /* display: block; */
+    border-radius: 0 10px;
+    top: 61px;
+    z-index: 12;
+}
+
+.input_list.find_route.show{
+    display: block;
 }
 
 .container_inp_w_abr{
@@ -781,7 +825,7 @@
 .abbreviation_airport_in_search{
     display: inline-block;
     float: right;
-    width: 26%;
+    width: 29%;
     height: 97%;
     border-top: 1px solid #E6E6E6;
     border-right: 1px solid #E6E6E6;
@@ -791,7 +835,7 @@
 
 
 .abbreviation_airport_in_search > text{
-    margin-top: 43%;
+    margin-top: 39%;
     display: block;
     font-size: 16px;
     color: #27242499;
@@ -1341,4 +1385,10 @@
 }
 .insert-airports-place.show{
     display: block;
+}
+
+/* styles to-from-addres point*/
+
+.from_address_point_txt.find_route{
+
 }

static/js/chat_sockets.js

@@ -85,6 +85,34 @@ chatSocket.onmessage = function (e) {
                 }
             }
         }
+        if (data.tickets_w_manager_html) {
+            if (document.querySelector(".list_linked_tickets") !== null || document.querySelector(".list_unlinked_tickets") !== null) {
+                document.querySelector(".list_linked_tickets").innerHTML = data.tickets_w_manager_html
+                if (el_tab !== null){
+                    document.querySelector(".tab_user_messanger.select").classList.remove("select")
+                    let old_insert_tab = document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]`)
+                    if (old_insert_tab) {
+                        old_insert_tab.classList.add("select")
+                        old_insert_tab.scrollIntoView({behavior: "smooth"});
+                    }
+
+                }
+                let container_messenger = document.querySelector(".container-messages")
+                if (container_messenger){
+                    let dataset_cont_mes = container_messenger.dataset
+                    if (dataset_cont_mes){
+                        let ticket_id = dataset_cont_mes["ticketId"]
+                        if (ticket_id !== ""){
+                            let ticket = document.querySelector(`[data-cur-receiver-item="${ticket_id}"]`)
+                            if (!ticket){
+                                let chat = document.querySelector(".block-chat").innerHTML = ""
+                            }
+                        }
+                    }
+                }
+            }
+
+        }
         if (data.tickets_wo_manager_html) {
             if (document.querySelector(".list_linked_tickets") !== null || document.querySelector(".list_unlinked_tickets") !== null) {
                 document.querySelector(".list_unlinked_tickets").innerHTML = data.tickets_wo_manager_html
@@ -98,24 +126,25 @@ chatSocket.onmessage = function (e) {
                         old_insert_tab.classList.add("select")
                         old_insert_tab.scrollIntoView({behavior: "smooth"});
                     }
-                }
-            }
 
-        }
-        if (data.tickets_w_manager_html) {
-            if (document.querySelector(".list_linked_tickets") !== null || document.querySelector(".list_unlinked_tickets") !== null) {
-                document.querySelector(".list_linked_tickets").innerHTML = data.tickets_w_manager_html
-                if (el_tab !== null){
-                    document.querySelector(".tab_user_messanger.select").classList.remove("select")
-                    let old_insert_tab = document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]`)
-                    if (old_insert_tab) {
-                        old_insert_tab.classList.add("select")
-                        old_insert_tab.scrollIntoView({behavior: "smooth"});
+                }
+                let container_messenger = document.querySelector(".container-messages")
+                if (container_messenger){
+                    let dataset_cont_mes = container_messenger.dataset
+                    if (dataset_cont_mes){
+                        let ticket_id = dataset_cont_mes["ticketId"]
+                        if (ticket_id !== ""){
+                            let ticket = document.querySelector(`[data-cur-receiver-item="${ticket_id}"]`)
+                            if (!ticket){
+                                let chat = document.querySelector(".block-chat").innerHTML = ""
+                            }
+                        }
                     }
                 }
             }
 
-        } else {
+        }
+         else {
             let list_of_users = document.querySelector(".block-list-of-users")
             if (list_of_users !== null){
                 if (data.users_list_html){

static/js/range_slider_double.js

@@ -0,0 +1,58 @@
+var $range = $(".js-range-slider"),
+    $inputFrom = $(".js-input-from"),
+    $inputTo = $(".js-input-to"),
+    instance,
+    min = 0,
+    max = 1000,
+    from = 0,
+    to = 0;
+
+$range.ionRangeSlider({
+	skin: "round",
+    type: "double",
+    min: min,
+    max: max,
+    from: 200,
+    to: 800,
+    onStart: updateInputs,
+    onChange: updateInputs
+});
+instance = $range.data("ionRangeSlider");
+
+function updateInputs (data) {
+	from = data.from;
+    to = data.to;
+
+    $inputFrom.prop("value", from);
+    $inputTo.prop("value", to);
+}
+
+$inputFrom.on("input", function () {
+    var val = $(this).prop("value");
+
+    // validate
+    if (val < min) {
+        val = min;
+    } else if (val > to) {
+        val = to;
+    }
+
+    instance.update({
+        from: val
+    });
+});
+
+$inputTo.on("input", function () {
+    var val = $(this).prop("value");
+
+    // validate
+    if (val < from) {
+        val = from;
+    } else if (val > max) {
+        val = max;
+    }
+
+    instance.update({
+        to: val
+    });
+});

templates/pages/p_results_find_route.html

@@ -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">

templates/tb_base.html

@@ -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>