From e77014d6eb47c1def34b3845115668ee0d9ab8ae Mon Sep 17 00:00:00 2001 From: emile Date: Thu, 27 Jun 2024 21:54:15 +0300 Subject: [PATCH] new --- .../__pycache__/views.cpython-310.pyc | Bin 8307 -> 8307 bytes .../customer-ticket-message.html | 106 +++++++ .../inner-customer-ticket.html | 292 ++++++------------ osinaweb/customercore/views.py | 4 +- osinaweb/db.sqlite3 | Bin 1396736 -> 1404928 bytes .../__pycache__/consumers.cpython-310.pyc | Bin 3018 -> 3018 bytes osinaweb/osinacore/consumers.py | 2 + .../details_templates/ticket-details.html | 4 +- .../__pycache__/settings.cpython-310.pyc | Bin 3097 -> 3097 bytes 9 files changed, 199 insertions(+), 209 deletions(-) create mode 100644 osinaweb/customercore/templates/details_templates/customer-ticket-message.html diff --git a/osinaweb/customercore/__pycache__/views.cpython-310.pyc b/osinaweb/customercore/__pycache__/views.cpython-310.pyc index b9dffc1121f07cf6936c39e2a812b575fbb08ba5..5beff506b6db27cd94565dbfc6c20df340389695 100644 GIT binary patch delta 112 zcmezD@Y#VkpO=@50SFd^*QTA_$QvNScxiK-2tOm^%gK47-HhKS{}OHIW@KbwC{hKg zDr%p+fmL<#MzIJ+?#*1{p-haTlM^K8Gn!12s%5m_Tqo7W$mqS9Rb~$(W9;NZvMU)2 QH|NMbU}RLE?5m�F!|s+yDRo delta 112 zcmezD@Y#VkpO=@50SK&XE7Q(x +
+
+ {% if update.added_by.customerprofile %} + {% if update.added_by.customerprofile.image %} + + {% else %} +
+ {{ update.added_by.first_name.0 }}{{ update.added_by.last_name.0 }} +
+ {% endif %} + {% elif update.added_by.staffprofile %} + {% if update.added_by.staffprofile.image %} + + {% else %} +
+ {{ update.added_by.first_name.0 }}{{ update.added_by.last_name.0 }} +
+ {% endif %} + {% endif %} +
+
+ + +
+
+

{{update.added_by.first_name}} + replied {{update.date_added}}

+ + + + + + + +
+ +
+ {{update.description | safe }} + + + {% if update.ticketattachment_set.all %} +
+ {% for file in update.ticketattachment_set.all %} +
+ + + + + {{ file.file_path | cut:"static/images/uploaded_ticket_files/" }}{% if not forloop.last %}, {% endif %} + +
+ {% endfor %} +
+ {% endif %} + +
+ + {% if update.added_by.staffprofile %} +
+ How + did I do? + +
+ +
+ +
+ + + +
+ +
+ + + +
+ +
+ +
+
+ {% endif %} +
+ \ No newline at end of file diff --git a/osinaweb/customercore/templates/details_templates/inner-customer-ticket.html b/osinaweb/customercore/templates/details_templates/inner-customer-ticket.html index 4e2a116f..339da787 100644 --- a/osinaweb/customercore/templates/details_templates/inner-customer-ticket.html +++ b/osinaweb/customercore/templates/details_templates/inner-customer-ticket.html @@ -69,120 +69,19 @@ -
- +
- {% for update in ticket_updates %} -
-
-
- {% if update.added_by.customerprofile %} - {% if update.added_by.customerprofile.image %} - - {% else %} -
- {{ update.added_by.first_name.0 }}{{ update.added_by.last_name.0 }} -
- {% endif %} - {% elif update.added_by.staffprofile %} - {% if update.added_by.staffprofile.image %} - - {% else %} -
- {{ update.added_by.first_name.0 }}{{ update.added_by.last_name.0 }} -
- {% endif %} - {% endif %} -
-
- - -
-
-

{{update.added_by.first_name}} - replied {{update.date_added}}

