From d3a45393055c98fa28b1dd7aa287adee6bb1b33c Mon Sep 17 00:00:00 2001
From: ArtemB <mil.basalyga@gmail.com>
Date: Sat, 29 Jul 2023 17:50:32 +0300
Subject: [PATCH] 0.0.58 upd route_info

---
 static/css/styles.css                     |  81 +++++++++++++++++++-
 static/img/png/Airplane.png               | Bin 0 -> 372 bytes
 static/img/png/Car.png                    | Bin 0 -> 330 bytes
 static/img/png/Scales.png                 | Bin 0 -> 508 bytes
 static/img/png/Tag.png                    | Bin 0 -> 346 bytes
 static/js/autocomlite.js                  |   9 +++
 static/js/newRoute.js                     |   3 +-
 static/js/sendRoute.js                    |  39 ++++------
 static/js/user_profile.js                 |  16 ++++
 templates/blocks/profile/b_new_route.html |   1 +
 templates/widgets/w_route_info.html       |  86 ++++++++++++++--------
 11 files changed, 174 insertions(+), 61 deletions(-)
 create mode 100644 static/img/png/Airplane.png
 create mode 100644 static/img/png/Car.png
 create mode 100644 static/img/png/Scales.png
 create mode 100644 static/img/png/Tag.png

diff --git a/static/css/styles.css b/static/css/styles.css
index 2c8a863..64c2910 100644
--- a/static/css/styles.css
+++ b/static/css/styles.css
@@ -1118,10 +1118,16 @@ input#id_cargo_type{
     width: 50%;
 }
 
+.errorlist.hide {
+    display: none;
+}
+
 
 /*my routes*/
 
 .my_route{
+    width: 100%;
+    height: 296px;
     background-color: White;
     border-radius: 10px;
     margin: 2% 0 0 0;
@@ -1129,16 +1135,85 @@ input#id_cargo_type{
 }
 
 .route_info{
+    vertical-align: top;
     border-style: inset;
     border-width: 1px;
     border-color: transparent #F8F8F8 transparent transparent;
     width: 59%;
-    float: left;
+    height: 280px;
+    display: inline-block;
 
 }
+.route_info_about>span:first-child{
+    background: url("/static/img/png/Tag.png") left center no-repeat;
+    margin: 0 20px 0 20px;
+    padding-left: 15px;
+
+}
+.route_info_about>span:nth-child(2){
+    background: url("/static/img/png/Scales.png") left center no-repeat;
+    padding-left: 20px;
+}
+
+.route_info_about>span:last-child{
+    background: url("/static/img/png/Airplane.png") left center no-repeat;
+    float: right;
+    margin-right: 20px;
+    padding-left: 15px;
+}
+
 .route_contact{
     width: 40%;
-    float: right;
+    display: inline-block;
 }
 
