Merge remote-tracking branch 'origin/main'

ArticlesApp/views.py

@@ -126,8 +126,8 @@ def ArticlesOnePageView(request, art_url):
     }
 
     try:
-        art = UserPageModel.objects.get(**kwargs)
+        art = ArticleModel.objects.get(**kwargs)
-    except UserPageModel.DoesNotExist:
+    except ArticleModel.DoesNotExist:
         raise Http404
 
 

RoutesApp/js_views.py

@@ -154,8 +154,8 @@ def find_routes_ajax(request):
 
     try:
 
-        data = request.POST
+        data = request.POST.dict()
-
+        data['owner_type'] = 'mover'
         routes_Dict = get_routes_Dict(data=data)
         if 'errors' in routes_Dict:
             return JsonResponse(routes_Dict, status=400)
@@ -242,6 +242,8 @@ def create_or_change_route_ajax(request, route_id=None):
             return JsonResponse({'html': html}, status=400)
 
         obj = form.save(commit=False)
+        if 'owner_type' in data:
+            obj.owner_type = data['owner_type']
         obj.owner = request.user
         obj.save()
 

static/css/styles(boris).css

@@ -999,12 +999,12 @@
 
 
 .carrier_inf_moving.left{
-    width: 41%;
+    width: 40%;
     float: left;
     text-align: left;
 }
 .carrier_inf_moving.right{
-    width: 41%;
+    width: 40%;
     float: right;
     text-align: right;
 }

static/js/user_profile.js

@@ -350,6 +350,10 @@ function sendRoute(el, routeID = null){
     let list_of_elements_form = document.querySelectorAll(".el_form_b_new_route");
     let obj_w_el_form = {}
     for (let i = 0;i < list_of_elements_form.length;i++) {
+        // let id_el = list_of_elements_form[i].id
+        // if (id_el){
+        //     if (id_el === "")
+        // }
         let name_attr = list_of_elements_form[i].attributes["name"]
         if (name_attr) {
             let name_el = name_attr.value

templates/blocks/profile/b_new_route.html

@@ -222,10 +222,9 @@
             {% for item in form.fields.cargo_type.choices  %}
                 <div>
                     <input
-                        class="custom-checkbox"
+                        class="custom-checkbox el_form_b_new_route"
                         type="checkbox"
                         name="cargo_type"
-                        class="el_form_b_new_route"
                         id="id_cargo_type_{{ forloop.counter }}"
                         {% if form.fields.cargo_type.required %} required{% endif %}
                             value="{{ item.0 }}"

templates/connect_ws_js.html

@@ -0,0 +1,6 @@
+{% load static %}
+<script src="{% static "js/chat_socket_functions/etc_operations_for_chat_socket.js" %}"></script>
+<script src="{% static "js/chat_socket_functions/inital_old_tab.js" %}"></script>
+<script src="{% static "js/chat_socket_functions/update_messenger.js" %}"></script>
+<script src="{% static "js/chat_socket_functions/update_tickets_operations_manager.js" %}"></script>
+<script src='{% static "js/chat_sockets.js" %}'> </script>

templates/pages/p_results_find_route.html

@@ -9,7 +9,8 @@
 {#    <script src="{% static "js/serch_town.js" %}"></script>#}
     <script src="{% static "js/user_profile.js" %}"></script>
     <script src="{% static "js/range_slider_double.js" %}"></script>
-    <script src="{% static "js/user_profile(boris).js" %}"></script>
+    <script src='{% static "js/user_profile(boris).js" %}'> </script>
+    {% include "connect_ws_js.html" %}
     <script src="{% static "js/filters_functions_find_route.js" %}"></script>
 
 {% endblock %}

templates/pages/profile/p_user_profile.html

@@ -11,13 +11,11 @@
 {#            <script src='{% static "js/chat_sockets.js" %}'></script>#}
 
 
-            <script src="{% static "js/chat_socket_functions/etc_operations_for_chat_socket.js" %}"></script>
+
-            <script src="{% static "js/chat_socket_functions/inital_old_tab.js" %}"></script>
-            <script src="{% static "js/chat_socket_functions/update_messenger.js" %}"></script>
-            <script src="{% static "js/chat_socket_functions/update_tickets_operations_manager.js" %}"></script>
             <link rel="stylesheet" href="{% static 'css/ion.rangeSlider.min.css'     %}">
             <script src='{% static "js/user_profile(boris).js" %}'> </script>
-            <script src='{% static "js/chat_sockets.js" %}'> </script>
+            {% include "connect_ws_js.html" %}
+
 
             <script defer src='{% static "js/check_new_messages.js" %}'></script>
 

templates/small_INCLUDES/carrier_card/inf_about_moving.html

@@ -3,13 +3,13 @@
     <div class="line_inf_about_moving">
         <div class="carrier_inf_moving left">
             <div>Отправка:</div>
-            <div class="from-to-city-text">{% if route.arrival_DT %}{{ route.arrival_DT }}{% else %}Неизвестно{% endif %}</div>
+            <div class="from-to-city-text">{% if route.arrival_DT %}{{ route.arrival_DT|date:"l: d.m.Y." }}{% else %}Неизвестно{% endif %}</div>
 
         </div>
         <img class="arrow_inf_about_moving" src="{% static "/img/svg/arrow.svg" %}">
         <div class="carrier_inf_moving right">
             <div>Прибытие:</div>
-            <div class="from-to-city-text">{% if route.departure_DT %}{{ route.departure_DT }}{% else %}Неизвестно{% endif %}</div>
+            <div class="from-to-city-text">{% if route.departure_DT %}{{ route.departure_DT|date:"l: d.m.Y." }}{% else %}Неизвестно{% endif %}</div>
 
         </div>
         <div class="clear_both"></div>