0.0.136

static/css/styles(boris).css

@@ -670,7 +670,6 @@
 /*p_results_find_route*/
 
 .container_form_search_carrier{
-    height: 120px;
     width: 100%;
     background: #FFF;
     box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20);
@@ -680,18 +679,82 @@
 }
 
 .container_form_search_carrier > form{
-    width: 100%;
+    width: 98%;
-    height: 100%;
+    height: 98%;
     display: flex;
-    padding: 20px 10px;
+    padding: 2% 1%;
 }
 
 .cont-el-form-search-carrier{
     flex-grow: 1;
+    flex-shrink: 1;
+    flex-basis: 0;
+}
+
+.cont-el-form-search-carrier > button{
+    width: 99%;
+    border-radius: 10px;
+    color: #FFFFFF;
+    background: #FF613A;
+    height: 60px;
 }
 
 .cont-el-form-search-carrier > input{
     border:1px solid #E6E6E6;
+    display: block;
+    height: 60px;
+    width: 99%;
+}
+
+.cont-el-form-search-carrier.first > input{
+    border:1px solid #E6E6E6;
+    display: block;
+    height: 60px;
+    width: 99%;
+    border-radius: 10px 0 0 10px;
+}
+
+.cont-el-form-search-carrier.first > select{
+    border:1px solid #E6E6E6;
+    display: block;
+    height: 60px;
+    width: 99%;
+    border-radius: 10px 0 0 10px;
+}
+
+.cont-el-form-search-carrier.last > input{
+    border:1px solid #E6E6E6;
+    display: block;
+    height: 60px;
+    width: 99%;
+    border-radius: 0 10px 10px 0;
+}
+
+.cont-el-form-search-carrier.last > select{
+    border:1px solid #E6E6E6;
+    display: block;
+    height: 62px;
+    width: 99%;
+    border-radius: 0 10px 10px 0;
+    padding: 0;
+    color: #272424;
+    font-family: Inter;
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 400;
+    margin-top: 0;
+}
+
+
+.cont-el-form-search-carrier > label{
+    color: #27242499;
+    padding-bottom: 10px;
+    display: block;
+    margin: 0;
+}
+
+.cont-el-form-search-carrier.last > label{
+    opacity: 0;
 }
 
 .block-filters-find-route{

static/js/chat_sockets.js

@@ -71,12 +71,18 @@ chatSocket.onmessage = function (e) {
         console.log(data)
     } else if (data.type === "update_chat") {
         let msg_cont = document.querySelector(".container-messages")
-        if (msg_cont !== null){
+        if (data.chat_html){
-            if (msg_cont.dataset['curReceiver'] === data['sender'].toString() || msg_cont.dataset['curReceiver'] === data['receiver'].toString()) {
+            if (msg_cont !== null){
-                msg_cont.innerHTML = data.chat_html
+                if (msg_cont.dataset['curReceiver'] === ""){
 
+                    msg_cont.innerHTML = data.chat_html
+                } else {
+                    // что бы не выводился левый чат
+                    if (msg_cont.dataset['curReceiver'] === data['sender'].toString() || msg_cont.dataset['curReceiver'] === data['receiver'].toString()) {
+                        msg_cont.innerHTML = data.chat_html
+                    }
+                }
             }
-
         }
         if (data.tickets_wo_manager_html) {
             if (document.querySelector(".list_linked_tickets") !== null || document.querySelector(".list_unlinked_tickets") !== null) {

templates/pages/p_results_find_route.html

@@ -12,7 +12,7 @@
         </div>
         <div class="container_form_search_carrier">
             <form>
-                <div class="cont-el-form-search-carrier">
+                <div class="cont-el-form-search-carrier first">
                     <label>Откуда</label>
                     <input type="text">
                 </div>
@@ -28,11 +28,13 @@
                     <label>Дата прибытия</label>
                     <input type="date">
                 </div>
-                <div class="cont-el-form-search-carrier">
+                <div class="cont-el-form-search-carrier last">
-                    <select type="text"></select>
+                    <label>test</label>
+                    <select></select>
                 </div>
                 <div class="cont-el-form-search-carrier">
-                    <button></button>
+                    <label style="opacity: 0">test</label>
+                    <button>Найти</button>
                 </div>
             </form>
         </div>