-/*my routes*/
+#edit_route {
+  display: block;
+  height: 44px;
+  width: 285px;
+  background: #FF613A;
+  color: #FFF;
+  font-family: Inter;
+  font-size: 18px;
+  font-style: normal;
+  font-weight: 600;
+  text-decoration: none;
+  line-height: 26px;
+  border-radius: 10px;
+  text-align: center;
+  margin-bottom: 5px;
+}
+
+.button_remove_route {
+  display: inline-block;
+}
+
+
+button#remove_route {
+  height: 44px;
+  width: 285px;
+}
+.confirm_remove{
+    width: 43% !important;
+    background: #ff0000a8;
+    border-radius: 10px;
+    color: white;
+    font-size: 18px;
+    font-style: normal;
+    font-weight: 600;
+
+
+
+}
+button.cancel_remove{
+    height: 44px;
+    width: 43%;
+    background: #808080cc;
+    border-radius: 10px;
+    color: white;
+    font-size: 18px;
+    font-style: normal;
+    font-weight: 600;
+}
+
+/*my routes END*/
diff --git a/static/img/png/Airplane.png b/static/img/png/Airplane.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9b0ed7c1b97d81c627f92f28881abf01687eeb5
GIT binary patch
literal 372
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k&H|6fVg?3oVGw3ym^DWND9BhG
z<nF|<?wrg^AcrO0(btiIVPik{pF~!m9H*y?V@L&KZoom`!wv#-Ha3{6PT>3F*rlx4
z%9UibBfv4pF~;c<!@dv)s}9u(XZXDgWM`-grELCoGu`^6NA>n{^WE0wElxfnuYbAz
z4t&6L#3x9At;j<oZ4XoPk-Z+vPKRw?qx<a%TR1~~iN0x`qu*DX+-2`dw11@>ZF^T(
zv;4^x)%doYna|ps*Isnu4*$BvP9uBYlhazfY~Rh|oionQR{kQR&w1g2kGf7lpHPwU
zqO+$Q&eX2ZtIc}Do^onk_yVDNU*(rpZN)45d$a0-W>1f0K6AmVXp>yhhyPb)o7``G
zU*q@u;=SGK?SU6+f2^JK;q9`&qWd<V*b{u9V8P-|TmN0=eD(XeXV6pkkedm5tRgSI
Q0RxG_)78&qol`;+02iE=y8r+H

literal 0
HcmV?d00001

diff --git a/static/img/png/Car.png b/static/img/png/Car.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ec37943eab84095d5b8f6b50cc18af4d5e1e1d3
GIT binary patch
literal 330
zcmeAS@N?(olHy`uVBq!ia0vp^{6NgZ!3HGvIz4{^q&N#aB8wRqxP?KOkzv*x37{Zj
zage(c!@6@aFM%AEbVpxD28NCO+<y{Tf&BZPE{-7;jB_U)<ZW^gae2Pp#Wsnv>_DJp
zBI_}}Yg|j1y#=HVrX;Xe8OgnLu$r*AC}D1@p`ltDZ?VGZ^n3p|zu~fywDo7?d>9(+
zRd@ESm!-iqftyYb+Fjq?QBWvgjrgF^?)@s+^2D#{F=<I(bP~4<`xvLrxx}xoxMbhu
z{SQ(u>IepT-oCo}mfef#y)#O4E(EXQ4nD-AZe|s~O8(xezwd00vg@$O)yqu2dc!P#
zuVZ-UkIQ*-S|#&-S(n-0Jo#Rt`kne`A+Jn{d);DYXS=HV8Upox?)<dTCY`V1lDS6Q
Yw0j;u&-yc20lmuL>FVdQ&MBb@07OoExBvhE

literal 0
HcmV?d00001

diff --git a/static/img/png/Scales.png b/static/img/png/Scales.png
new file mode 100644
index 0000000000000000000000000000000000000000..aacaf34c8f96caedf64cce6fb56b30703430f2e5
GIT binary patch
literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq000pH000gM1^@s6$?f;F00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0g*{WK~#7FjZ)E3
z!axw+JtO==2T%cgia&%7(t)7@p#nk$jt!Wj0!!eWagZ5*Vh6DUf1FW~tncnJnt-4?
zbIIN9?%VhFmg$H|eAXf2E28F@wRt%d$A5r?#A->RMnpkI^xDBcL|Tt%bItlOvvI+3
z7Ha5AZBwEG=hI3=fHRG1Ov<DQc0FS5<EmB3xWmdwP7DBN*!O)>qitoXin0WdmjJL8
z79=!w%LS{1(-jJAG6x_u_c<RE`&Hj8m@j++8Joa*r6D1&i$o!31$<&`QHjG=$wY;v
zs0AF6b<kdqaK}7^U$b84Br^As-y#pfG;_K|67TRd>-KI7b*NAam!j9k^@%xB5)UHh
zl)_giY3_qGjW4)OB|gU*EM0$?Gs^@Ck^?|{-kzqLk!m;Wut|X@<!2NbA-RkHoNrbM
z=7gUR6Iyg9iNrV9jnF66ft-YJmm`=olCq&OR_bPiWy<>A&_As<_V%fLU+jKx3pbwL
y4HgDX4C{yKZy>=A-TdbO?L=)a(Ve?=z`g)wah7^x!s(g-0000<MNUMnLSTZikky0$

literal 0
HcmV?d00001

diff --git a/static/img/png/Tag.png b/static/img/png/Tag.png
new file mode 100644
index 0000000000000000000000000000000000000000..4035a289896498cb66a4f99de8936194e1e2cb7d
GIT binary patch
literal 346
zcmeAS@N?(olHy`uVBq!ia0vp@K+MO%1|+}KPrC%9I14-?iy0WWg+Z8+Vb&Z8pde#$
zkh>GZx^prwfgF}}M_)$<hK>E)e-c@N{P&(Njv*C{b0;3;J!HV+`j)FOo!M-G%!CEY
zjTn_DY+@9?kavJZ!0aK5hfIUu42E|eGu{WNNG(;k8YFf6)8_rLi`b6+5;XRCc+A4q
zCfH@S%BGav^Vt;*J$se}|J?Uzj(2_2j;B}kJ}(sWdt+1i<))lH!%3Z!o*9j^YYem&
z?q-^#s&2>}&eCaVCCb2iU@Lp)xx&in`ThHMUu_gLTrTnJ*`zn$-o55;)VX=$(X2@}
z#oOAOvV4~A4qS4#vtq9~M{dVrnbq+ujE}8eOzZBFdfSopsF`cWjyz+Xg<RJdWti?8
pKT<E&^ql_jd_e8b;2_~@#yN9p=kT0Td;;`3gQu&X%Q~loCIF~{gc1M%

literal 0
HcmV?d00001

diff --git a/static/js/autocomlite.js b/static/js/autocomlite.js
index 31bdc12..7efa33c 100644
--- a/static/js/autocomlite.js
+++ b/static/js/autocomlite.js
@@ -84,3 +84,12 @@ function onblurInputField(event,el){
 
     // }
 }
+
+
+// function hideErrorMsg(el) {
+//     let hide_element = document.querySelector()
+//     if(el.value !== 0){
+//         hide_element.classList.add('hide')
+//     }
+//
+// }
\ No newline at end of file
diff --git a/static/js/newRoute.js b/static/js/newRoute.js
index 1bb11c2..30878fb 100644
--- a/static/js/newRoute.js
+++ b/static/js/newRoute.js
@@ -69,4 +69,5 @@ function getRoute(){
 
         }
     });
-}
\ No newline at end of file
+}
+
diff --git a/static/js/sendRoute.js b/static/js/sendRoute.js
index 993d616..01b85c9 100644
--- a/static/js/sendRoute.js
+++ b/static/js/sendRoute.js
@@ -62,35 +62,24 @@ function OnSelectionChange(el) {
             // location.href = '/profile'
             document.querySelector(".info_profile").innerHTML = data.html
             //
-            // $(document).ready(function (e){
-            //     $('#id_weight').ionRangeSlider({
-            //         skin: "round",
-            //         type: "single",
-            //         min: 0,
-            //         max: 1000,
-            //         from: 100,
-            //         step: 1,
-            //         grid: true,
-            //         grid_num: 5,
-            // }
 
-            //get dynamic value
-            // let fromCountry = document.getElementById('id_from_country');
-            // let toCounytry = document.getElementById('id_to_country')
-            //
-            // toCounytry.oninput = function (){
-            //     console.log(toCounytry.value)
-            // }
-            // fromCountry.oninput = function (){
-            // console.log(fromCountry.value)
-//
-// };
+                $('#id_weight').ionRangeSlider({
+                    skin: "round",
+                    type: "single",
+                    min: 0,
+                    max: 1000,
+                    from: 0,
+                    step: 1,
+                    grid: true,
+                    grid_num: 5,
+                });
 
-
-        }
+       }
     });
 
