0.0.91 new error msg

2023-08-15 12:20:35 +03:00
parent 26877620b1
commit cbee5af4ed
4 changed files with 96 additions and 42 deletions
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -106,15 +106,8 @@ html, body{
    height: 100%;
 }

-input::-webkit-outer-spin-button,
-input::-webkit-inner-spin-button {
-    -webkit-appearance: none;
-    margin: 0;
-}

-input[type='number'] {
-    -moz-appearance: textfield;
-}
+



@@ -228,10 +221,6 @@ section.register>h1 {
    line-height: 22px;
 }

-@font-face {
-    font-family: "mr_NorwesterG";
-    src: url("/static/fonts/mr_NorwesterG.ttf");
-}

 .first-column>div:nth-child(2)>div:first-child {
    color: #FFF;
@@ -938,9 +927,17 @@ select {
    margin-top: 10px;
 }

+.checkbox_cargo_type>span{
+    width: 100%;
+}
+.errorlist{
+   position: absolute;
+
+}

 .errorlist>li{
    color:red;
+
 }

 /*create new route*/
@@ -961,6 +958,10 @@ select#id_type_transport{
    margin-top: 10px;

 }
+
+
+
+
 select#id_type_transport>option{
    font-size: 16px;
    font-family: Inter;
@@ -968,6 +969,38 @@ select#id_type_transport>option{

 }

