sysadminix/account_store
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
ArtemB
2023-08-29 12:42:19 +03:00
parent 408da784e1 5e77e204ba
commit 4ee4d3f836
9 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ArticlesApp/views.py
View File

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

6
RoutesApp/js_views.py
View File

@@ -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()

4
static/css/styles(boris).css
View File

@@ -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;
}

4
static/js/user_profile.js
View File

@@ -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

3
templates/blocks/profile/b_new_route.html
View File

@@ -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 }}"

6
templates/connect_ws_js.html Normal file
View File

@@ -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>

3
templates/pages/p_results_find_route.html
View File

@@ -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 %}

8
templates/pages/profile/p_user_profile.html
View File

@@ -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>

4
templates/small_INCLUDES/carrier_card/inf_about_moving.html
View File

@@ -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>