-}
+};
+
+
 
 
 
diff --git a/static/js/user_profile.js b/static/js/user_profile.js
index cd7e60a..f605fee 100644
--- a/static/js/user_profile.js
+++ b/static/js/user_profile.js
@@ -92,4 +92,20 @@ function myProfile(){
 
         }
     });
+}
+
+function confirmRemove(el) {
+    let place = document.querySelector('.button_remove_route')
+    // let new_button = document.querySelector('.cancel_remove')
+    // if(!button){
+        let cancel_button = document.createElement('button')
+        cancel_button.className = "cancel_remove";
+        cancel_button.innerText = "Отменить удаление";
+        place.appendChild(cancel_button);
+    // }
+
+
+    el.classList.add('confirm_remove')
+    el.innerText = 'Подтвердить удаление'
+
 }
\ No newline at end of file
diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html
index dfad0f0..981a466 100644
--- a/templates/blocks/profile/b_new_route.html
+++ b/templates/blocks/profile/b_new_route.html
@@ -123,6 +123,7 @@
     <label for="id_from_place">{{ form.fields.from_place.label }}</label>
     <select
             name="from_place"
+{#            onchange="hideErrorMsg(this)"#}
             id="id_from_place"
             {% if form.fields.from_place.required %} required{% endif %}>
             {% for item in form.fields.from_place.choices  %}
diff --git a/templates/widgets/w_route_info.html b/templates/widgets/w_route_info.html
index 6136be8..51297df 100644
--- a/templates/widgets/w_route_info.html
+++ b/templates/widgets/w_route_info.html
@@ -1,47 +1,69 @@
     {% for route in routes %}
         <div class="my_route">
             <div class="route_info">
-                {{ route.get_cargo_type_display }}
-                {{ route.weight }}
-                {{ route.get_type_transport_display }}
-            <div class="route_info_point">
-                {{ route.from_country.name }}/{{ route.from_city.name }}
-                <br>
-                {{ route.to_country.name }}/{{ route.to_city.name }}
-            </div>
-            <div class="route_info_date">
-               Отправка: {{route.departure_DT  }}
-               Прибытие: {{route.arrival_DT  }}
-            </div>
-            <div class="route_info_ft_place">
-                Откуда заберёт:{{ route.from_place }}
-                Куда доставит:{{ route.to_place }}
-            </div>
-            </div>
-        </div>
+                <div class="route_info_about">
+                    <span>
+                        Тип:{{ route.get_cargo_type_display }}
+                    </span>
 
-        <div class="route_contact">
-            <h2>Контакты перевозчика:</h2>
+                    <span>
+                       Вес:{{ route.weight }} кг
+                    </span>
 
-            <div class="route_contact_name">
-                {{ route.owner.last_name }} {{ route.owner.first_name }}
-            </div>
+                    <span>
+
+                        {{ route.get_type_transport_display }}
+                    </span>
+
+                </div>
+
+                <div class="route_info_point">
+                    {{ route.from_country.name }}/{{ route.from_city.name }}
+                    <br>
+                    {{ route.to_country.name }}/{{ route.to_city.name }}
+                </div>
+
+                <div class="route_info_date">
+                   Отправка: {{route.departure_DT  }}
+                   Прибытие: {{route.arrival_DT  }}
+                </div>
+
+                <div class="route_info_ft_place">
+                    Откуда заберёт:{{ route.from_place }}
+                    Куда доставит:{{ route.to_place }}
+                </div>
 
-            <div class="route_contact_phone_email">
-                {{ route.phone }}
-                <br>
-                {{ route.extra_phone }}
-                <br>
-                {{ route.owner.email }}
             </div>
 
 
+            <div class="route_contact">
 
+                <h2>Контакты перевозчика:</h2>
 
+                <div class="route_contact_name">
+                    {{ route.owner.last_name }} {{ route.owner.first_name }}
+                </div>
 
-
-
-
+                <div class="route_contact_phone_email">
+                    {{ route.phone }}
+                    <br>
+                    {{ route.extra_phone }}
+                    <br>
+                    {{ route.owner.email }}
+                </div>
+                <div class="button_edit_route">
+                    <button
+                            id="edit_route">
+                            Редактировать
+                    </button>
+                </div>
+                <div class="button_remove_route">
+                     <button
+                             onclick="confirmRemove(this)"
+                            id="remove_route">
+                            Удалить
+                    </button>
+                </div>
 
             </div>
         </div>