0.1.20
support tickets routines
This commit is contained in:
@@ -6,7 +6,7 @@ from .models import *
|
|||||||
|
|
||||||
|
|
||||||
class TicketForm(forms.ModelForm):
|
class TicketForm(forms.ModelForm):
|
||||||
text = forms.CharField(required=True)
|
# text = forms.CharField(required=True)
|
||||||
# files = forms.CharField(required=True)
|
# files = forms.CharField(required=True)
|
||||||
class Meta:
|
class Meta:
|
||||||
model = MsgGroup
|
model = MsgGroup
|
||||||
|
|||||||
19
ChatServiceApp/migrations/0003_msggroup_text.py
Normal file
19
ChatServiceApp/migrations/0003_msggroup_text.py
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
# Generated by Django 4.2.2 on 2023-08-02 14:54
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('ChatServiceApp', '0002_msggroup_manager_msggroup_owner'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='msggroup',
|
||||||
|
name='text',
|
||||||
|
field=models.TextField(default='', verbose_name='Сообщение'),
|
||||||
|
preserve_default=False,
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -31,6 +31,8 @@ class MsgGroup(BaseModel):
|
|||||||
department = models.CharField(verbose_name='Отдел', default='support', choices=grp_msg_department)
|
department = models.CharField(verbose_name='Отдел', default='support', choices=grp_msg_department)
|
||||||
status = models.CharField(verbose_name='Статус', default='open', choices=grp_msg_status)
|
status = models.CharField(verbose_name='Статус', default='open', choices=grp_msg_status)
|
||||||
|
|
||||||
|
text = models.TextField(verbose_name='Сообщение')
|
||||||
|
|
||||||
owner = models.ForeignKey(User, verbose_name=_('Владелец'), related_name='rel_msgGroups_for_owner',
|
owner = models.ForeignKey(User, verbose_name=_('Владелец'), related_name='rel_msgGroups_for_owner',
|
||||||
on_delete=models.SET_NULL, null=True)
|
on_delete=models.SET_NULL, null=True)
|
||||||
manager = models.ForeignKey(User, verbose_name=_('Менеджер'), related_name='rel_msgGroups_for_manager',
|
manager = models.ForeignKey(User, verbose_name=_('Менеджер'), related_name='rel_msgGroups_for_manager',
|
||||||
|
|||||||
@@ -19,10 +19,23 @@
|
|||||||
<img class="header-icons-right-part-padding" src="{% static "img/svg/info.svg" %}">
|
<img class="header-icons-right-part-padding" src="{% static "img/svg/info.svg" %}">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
<div class="container-messages">
|
<div class="container-messages">
|
||||||
{% include "widgets/w_message.html" %}
|
{% if not ticket.rel_messages_for_group.all %}
|
||||||
</div>
|
{% with text=ticket.text modifiedDT=ticket.modifiedDT %}
|
||||||
|
{% include "widgets/w_message.html" %}
|
||||||
|
{% endwith %}
|
||||||
|
{% else %}
|
||||||
|
{% for msg in ticket.rel_messages_for_group.all %}
|
||||||
|
{% with text=msg.text modifiedDT=msg.modifiedDT %}
|
||||||
|
{% include "widgets/w_message.html" %}
|
||||||
|
{% endwith %}
|
||||||
|
{% endfor %}
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% if user.is_staff or ticket.manager %}
|
||||||
<div class="footer-chat">
|
<div class="footer-chat">
|
||||||
<div class="left-part-block-enter-message">
|
<div class="left-part-block-enter-message">
|
||||||
<input class="enter-message-inp" placeholder="Отправить сообщение">
|
<input class="enter-message-inp" placeholder="Отправить сообщение">
|
||||||
@@ -33,6 +46,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
{% if user.is_staff %}
|
{% if user.is_staff %}
|
||||||
<div class="block-list-of-users">
|
<div class="block-list-of-users">
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
{% load static %}
|
{% load static %}
|
||||||
|
|
||||||
<div class="container-message_support_chat{% if msg.sender == ticket.manager %} left{% else %} right{% endif %}">
|
<div class="container-message_support_chat{% if msg.sender == ticket.manager %} left{% else %} right{% endif %}">
|
||||||
<div class="block_avatar_message{% if msg.sender == ticket.manager %} left{% else %} right{% endif %}">
|
<div class="block_avatar_message{% if msg.sender == ticket.manager %} left{% else %} right{% endif %}">
|
||||||
<img src="{% static "delete_later/Avatar.png" %}">
|
<img src="{% static "delete_later/Avatar.png" %}">
|
||||||
@@ -6,11 +7,11 @@
|
|||||||
<div class="block_text_message{% if msg.sender == ticket.manager %} right{% else %} left{% endif %}">
|
<div class="block_text_message{% if msg.sender == ticket.manager %} right{% else %} left{% endif %}">
|
||||||
<div class="container_text_message{% if msg.sender == ticket.manager %} border{% else %} background{% endif %}">
|
<div class="container_text_message{% if msg.sender == ticket.manager %} border{% else %} background{% endif %}">
|
||||||
<span class="text_message">
|
<span class="text_message">
|
||||||
{{ msg.text }}
|
{{ text }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div class="data_send_message{% if msg.sender == ticket.manager %} left{% else %} right{% endif %}">
|
<div class="data_send_message{% if msg.sender == ticket.manager %} left{% else %} right{% endif %}">
|
||||||
<span>{{ msg.modifiedDT }}</span>
|
<span>{{ modifiedDT }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user