Merge remote-tracking branch 'origin/main'

AuthApp/funcs.py

@@ -18,10 +18,10 @@ def get_profile_page_content_html(request, page_name, data):
         return get_chat_page_content_html(request, data)
     elif page_name == 'create_route_for_customer':
         from RoutesApp.funcs import get_profile_new_route_page_html
-        return get_profile_new_route_page_html(request, {})
+        return get_profile_new_route_page_html(request, {'owner_type': 'customer'})
     elif page_name == 'create_route_for_mover':
         from RoutesApp.funcs import get_profile_new_route_page_html
-        return get_profile_new_route_page_html(request, {})
+        return get_profile_new_route_page_html(request, {'owner_type': 'mover'})
     elif page_name == 'my_routes':
         from RoutesApp.funcs import get_profile_my_routes_page_content_html
         return get_profile_my_routes_page_content_html(request)

RoutesApp/funcs.py

@@ -75,11 +75,17 @@ def get_profile_new_route_page_html(request, data):
             # if not form.is_valid():
             #     pass
 
+        if 'owner_type' in data:
+            form.initial['owner_type'] = data['owner_type']
+
         Dict = {
             'form': form,
             'errors_off': errors_off
         }
 
+        if 'owner_type' in data:
+            Dict.update({'owner_type': data['owner_type']})
+
         # print(form)
     except Exception as e:
         # form.errors.append({'__all__': f'Ошибка: {str(e)}'})

static/css/mobile_styles.css

@@ -120,6 +120,9 @@
         font-size: 29px;
         line-height: 33px;
     }
+     .header_buttons{
+        display: none;
+    }
 
     .not_found_routes>img{
         display: none;
@@ -1796,9 +1799,7 @@
         height: 30px;
     }
 
-    .header_buttons{
+
-        display: none;
-    }
     /*.to_address_point_txt.find_route {*/
     /*    width: 48.4%;*/
     /*}*/

static/css/styles(boris).css

@@ -1232,7 +1232,7 @@
 }
 
 .not_found_routes{
-    width: 98%;
+    width: 96%;
     height: 250px;
     background: #FFFFFF;
     box-shadow: -1px 4px 10px 0 rgba(198, 199, 203, 0.20), 0 -1px 10px 0 rgba(198, 199, 203, 0.20);
@@ -2550,6 +2550,7 @@
     position: absolute;
     top: 293px;
     transition: 0ms;
+    scrollbar-width: none;
 }
 
 
@@ -2674,6 +2675,7 @@
     height: calc(100vh - 95px);
     max-height: 697px;
     background: #F8F8F8;
