From 5d707853b73fcc69613f6d608835a0b023ee703e Mon Sep 17 00:00:00 2001
From: borissedw <strigevitch.boris@gmail.com>
Date: Sun, 22 Oct 2023 16:50:58 +0300
Subject: [PATCH] 0.0.295

---
 static/css/styles(boris).css                     |  4 ++++
 templates/blocks/profile/b_chats.html            |  2 +-
 templates/blocks/profile/b_profile.html          | 16 ++++++++--------
 templates/blocks/profile/b_support_chat.html     |  2 +-
 .../widgets/w_chat_right_panel_tickets.html      |  2 +-
 templates/widgets/w_chat_right_panel_user.html   |  2 +-
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css
index e4e5fc8..1c240b3 100644
--- a/static/css/styles(boris).css
+++ b/static/css/styles(boris).css
@@ -425,6 +425,8 @@
 
 .chat-avatar{
     height: 40px;
+    width: 40px;
+    object-fit: cover;
 }
 
 .chat-username {
@@ -621,6 +623,8 @@
 .user_avatar_messenger{
     width: 40px;
     height: 40px;
+    object-fit: cover;
+
 }
 
 .user_name_messenger{
diff --git a/templates/blocks/profile/b_chats.html b/templates/blocks/profile/b_chats.html
index 5672044..3e35e36 100644
--- a/templates/blocks/profile/b_chats.html
+++ b/templates/blocks/profile/b_chats.html
@@ -42,7 +42,7 @@
     <div class="block-chat">
         <div class="container-header-chat">
             <div class="header-chat-left-part">
-                <img class="chat-avatar" src="{% static "delete_later/Avatar.png" %}">
+                <img class="chat-avatar" {% if cur_receiver.user_profile.avatar %}src="{{ cur_receiver.user_profile.avatar.url }}"{% else %}src="{% static "img/svg/User.svg" %}"{% endif %}>
     {#            <span class="chat-username">{{ ticket.manager.last_name }} {{ ticket.manager.first_name }}</span>#}
                 <span class="chat-username">{{ cur_receiver.last_name }} {{ cur_receiver.first_name }}</span>
             </div>
diff --git a/templates/blocks/profile/b_profile.html b/templates/blocks/profile/b_profile.html
index 0e30a44..28863d1 100644
--- a/templates/blocks/profile/b_profile.html
+++ b/templates/blocks/profile/b_profile.html
@@ -24,38 +24,38 @@
 <form name="form_user_data">
     <div class="container_form_profile">
         <div class="container_el_form_profile">
-            <label class="label_f_profile" for="name"><span class="orange-text">*</span> Ваше имя</label>
+            <label class="label_f_profile" for="name">{% if profileForm.fields.firstname.required %}<span class="orange-text">*</span>{% endif %} Ваше имя</label>
             <input class="input_f_profile" type="text" id="id_firstname" name="firstname" {% if profileForm.initial.firstname %}value="{{ profileForm.initial.firstname }}" {% endif %}  {% if profileForm.initial.firstname %}data-initial-value="{{ profileForm.initial.firstname }}"{% else %}data-initial-value=""{% endif %} >
         </div>
         <div class="container_el_form_profile">
-            <label class="label_f_profile" for="id_lastname"><span class="orange-text">*</span> Ваша фамилия</label>
+            <label class="label_f_profile" for="id_lastname">{% if profileForm.fields.lastname.required %}<span class="orange-text">*</span>{% endif %} Ваша фамилия</label>
             <input class="input_f_profile" type="text" id="id_lastname" name="lastname" {% if profileForm.initial.lastname %}value="{{ profileForm.initial.lastname }}" {% endif %} {% if profileForm.initial.lastname %}data-initial-value="{{ profileForm.initial.lastname }}"{% else %}data-initial-value=""{% endif %}>
         </div>
         <div class="container_el_form_profile">
-            <label class="label_f_profile" for="id_tel"><span class="orange-text">*</span> Номер телефона</label>
+            <label class="label_f_profile" for="id_tel">{% if profileForm.fields.tel.required %}<span class="orange-text">*</span>{% endif %} Номер телефона</label>
             <input class="input_f_profile" type="text" id="id_tel" name="tel" {% if profileForm.initial.tel %}value="{{ profileForm.initial.tel }}" {% endif %} {% if profileForm.initial.tel %}data-initial-value="{{ profileForm.initial.tel }}"{% else %}data-initial-value=""{% endif %}>
         </div>
         <div class="container_el_form_profile">
-            <label class="label_f_profile" for="id_email"><span class="orange-text">*</span> Е-mail</label>
+            <label class="label_f_profile" for="id_email">{% if profileForm.fields.email.required %}<span class="orange-text">*</span>{% endif %} Е-mail</label>
             <input class="input_f_profile" type="text" id="id_email" name="email" {% if profileForm.initial.email %}value="{{ profileForm.initial.email }}" {% endif %} {% if profileForm.initial.email %}data-initial-value="{{ profileForm.initial.email }}"{% else %}data-initial-value=""{% endif %}>
         </div>
         <div class="container_el_form_profile">
-            <label class="label_f_profile" for="id_country"><span class="orange-text">*</span> Страна проживания</label>
+            <label class="label_f_profile" for="id_country">{% if profileForm.fields.country.required %}<span class="orange-text">*</span>{% endif %} Страна проживания</label>
             <input class="input_f_profile" type="text" id="id_country" name="country" {% if profileForm.initial.country %}value="{{ profileForm.initial.country }}" {% endif %} {% if profileForm.initial.country %}data-initial-value="{{ profileForm.initial.country }}"{% else %}data-initial-value=""{% endif %}>
         </div>
         <div class="container_el_form_profile">
-            <label class="label_f_profile" for="id_city"><span class="orange-text">*</span> Город проживаня</label>
+            <label class="label_f_profile" for="id_city">{% if profileForm.fields.city.required %}<span class="orange-text">*</span>{% endif %} Город проживаня</label>
             <input class="input_f_profile" type="text" id="id_city" name="city" {% if profileForm.initial.city %}value="{{ profileForm.initial.city }}" {% endif %} {% if profileForm.initial.city %}data-initial-value="{{ profileForm.initial.city }}"{% else %}data-initial-value=""{% endif %}>
         </div>
 
         <div class="line_f_form_profile"></div>
 
         <div class="container_el_form_profile">
-            <label class="label_f_profile" for="id_password"><span class="orange-text">*</span> Новый пароль</label>
+            <label class="label_f_profile" for="id_password">{% if profileForm.fields.password.required %}<span class="orange-text">*</span>{% endif %} Новый пароль</label>
             <input class="input_f_profile" type="text" id="id_password" name="password" {% if profileForm.initial.password %}value="{{ profileForm.initial.password }}" {% endif %} {% if profileForm.initial.password %}data-initial-value="{{ profileForm.initial.password }}"{% else %}data-initial-value=""{% endif %}>
         </div>
         <div class="container_el_form_profile">
-            <label class="label_f_profile" for="id_confirm_password"><span class="orange-text">*</span> Подвердить пароль</label>
+            <label class="label_f_profile" for="id_confirm_password">{% if profileForm.fields.confirm_password.required %}<span class="orange-text">*</span>{% endif %} Подвердить пароль</label>
             <input class="input_f_profile" type="text" id="id_confirm_password" name="confirm_password" {% if profileForm.initial.confirm_password %}value="{{ profileForm.initial.confirm_password }}" {% endif %} {% if profileForm.initial.confirm_password %}data-initial-value="{{ profileForm.initial.confirm_password }}"{% else %}data-initial-value=""{% endif %}>
         </div>
         <button class="confirm_profile_btn" onclick="change_profile_confirm(this)">Сохарнить</button>
diff --git a/templates/blocks/profile/b_support_chat.html b/templates/blocks/profile/b_support_chat.html
index 727edba..420ace7 100644
--- a/templates/blocks/profile/b_support_chat.html
+++ b/templates/blocks/profile/b_support_chat.html
@@ -18,7 +18,7 @@
             {% if user.is_staff or ticket.manager %}
                 <div class="container-header-chat">
                     <div class="header-chat-left-part">
-                        <img class="chat-avatar" src="{% static "delete_later/Avatar.png" %}">
+                        <img class="chat-avatar" {% if cur_receiver.user_profile.avatar %}src="{{ cur_receiver.user_profile.avatar.url }}"{% else %}src="{% static "img/svg/User.svg" %}"{% endif %}>
                         <span class="chat-username">{{ cur_receiver.last_name }} {{ cur_receiver.first_name }}</span>
                     </div>
                     <div class="header-chat-right-part">
diff --git a/templates/widgets/w_chat_right_panel_tickets.html b/templates/widgets/w_chat_right_panel_tickets.html
index 77af64d..5d002ec 100644
--- a/templates/widgets/w_chat_right_panel_tickets.html
+++ b/templates/widgets/w_chat_right_panel_tickets.html
@@ -1,7 +1,7 @@
 {% load static %}
 <div class="tab_user_messanger{% if item.id == ticket.id %} select{% endif %}" onclick="selectedUserMessenger({{ item.id }},null)" data-cur-receiver-item="{{ item.id }}">
     <div class="left-part-tab-user">
-        <img class="user_avatar_messenger" src="{% static "delete_later/Avatar.png" %}">
+        <img class="user_avatar_messenger" {% if item.user_profile.avatar %}src="{{ item.user_profile.avatar.url }}"{% else %}src="{% static "img/svg/User.svg" %}"{% endif %}>
         <div class="status_user">
         </div>
     </div>
diff --git a/templates/widgets/w_chat_right_panel_user.html b/templates/widgets/w_chat_right_panel_user.html
index f8e5559..f546e21 100644
--- a/templates/widgets/w_chat_right_panel_user.html
+++ b/templates/widgets/w_chat_right_panel_user.html
@@ -1,7 +1,7 @@
 {% load static %}
 <div class="tab_user_messanger{% if item.id == cur_receiver.id %} select{% endif %}" onclick="selectedUserMessenger(null,{{ item.id }})" data-cur-receiver-item="{{ item.id }}">
     <div class="left-part-tab-user">
-        <img class="user_avatar_messenger" src="{% static "delete_later/Avatar.png" %}">
+        <img class="user_avatar_messenger" {% if item.user_profile.avatar %}src="{{ item.user_profile.avatar.url }}"{% else %}src="{% static "img/svg/User.svg" %}"{% endif %}>
         <div class="status_user">
         </div>
     </div>