From 039e092ceeb0155c3415d436c6429fe07b95f891 Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Sun, 12 May 2024 16:41:59 +0300
Subject: [PATCH] new

---
 .../__pycache__/urls.cpython-310.pyc          | Bin 1804 -> 1813 bytes
 .../__pycache__/views.cpython-310.pyc         | Bin 8201 -> 8291 bytes
 .../inner-customer-project.html               |  28 +++++-----
 .../listing_pages/customer-invoices.html      |   2 +-
 .../listing_pages/customer-orders.html        |   2 +-
 .../listing_pages/customer-projects.html      |  23 ++++----
 osinaweb/customercore/urls.py                 |   4 +-
 osinaweb/customercore/views.py                |  49 ++++++++++--------
 osinaweb/db.sqlite3                           | Bin 1245184 -> 1245184 bytes
 .../edit_templates/edit-project.html          |   2 +-
 10 files changed, 61 insertions(+), 49 deletions(-)

diff --git a/osinaweb/customercore/__pycache__/urls.cpython-310.pyc b/osinaweb/customercore/__pycache__/urls.cpython-310.pyc
index 71f075c1c68d2659012ece1740984bb02ed7019f..f2ddcdf37072c85257ad5daed0d067512f2c37d1 100644
GIT binary patch
delta 65
zcmeC-o65(V&&$ij00g;59nvH=^0qNE7nc-Gp2n;sE1O%XTTqmrm6}{qtZxGpwSw~E
NGgIs~pJ8@j1^{0{6q*14

delta 56
zcmbQr*Tct~&&$ij00c~@?bG--^0qNEXXcemp2n;sB9dFFTTqmrm6}{qtecWrl9-uO
Ky!k4#12X`fa}dY?

diff --git a/osinaweb/customercore/__pycache__/views.cpython-310.pyc b/osinaweb/customercore/__pycache__/views.cpython-310.pyc
index 7f324cffce26f4d680379ce26bb6085b85547b0a..6d2d5fcefef262d75fe4eb5238f6a72360503dde 100644
GIT binary patch
delta 689
zcmX|<O=uHg5Qa0msl@DN&0jZZ(k6|jkriSQib6q+s0fNhY`wHf4cQ2lLeekWgKZW`
zqn1cpHKU%Yr>OlCECFx5=~V;|LQaArf=ADyGmCa%9^QFp=G$4mZREb@w35%~b<xv&
zpSv-5?2-06nYiPs!+1~8XC}>lN5@E~OuwUp?L+WOQw`{NO2RCP$te@}`>%q)+x|DI
zn4zPDVBEr7Anczb+3}P`$($`%6)}(3V^ORI&f~?td8knq!7qJX(GS#C@eqQNTXz3Z
zyTmXh1qo+-p;M>1*iW!r7F5B6WyzLIsVYr@En8C6Wy)2#E|0nl_XzFfrMKNI7A)FK
zq-km{i`#k%PbSo)Aq$xtkzq&#!!3fW7Z_=0xniOx)S=W_NBzG}z5O;|15|J*v<)_X
z57iDfc;-Ii2xEoNQKs`1YjU=1=B=W5!1hC22_J?ZxD!4L&9>Zqln)u!heG$LYDi*~
zn>50hSj3wCPO;foVl3mO$T{sX$<CgCM?P^@+=)ab9q@DH1gxSSJp;$v6Vac5S7Q5=
z7EiulyrkX?T*JlK0IcEbSXq5W_Lz9i#TFXz6uiO<@iers9M5!HK;O*2LQvMhxdgXZ
z$87HaevDsM7N{zwd2)k1TUpx8Hz^;)Z@nYR(_L>18;MT_U!kZonv7M(8e^TY!PsPM
a;oW5ZfZ_$oN0Ft-P$VgI3ikGLXz&+Q7^xrt

delta 642
zcmaFt(CNUJ&&$ij00c4n9MaC4P2~G4FVMo!%ort<%9|pWA`fOu0@(^FieR?XW-Z3g
ze5^(4Ks}Q+1!5QrC$|Y~Fulc*UzCzs6rY(=R0xzQssIvEd{D8H)LfuMaZx2u@D@iw
zQGQBka!GMf)nt8MiOF?>UYm1-a~T<nCf^d-$XGMEN3>C=4P-_;h%f{Z-5`zJIf=z3
z@udYRi6yB;Js{y;5D^SAMMxmIw74Wc7wCeL%;fCUlHzldlf_&a`!}x?GXoj@K-@&Q
z8K_*7sVEqviw{VI6tzrNmpH;*0}|*25nYqNNx1V(1Tt^2K`ojDc4V@o1k)de$+ePp
zj58<ik#u2H-pnZVno(*VNY{K2u>eFY1QCls#A2{EIT=1i=gGP<s%%Svg2{}N4@wG8
z&X$SbnFZvA6wL;yTsZl>j3VQb$sc7@7#D(d>B;hmMlmul6oVp0h*^x0g_-3)4@=Rq
z$$_%v+!;Wbq8yOU<v_mb<OVse$xL#7+(mHl6;SaA?i#q*%E>zfyBSvj%@>y_vI6RE
z16jZUvVaL}JZq5^SlekKy~)euq$V2(OL9+wYhOM2vD{_Nevqv*K?KM<Maw|MauBfs
lM63i6Aft;`PrfgosI1Gy$fO3u@<1#G#JoVviG;cN7y;4qrvm^0

diff --git a/osinaweb/customercore/templates/details_templates/inner-customer-project.html b/osinaweb/customercore/templates/details_templates/inner-customer-project.html
index fe6fa6e5..c9e5107a 100644
--- a/osinaweb/customercore/templates/details_templates/inner-customer-project.html
+++ b/osinaweb/customercore/templates/details_templates/inner-customer-project.html
@@ -5,27 +5,26 @@
 
 <div class="w-full px-5 s:px-9 flex flex-col gap-3">
     <div class="w-full bg-white rounded-md h-fit shadow-md p-5">
-        <div class="w-full bg-orange-500 rounded-md flex flex-col justify-center items-center py-2 gap-2 mt-[50px]">
+        <div class="w-full rounded-md flex flex-col justify-center items-center py-2 gap-2 mt-[50px] {% if project.projectstatus_set.all.last.status == 'In Progress' %} bg-orange-500 {% elif project.projectstatus_set.all.last.status == 'Completed' %} bg-green-700 {% elif project.projectstatus_set.all.last.status == 'Cancelled' %} bg-red-500 {% endif %}">
             <div
                 class="w-[70px] s:w-[90px] h-[70px] s:h-[90px] rounded-full mt-[-50px] s:mt-[-63px] border border-gray-300 bg-white">
-                <img src="{% static 'images/ositcom_logos/full-logo.png' %}" alt="" class="w-full h-full object-cover rounded-full">
+                <img src="{{project.logo.url}}" alt="" class="w-full h-full object-cover rounded-full">
             </div>
             <div class="text-center">
-                <p class="text-xl text-white font-semibold">Winabig</p>
-                <p class="text-sm text-white font-light">P20302</p>
+                <p class="text-xl text-white font-semibold">{{project.name}}</p>
+                <p class="text-sm text-white font-light">{{project.project_id}}</p>
             </div>
         </div>
 
-
+        <p id="projectId" class="hidden">{{project.id}}</p>
         <div class="w-full flex flex-col gap-2 mt-3">
-            <div class="w-full rounded-md bg-white shadow-md h-[8px]">
-                <div class="w-[80%] h-full bg-green-700 rounded-md">
-
+            <div class="w-full h-[10px] bg-gray-100 shadow-md mainBar rounded-md">
+                <div class="h-full rounded-md progressBar">
                 </div>
             </div>
             <div class="w-full flex justify-between items-center gap-3 text-gray-500 font-light text-sm">
-                <p>20-2-2023</p>
-                <p>20-2-2024</p>
+                <p class="startDate">{{project.start_date}}</p>
+                <p class="endDate">{{project.end_date}}</p>
             </div>
         </div>
 
@@ -59,10 +58,15 @@
             <div
                 class="w-[240px] px-5 py-2 bg-white shadow-md mt-3 rounded-md flex justify-start items-center gap-2 cursor-pointer">
                 <div class="w-[50px] h-[50px] rounded-full">
+                    {% if not project.manager.image %}
                     <img src="{% static 'images/default-user.png' %}"
                         class="w-full h-full object-cover shadow-md rounded-full">
+                    {% else %}
+                    <img src="{{project.manager.image.url}}"
+                        class="w-full h-full object-cover shadow-md rounded-full">
+                    {% endif %}
                 </div>
-                <p class="text-gray-500 text-[16px]">Emile Elliye</p>
+                <p class="text-gray-500 text-[16px]">{{project.manager.user.first_name}} {{project.manager.user.last_name}}</p>
             </div>
 
         </div>
@@ -270,5 +274,5 @@
         </div>
     </div>
 </div>
-
+<script type="text/javascript" src='{% static "js/calculate-project-time.js" %}'></script>
 {% endblock content %}
\ No newline at end of file
diff --git a/osinaweb/customercore/templates/listing_pages/customer-invoices.html b/osinaweb/customercore/templates/listing_pages/customer-invoices.html
index 0bf4d3c1..b7702622 100644
--- a/osinaweb/customercore/templates/listing_pages/customer-invoices.html
+++ b/osinaweb/customercore/templates/listing_pages/customer-invoices.html
@@ -87,7 +87,7 @@
                                 </a>
 
                                 {% if invoice.status == 'Not Completed' %}
-                                <a href="{% url 'customerorderdetails' invoice.order.id %}">
+                                <a href="{% url 'customerorderdetails' invoice.order.order_id %}">
                                     <button
                                         class="flex justify-center items-center gap-2 px-3 py-1 rounded-md bg-osiblue text-white border border-osiblue cursor-pointer hover:bg-white hover:text-osiblue duration-300">
                                         Pay Now
diff --git a/osinaweb/customercore/templates/listing_pages/customer-orders.html b/osinaweb/customercore/templates/listing_pages/customer-orders.html
index 92cd9a62..b6419a13 100644
--- a/osinaweb/customercore/templates/listing_pages/customer-orders.html
+++ b/osinaweb/customercore/templates/listing_pages/customer-orders.html
@@ -67,7 +67,7 @@
 
                         <td class="px-6 py-4 text-center text-sm"> 
                             <div class="w-full flex justify-center items-center gap-3">
-                                <a href="{% url 'customerorderdetails' order.id %}">
+                                <a href="{% url 'customerorderdetails' order.order_id %}">
                                     <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[18px] text-fifthosiblue hover:scale-110 duration-500 transition-transform">
                                         <path stroke-linecap="round" stroke-linejoin="round" d="M2.036 12.322a1.012 1.012 0 0 1 0-.639C3.423 7.51 7.36 4.5 12 4.5c4.638 0 8.573 3.007 9.963 7.178.07.207.07.431 0 .639C20.577 16.49 16.64 19.5 12 19.5c-4.638 0-8.573-3.007-9.963-7.178Z" />
                                         <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
diff --git a/osinaweb/customercore/templates/listing_pages/customer-projects.html b/osinaweb/customercore/templates/listing_pages/customer-projects.html
index de7c5e41..bf9d3fc8 100644
--- a/osinaweb/customercore/templates/listing_pages/customer-projects.html
+++ b/osinaweb/customercore/templates/listing_pages/customer-projects.html
@@ -10,9 +10,9 @@
         <div class="w-full grid grid-cols-1 l:grid-cols-2 gap-5 mt-4">
 
             {% for project in projects %}
-            <a href="{% url 'customerprojectdetails' %}">
+            <a href="{% url 'customerprojectdetails' project.project_id %}">
                 <div
-                    class="w-full rounded-md flex flex-col justify-between items-center gap-3 px-5 py-9 h-[250px] bg-gray-50 shadow-md relative hover:bg-gray-100 duration-300">
+                    class="w-full rounded-md flex flex-col justify-between items-center gap-3 px-5 py-9 h-[250px] bg-gray-50 shadow-md relative hover:bg-gray-100 duration-300 projectContainer">
                     <div class="flex flex-col justify-center items-center gap-5">
                         <div
                             class="w-[70px] h-[70px] rounded-full shadow-md">
@@ -26,20 +26,23 @@
                     </div>
 
                     <div
-                        class="bg-orange-500 px-3 py-2 rounded-r-md text-xs text-white font-light uppercase absolute top-5 left-0">
+                        class="{% if project.projectstatus_set.all.last.status == 'In Progress' %} bg-orange-500 {% elif project.projectstatus_set.all.last.status == 'Completed' %} bg-green-700 {% elif project.projectstatus_set.all.last.status == 'Cancelled' %} bg-red-500 {% endif %} px-3 py-2 rounded-r-md text-xs text-white font-light uppercase absolute top-5 left-0">
                         <p>{{project.projectstatus_set.all.last.status}}</p>
                     </div>
 
 
                     <div class="w-full mt-5 flex flex-col gap-2">
                         <div class="w-full flex justify-between items-center gap-3 text-gray-500 font-light text-xs">
-                            <p>20-2-2023</p>
-                            <p>20-2-2024</p>
+                            <p>{{project.start_date}}</p>
+                            <p>{{project.end_date}}</p>
                         </div>
-                        <div class="w-full rounded-md bg-white shadow-md h-[8px]">
-                            <div class="w-[80%] h-full bg-green-700 rounded-md">
-    
-                            </div>
+
+                        <p id="projectId" class="hidden">{{project.id}}</p>
+                        <p class="hidden startDate">{{project.start_date}}</p>
+                        <p class="hidden endDate">{{project.end_date}}</p>
+
+                        <div class="w-full rounded-md bg-white shadow-md h-[8px] mainBar">
+                            <div class=" rounded-md h-full rounded-md progressBar"></div>
                         </div>
                     </div>
 
@@ -50,6 +53,6 @@
         </div>
     </div>
 </div>
-
+<script type="text/javascript" src='{% static "js/calculate-all-projects-time.js" %}'></script>
 
 {% endblock content %}
\ No newline at end of file
diff --git a/osinaweb/customercore/urls.py b/osinaweb/customercore/urls.py
index 224aa168..80c27439 100644
--- a/osinaweb/customercore/urls.py
+++ b/osinaweb/customercore/urls.py
@@ -24,8 +24,8 @@ urlpatterns = [
     # DETAILS
     path('my-tickets/<int:ticket_number>/', views.customer_ticket_details, name='customerticketdetails'),
     path('addticketupdatereaction/<str:reaction_type>/<int:ticketupdate_id>/', views.customer_add_ticket_update_reaction, name='customeraddticketupdatereaction'),
-    path('my-orders/<int:order_id>/', views.customer_order_details, name='customerorderdetails'),
-    path('my-projects-details/', views.customer_project_details, name='customerprojectdetails'),
+    path('my-orders/<str:order_id>/', views.customer_order_details, name='customerorderdetails'),
+    path('my-projects/<str:project_id>/', views.customer_project_details, name='customerprojectdetails'),
 
 
     # PRODUCTS URL
diff --git a/osinaweb/customercore/views.py b/osinaweb/customercore/views.py
index 6a485385..b6642a91 100644
--- a/osinaweb/customercore/views.py
+++ b/osinaweb/customercore/views.py
@@ -183,7 +183,7 @@ def customer_orders(request, *args, **kwargs):
 
 
 def customer_order_details(request, order_id):
-    order = get_object_or_404(Order, id=order_id)
+    order = get_object_or_404(Order, order_id=order_id)
 
     order_items = OrderItem.objects.filter(order=order).order_by('-id')
     order_item_ids = order_items.values_list('item_id', flat=True)
@@ -203,6 +203,32 @@ def customer_order_details(request, order_id):
 
 
 
+@customer_login_required
+def customer_projects(request, *args, **kwargs):
+    projects = Project.objects.filter(customer=request.user.customerprofile)
+
+    context = {
+        'projects': projects,
+        
+    }
+
+    return render(request, 'listing_pages/customer-projects.html', context)
+
+
+@customer_login_required
+def customer_project_details(request, project_id):
+    project = get_object_or_404(Project, project_id=project_id)
+
+    context = {
+        'project': project,
+        
+    }
+
+    return render(request, 'details_templates/inner-customer-project.html', context)
+
+
+
+
 @customer_login_required
 def customer_tickets(request, *args, **kwargs):
     open_tickets = Ticket.objects.filter(Q(status__in=['Open', 'Working On']) & Q(customer=request.user.customerprofile))
@@ -387,26 +413,5 @@ def dedicated_servers_plans(request, *args, **kwargs):
     return render(request, 'products/dedicated-servers-plans.html', context)
 
 
-@customer_login_required
-def customer_projects(request, *args, **kwargs):
-    projects = Project.objects.filter(customer=request.user.customerprofile)
-
-    context = {
-        'projects': projects,
-        
-    }
-
-    return render(request, 'listing_pages/customer-projects.html', context)
-
-
-@customer_login_required
-def customer_project_details(request, *args, **kwargs):
-
-    context = {
-        
-    }
-
-    return render(request, 'details_templates/inner-customer-project.html', context)
-
 
 
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index ed107c5f4ff4bced6d953ca90f26cf4b7a465f07..09d72e8d5b2761cb4510312f09818eaf442b24ad 100644
GIT binary patch
delta 785
zcmaiyOH30{7=`a+rY)t@844Om#a5^#Kp@kZGJQk?1r!hvFtRZrfTgswP=`laAtqKa
zbVU>-4(Wo_NP<gE6Rt7tV4*HFxDz#y=)xT<7sU9um|!$6TzvoCoO|xcxqm9vkxF&k
zvBKqrV@+`R@xaSU9WK3!>!G&wo-4_<RplVG=Dt-wgV2$CTC?vjknAqmFNuDaSSyLL
z&nwPuM$(%RNH!y=Va<T}MZiDd7l}#0b9|Kpv!GmtZE<_|#Fg+wXmU~#C3lTjSL6C+
zBzydl&sm08pzYf5k@S`gQy2<M(NXji10|1Qq~wz=n@Mb7j9p+@V+TyH;7snsn>nOi
z3YzS88xEku7bNA+s2-23fQ@t}Xd;;)7rll>LkrRGa{UMyTBySgdslqR;AUhc=Rb4n
zq^O4}1pGUGonO$4{3zeTmobIpXx97{SDnP2C?>hpy5LOmax66B9gIYMaWytJ85<8K
zredljhrz~yN_+jNz@F|~HIu$oel5nV;Cn#JF3^55g76R_{)4tsD0GvhLcyI6i^+@Q
zLNUbkMhE$16YSm0f-VCzqiVQL(yDMDAzg+>Rk4;$2rP7@=|QrIf}wrvfzz5^wTvM+
zO%)gxbu2mZ0Dn5K8s-ILT7EPXoYH=jF?MVHVL`vYKo)BiucEj_@_gKK%8Ugrsp(S|
z8{(3rK!9CbrSq1R1tl=h6(1dmhnoL(INXLhm)A?O^Om6tbPe_ZzsG+$xc-sX)Y}YG
z>clLDumS-9*b0tL#N~i_n+^bK4}=f6%A4gkn%K_S-oXFr)pq91x%NrL=Na_ZM9#T-
y624^Pn0rc2UJOg^<58t)SW29Ux3-Sdxy9BtrLjNU>pL4h4F2zKknQglC;SQU&g6>#

delta 447
zcmWmA&ubG=5C`x#@4d|?>F&OlEn;n~o3^y^2em8y07bCiL4>Fwcq$YFX(6-<@lr|=
zToAgaVq?Syp~8xVdekmBLA(e#)E<<0vkL9OL;VACD5CfR^BIOO0|OHTg&-)bWuZ|&
zejOU`$~&hLbZCiP1J(IyAB%6EjsXVazh^!IjK&`(4zH-zs%!I$zJLBnyBfBufbA-s
z+Dw9I5z!JYv?N;*seFoLCx!vCYJJZg;v>``YTsi=!j8u@t{GZFGqt3a($ZQVc09|U
z;%u4BDWhzCf$4bo+X_|F6)VTncSueZwlag1d<vTt3!4>t{t=r@-bQoZzDM=yfzj~4
zb1WU$Tj&<~Wg>ov_o8n4;=Z^cMsOf<{;)=|e3Fl`TU330o5_VU8xGEFh|LB5lD!}*
zs*7jXl=2N#>;1BX&->+tKJf7K2{{04lE21Zp3D{bS|TDUT}wX3uqI#ijxVt=T9g<q
zW@ZoBCD>MG&3&NryMWsd-K!20cBIU}^)Mr0*~Vzqoh|9_b&2STZZG^TRP8C}NAr{r
ZV&rYz!PzCc&gt=NZ)L~9-GA;l{0At<kD34g

diff --git a/osinaweb/osinacore/templates/edit_templates/edit-project.html b/osinaweb/osinacore/templates/edit_templates/edit-project.html
index 18786bca..5cb12fa7 100644
--- a/osinaweb/osinacore/templates/edit_templates/edit-project.html
+++ b/osinaweb/osinacore/templates/edit_templates/edit-project.html
@@ -82,7 +82,7 @@
             <div class="w-full">
                 <label class="text-gray-500">Description:</label>
                 <textarea required name="details" type="text" rows="5" cols="5"
-                    class="w-full py-3 px-3 border border-gray-300 outline-none rounded-md resize-none mt-1">{{project.description}}
+                    class="w-full py-3 px-3 border border-gray-300 outline-none rounded-md resize-none mt-1">{{project.details}}
                 </textarea>
             </div>