From c11d964b51689d305a4fbd9cd4a877f82b9c91a4 Mon Sep 17 00:00:00 2001 From: emile Date: Tue, 4 Jun 2024 10:41:03 +0300 Subject: [PATCH] new --- osinaweb/db.sqlite3 | Bin 1368064 -> 1368064 bytes .../edit/__pycache__/urls.cpython-310.pyc | Bin 2159 -> 2259 bytes .../edit/__pycache__/views.cpython-310.pyc | Bin 12520 -> 13036 bytes osinaweb/osinacore/edit/urls.py | 2 +- osinaweb/osinacore/edit/views.py | 17 +++++++++++++---- .../details_templates/ticket-details.html | 12 ++++++------ .../edit-ticket-status-modal.html | 4 ++-- 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index b6972604ff572d01e28bd4b7c1a7e6cd0a5534d5..6a056e320e2b6949e058b8edd127408d4b23c72f 100644 GIT binary patch delta 1366 zcmai!No*Tc7=S%qaT9xz5F%DJMF~qHn;CE8u|!)t-j{g1#S2Kz*fV2~XFM}r#&*mh z35}EsYLn(*i32o>R6%bLU=Dzk3nvg~3YTyoEj^?XZ6yeb#1IrI5}+KurzidI{lDJ# z{`Xe)QY(9@jTeB@=8JQhlERz~e?ojcqcOiEsIF|S&OE<$b@nTO+C82agoetP`tx#DnQ~(*Jj7ml=qmj|d=wzOf(aT(r3YDQd zzXRogW^wo%wQSQD(@xXB7V^vW(InZqw zx0T9C>7xx}2bh^w#gr6{Hyb6s(=SnIwZ#(7l3*7*C~B|OTQEx475DyLHTd(@@kyz6 z)A+t&90zt4;7{Ne;HK&g9R#vq0N5Q&+%kT;HM;-nNlv=gvDNzwEcBhE)7B8IxIpt& z+RDHjjayMlad49J((B`s>&M$h8BjXj9?=~RtHG)Q{6Wrr9jr2b!l_|4UamlI& zvV4=FxyodmJM|{t5)8Sl78e9vmacy|+F6wMKTv>Azz5(F`0(?Qu^&N=TBQffgNNYQ zGjj00LJm9z55fD=$jI1TP@@8X%Vz2D;@HHZ>MdYrpj#Q+RRiAwJMvk6!KT+Jjp8}I zJI=8*N1iErra2G@vQ4j%=d6PeyTyU7KUy7=9<4q-`oV-=b6a8fZ1~1d^}-eXv&Or+ z-?ZOpZtsrnzo%J#_vO`!CU!05KJRYKWVp9b^ZDYHnmdssi>Y?DUT3|{3RHtRJc1K} zjBh@jqFc2fk@Hn?N0Bt4#eO8&=CZM@J;SE!U9l%{X~drAF-w|s6R6Nxu4YS1NLS1t z5hPzhab&@h=h~FFm~Q18d4vkIOpU(BhLqEF28!}-&MQ)syOTh@P=&$hSQL-b?uHQR zIumFi!N=xW4kuXApC{n@f>)$#J)SYm$BI#&K-#EB z?rW$`WFr1RwH8I00@^M#`xYX^`rKHs8ISgbWx5r?a(vV~*GNVxXei;aCgu{RoHK>Q zJ(W{4_HdGB3cSDCEoX8)s%_6WmU0PCxe(6wtO;wZ*X3Gbk~1~J`Tr90&-WmUAy34R TRGV%xZM?(4O-c9K_#e_=sgba9 delta 557 zcmZoT5ZrJec!D%z_(U0J)^G;BvaXFOd$m|~Web??CpT(IO?J@U!m_74y9E-^On$@0`L(yubf49SdeHc2fv zate0M@(oEbE%weR^v=#px1G+|BqYXcZf@8dmEIne&IrUzK+FupEI`Z(#B4y!4#XTl z%n8I?+oRICSN&j2oX(oSbCgBF(9&xAxdfgPZpMYvTfQ(RZ)f|;XvNh2AdhGJgFIf9 zLgq@g((UXIco#EnU-yuAH_POJ1cB|P&v^S+GRHBwO=q9Lw{ZKa34CRYKnacM3X}L) zrvFwKQP`d}iEkFKPy*vk2L9Xp+xRCk>$4m1=kU8vmsr5JiHW0jvfzW4VC8C=h85-+ zIc2%&`2}Xhrd4T{$%fg+`DK+RC5d^KrHPgdPgR+HnWighiYT=IUC0N-{M-L76kvbH z#mwKwz<&d1df#+`34%V`qb3OQ@vAvSN&|Las9p@6MXLKFB|tyqDQ)8F$8i2_Z3$H4!K{|o=S z=>h^mK+^?;`uRc9;_Tbs$qR`kFh??ep3dGNw0X1O153vC&y7OcKQ{^s&J$v1|HQz% eg{Pl8gUg;%g6}5#C!mVk?2Jv@KdFoG?EnC$@VGkw diff --git a/osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc index 3e2ef7e9a791cdcde885fe8fe17b0fa996166c5f..4247db50ffade6a903624ea15a07471b164cec38 100644 GIT binary patch delta 211 zcmaDaa9L10pO=@50SLqn#igZkGB7*_agc#DkmCTv#Yr2r{TU@v8B+{XnX{x)j8fQo znbXCiq*IK888l5cw=jNXvX(2!OwLX%(YMLWE3tyG<1aFE{GNRcqtWC!92&eVe2g&2@eBZpt`?#I diff --git a/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc index 439d4f2f4166dc2c24856e6cb67b42f109451c72..60665d17a90f29e99fe6ae52bd30d5c39709a3cf 100644 GIT binary patch delta 2089 zcmbu9Z){Ul6u{qk@9nMY+OBNf)^;oH%C_!pYdZ!8!v~Z^V}d$NMoh$v((OLCj+U9% zH>~z)=iJVW#EmSmFYnji zz3sjC+;i@Gzo)Mno-w!EDdER=Vb^1uA3W%3hLM9^_ZOMOAX~jdGF(h!l?SB#u+xq1 zU{%6B=uTEGyawIH+`_%+9#$iK4Z4@D5nhX4%j$&Jq5D|9a36XDYZP9O?q>nv#RhBy zS(9iqqBpaUa6kH578V{rkFXZuLG&nFC%g&0m9+_PMsH^^;UV-6rVC$--pRUzhta!P zTzCXM!IG__(SnU0wqAG?y_anezK(6|m-IXA1F%~Gr~RAyG(f^0(NqQQvU6221@_p_ zx#ks^vWL9q0DiJtYwreFu#LK13f#138zumH_!j>OxYz#EzY$=&9SJ@IFknwN^#J7T zUz!1+X#W~Y0!;GS@TJBVK$7wq7QeI+MLTSh9)n8AuAhxkqnPL$l`|1iT!XR>)6{_RNZ9nTFK zrui&R^<=lfGFHkma*tOi11FEdvbSdT``+9f-z!Z{Iz|X%gek&%g!c(2`9i|aFSbUspK0^0{Cu=c^(f{Hza9?p z-nO}Iw1K~>BJs#W>G8b5ZrQ81 zS(zs?)`WSI))px`MfL%|(cT7s^Jpvvv;0~##D`2V$nqbPBjH0d>NH`7FiV&tTqa!MJA2w|Mo}G-4_xAM@X4Ng Wnq2r+^Wh!AJA`)t?|QsDJn#<<6#e)B delta 1657 zcmb`GU2Kz87{~jxqpVxsu3g)$eb=ttR=U0$?bfkGf{A*8H(OkcdI3g+;wf`xGV-o! zmJl128xu7l2M7veQ$Zav`8a%tNMeF~GXq?aC0uY};sr(%KN7qUpa0o(i(z3Tv^l^0 z&U?;j&-4Dzxn2CJ;2ScGDhGf1udUi}yl1N~M$c_+?=2Urgpq2v3rG~y@uT={UV?}z+NkY+H2WEBCI{gUMK3chu9+`sy)nZiiRy^{Ba$3 zVj`{w>e(AbLVJWgDVnrL*_%a+c9T6NmS}HaPm5OVG4_nGw8z=oM7#Dz_N5}LJ;9z6 z9omz{YQN|ddEIFeUC%nKWojp_bCE~gsd$?xt2VnUT=bZF%hT$jSJb$7(nX`{4gYsU zQ)+qb6GXqNk>HCi`di(o8zJhD&qNN;N_98VP1L8l%@2rPP-hxCi3Zj0F(P_X{Tc5d zdQYYkSL=6?!!hjTP`u76r;jSB(&=~FQr&D?Mzli)T29d(IoYy?y**W;2|1R^(;=C& z;_{c&kL7K=(%ug21U>{l0(Jqrfl**1(9f_!_9D0qd;<7^Pl3Ha0@w#cfz`lgz#iap zU=8pE@OT^?2Zn$O;AMv8v6Jxq|2~)=-+}IzzyV-Fo^FfC{plqAATOu0bXeYOip#pz zvpuNhFHbU?e7f-3a8b-DXABEJW?0b$RU(&Uddz$6eR}Ki-ArQne7l@71`ETbwS|{T z1FsL1M(hdvw|-w=!4Aq>k)Zr7Q%kp{+iI29QjN0LIv75JL7j(!O-CVX+RXAoU-(h1 zI|dvFP5@s6^B02A`(+T;6J|p=iA4yZ+wFGpIW%Rp)gb>!hg7 zn(g!7Gc|uMOfi|xJxW*9`rJASe~TUJ&`!fjS^3%V!AgRysoD#aF)HwX!}?Mb0F*IJYRbFt?14{s9$=gd6|> diff --git a/osinaweb/osinacore/edit/urls.py b/osinaweb/osinacore/edit/urls.py index f19963bc..bc21f25f 100644 --- a/osinaweb/osinacore/edit/urls.py +++ b/osinaweb/osinacore/edit/urls.py @@ -20,7 +20,7 @@ urlpatterns = [ path('businesstype//', views.edit_business_type, name='editbusinesstype'), path('reference//', views.edit_reference, name='editreference'), path('tag//', views.edit_tag, name='edittag'), - path('edit-ticket-status', views.edit_ticket_status_modal, name='edit-ticket-status-modal'), + path('ticket//status/', views.edit_ticket_status_modal, name='edit-ticket-status-modal'), diff --git a/osinaweb/osinacore/edit/views.py b/osinaweb/osinacore/edit/views.py index eb023575..70d9bd88 100644 --- a/osinaweb/osinacore/edit/views.py +++ b/osinaweb/osinacore/edit/views.py @@ -4,6 +4,7 @@ from django.http import HttpResponseRedirect from django.urls import reverse from django.http import HttpResponse from osinacore.decorators import * +from customercore.models import * @staff_login_required @@ -422,12 +423,20 @@ def edit_tag(request, tag_id): @staff_login_required -def edit_ticket_status_modal(request, *args, **kwargs): - +def edit_ticket_status_modal(request, ticket_id): + ticket = get_object_or_404(Ticket, id=ticket_id) + if request.method == 'POST': + ticket_status = TicketStatus( + ticket = ticket, + status = request.POST.get('status'), + date_added = request.POST.get('date'), + added_by = request.user + ) + ticket_status.save() + return redirect('ticketdetails', ticket_number=ticket.ticket_number) context = { - + 'ticket': ticket, } - return render(request, 'edit_templates/edit-ticket-status-modal.html', context) diff --git a/osinaweb/osinacore/templates/details_templates/ticket-details.html b/osinaweb/osinacore/templates/details_templates/ticket-details.html index 206f1e81..50624d68 100644 --- a/osinaweb/osinacore/templates/details_templates/ticket-details.html +++ b/osinaweb/osinacore/templates/details_templates/ticket-details.html @@ -17,7 +17,7 @@
- @@ -32,20 +32,20 @@ {% if last_ticket_status.status == 'Open' %}
-

Opened by {{last_ticket_status.added_by.first_name}} at - {{last_ticket_status.date_added}}

+

Opened by {{last_ticket_status.added_by.first_name}} on + {{ last_ticket_status.date_added|date:"d F Y, h:i A" }}

{% elif last_ticket_status.status == 'Working On' %}

Updated to 'Working On' by - {{last_ticket_status.added_by.first_name}} at {{last_ticket_status.date_added}}

+ {{last_ticket_status.added_by.first_name}} on {{ last_ticket_status.date_added|date:"d F Y, h:i A" }}

{% elif last_ticket_status.status == 'Closed' %}
-

Closed by {{last_ticket_status.added_by.first_name}} at - {{last_ticket_status.date_added}}

+

Closed by {{last_ticket_status.added_by.first_name}} on + {{ last_ticket_status.date_added|date:"d F Y, h:i A" }}

{% endif %} diff --git a/osinaweb/osinacore/templates/edit_templates/edit-ticket-status-modal.html b/osinaweb/osinacore/templates/edit_templates/edit-ticket-status-modal.html index fb929c27..e109ff32 100644 --- a/osinaweb/osinacore/templates/edit_templates/edit-ticket-status-modal.html +++ b/osinaweb/osinacore/templates/edit_templates/edit-ticket-status-modal.html @@ -14,7 +14,7 @@ -
+ {% csrf_token %}

Update Ticket Status

@@ -26,7 +26,7 @@
-