From f494a5b84a3c5d82a4a67a8692e642dc791eeadb Mon Sep 17 00:00:00 2001
From: nataly <nataly.abi.wajeh0@gmail.com>
Date: Fri, 17 May 2024 17:00:01 +0300
Subject: [PATCH] New changes.

---
 .../add/__pycache__/urls.cpython-312.pyc      | Bin 1070 -> 1070 bytes
 .../add/__pycache__/views.cpython-312.pyc     | Bin 12211 -> 12211 bytes
 osinaweb/db.sqlite3                           | Bin 1273856 -> 1273856 bytes
 .../__pycache__/views.cpython-312.pyc         | Bin 37684 -> 38977 bytes
 .../details_templates/customer-details.html   |  25 +++++++++---
 .../edit-customer-status-modal.html           |  36 ++++++++++++++++++
 .../templates/projects-by-status.html         |   2 +-
 osinaweb/osinacore/views.py                   |  24 ++++++++++--
 8 files changed, 76 insertions(+), 11 deletions(-)
 create mode 100644 osinaweb/osinacore/templates/edit_templates/edit-customer-status-modal.html

diff --git a/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc b/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc
index a57ddb756117c73d3c1d8905e6838cdf89daf001..99978efc947374ae5d656226e48e9277b8a668ff 100644
GIT binary patch
delta 20
acmZ3-v5tfLG%qg~0}zx(x^LuGW&r>*PXu28

delta 20
acmZ3-v5tfLG%qg~0}w3V=(3SpnFRngt_0=)

