diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index d1ebec5..eb17e78 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -824,7 +824,7 @@ .phones_carrier_span{ position: relative; - top: 4px; + top: 6px; background: linear-gradient(99deg, #040404 56%, #9f9f9f 25%, #ffffff); -webkit-background-clip: text; -webkit-text-fill-color: transparent; @@ -860,7 +860,7 @@ .email_carrier_span{ position: relative; - top: 2px; + top: 5px; background: linear-gradient(99deg, #040404 2%, #f5f5f5 16%, #ffffff); -webkit-background-clip: text; -webkit-text-fill-color: transparent; diff --git a/static/js/user_profile(boris).js b/static/js/user_profile(boris).js index 0cf2945..98bf89e 100644 --- a/static/js/user_profile(boris).js +++ b/static/js/user_profile(boris).js @@ -170,7 +170,7 @@ function selectedUserMessenger (el,ticket_id){ }); } -function sendMessage(id_ticket,sender,receiver){ +function sendMessage(id_ticket=null,sender,receiver){ event.preventDefault() let text = document.querySelector(".enter-message-inp").value @@ -179,14 +179,24 @@ function sendMessage(id_ticket,sender,receiver){ // } else { - let data = { - 'ticket_id': id_ticket, - 'sender': sender, - 'receiver': receiver, - 'text': text + let data = {} + if (id_ticket === null){ + data = { + 'sender': sender, + 'receiver': receiver, + 'text': text + } + } else { + data = { + 'ticket_id': id_ticket, + 'sender': sender, + 'receiver': receiver, + 'text': text + } } + $.ajax({ headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() }, url: '/ru/messages/send_msg/', diff --git a/templates/blocks/profile/b_chats.html b/templates/blocks/profile/b_chats.html index d47dce3..1d8d75e 100644 --- a/templates/blocks/profile/b_chats.html +++ b/templates/blocks/profile/b_chats.html @@ -4,35 +4,84 @@

Написать сообщение

-
-
-
-
- - Сергейко Сергей -
-
- - -
+{#
#} +{#
#} +{#
#} +{#
#} +{# #} +{# Сергейко Сергей#} +{#
#} +{#
#} +{# #} +{# #} +{#
#} +{#
#} +{#
#} +{# {% include "widgets/w_message.html" %}#} +{#
#} +{# #} +{#
#} +{#
#} +{# Пользователи#} +{#
#} +{# {% include "widgets/w_tab_user.html" %}#} +{#
#} +{#
#} +{#
#} + + +
+
+
+ + {{ ticket.manager.last_name }} {{ ticket.manager.first_name }}
-
- {% include "widgets/w_message.html" %} -
- -
- Пользователи -
- {% include "widgets/w_tab_user.html" %} + +
+ {% if not messages %} + {% with text=ticket.text modifiedDT=ticket.modifiedDT %} + {% include "widgets/w_message.html" %} + {% endwith %} + {% else %} + {% for msg in messages %} + {% with text=msg.text modifiedDT=msg.modifiedDT %} + {% include "widgets/w_message.html" %} + {% endwith %} + {% endfor %} + {% endif %} +
+ + +
+
+ Неразобранные тикеты +
+ {% if tickets_wo_manager %} + {% for item in tickets_wo_manager %} + {% include "widgets/w_tab_user.html" %} + {% endfor %} + {% endif %} +
\ No newline at end of file diff --git a/templates/tb_base.html b/templates/tb_base.html index 4fb85dc..1132407 100644 --- a/templates/tb_base.html +++ b/templates/tb_base.html @@ -8,9 +8,11 @@ + - + + {% block meta %} diff --git a/templates/widgets/w_carrier_card.html b/templates/widgets/w_carrier_card.html index 9440f8e..b5208e2 100644 --- a/templates/widgets/w_carrier_card.html +++ b/templates/widgets/w_carrier_card.html @@ -43,9 +43,9 @@