+    scrollbar-width: none;
 }
 
 .menu_profile.background{

static/css/styles.css

@@ -557,6 +557,7 @@ header .header-first {
     height: 390px;
    box-shadow: -1px 4px 10px 0px rgba(198, 199, 203, 0.20), 0px -1px 10px 0px rgba(198, 199, 203, 0.20);
     z-index: 1;
+    top: 30px;
 }
 .dropdown-content.show{
    display:block;
@@ -635,7 +636,8 @@ header .header-second {
 
 .button_profile_header_mobile{
         display: none;
-    cursor: pointer;
+        cursor: pointer;
+        vertical-align: middle;
     }
 
 .route_contact_avatar{
@@ -764,7 +766,7 @@ span.btn_profile_name {
 /*END Language select*/
 
 
-.header-second>div>img{
+#support_img{
     margin-right: 5px;
     margin-left: 40px;
 }
@@ -1424,6 +1426,7 @@ span.errorlist{
 
 /*create new route*/
 select#id_type_transport{
+    cursor: pointer;
     display: block;
     height: 60px;
     width: 47%;
@@ -1617,6 +1620,10 @@ div.departure_arrival>div>input{
 
 }
 
+#hide_owner_type{
+    display: none;
+}
+
 
 
 /*end create new route*/
@@ -1703,7 +1710,7 @@ div.departure_arrival>div>input{
 .input_list .hide{
     display: none;
 }
-span.hide{
+span.hide, .error_to_address_point.hide, #id_cargo_lable.hide, #error_id_phone.hide{
     display: none;
 }
 #agreement_check.hide{

static/js/user_profile.js

@@ -598,12 +598,20 @@ function sendRoute(el, routeID = null){
 
 
 
-function validate(el) {
+// function validate(el) {
-  if (el.checked) {
+//   if (el.checked) {
-      console.log('cheked', el.id);
+//       console.log('cheked', el.id);
-  } else {
+//   } else {
-      console.log("You didn't check it! Let me check it for you.", el.id);
+//       console.log("You didn't check it! Let me check it for you.", el.id);
-  }
+//   }
+// }
+
+function setIcon(el) {
+    if(el.id === 'id_departure_DT' ){
+        document.getElementById('id_departure_DT').style.background = 'url("/static/img/svg/IconCalendar.svg") white 98% no-repeat';
+
+    }
+
 }
 
 
@@ -612,9 +620,22 @@ function validate(el) {
 //cleaning route inputs after selection changes
 function OnSelectionChange(el) {
     event.preventDefault()
-
     let form = el.form;
+
+    // if (customer.classList.contains('selected')) {
+    //      owner_type = form.dataset['customer']
+    // } else if (mover.classList.contains('selected')) {
+    //      owner_type = form.dataset['customer']
+    // }
+    let owner_type_value = document.getElementById('hide_owner_type').value
+
+
+
     let formData = new FormData(form);
+    let owner_type = owner_type_value
+    formData.set('owner_type', owner_type)
+
+    // formData.set('owner_type', owner_type)
 
     // let data = {};
     // data['csrfmiddlewaretoken'] = $('input[name="csrfmiddlewaretoken"]')[0].value;
@@ -962,33 +983,38 @@ function hideErrors(el) {
         let agree_error = document.getElementById('reg_agree_error')
         let error_departure_DT = document.getElementById('error_departure_DT')
         let error_arrival_DT = document.getElementById('error_arrival_DT')
-
+        let error_from_address_point = document.getElementById('error_from_address_point')
-
+        let error_to_address_point = document.getElementById('error_to_address_point')
-
+        let error_cargo_type = document.getElementById('error_cargo_type')
-
+        let error_id_phone = document.getElementById('error_id_phone')
-   if(error_feeedback === counter_text && error_feeedback !== null && error_feeedback_text !== null ){
-       error_feeedback_text.classList.add('hide')
-   } else if(error_feeedback === footer_button && error_footer !== null  ){
-       error_footer.classList.add('hide')
-   } else if(el.id === 'agreement_check'){
-       agree_error.classList.add('hide')
-   } else if(el.id === 'id_arrival_DT' && error_arrival_DT !== null){
-       error_arrival_DT.classList.add('hide')
-   }else if(el.id === 'id_departure_DT' && error_departure_DT !== null){
-       error_departure_DT.classList.add('hide')
-   } else if(error_feeedback !== null) {
-       error_feeedback.classList.add('hide')
-   }
 
 
 
 
 
+       if(error_feeedback === counter_text && error_feeedback !== null && error_feeedback_text !== null ){
+           error_feeedback_text.classList.add('hide')
+       } else if(error_feeedback === footer_button && error_footer !== null  ){
+           error_footer.classList.add('hide')
+       } else if(el.id === 'agreement_check'){
+           agree_error.classList.add('hide')
+       } else if(el.id === 'id_arrival_DT' && error_arrival_DT !== null){
+           error_arrival_DT.classList.add('hide')
+       }else if(el.id === 'id_departure_DT' && error_departure_DT !== null){
+           error_departure_DT.classList.add('hide')
+       } else  if(el.id === 'id_from_address_point_txt' && error_from_address_point !== null ){
+           error_from_address_point.classList.add('hide')
+       }else  if(el.id === 'id_to_address_point_txt' && error_to_address_point !== null ){
+           error_to_address_point.classList.add('hide')
+       } else if(el.id === 'id_cargo_lable' && error_cargo_type !== null){
+           error_cargo_type.classList.add('hide')
+       } else if(el.id === 'id_phone' && error_id_phone !==null){
+           error_id_phone.classList.add('hide')
+       }
 
-    // if(el.nextElementSibling === errorFeeedback){
+       else if(error_feeedback !== null) {
-    //     errorFeeedback.classList.add('hide')
+           error_feeedback.classList.add('hide')
-    // }
+       }
-
 
 }
 

templates/blocks/b_header.html

@@ -52,7 +52,7 @@
               </div>
           </div>
           <div class="header-second-item">
-              <img class="svg" src="/static/img/svg/Helpdesk_%20Icon.svg">
+              <img id="support_img" class="svg" src="/static/img/svg/Helpdesk_%20Icon.svg">
           </div>
           <div class="header-second-item">
               <a id="customer_service" href="{% url 'static_page' 'customer_service' %}">{% trans "Служба поддержки" %}</a>

templates/blocks/profile/b_buttons_menu_profile.html

@@ -9,7 +9,7 @@
 {%trans "Написать сообщение" as t_chats %}
 {%trans "Тех. поддержка" as t_support %}
 {%trans "Моя подписка" as t_subscribe %}
-{%trans "Мой профиль" as t_change_profile %}
+{%trans "Изменить профиль" as t_change_profile %}
 {%trans "Выход" as t_logout %}
 
 <div class="menu_profile {% if not page_type == 'profile' %}background{% endif %}">

templates/blocks/profile/b_new_route.html

@@ -32,7 +32,7 @@
 {#    </div>#}
 
 
-
+{#    <label for="id_type_transport">{% translate "Выберите способ перевозки" %}</label>#}
     <select
             onchange="OnSelectionChange(this)"
             name="type_transport"
@@ -56,11 +56,23 @@
     {% endif %}
   </div>
 
+    <input id="hide_owner_type" type="hidden" value="{{ form.initial.owner_type }}">
+
 {% if form.initial and form.initial.type_transport and form.initial.type_transport != '' %}
     <hr>
     <div class="departure_arrival">
           <div class="wrap_left">
-              <label for="id_departure_DT">{% if form.initial.type_transport == 'road' %}Дата и время выезда{% elif form.initial.type_transport == 'avia' %}Дата и время вылета{% endif %}</label>
+              <label for="id_departure_DT">
+
+                {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %}
+                    {% translate "Дата и время выезда" %}
+                {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
+                    {% translate "Дата и время вылета" %}
+                {% elif form.initial.owner_type == 'customer' and form.initial.type_transport == 'road' or form.initial.type_transport == 'avia' %}
+                    {% translate "Дата и время отправки" %}
+                {% endif %}
+
+              </label>
 
 
 {#          <input#}
@@ -77,7 +89,8 @@
           {# boris change input #}
             <input
                     class="el_form_b_new_route"
-                    onchange="checkDate()"
+{#                    onchange="checkDate()"#}
+{#                    onclick="setIcon(this)"#}
                     onmouseup="hideErrors(this)"
                     type="text"
                     id="id_departure_DT"
@@ -92,7 +105,19 @@
 
         </div>
           <div id="arrival_div">
-          <label for="id_arrival_DT">Дата и время прибытия</label>
+          <label for="id_arrival_DT">
+
+              {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %}
+                    {% translate "Дата и время прибытия" %}
+                {% elif form.initial.owner_type == 'mover' and  form.initial.type_transport == 'avia' %}
+                    {% translate "Дата и время прибытия" %}
+                {% elif form.initial.owner_type == 'customer' and form.initial.type_transport == 'avia'  %}
+                    {% translate "Дата и время доставки посылки" %}
+                {% elif form.initial.owner_type == 'customer' and form.initial.type_transport == 'road'  %}
+                    {% translate "Дата и время доставки посылки" %}
+              {% endif %}
+
+          </label>
 {#          <input#}
 {#                  type="datetime-local"#}
 {#                  min= {% now "Y-m-d" %}T{% now "H:i" %}#}
@@ -125,7 +150,15 @@
 <hr>
   <div class="from_to_country">
     <div class="from_country_container">
-        <label for="id_from_address_point_txt">{% if form.initial.type_transport == 'avia' %}Пункт вылета{% elif form.initial.type_transport == 'road' %}Пункт выезда{% endif %}</label>
+        <label for="id_from_address_point_txt">
+            {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
+                    {% translate "Пункт вылета" %}
+                {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %}
+                    {% translate "Пункт выезда" %}
+                {% elif form.initial.owner_type == 'customer' %}
+                    {% translate "Пункт отправки" %}
+            {% endif %}
+        </label>
         <input
                 type="number"
                 name="from_address_point"
@@ -139,10 +172,10 @@
                 onclick="showSearchList(this)"
                 onblur="onblurInputField(event, this)"
                 onfocus="clearID(this)"
+                onkeydown = "hideErrors(this)"
                 autocomplete="off"
                 type="text"
                 minlength="3"
-
                 name="from_address_point_txt"
                 class="from_address_point_txt post_route el_form_b_new_route"
                 {% if form.fields.from_address_point.required %} required{% endif %}
@@ -158,11 +191,19 @@
 
         </div>
         {% if not errors_off and form.errors and form.errors.from_address_point %}
-            <span>{{ form.errors.from_address_point}}</span>
+            <span id="error_from_address_point">{{ form.errors.from_address_point}}</span>
         {% endif %}
     </div>
     <div class="wrap_right">
-    <label for="id_to_address_point_txt">{% if form.initial.type_transport == 'avia' %}Пункт прилета{% elif form.initial.type_transport == 'road' %}Пункт приезда{% endif %}</label>
+    <label for="id_to_address_point_txt">
+        {% if form.initial.owner_type == 'mover' and form.initial.type_transport == 'avia' %}
+                {% translate "Пункт прилета" %}
+            {% elif form.initial.owner_type == 'mover' and form.initial.type_transport == 'road' %}
+                {% translate "Пункт приезда" %}
+            {% elif form.initial.owner_type == 'customer'%}
+                {% translate "Пункт прибытия" %}
+        {% endif %}
+    </label>
     <input
             type="number"
             name="to_address_point"
@@ -175,7 +216,7 @@
             oninput="searchTown(this)"
             onclick="showSearchList(this)"
             onblur="onblurInputField(event, this)"
-
+            onkeydown = "hideErrors(this)"
             onfocus="clearID(this)"
             autocomplete="off"
             type="text"
@@ -191,7 +232,7 @@
 
     </div>
     {% if not errors_off and form.errors and form.errors.to_address_point %}
-        <span>{{ form.errors.to_address_point }}</span>
+        <span id="error_to_address_point">{{ form.errors.to_address_point }}</span>
     {% endif %}
     </div>
     <div class="clear_both"></div>
@@ -207,7 +248,13 @@
 {#  </div>#}
   <div class="from_to_place">
     <div class="wrap_left">
-        <label for="id_from_place">{{ form.fields.from_place.label }}</label>
+        <label for="id_from_place">
+             {% if form.initial.owner_type == 'mover' %}
+                    {% translate "Откуда можете забрать?" %}
+             {% elif form.initial.owner_type == 'customer' %}
+                    {% translate "Откуда нужно забрать посылку?" %}
+             {% endif %}
+        </label>
         <select
                 class="custom_select el_form_b_new_route"
                 name="from_place"
@@ -226,7 +273,13 @@
                  {% endif %}
     </div>
     <div class="wrap_right">
-    <label for="id_to_place">{{ form.fields.to_place.label }}</label>
+    <label for="id_to_place">
+        {% if form.initial.owner_type == 'mover' %}
+                    {% translate "Куда можете доставить?" %}
+        {% elif form.initial.owner_type == 'customer' %}
+                    {% translate "Куда нужно доставить посылку?" %}
+        {% endif %}
+    </label>
     <select
             name="to_place"
             id="id_to_place"
@@ -249,7 +302,12 @@
 <hr>
 
   <div>
-    <label>{{ form.fields.cargo_type.label }}</label>
+    <label>{% if form.initial.owner_type == 'mover' %}
+                    {% translate "Могу перевезти:" %}
+        {% elif form.initial.owner_type == 'customer' %}
+                    {% translate "Что нужно перевезти?" %}
+        {% endif %}
+    </label>
 
 
   </div>
@@ -264,6 +322,7 @@
                         class="custom-checkbox cargo_check"
                         type="radio"
                         name="cargo_type"
+
                         id="id_cargo_type_{{ forloop.counter }}"
                         {% if form.fields.cargo_type.required %} required{% endif %}
                             value="{{ item.0 }}"
@@ -273,7 +332,8 @@
                     />
 
                     <label
-
+                            onmousedown="hideErrors(this)"
+                            id="id_cargo_lable"
                             for="id_cargo_type_{{ forloop.counter }}" >
                         <span>{{ item.1 }}</span>
                     </label>
@@ -282,7 +342,7 @@
 
 
 {% if not errors_off and form.errors and form.errors.cargo_type %}
-                     <span>{{ form.errors.cargo_type }}</span>
+                     <span id="error_cargo_type">{{ form.errors.cargo_type }}</span>
                  {% endif %}
 
 </div>
@@ -332,6 +392,7 @@
     <input
             type="phone"
             name="phone"
+            onkeydown="hideErrors(this)"
             autocomplete="off"
             maxlength="13"
             minlength="11"
@@ -343,7 +404,7 @@
 
     />
       {% if not errors_off and form.errors and form.errors.phone %}
-          <span>{{ form.errors.phone }}</span>
+          <span id="error_id_phone">{{ form.errors.phone }}</span>
       {% endif %}
   </div>