diff --git a/ChatServiceApp/forms.py b/ChatServiceApp/forms.py index 116f7c3..eca5d8c 100644 --- a/ChatServiceApp/forms.py +++ b/ChatServiceApp/forms.py @@ -6,7 +6,7 @@ from .models import * class TicketForm(forms.ModelForm): - text = forms.CharField(required=True) + # text = forms.CharField(required=True) # files = forms.CharField(required=True) class Meta: model = MsgGroup diff --git a/ChatServiceApp/migrations/0003_msggroup_text.py b/ChatServiceApp/migrations/0003_msggroup_text.py new file mode 100644 index 0000000..6ca3e51 --- /dev/null +++ b/ChatServiceApp/migrations/0003_msggroup_text.py @@ -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, + ), + ] diff --git a/ChatServiceApp/models.py b/ChatServiceApp/models.py index 008d5ad..be5725d 100644 --- a/ChatServiceApp/models.py +++ b/ChatServiceApp/models.py @@ -31,6 +31,8 @@ class MsgGroup(BaseModel): department = models.CharField(verbose_name='Отдел', default='support', choices=grp_msg_department) 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', on_delete=models.SET_NULL, null=True) manager = models.ForeignKey(User, verbose_name=_('Менеджер'), related_name='rel_msgGroups_for_manager', diff --git a/templates/blocks/profile/b_support_chat.html b/templates/blocks/profile/b_support_chat.html index fd0ff40..dda45e4 100644 --- a/templates/blocks/profile/b_support_chat.html +++ b/templates/blocks/profile/b_support_chat.html @@ -19,10 +19,23 @@ + {% endif %} -
- {% include "widgets/w_message.html" %} -
+
+ {% if not ticket.rel_messages_for_group.all %} + {% 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 %} +
+ + {% if user.is_staff or ticket.manager %} {% endif %} + {% if user.is_staff %}
diff --git a/templates/widgets/w_message.html b/templates/widgets/w_message.html index 6778190..9cd3cfb 100644 --- a/templates/widgets/w_message.html +++ b/templates/widgets/w_message.html @@ -1,4 +1,5 @@ {% load static %} +
@@ -6,11 +7,11 @@
- {{ msg.text }} + {{ text }}
- {{ msg.modifiedDT }} + {{ modifiedDT }}