Merge remote-tracking branch 'origin/main'

static/css/styles(boris).css

@@ -1,7 +1,7 @@
 /*tech support classes*/
 
 
-.title-support-cont{
+.title-profile-cont{
     width: 100%;
     text-align: center;
     font-size: 44px;
@@ -149,3 +149,51 @@
     width: 100%;
     margin-top: 40px;
 }
+
+
+/*slider*/
+
+
+.prise-slider-div{
+    margin-right: 5px;
+    margin-top: 5px;
+}
+
+.filter-span{
+    margin-top: 13px;
+    font-size: 15px;
+}
+
+#slider-range {
+    margin-top: 10px;
+    margin-bottom: 10px;
+    height: 3px;
+    margin-left: 6px;
+    margin-right: 7px;
+}
+
+.input-control-price{
+    display: flex;
+    justify-content: space-between;
+}
+
+.slider-range-div-input {
+    display: flex;
+    width: 100px;
+    border: 1px solid rgba(0, 0, 0, 0.17);
+    border-radius: 3px;
+    height: 30px;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.span-price-placeholder{
+    padding-left: 7px;
+    color: rgba(139, 139, 139, 1);
+}
+
+.form-control{
+    /*width: 100px;*/
+    border: none;
+    /*border-radius: 3px;*/
+}

static/js/user_profile(boris).js

@@ -52,4 +52,63 @@ function attachFileCreateTicket () {
         },
     });
 
-}
+}
+
+
+// $( "#slider-range" ).slider({
+//     range: true,
+//     min: 0,
+//     max: 1000,
+//     values: [ 0, 1000 ],
+//     step: 1,
+//     slide: function( event, ui ) {
+//         $( "#control-price-1" ).val(ui.values[ 0 ]);
+//         $( "#control-price-2" ).val( ui.values[ 1 ] );
+//     }
+// });
+// $( "#control-price-1" ).val($( "#slider-range" ).slider( "values", 0 ));
+// $( "#control-price-2" ).val($( "#slider-range" ).slider( "values", 1 ));
+//
+//
+//
+// function set_range(obj) {
+//     let parent = $(obj).parents('.input-control-price')[0];
+//     let min_obj = $(parent).find('#control-price-1')[0];
+//     let max_obj = $(parent).find('#control-price-2')[0];
+//     var valmin = min_obj.value;
+//     var valmax = max_obj.value;
+//
+//     if (min_obj === obj) {
+//         if (valmin < 0){
+//             valmin = 0
+//         }
+//         else if (valmin > 1000){
+//             valmin = 1000
+//         }
+//         else if (valmin > valmax){
+//             valmin = valmax
+//         }
+//         $(parent).find('#control-price-1')[0].value = valmin;
+//     } else if (max_obj === obj) {
+//         if (valmax > 1000) {
+//             valmax = 1000
+//         }
+//         else if (valmax < 1) {
+//             valmax = 1
+//         }
+//         else if (valmax < valmin) {
+//             valmax = valmin
+//         }
+//         $(parent).find('#control-price-2')[0].value = valmax;
+//     }
+//
+//
+//
+//
+//
+//     $("#slider-range" ).slider({
+//         values: [parseInt(valmin), parseInt(valmax)]
+//     });
+//
+//
+// }

templates/blocks/profile/b_create_ticket.html

@@ -1,16 +1,19 @@
 {% load static %}
 <form class="form-create-ticket" name="create-ticket">
     {% csrf_token %}
-    <select name="choise_departement"
+    <select name="department"
+            id="id_department"
         class="el-form-create-ticket">
     </select>
     <input type="text"
            class="el-form-create-ticket"
-           name="request_subject"
+           name="name"
+           id="id_name"
            placeholder="Тема запроса"
     >
     <div class="letrs-count" style="color: #27242499;position: relative;top: 20px;left: 780px;display: inline-block;"><span class="letrs-count-span">0</span><span>/500</span></div>
-    <textarea name="enter-message"
+    <textarea name="text"
+              id="id_text"
               class="el-form-create-ticket-textarea"
               placeholder="Введите сообщение..."
               onkeyup="countLetters()"></textarea>

templates/blocks/profile/b_new_msg_to_support.html

@@ -5,7 +5,7 @@
 
 
 <div>
-    <div class="title-support-cont">
+    <div class="title-profile-cont">
         <h1>Техническая поддержка</h1>
     </div>
     <div class="insert-tech-place">

templates/blocks/profile/b_new_msg_to_user.html

@@ -1 +1,17 @@
-<div>Написать сообщение</div>
+<div class="title-profile-cont">
+    <h1>Написать сообщение</h1>
+</div>
+
+<div>
+    <div>
+        <div>
+
+        </div>
+    </div>
+    <div>
+        <div>
+
+        </div>
+
+    </div>
+</div>

templates/blocks/profile/b_new_route.html

@@ -209,7 +209,7 @@
               id="id_weight"
               {% if form.fields.weight.required %} required{% endif %}
               name="weight"
-{#              value=""#}
+              value=""
               {% if form.cleaned_data.weight %}value="{{ form.cleaned_data.weight}}"{% endif %}
       />
   {% if not errors_off and form.errors and form.errors.weight %}
@@ -217,6 +217,23 @@
   {% endif %}
   </div>
 
+
+{#    <div class="prise-slider-div">#}
+{#        <span class="filter-span">Цена</span>#}
+{#        <div id="slider-range"></div>#}
+{#        <div class="input-control-price">#}
+{#            <div class="slider-range-div-input">#}
+{#                <span class="span-price-placeholder">от</span>#}
+{#                <input min="0" max="1000" type="number" onchange="set_range(this)" class="form-control" name="price" id="control-price-1">#}
+{#            </div>#}
+{##}
+{#            <div class="slider-range-div-input">#}
+{#                <span class="span-price-placeholder">до</span>#}
+{#                <input min="0" max="1000" type="number" onchange="set_range(this)" class="form-control" name="price" id="control-price-2">#}
+{#            </div>#}
+{#        </div>#}
+{#    </div>#}
+
 <hr>
 
 <div class="phone">

templates/pages/profile/p_user_profile.html

@@ -5,12 +5,14 @@
 {% block meta %}
             <script src='{% static "js/jquery_v3_6_4.js" %}'> </script>
             <script src='{% static "js/ion.rangeSlider.min.js" %}'> </script>
+            <link href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css" rel="stylesheet">
             <script src='{% static "js/user_profile.js" %}'> </script>
             <script src='{% static "js/user_profile(boris).js" %}'> </script>
 
             <link rel="stylesheet" href="{% static 'css/ion.rangeSlider.min.css' %}">
 
 
+
 {% endblock %}
 
 {% block content %}