From 02f7edade579fa2a58dc8a4db4bd2b6782bd4831 Mon Sep 17 00:00:00 2001
From: borissedw <strigevitch.boris@gmail.com>
Date: Wed, 25 Oct 2023 16:27:08 +0300
Subject: [PATCH] 0.0.298

---
 static/css/styles(boris).css                  | 10 +++----
 static/js/range_calendar.js                   | 28 ++++++++++++++-----
 templates/blocks/b_header.html                |  2 +-
 .../blocks/profile/b_profile_first_page.html  | 11 +++++++-
 4 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css
index d2a7421..b26d619 100644
--- a/static/css/styles(boris).css
+++ b/static/css/styles(boris).css
@@ -1920,11 +1920,6 @@
     box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12);
 }
 
-.btn_menu_profile:first-of-type{
-    margin-top: 20px;
-}
-
-
 .btn_menu_profile{
     border-radius: 10px;
     background: #FFF;
@@ -1938,6 +1933,10 @@
     cursor: pointer;
 }
 
+.btn_menu_profile:last-of-type{
+    margin-bottom: 0;
+}
+
 .separator_menu_profile{
     margin: 10px 0 10px 0;
     border:1px solid #E6E6E6;
@@ -1948,6 +1947,7 @@
     color: #000;
     font-size: 14px;
     width: 100%;
+    margin-bottom: 20px;
 }
 
 .header_big_background{
diff --git a/static/js/range_calendar.js b/static/js/range_calendar.js
index e2c892e..7954e1d 100644
--- a/static/js/range_calendar.js
+++ b/static/js/range_calendar.js
@@ -43,7 +43,14 @@
 //             });
 //         }
 // });
-function init_arrival_DT (){
+function init_arrival_DT (date,single=true,hour=true){
+    let minDate = null
+    if (date){
+        minDate = date
+    } else {
+        minDate = moment()
+    }
+
 
     let onl_param = ""
     if (window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_mover/" || window.location.href === "http://localhost:8016/ru/profile/page/create_route_for_customer/"){
@@ -54,14 +61,20 @@ function init_arrival_DT (){
         $(place_1).daterangepicker({
                 "autoapply": true,
                 "linkedCalendars": false,
-                "singleDatePicker":true,
-                "timePicker":true,
-                "timePicker24Hour":true
+                "singleDatePicker":single,
+                "timePicker":hour,
+                "timePicker24Hour":true,
+                "minDate":minDate
             },
             function (start, end, label) {
 
                 // $('#displayRegervation').text('Registration date is: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));
-                $('#id_arrival_DT').val(start.format('DD.MM.YYYY HH:mm'))
+                if (single === true){
+                    $('#id_arrival_DT').val(start.format('DD.MM.YYYY HH:mm'))
+                }
+                else if (single === false){
+                    $('#id_arrival_DT').val(start.format('DD.MM.YYYY') + " - " + end.format('DD.MM.YYYY'))
+                }
             });
 
         $(`${place_1.id} .drp-calendar.right`).hide();
@@ -87,12 +100,13 @@ function init_departure_DT (){
         onl_param = "singleDatePicker"
     }
     if (place_1) {
+
         $(place_1).daterangepicker({
             "autoapply": true,
             "linkedCalendars": false,
             "singleDatePicker":true,
             "timePicker":true,
-            "timePicker24Hour":true
+            "timePicker24Hour":true,
         },
         function(start, end, label) {
             // $('#displayRegervation').text('Registration date is: ' + start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));
@@ -166,7 +180,7 @@ $(function() {
             // $('#regervation')[0].dataset['departure_DT'] = start.format('YYYY-MM-DD');
             // $('#regervation')[0].dataset['arrival_DT'] = end.format('YYYY-MM-DD');
             $('#id_departure_DT').val(start.format('DD.MM.YYYY') + " - " + end.format('DD.MM.YYYY'))
-
+            init_arrival_DT(start.format('DD.MM.YYYY'),false,false)
         });
 
         $(`${place_1.id} .drp-calendar.right`).hide();
diff --git a/templates/blocks/b_header.html b/templates/blocks/b_header.html
index e4b86d2..081ac97 100644
--- a/templates/blocks/b_header.html
+++ b/templates/blocks/b_header.html
@@ -73,7 +73,7 @@
                 </div>
 
                     <div class="menu_profile_btn">
-                        {% if user_subscribe %}<div class="subscribe_type_txt"><span class="f-l">Подписка:</span> <span class="f-r">{{ user_subscribe.subscribe.name }}</span></div>{% endif %}
+                        {% if user_subscribe %}<div class="subscribe_type_txt"><span class="f-l">Подписка:</span> <span class="f-r">{{ user_subscribe.subscribe.name }}</span><div class="clear_both"></div></div>{% endif %}
                         <a class="btn_menu_profile" href="{% url "user_profile" %}" >Перейти в профиль</a>
                         <a class="btn_menu_profile" href="{% url 'profile_page' 'create_route_for_mover' %}">Перевезти посылку</a>
                         <a class="btn_menu_profile" href="{% url 'profile_page' 'create_route_for_customer' %}">Отправить посылку</a>
diff --git a/templates/blocks/profile/b_profile_first_page.html b/templates/blocks/profile/b_profile_first_page.html
index 4dde309..544e64c 100644
--- a/templates/blocks/profile/b_profile_first_page.html
+++ b/templates/blocks/profile/b_profile_first_page.html
@@ -1,6 +1,15 @@
+{% load static %}
+
 <h1>Добро пожаловать: <span>{{ user.first_name }} {{ user.last_name }}</span> <span>({{ user.username }})</span></h1>
-  <div class="profile_prof"><img class="avatar_profile" src="{{ user.user_profile.avatar }}" alt="">
+  <div class="profile_prof"><img class="avatar_user_profile" {% if user.user_profile.avatar %}
+            src="{{ user.user_profile.avatar.url }}"
+            {% else %}src="{% static "img/svg/User.svg" %}"{% endif %} alt="">
     <div>
+{#        <div class="avatar_block">#}
+{#            <img class="avatar_user_profile" {% if user.user_profile.avatar %}#}
+{#            src="{{ user.user_profile.avatar.url }}"#}
+{#            {% else %}src="{% static "img/svg/User.svg" %}"{% endif %} >#}
+{#        </div>#}
       <div>Статус: {{ user.user_profile.get_account_type_display }}</div>
 {#          <div>#}
 {#              <select name="" id="">#}