- - - - - - - -
- -
- {{update.description | safe }} - - - {% if update.ticketattachment_set.all %} -
- {% for file in update.ticketattachment_set.all %} -
- - - - - {{ file.file_path | cut:"static/images/uploaded_ticket_files/" }}{% if not forloop.last %}, {% endif %} - -
- {% endfor %} -
- {% endif %} - -
- - {% if update.added_by.staffprofile %} -
- How - did I do? - -
- -
- -
- - - -
- -
- - - -
- -
- -
-
- {% endif %} -
+
+ {% for update in ticket_updates %} + {% include 'details_templates/customer-ticket-message.html' %} + {% endfor %}
- {% endfor %} + +
-
{% csrf_token %}
@@ -213,103 +112,9 @@
-
-
-
- - - - - - - - - - - - - -
-
- -
-
-
@@ -338,6 +143,85 @@
+ +
diff --git a/osinaweb/customercore/views.py b/osinaweb/customercore/views.py index c5815939..fdb5e810 100644 --- a/osinaweb/customercore/views.py +++ b/osinaweb/customercore/views.py @@ -204,9 +204,7 @@ def customer_ticket_details(request, ticket_number): } return render(request, 'details_templates/inner-customer-ticket.html', context) - - - + # PRODUCTS @customer_login_required diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 2b2aec048cc6aac30e4aa77ed72d647cfe0cf15b..10edc8b1a68097ec74d580214ab1e6b484b31803 100644 GIT binary patch delta 7199 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 delta 1009 zcmXw%Z){Ul7{>3p=iEO%=l0z8t{ri4%N%UN8k=_Oy3&|Y@PUZ&1IEUIXAnR9PV&6x z&3p1Z=RL99aU#=^EK^%||0ww{O!!K>&|^3m9!t{#T!oix!wlv0rRr? zC8J5YgY8Mu@FulW4XISQseG@bl~FXLyr?{;=x7C9Kn(s4Ih=-l{9KZrm)YbQ`T@U} zqKX0AkdJ8@S}&tE7R}ISYw$IE0W&;|Tk&QL9akOmj`tn?j_r;reNF#W&+8}kgYY+= z&CpJmI{ZncS`Ay}(IE59(%Pzn!;L-NW1|Dzy+fh?c*98J(MVmq*RCJzJ9=#NaJ&(q zsrW1vm^?n~dY7PKXG~())}LoD=UfAbzDD=BE0^?V_&;|uyn~KNoLN>apR(E z$*dTQivN2UYyi%dZrdJf7K#c*AE>!y7wSU8#)`yT88yOUF?TjUVc#KqWrw>8!mPf; zwHMr-KomzbzVwRQuRVC-ig}$IUG7zrx*vjKC~?Z-ROp=TMmYnRMWH~4Sv1SJtJ1n* zmW0+K zPm?ARCVo;wDo81zM8$XU9sCDg#Y^}qUc_uDV|3(`w&mapQL9OTS(0E{%-X_s#jLm1 zLu=*JPgqnJJ#m>Qp0mb1|2w%NoLDzaleoCA-pO=@50SLaQ)}|$I}@@&p6j7gINxK=RoPyWeu5dbv+ B4p#sG delta 46 zcmX>leoCA-pO=@50SH`_Yts@p^7e2rvMip(!N?dkc{b-3#)QcMTq_uPC;#NS2mloW B4OjpG diff --git a/osinaweb/osinacore/consumers.py b/osinaweb/osinacore/consumers.py index f4d27f77..f2462b93 100644 --- a/osinaweb/osinacore/consumers.py +++ b/osinaweb/osinacore/consumers.py @@ -77,6 +77,8 @@ class TicketRoomConsumer(WebsocketConsumer): 'update': update, 'user': self.user } + + html = render_to_string("details_templates/new-ticket-message.html", context=context) self.send(text_data=json.dumps({ 'event_type': 'update', diff --git a/osinaweb/osinacore/templates/details_templates/ticket-details.html b/osinaweb/osinacore/templates/details_templates/ticket-details.html index 01b0a71c..491a7146 100644 --- a/osinaweb/osinacore/templates/details_templates/ticket-details.html +++ b/osinaweb/osinacore/templates/details_templates/ticket-details.html @@ -79,7 +79,7 @@
{% for update in ticket_updates %} - {% include 'details_templates/ticket-message.html' %} + {% include 'details_templates/ticket-message.html' %} {% endfor %}
@@ -158,7 +158,7 @@