From 708939c1d3b84285ea77d3286c98a2f30a6ed513 Mon Sep 17 00:00:00 2001
From: nataly <nataly.abi.wajeh0@gmail.com>
Date: Tue, 25 Jun 2024 11:31:29 +0300
Subject: [PATCH] New changes.

---
 .../add/__pycache__/urls.cpython-311.pyc      | Bin 1093 -> 1095 bytes
 .../add/__pycache__/views.cpython-311.pyc     | Bin 13274 -> 13274 bytes
 .../listing_pages/customer-tickets.html       |   6 ++--
 osinaweb/db.sqlite3                           | Bin 1376256 -> 1376256 bytes
 .../__pycache__/views.cpython-311.pyc         | Bin 46157 -> 45977 bytes
 .../osinacore/templates/customer_index.html   |  34 +++++++++---------
 .../templates/listing_pages/tickets.html      |   2 +-
 osinaweb/static/dist/output.css               |   8 +++++
 8 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/osinaweb/billing/add/__pycache__/urls.cpython-311.pyc b/osinaweb/billing/add/__pycache__/urls.cpython-311.pyc
index bff37e192ab5b81d1d410e073e71762a937c34e7..b85203f0a21501bbf70338a386095cda0cdb9c67 100644
GIT binary patch
delta 54
zcmX@gah!v9IWI340}vdmu1Z_IkvD*u@!{k+=3>?lYz(ZNldmu*@r&~CGc|C7V39ab
FApoVx4ch<!

delta 52
zcmX@kag>91IWI340}wn2tV&zCkvD*u@&4pE=3?dtEF6=sF(>g0bMrGbaD!lxI8Ye?
DjfM@Z

diff --git a/osinaweb/billing/add/__pycache__/views.cpython-311.pyc b/osinaweb/billing/add/__pycache__/views.cpython-311.pyc
index 8e372858e675b1121dd56d206d27176cda9defe5..66da3790c20f367f54248d88c622a31e2e399c5c 100644
GIT binary patch
delta 19
ZcmcbWek+}8IWI340}wbhY~;FN3;;lt1=s)p

delta 19
ZcmcbWek+}8IWI340}$|MY~;FN3;;gs1&sgz

diff --git a/osinaweb/customercore/templates/listing_pages/customer-tickets.html b/osinaweb/customercore/templates/listing_pages/customer-tickets.html
index 1bb802bf..0509dfcc 100644
--- a/osinaweb/customercore/templates/listing_pages/customer-tickets.html
+++ b/osinaweb/customercore/templates/listing_pages/customer-tickets.html
@@ -51,7 +51,7 @@
                                 Last Updated
                             </th>
                             <th scope="col"
-                                class="px-6 py-3 text-sm font-medium text-gray-500 border-r border-gray-300 uppercase whitespace-nowrap">
+                                class="px-6 py-3 text-sm font-medium text-gray-500 uppercase whitespace-nowrap">
                                 Updated By
                             </th>
                         </tr>
@@ -62,7 +62,7 @@
 
                         {% for ticket in open_tickets %}
                         <tr data-href="{% url 'customerticketdetails' ticket.ticket_number %}" class="hover:bg-gray-100 duration-300 cursor-pointer">
-                            <td class="max-w-[250px] px-6 py-4 text-center text-sm border-r border-gray-300">
+                            <td class="min-w-[250px] max-w-[250px] px-6 py-4 text-center text-sm border-r border-gray-300">
                                 <div class="w-full flex {% if ticket.unread_updates_count > 0 %} justify-between {% else %} justify-center {% endif %} items-center gap-3"> 
                                     <a href="{% url 'customerticketdetails' ticket.ticket_number %}">
                                         <p class="text-secondosiblue">{{ticket.title }}</p>
@@ -94,7 +94,7 @@
                                 <p class="text-secondosiblue">{{ticket.ticketupdate_set.last.date_added}}</p>
                             </td>
 