diff --git a/osinaweb/billing/add/__pycache__/views.cpython-312.pyc b/osinaweb/billing/add/__pycache__/views.cpython-312.pyc
index b7b7328da84831a704fc3c6808778681b69f55ea..b4fd2150074701fba7d10158e51fb3400ce23a24 100644
GIT binary patch
delta 108
zcmdlSzd4@oG%qg~0}xzDa!>oGx{>byD<j|L^Q`%-jM|&+xn0>9eK)rX3Ntg7Z=NY~
zo{6!2bEdc&E90Ea6J(f~7*B7WA~%_x@!Dn$H4ZjL(anZBH<%dNCUfb};ukSz6!~1o
MsK+Q$qysb_0P$!ZLjV8(

delta 108
zcmdlSzd4@oG%qg~0}wdubV*}S+sJo-l~G{xdDeVZM%~T!+^%el{+n9`g_#*EH_sF~
z&&1fdIa6GXm2uwY2{Oz~jAu7bk(<oUcz3gg8V4Jr%w|KK8%&H`lezR~@ynSrihQnP
M)MFGW(g7L|0EYM-Gynhq

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 9d673db9a4e9612aeb067606ef160b14ff50bab2..707be33c43f9b6ae59ea7910811a40a5b0ac9d33 100644
GIT binary patch
delta 479
zcmZp8;M?%PcY-vd*hCp;Rxt*>vaXFOGqf4CHviQ=?<{DpU}$V*WME}zq-ShtU~F#L
zd^f-SZayOrGXXI(5VHU=D-g2*F*^`*05K;Jb8Wwy&#nG}IfrT1boK<E>r70uHVZ!3
z#W;Oe5)ZGiA+o{dW)?;ar`mxM+jk}Ldet)9v%lQV{(v`@kqO91dC1$$HvRo`URFk}
z?LbO&1#>9#oayWn_!^mjbjJifjqRHz@V#SFOR>x;G&M9gGA~XvthA_1F3rm*NG{4U
zDzQjQGf&JiVK}AA?8`KLPp+^+`?JY>K+F%s0^6TW7L<F#EYB@HoxMTGmWf*$=+LWN
z%&IL~(;0h(L_|<R!N}0WK($2^EVDhTTWHl4F;3QH3_QKuX<QDRQtV&&Zt-qrJIlHZ
zXh;vMW|MNG7pre`s3RfAP5+iAyw$TJ%-1Tw)VZjlG`Q3xI4?9O*tFQ(z|t?&%%#L9
oBh*_rvNSl^CqFR9$tcLxBhtvg$VAt`RM!|IJhz`s6E@}q0AMMib^rhX

delta 297
zcmZp8;M?%PcY-vd&_o$$Rv`wxyqz0UW@s~NZvLx%-dWI0!O+Oc$jr*fLeIq9$jH>N
z`EGvu-F!wMW&&bnAZ7t#Rv=~rVs;?r0Afxc=GuNYpIiL{b2ihi>FfzS*Eb73xWhPo
zRuT_y`|%{6?Z=aNZEKnB*xzqwf502dxIOJ5Z!_D(0FLeNpYw{YU=CqEG@X3{U*q(y
z349vcH%#FBz@%oBUtm#WX;EHSQdU)LX_0JZnOm7`nvs!Lky4nKoMp~%QkB`4Y5JaA
zVTJZ*llg#{ABY9EKbtHl_l8-H+j%;BgODxI9sjwQRa-QtGxiFJY>(;|T6IN)gY7H>
iPcL^GmjkC1`xm}jyqnq10u^p%V`@^}el|_mm=gfcopBHV

diff --git a/osinaweb/osinacore/__pycache__/views.cpython-312.pyc b/osinaweb/osinacore/__pycache__/views.cpython-312.pyc
index 560478a6cf14ce033f2c02582d5327645ace81be..c6b905785d693e90652443b4d7c568b29affdd9b 100644
GIT binary patch
delta 3204
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
CUr1O0

delta 2742
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
J20k6F{twt$&lmsz

diff --git a/osinaweb/osinacore/templates/details_templates/customer-details.html b/osinaweb/osinacore/templates/details_templates/customer-details.html
index da801533..d87fd3cf 100644
--- a/osinaweb/osinacore/templates/details_templates/customer-details.html
+++ b/osinaweb/osinacore/templates/details_templates/customer-details.html
@@ -26,22 +26,28 @@
 
     <div class="w-full h-fit flex justify-end items-center bg-gray-100 shadow-md rounded-md px-3 py-3 mt-3">
         <div class="w-full md:w-fit flex flex-col md:flex-row justify-end items-center gap-3">
-            <a href="{% url 'addticket' customer.id %}">
+            <button
+                class="w-full md:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300">Update
+                Status</button>
+
+            <a href="{% url 'addproject' %}" class="w-full md:w-fit">
+                <button
+                    class="w-full md:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300">Add
+                    Project</button>
+            </a>
+
+            <a href="{% url 'addticket' customer.id %}" class="w-full md:w-fit">
                 <button
                     class="w-full md:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300">Add
                     Ticket</button>
             </a>
 
-            <a href="{% url 'addorder' customer.id %}">
+            <a href="{% url 'addorder' customer.id %}" class="w-full md:w-fit">
                 <button
                     class="w-full md:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300">Add
                     Order</button>
             </a>
 
-            <button
-                class="w-full md:w-fit text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-md cursor-pointer hover:bg-white hover:text-red-500 duration-300 deleteCustomerButton"
-                data-modal-url="{% url 'deletecustomermodal' customer.id %}">Delete
-                Customer</button>
             <a href="{% url 'editcustomer' customer.customer_id %}" class="w-full md:w-fit">
                 <button
                     class="w-full md:w-fit text-base px-3 py-2 bg-fifthosiblue text-white outline-none border border-fifthosiblue rounded-md cursor-pointer hover:bg-white hover:text-fifthosiblue duration-300">Edit
@@ -292,9 +298,16 @@
             </table>
         </div>
     </div>
+
+
+    <button
+        class="w-full text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-md cursor-pointer hover:bg-white hover:text-red-500 duration-300 mt-5 deleteCustomerButton"
+        data-modal-url="{% url 'deletecustomermodal' customer.id %}">Delete
+        Customer</button>
 </div>
 
 
+
 <!-- POPUP MODAL -->
 <div class="w-full h-full bg-black bg-opacity-40 z-20 fixed justify-center items-center hidden inset-0" id="popUpModal">
     <div class="w-[95%] md:w-fit h-fit bg-white rounded-md p-9 relative">
diff --git a/osinaweb/osinacore/templates/edit_templates/edit-customer-status-modal.html b/osinaweb/osinacore/templates/edit_templates/edit-customer-status-modal.html
new file mode 100644
index 00000000..5a587d37
--- /dev/null
+++ b/osinaweb/osinacore/templates/edit_templates/edit-customer-status-modal.html
@@ -0,0 +1,36 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Osina</title>
+
+    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+</head>
+
+<body class="font-poppinsLight">
+    <form method="POST" action="">
+        {% csrf_token %}
+        <h1 class="text-secondosiblue text-2xl font-semibold text-center">Update Customer Status</h1>
+
+        <select name="status" id="" class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4">
+            <option value="Completed">Completed</option>
+            <option value="In Progress">In Progress</option>
+            <option value="Pending">Pending</option>
+            <option value="Cancelled">Cancelled</option>
+        </select>
+
+
+        <div class="w-full flex justify-center items-center mt-4">
+            <button type="submit"
+                class="w-fit bg-osiblue border border-osiblue rounded-md text-white text-xl px-5 py-1 hover:bg-white hover:text-osiblue">Save</button>
+        </div>
+    </form>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/osinaweb/osinacore/templates/projects-by-status.html b/osinaweb/osinacore/templates/projects-by-status.html
index 564a9fb5..6503eb75 100644
--- a/osinaweb/osinacore/templates/projects-by-status.html
+++ b/osinaweb/osinacore/templates/projects-by-status.html
@@ -1,6 +1,6 @@
 {% load static %}
 
-{% for project in projects %}
+{% for project in filtered_projects %}
 
 <div class="w-full h-fit bg-white rounded-md shadow-md p-3 projectContainer">
     <p id="projectId" class="hidden">{{project.id}}</p>
diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py
index 2dc8fdf5..e38cf624 100644
--- a/osinaweb/osinacore/views.py
+++ b/osinaweb/osinacore/views.py
@@ -288,8 +288,8 @@ def my_projects(request, *args, **kwargs):
     # Fetch projects with their last status as "In Progress"
     in_progress_projects = []
     for project in projects:
-        last_status = project.projectstatus_set.aggregate(last_status=Max('date', filter=Q(status='In Progress')))
-        if last_status['last_status']:
+        last_status = ProjectStatus.objects.filter(project = project).last()
+        if last_status.status == 'In Progress':
             in_progress_projects.append(project)
 
     for project in in_progress_projects:
@@ -859,7 +859,23 @@ def reset_password(request, uidb64, token):
 
 
 def fetch_projects_by_status(request, status):
-    projects = Project.objects.filter(projectstatus__status=status)
+    user = request.user
+
+    if user.is_superuser:
+        # Superadmin can see all projects with total time worked on each project
+        projects = Project.objects.all().order_by('-project_id')
+    else:
+        # Non-superuser, filter projects where the user is either the manager or a member
+        projects = Project.objects.filter(
+            Q(manager=user.staffprofile) | Q(members=user.staffprofile)
+        ).distinct().order_by('-project_id')
+
+    # Fetch projects with their last status as "In Progress"
+    filtered_projects = []
+    for project in projects:
+        last_status = ProjectStatus.objects.filter(project = project).last()
+        if last_status.status == status:
+            filtered_projects.append(project)
 
     for project in projects:
         total_time_seconds = 0
@@ -887,7 +903,7 @@ def fetch_projects_by_status(request, status):
         project.open_user_tasks_count = open_user_tasks_count
 
     context = {
-        'projects': projects,
+        'filtered_projects': filtered_projects,
         'status': status,
     }
     return render(request, 'projects-by-status.html', context)