+select#id_type_transport:after{
+  content: "";
+  display: block;
+  width: 25px;
+  height: 25px;
+  /*background-image: url("/put_k_strelke");*/
+  position: absolute;
+  right: 5px;
+  top: 5px;
+}
+.type_transport_list{
+    width: 394px;
+    height: 154px;
+    border: 2px solid #E6E6E6;
+    padding: 10px;
+    color:  #272424;
+    font-family: Inter;
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 22px;
+    appearance: none;
+    box-sizing: border-box;
+    border-radius: 10px;
+
+
+}
+.type_transport_list>label{
+    float: left;
+    width: 100%;
+}
+
 hr {
    border: none; /* Убираем границу */
    background-color: #E6E6E6; /* Цвет линии */
--- a/static/js/user_profile.js
+++ b/static/js/user_profile.js
@@ -45,7 +45,7 @@ function technicalSupport(el){
                getNewMessageSession()
            }
            getNewMessageSession()
-            console.log('data received')
+
            // location.href = '/profile'
            document.querySelector(".info_profile").innerHTML = data.html;

@@ -76,7 +76,7 @@ function mySubscription(el){
            if (data.user_alerts) {
                getNewMessageSession()
            }
-            console.log('data received')
+
            // location.href = '/profile'
            document.querySelector(".info_profile").innerHTML = data.html;

@@ -107,7 +107,7 @@ function myProfile(el){
            if (data.user_alerts) {
                getNewMessageSession()
            }
-            console.log('data received')
+
            // location.href = '/profile'
            document.querySelector(".info_profile").innerHTML = data.html;

@@ -353,7 +353,7 @@ function sendRoute(el, routeID = null){
            if (data.user_alerts) {
                getNewMessageSession()
            }
-            console.log('data received')
+
            // location.href = '/profile'
            document.querySelector(".info_profile").innerHTML = data.html

@@ -370,12 +370,7 @@ function sendRoute(el, routeID = null){
    });
 }

-// function maxLength(el) {
-//     if (el.value.length > el.maxLength){
-//       el.value = el.value.slice(0, el.maxLength);
-//     }
-//
-// }
+



@@ -407,10 +402,10 @@ function OnSelectionChange(el) {
            // location.href = '/profile'
            document.querySelector(".info_profile").innerHTML = data.html
            //
-            let checkbox_width = document.querySelector('.checkbox_cargo_type');
-            if(checkbox_width.childElementCount === 4){
-                checkbox_width.classList.add('width')
-            }
+            // let checkbox_width = document.querySelector('.checkbox_cargo_type');
+            // if(checkbox_width.childElementCount === 4){
+            //     checkbox_width.classList.add('width')
+            // }
               sliderInit();

       }
@@ -436,7 +431,7 @@ function createRoute(el){
            if (data.user_alerts) {
                getNewMessageSession()
            }
-            // console.log('data received')
+
            // location.href = '/profile'
            document.querySelector(".info_profile").innerHTML = data.html

@@ -478,7 +473,7 @@ function getRoute(el){
            if (data.user_alerts) {
                getNewMessageSession()
            }
-            console.log('data received')
+
            // location.href = '/profile'
            document.querySelector(".info_profile").innerHTML = data.html;

@@ -509,7 +504,7 @@ function getRoute(el){
        // enctype: 'json',
        data: JSON.stringify(route_obj),
        success: function (data) {
-            console.log('data received')
+
            // location.href = '/profile'
            document.querySelector(".info_profile").innerHTML = data.html;

--- a/templates/blocks/profile/b_new_route.html
+++ b/templates/blocks/profile/b_new_route.html
@@ -10,8 +10,30 @@


 <div>
+{#    <div class="type_transport_list">#}
+{#        <label for="id_type_transport">{{ form.fields.type_transport.label }}</label>#}
+{#        <label for="id_type_transport"></label>#}
+{##}
+{#     {% for item in form.fields.type_transport.choices  %}#}
+{#         <label>#}
+{#             <input type="radio"#}
+{#                    onclick="OnSelectionChange(this)"#}
+{#                    name="type_transport"#}
+{#                    id="id_type_transport_{{ forloop.counter }}"#}
+{#                    value="{{ item.0 }}"#}
+{##}
+{#                        {% if form.initial.type_transport == item.0 %}#}
+{#                            checked="checked"#}
+{#                        {% endif %}#}
+{#             />#}
+{#             {{ item.1 }}#}
+{#        </label>#}
+{#     {% endfor %}#}
+{##}
+{#    </div>#}
+
+

-    <label for="id_type_transport">{{ form.fields.type_transport.label }}</label>
    <select
            onchange="OnSelectionChange(this)"
            name="type_transport"
@@ -183,8 +205,11 @@

  <div>
    <label>{{ form.fields.cargo_type.label }}</label>
+
+
  </div>

+
 <div class="checkbox_cargo_type">

            {% for item in form.fields.cargo_type.choices  %}
@@ -195,9 +220,9 @@
                        name="cargo_type"   
                        id="id_cargo_type_{{ forloop.counter }}"
                        {% if form.fields.cargo_type.required %} required{% endif %}
-                        value="{{ item.0 }}"
+                            value="{{ item.0 }}"
                        {% if form.initial.cargo_type == item.0 %}
-                        checked="checked"
+                            checked="checked"
                        {% endif %}
                    />

@@ -208,12 +233,10 @@
            {% endfor %}


-{#            <lable for="">#}
-{##}
-{#            </lable>#}
-     {% if not errors_off and form.errors and form.errors.cargo_type %}
+{% if not errors_off and form.errors and form.errors.cargo_type %}
                     <span>{{ form.errors.cargo_type }}</span>
                 {% endif %}
+
 </div>


@@ -222,12 +245,16 @@
  <div class="extra-controls">
      <label for="id_weight">{{ form.fields.weight.label }}</label>
      <input
-              type="number"
-              maxLength="1000"
+              type="text"
+              maxlength="4"
              class="js-input"
              placeholder="Укажите вес"
-{#              onchange="maxLength(this)"#}
+              {% if form.fields.weight.required %} required{% endif %}
+
      />
+  {% if not errors_off and form.errors and form.errors.weight %}
+                     <span>{{ form.errors.weight }}</span>
+                 {% endif %}
  </div>

  <div class="range-slider">
@@ -235,14 +262,12 @@
      <input
              type="text"
              id="id_weight"
-              {% if form.fields.weight.required %} required{% endif %}
              name="weight"
              {% if form.initial.weight %}
                value="{{ form.initial.weight }}"
              {% endif %}
      />
-  {% if not errors_off and form.errors and form.errors.weight %}
-      <span>{{ form.errors.weight }}</span>
+
  {% endif %}
  </div>

--- a/templates/blocks/profile/b_support_chat.html
+++ b/templates/blocks/profile/b_support_chat.html
@@ -47,6 +47,7 @@


            <div class="footer-chat{% if not new_msg_allow  %} hide{% endif %}">
+
                <div class="left-part-block-enter-message">
                    <input class="enter-message-inp" onfocus="check_new_messages_timeout()" onkeypress="sendMessageEnter(event,{{ ticket.id }},{{ user.id }},{{ cur_receiver.id }})" placeholder="Отправить сообщение">
                </div>