-                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                            <td class="px-6 py-4 text-center text-sm">
                                 <p class="text-secondosiblue">{{ticket.ticketupdate_set.last.added_by.first_name}}</p>
                             </td>
                         </tr>
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 5a6e033e50004f6a61baeb487608ea82cafd0f21..e6e9acbf2c7aed9335210c80c36691c4c76efa65 100644
GIT binary patch
delta 751
zcmajdOKTHR6bJBRCX?7SNv%eNT2ZtrC8XXvkIYQK#blavVjfMJq)of2$z<}LB+aWy
zq%>M2f>0EdxRQ#CZc4FsG1!$KK)QEV7k&V7R}j3Y;7UC3+n#gypVRNh`~CRSOZwAi
zlOl1do2h&_$h>msw-0|fR6fI!0M*ny&G`L(vBJQnsw7}oY(*>0<P@g{rQ}>F>2O4P
zJoLpRKkZqBYNdF)neL>>g>p?wa>aN=Nk#9FfTW$k<s_M_fOA8}O))bh1zkL|b*v1I
z6+MC>IATBu#E6)XGsp;H){d1?*QtI@BkoxOX8lJkTC|Mem#^Rg_Pamp1pMFrG^7AE
z*ibFnhH4$u@wbGmnNF-CZXjgii^K7g3z*4>>oFg;trfpohermTPL~@JJGNcS_IS9r
zW1D{Fnb5xN*oM}r8+Zuo@G@J6l-zB|8LHIGmNMN+y4uQjN~vnDr;>xceH$`{oJGcw
zbK2hi`Q(>L3r6ckvu0sr!t~wt+4|n{#Q2HWHT3Znj7FQ-vFV4`9^5BFTQT8(Q-%iy
z!oIm4k&?A`lNUVsLMc@cYOGwRS$?e~@{}TT4BuFuO)oV<WJ)OaR`OZZGu!5ic`2Ub
zYx7*5O4qZI1j*JzC4~z_oW)#%TLo<o+oFKvOQbm%5Hh*qVr;q5ZKaZ;KjM*T5eRcN
z*WFMqpV?dq7NYfqsvn58U?dg|d&^4=N|9C*Y?uaa*a*Qu$34r%eCbxTU5W>qm32y;
zUv;*-IU&du@-WyG7=AHUm$G5C?e+ijfGi58_bZq($ST#|TCdy%HLd#G{&Et(Zf*@t
l@9bX8+(IedGUGQN*@kb9>=(x%{PSfLfD{F^*GKlW_b0^C^y&Zr

delta 686
zcmajcO-tKw00!`;F?QCr&P@-SZivXnkZ4|-G%4&5V{A>WO*+%sz^FAzo21sh+1d)S
zf`<;qVB(-ViR|KGB6A)Bp7sHT_ubrKA3%ne!C-&bWtXwT@A^CsJe|%;r?c{A47%AL
z=aC!NOj<nC-%UfW&wovq*n?Ti^L(ppEQ_>STP#RolP`u8H8@v|OqETsiKjKDYBn2k
zZJETFn3kArwU(r!l@J!Rd^HoSX|pwf)t(X<5kxT>C8!B36vn79Ma&Qc9SUN5mqz!}
zfB-iD1APDj^aCE?7BB#Kol9eo{s~naWX%`zLTip}`-b2L{?D$7KlvdPWB<-)D5|?#
z@;SRDf42s|M{LJ)<>z5{|J(E7tA}pK{_gKx^aWnJ@;&4zaNIjR3Os?X_qj3W`Y6!z
zPq|#KM>b<qn^py{8#ZZ~>^9jbn)=4hR;y6k$kAoJdvY28hJf3^FmT5?Ila63ZF~?`
zU4wZqH*nwcBk<M#$@i-N3v%4ofmJsN28_C+&|@UNr*Qx4m@&jw$`*vgw#CUwBg+#e
zmuZ6?jRvFg^Za}-cW+?yMRv|i2b=kX#iHV-kW|~LM3aceX>9=)Nm*ibwV2yX>6B%X
z$s~=n>0(l%(I`slvTSAZgl!eM)nz$inbAyLD#UpsTENqGT;oL{CN5bf!I$-jnUU*@
zi>a!va9JxW3!<=N)Wdi^9>o@vu!)jNz7dP4jddxLd$x_Xr4qAMz$>OAr3zKX)aR;f
k3#aLd^3Ttl%)!Wqad^^u*z<fG5u8cPo%A|~7bEM!Z`5_<k^lez

diff --git a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc
index 11886e362f2e93411ae01a6cb9dadf1e64143145..a13b776f48e9c8646936d06ebe74cc624d80b986 100644
GIT binary patch
delta 1491
zcmYL|e@xVM7{|ZQ_xODIad&Vga0sa=9svV&B*6#^QE{Be57CLHo#-9$<4%sx9UI`G
zI8xN%kK1D{HYKxCiFDGZ+R)tkL#MN4&1f}REtgqsR^(P|Evx6b8|$`v@A<r*=kt6%
z-_P?rAOENi|DapXS*-~g{Tg@oHW!UsTbz1j3{DTEtFRLRZsM$re6;PisZX360IfCg
zvqWD)D6Y-Id-!+Sik%6`_{$k9#+M`+tF&$9eP;Z$*p4mLsdjTnYm3H_x?|stJ8ROk
zF%$lJB)>W!LJ98pUaO|{B@C?yQC8Qinb;v;$Oy%{6He-VmY`#XYFbEhn?sgpk{Q~d
z<yvq~?OF`f`e8QStF6L@x}2CC@?&q^0z6u7!?C&*d5NHDGKpl$2)6EQ_XOnw3X#c-
zEi8Uo2Ix8(j@xHrS$%x^9KwG32X^b4)~|gVoA_dAGB$Hs%R*QE_u}_7%{~|1^<Syg
z4Oam&(6%+jEHgM4%c#oQxIl;bxO!8zSU})?<=<2Z)+w{w<8P8dpJ!JvfL9uwkQLpT
z#XDJUsO-%yfNa8cJhdfJ<PiK!UD`r0kDx>36Zl4zZgm4JCXkBnZL^7`1Rtnd+tvdV
zMl%)?kt~0x<*rJAWl_A0F^jI=*ggtSj5Rx+6eR>w)qx$0OpDSu;4D8+JXyJV^nvmT
zY>;LqCYgq}J>BNVIFPxVjrGk1X{Ef5?0%Z8DWl8pZVGy28NS?{C&~$By?(t}H!3)6
zC4SVBBUX`FjDNOVgL!zhwZf=m*E|$$4zY&Ja<!zb44@jl?JkRxebp>AfGY}9@#pqL
zv7Xk>cf2)Vt76YumZN;5b@;rmz^LVQJ%)YRVgs3t>I2_B9jfp(e-UN<!vCES&59p(
zt}(W7@N;ODF40P+TXo75!)Ro>8Hc);f*r4RuLM6rPdL}h_y(WEJtBQ9yI49{Qdm-1
z?0BUokIuT^(<OEj7*yMPAL(KbnU~d$zPSMX*uSSKwx5IdML+DHJr*%Q>su;m?|j|z
z|55v+{<?j0!~ybusdnu<2KI=*o%eImrbMtc==De+CJ*EnbrPm}<?%%$aeUDL&7qc=
znJEi6-rVd7?rd>+{H;3!@-Vr7Qe6WtnQU{(?2U6&l{(gCI{fqm>4T%tg4YHsVF=9!
z7s3%-e6UgsQ`ke*bMTG<C$ak2=kOFRJbnfa;q~J^a2lTtrx4#5UjFz91xm#yCV8nX
z0zp?G*c9vvcmncOycn()=P4jr{TrUpp${ic<cPNjtW@_;+%>@%-h8D4E?~)Up}0u6
zL3Ip2iXrS9aT%95^Eloaafo-xY*&Aed~LufoO&}1Bj`Ol2BVmE?jcN|`TQnvnL-Y!
z7tT+{?Bx-Ujx0}TWcnmeo6Kk7iHgimWLhLoh~zGo+_jSXQ*!%B?kve2Be}qmODnm2
zl4}%sQOS=a`THb)lN@8Y2v3mmg(Y7}-r^c9Vd1j;6<6l#aCdn<&&b>A?u80ddJ$B>
Xw8r|INz+p&A!S;RFuz(pZZrJ{ptgvc

delta 1711
zcmZuxdu)?c6#wp5zOP#!TPy2Vw!+3<WMi8Ohztb{4~L9BC=SMgqtvyNZl&#RyU1pT
z6OaMnF*uk^9pfbsUK6}TK;RFe1`{;_Qlr)oO#B05Bq?fQVqD@mU&F)1n|vqd{?6~7
zbMCq4eDB?rzxhSB9=BRe60Y&?-uCO~tZQrKk#R7V?-F}!_p+)#<5CA%_0?f{s97Is
zSr4>66WCo&nAo7ffg@(^|H<I#&J}CwRx_j8XO3rd*ub+hA0~fjkxv`pe*JiZB~}97
z<qmRFXn8!iFXMFPF@q$X!Y{oJjt5p$R2Nm^W}m4SGwL(%m={N{o}34i9qZz1+~_k8
z%YD{Z#RF85;*!r2xBl1ND^j@?t~D&lE@w%z&mZyf*gAhG76nUVglW*%xVV^qfG(0*
z(U`Zr-4h8%1F=9jlr%je^D_9Xv7+!DqUCglxZmsZbVq#Nm_O=i3wMWNoU$*^f}EvG
z=VUWU;x-gXH5O>=^vC#bbk3G`|Cm!J5v?R5NQhF!;jA;K%$PnF<&)4B!7n;2OH#k|
zlQC;^JYk%il1h}y+uB4Jb^ka!<uGMdrY1-ei-+eVT+bw23lgq|8yOSOzAyBhR&h(K
zxM;j$NmRQN)oT*foj0_Kn_4iT1;rKjc9|8x4Uc9jpd?6~6t6cG%B&dN0Vf<>k*$;>
zctM<BQNt9Ti8>fp*0N0f5N&nrOTkxq7%NBA0e4$$N(EXH;-3}-s|a)?tsUXl9#%HW
zpF+YNv1OHyv1vru+iF*4Aa+k^t;-mjsr#Qv{z?2LwymyVY?hABB9w$dq&z1Wdk)_B
z&QP95z$tEdOAIA0A{@h7auaIha=OBm2sCjEAqMV(JpX#LgNTH44fgx1^5@cCKm7t~
zNj3ez{6&Hz5)_O$V9cMbEWmxq5qrC=zC@N9y;M)GwJVEoTMY}>ey$dw)>{IpsSYR(
zl&On}SA@J$r54qB;?2Mu#v0*bhsRP+wnh?e2J@zCFuOBLS&sW9qOP-n+3U#EKw=kV
zx)e!X4Xy<>bs2$8a634~)QoBiwn)?q?#{WQcHLo_)xo{+Obk*S`B_Z|0ZZ2+wUth-
zhL$dm5=7N6u68+8brqqn!uM}H&GH~~{Q?$+`t^It!vtTaxKYxm6?qp4PGSOyToQR;
z?3s$OruTF!8xYtkPWOz-%G;=37NhY=jBSFi`@F_YMBbdfXYB@yvIX~FiB%g4WXq#a
zThsR8{#<1n+J6wA_U~p+-5#Rz^t4GO7KjD?JOXPrRz49!7+-ZNC93lxFtRaU*@^J4
z;@ZY{4Yop5doxNGKUZ2mxio?|ZQpW&b%Jf6hV6#tfg&~ty#qDMFw*`IUkuz**#Q{Z
z^)0qsX!l{Z1MGu6&Le0{n%cslkiU)o5By__cK{9z&Si(-&R`xp41W*SDW{O<5KH!4
zl370}`^wZa2rM+fNAX-Jm}VEP`#v$SQOFqzv$L>yXu5I^?M>qH(AYSHFYWiJ0s(#=
z@<&RQ3#bOg%Okf{HUd+Q?!mk+9zDfQg74Vx><Tm=Z&t1%WxEi^6XV{Z|AjuroW@q4
zO-{3@&l{%!)8|PaA5J5~shK%7E~n1q)Oeh_iBofMdP`2P$myjxJqM?%aw-(3i*mXg
vA0=^)Wul~n`Blh1Gl|_4RcGcK@}6b$SxO>#-yq3af;m#Mj&ZT=tj+K*f^N!*

diff --git a/osinaweb/osinacore/templates/customer_index.html b/osinaweb/osinacore/templates/customer_index.html
index 93d93ae6..76a69b27 100644
--- a/osinaweb/osinacore/templates/customer_index.html
+++ b/osinaweb/osinacore/templates/customer_index.html
@@ -146,12 +146,9 @@
                             Last Updated
                         </th>
                         <th scope="col"
-                            class="px-6 py-3 text-sm font-medium text-gray-500 border-r border-gray-300 uppercase whitespace-nowrap">
+                            class="px-6 py-3 text-sm font-medium text-gray-500 uppercase whitespace-nowrap">
                             Updated By
                         </th>
-                        <th scope="col" class="px-6 py-3 text-sm font-medium text-gray-500 uppercase whitespace-nowrap">
-                            Unread
-                        </th>
                     </tr>
                 </thead>
 
@@ -160,10 +157,20 @@
                 <tbody class="bg-white divide-y divide-gray-200">
                     <tr data-href="{% url 'customerticketdetails' ticket.ticket_number %}"
                         class="hover:bg-gray-100 duration-300 cursor-pointer">
-                        <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                            <a href="{% url 'customerticketdetails' ticket.ticket_number %}">
-                                <p class="text-secondosiblue cursor-pointer">{{ticket.title}}</p>
-                            </a>
+                        <td class="min-w-[250px] max-w-[250px] px-6 py-4 text-center text-sm border-r border-gray-300">
+                            <div class="w-full flex {% if ticket.unread_updates_count > 0 %} justify-between {% else %} justify-center {% endif %} items-center gap-3"> 
+                                <a href="{% url 'customerticketdetails' ticket.ticket_number %}">
+                                    <p class="text-secondosiblue">{{ticket.title }}</p>
+                                </a>
+
+                                {% if ticket.unread_updates_count > 0 %}
+                                <div>
+                                    <div class="w-[25px] h-[25px] rounded-full bg-green-700 text-white flex justify-center items-center text-sm">
+                                        <p>{{ticket.unread_updates_count}}</p>
+                                    </div>
+                                </div>
+                                {% endif %}
+                            </div>
                         </td>
 
                         <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
@@ -180,18 +187,9 @@
 
                         </td>
 
-                        <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                        <td class="px-6 py-4 text-center text-sm">
                             <p class="text-secondosiblue">{{ticket.ticketupdate_set.last.added_by.first_name}}</p>
                         </td>
-
-                        <td class="px-6 py-4 text-center items-center text-sm">
-                            <div class="w-full flex justify-center items-center">
-                                <div
-                                    class="w-[40px] h-[40px] rounded-full border-2 border-secondosiblue flex justify-center items-center">
-                                    <p class="text-secondosiblue">{{ticket.unread_updates_count}}</p>
-                                </div>
-                            </div>
-                        </td>
                     </tr>
                 </tbody>
                 {% endfor %}
diff --git a/osinaweb/osinacore/templates/listing_pages/tickets.html b/osinaweb/osinacore/templates/listing_pages/tickets.html
index ee03bfb1..4147a17e 100644
--- a/osinaweb/osinacore/templates/listing_pages/tickets.html
+++ b/osinaweb/osinacore/templates/listing_pages/tickets.html
@@ -75,7 +75,7 @@
                     <tbody class="bg-white divide-y divide-gray-200">
 
                         <tr>
-                            <td class="max-w-[300px] px-6 py-4 text-sm border-r border-gray-300">
+                            <td class="min-w-[300px] max-w-[300px] px-6 py-4 text-sm border-r border-gray-300">
                                 <div class="w-full flex  {% if ticket.unread_updates_count > 0 %} justify-between {% else %} justify-center text-center {% endif %} items-center gap-3">
                                     <p class="text-secondosiblue">{{ticket.title}}</p>
 
diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css
index 60dd3e99..84e331db 100644
--- a/osinaweb/static/dist/output.css
+++ b/osinaweb/static/dist/output.css
@@ -1553,6 +1553,14 @@ video {
   min-width: 100%;
 }
 
+.min-w-\[250px\] {
+  min-width: 250px;
+}
+
+.min-w-\[300px\] {
+  min-width: 300px;
+}
+
 .max-w-0 {
   max-width: 0px;
 }