From 17bd123d2c46aa3ce22d3785c90a19cc368735de Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Fri, 2 Feb 2024 22:52:41 +0200
Subject: [PATCH] sss

---
 osinaweb/db.sqlite3                         | Bin 663552 -> 663552 bytes
 osinaweb/templates/index.html               |  47 +++++++++---
 osinaweb/templates/listing_pages/tasks.html |  79 ++++++++++++++------
 3 files changed, 93 insertions(+), 33 deletions(-)

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index f1e97913ca42481fb399e2b91963d67bec0a5eb5..29417acf0954f2c513c01e5ce15366cd59f9bad9 100644
GIT binary patch
delta 819
zcmZuuO=uHA7~Q{YW+rAP)oN)HXt2!>Xf~ToHpwOd8{$EPLOm2K2yL}VDzr#z%|W!L
zC|Es+9^wcdMDePrgt|A0g<ib0;6Xfv;BOGbo0eXjrUywAnD;*TzV~M4&6H|^QZ4Yn
z#V<W{XZfYqlLvx)vpN?90$;dQ4BaV)cm{z%WRMsv3^Ie&EQY}SEvYWa9DN_Lrq@ow
zMUh^20Gn9C*XW7_hfP_6Cgf}MtsT~UsA&<QfPS?2dyBud_-l*5wD`060>jC7;sEhe
z>lO_3=|mxZvPkAgo=lK&a)z8HS(2{ytTymrSrmA#QrIi`y^=H2b-3Y>ZTGkVFi)+&
zq1Oomwh@~HeL#=UIpl_Q_#EcIPw)!NS2Lbt;AW~|;W9!-Q?+PN)!6cAYBCy0s+tmw
z8b;jUDxI^aqH2j)BA&{3GiyoRP&D007?EyfRWS@Ts)kcJW=?h-&D@$2j;p$^b-39q
zuBdt}rt7J3+SrDN=+hmD-TQ8+u>gu1Nw9WmYFBo|ys-`Kf)^8RFe7mL<ZWS7XIuN4
z>pSp-G>A)Ful<jY%#bE~{s?iBO=7{n@JGCkUy?WYF}}SvgwA6ZS>dFf<&cHz>*r79
zW@j&tPF=l{oAw`ER_H25y=DcYF<uOS1!{GmEQWXC7(5RCf=%!QEU>R|0?}8#M4t`I
zPU>+Y3resMp3#wTd4@Kc&`XKyf74ekbW`Trl^V1A%DHysZZlk-?xwuhsXSV~Kqs7N
K$o$lg{PI7||Ib+f

delta 540
zcmZoTpwVzZV}dke=0q81#>|ZgJi3gJHs|VcFfpbym+7~c=`#W`6A&{4F$)m00x=s9
zvu`ic=jgk@a)X79Vfra!cAKp(oF&ZDt5`VwwzIKtZs%ltHGLm1=K&^;XVV+1IW)Gf
z;Ny%r$SlKeGoAecr^a;s4QxWJ>ij^sS#ZM>J|R(tZ7B>4415gRl7SRE!?vXDHupJ?
z3b66<GstkJPG|qXsVc?Y#qG;2z;&5x8doHj4Cj5$MVzS|>p*a`qe2EpJy7j-M<z!j
z10xe%10x_(FtoHXHL)@^(lfENw6L&b*oG-*re|SbW@cgl)Ley4vw@kOv5A?Pp*a@K
z1{QiI=B5_rW<brhj#d~}8(W#0>6x2Znwc46(`}?@W@Kt&Xl$K0{ozkevF)`#IeD4b
z6(d*~9GMuV>;L4GVX_VfNeOR1^qbS3MVY^YL4^0a8h-}=Oa4H9V}2?A^ZcxQ@A$6s
z9pYQdzm0DOU&B@vt{6UP(MEk%26073kJOx;{P6su?99A$1^+yCp+>#w8~C_Hwy)>o
j3T0$g<lHo!U4Y9O6nvb_N>h`j$4hakY`-bVrOpNb5FL(H

diff --git a/osinaweb/templates/index.html b/osinaweb/templates/index.html
index bf2e7d87..a2d98508 100644
--- a/osinaweb/templates/index.html
+++ b/osinaweb/templates/index.html
@@ -139,52 +139,75 @@
                 <div class="w-full bg-white h-fit rounded-md border border-gray-200">
                     <!-- TABLE HEADER -->
                     <div class="w-full h-[70px] rounded-t-md grid grid-cols-2">
+                        {% if task.status == 'Open' %}
+                        <div
+                            class="flex justify-center items-center border-r border-b border-gray-200 bg-blue-500 rounded-tl-md text-xl text-white font-semibold">
+                            <p>{{task.name}}</p>
+                        </div>
+                        {% endif %}
+
+                        {% if task.status == 'Working On' %}
                         <div
-                            class="flex justify-center items-center border-r border-b border-gray-200 bg-slate-600 rounded-tl-md text-xl text-white font-semibold">
+                            class="flex justify-center items-center border-r border-b border-gray-200 bg-yellow-500 rounded-tl-md text-xl text-white font-semibold">
                             <p>{{task.name}}</p>
                         </div>
+                        {% endif %}
 
                         <div class="grid grid-cols-3">
                             {% if task.status == 'Open' %}
                             <div
-                                class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-red-500">
+                                class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-blue-500">
                                 <p>{{task.status}}</p>
                             </div>
                             {% endif %}
 
                             {% if task.status == 'Working On' %}
                             <div
-                                class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-orange-500">
+                                class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-yellow-500">
                                 <p>{{task.status}}</p>
                             </div>
                             {% endif %}
 
                             {% if task.status == 'Open' %}
                             <div
-                                class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-red-500">
+                                class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-blue-500">
                                 <p>{{task.formatted_start_date}}</p>
                             </div>
                             {% endif %}
 
                             {% if task.status == 'Working On' %}
                             <div
-                                class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-orange-500">
+                                class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-yellow-500">
                                 <p>{{task.formatted_start_date}}</p>
                             </div>
                             {% endif %}
 
                             {% if task.status == 'Open' %}
+                            {% if task.end_date < current_date %}
                             <div
                                 class="flex justify-center items-center border-b border-gray-200 text-white bg-red-500 rounded-tr-md">
                                 <p>{{task.formatted_end_date}}</p>
                             </div>
+                            {% else %}
+                            <div
+                            class="flex justify-center items-center border-b border-gray-200 text-white bg-blue-500 rounded-tr-md">
+                            <p>{{task.formatted_end_date}}</p>
+                            </div>
+                            {% endif %}
                             {% endif %}
 
                             {% if task.status == 'Working On' %}
-                            <div
-                                class="flex justify-center items-center border-b border-gray-200 text-white bg-orange-500 rounded-tr-md">
+                                {% if task.end_date < current_date %}
+                                <div
+                                    class="flex justify-center items-center border-b border-gray-200 text-white bg-red-500 rounded-tr-md">
+                                    <p>{{task.formatted_end_date}}</p>
+                                </div>
+                                {% else %}
+                                <div
+                                class="flex justify-center items-center border-b border-gray-200 text-white bg-yellow-500 rounded-tr-md">
                                 <p>{{task.formatted_end_date}}</p>
-                            </div>
+                                </div>
+                                {% endif %}
                             {% endif %}
                         </div>
 
@@ -292,7 +315,7 @@
 
                         {% if task.status == 'Working On' %}
                         <div
-                            class="w-full flex justify-center items-center text-white text-center bg-orange-500 rounded-t-md py-5 px-3">
+                            class="w-full flex justify-center items-center text-white text-center bg-yellow-500 rounded-t-md py-5 px-3">
                             <p>{{task.name}}</p>
                         </div>
                         {% endif %}
@@ -309,7 +332,7 @@
 
                         {% if task.status == 'Working On' %}
                         <div
-                            class="text-white bg-orange-500 border-r border-gray-200 flex justify-center items-center text-center py-3 text-sm">
+                            class="text-white bg-yellow-500 border-r border-gray-200 flex justify-center items-center text-center py-3 text-sm">
                             <p>{{task.status}}</p>
                         </div>
                         {% endif %}
@@ -324,7 +347,7 @@
 
                         {% if task.status == 'Working On' %}
                         <div
-                            class="text-white bg-orange-500 border-r border-gray-200 flex justify-center items-center text-center py-3 text-sm">
+                            class="text-white bg-yellow-500 border-r border-gray-200 flex justify-center items-center text-center py-3 text-sm">
                             <p>{{task.start_date}}</p>
                         </div>
                         {% endif %}
@@ -337,7 +360,7 @@
                         {% endif %}
 
                         {% if task.status == 'Working On' %}
-                        <div class="text-white bg-orange-500 flex justify-center items-center text-center py-3 text-sm">
+                        <div class="text-white bg-yellow-500 flex justify-center items-center text-center py-3 text-sm">
                             <p>{{task.end_date}}</p>
                         </div>
                         {% endif %}
diff --git a/osinaweb/templates/listing_pages/tasks.html b/osinaweb/templates/listing_pages/tasks.html
index af08a0fb..25737f9a 100644
--- a/osinaweb/templates/listing_pages/tasks.html
+++ b/osinaweb/templates/listing_pages/tasks.html
@@ -159,22 +159,38 @@
                     <div class="w-full bg-white h-fit rounded-md border border-gray-200">
                         <!-- TABLE HEADER -->
                         <div class="w-full h-[70px] rounded-t-md grid grid-cols-2">
+                            {% if task.status == 'Open' %}
                             <div
-                                class="flex justify-center items-center border-r border-b border-gray-200 bg-slate-600 rounded-tl-md text-xl text-white font-semibold">
+                                class="flex justify-center items-center border-r border-b border-gray-200 bg-blue-500 rounded-tl-md text-xl text-white font-semibold">
                                 <p>{{task.name}}</p>
                             </div>
+                            {% endif %}
+    
+                            {% if task.status == 'Working On' %}
+                            <div
+                                class="flex justify-center items-center border-r border-b border-gray-200 bg-yellow-500 rounded-tl-md text-xl text-white font-semibold">
+                                <p>{{task.name}}</p>
+                            </div>
+                            {% endif %}
+
+                            {% if task.status == 'Closed' %}
+                            <div
+                                class="flex justify-center items-center border-r border-b border-gray-200 bg-green-700 rounded-tl-md text-xl text-white font-semibold">
+                                <p>{{task.name}}</p>
+                            </div>
+                            {% endif %}
 
                             <div class="grid grid-cols-3">
                                 {% if task.status == 'Open' %}
                                 <div
-                                    class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-red-500">
+                                    class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-blue-500">
                                     <p>{{task.status}}</p>
                                 </div>
                                 {% endif %}
 
                                 {% if task.status == 'Working On' %}
                                 <div
-                                    class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-orange-500">
+                                    class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-yellow-500">
                                     <p>{{task.status}}</p>
                                 </div>
                                 {% endif %}
@@ -188,14 +204,14 @@
 
                                 {% if task.status == 'Open' %}
                                 <div
-                                    class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-red-500">
+                                    class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-blue-500">
                                     <p>{{task.formatted_start_date}}</p>
                                 </div>
                                 {% endif %}
 
                                 {% if task.status == 'Working On' %}
                                 <div
-                                    class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-orange-500">
+                                    class="flex justify-center items-center border-r border-b border-gray-200 text-white bg-yellow-500">
                                     <p>{{task.formatted_start_date}}</p>
                                 </div>
                                 {% endif %}
@@ -208,24 +224,45 @@
                                 {% endif %}
 
                                 {% if task.status == 'Open' %}
-                                <div
-                                    class="flex justify-center items-center border-b border-gray-200 text-white bg-red-500 rounded-tr-md">
-                                    <p>{{task.formatted_end_date}}</p>
-                                </div>
+                                    {% if task.end_date < current_date %}
+                                    <div
+                                        class="flex justify-center items-center border-b border-gray-200 text-white bg-red-500 rounded-tr-md">
+                                        <p>{{task.formatted_end_date}}</p>
+                                    </div>
+                                    {% else %}
+                                    <div
+                                        class="flex justify-center items-center border-b border-gray-200 text-white bg-blue-500 rounded-tr-md">
+                                        <p>{{task.formatted_end_date}}</p>
+                                    </div>
+                                    {% endif %}
                                 {% endif %}
 
                                 {% if task.status == 'Working On' %}
-                                <div
-                                    class="flex justify-center items-center border-b border-gray-200 text-white bg-orange-500 rounded-tr-md">
-                                    <p>{{task.formatted_end_date}}</p>
-                                </div>
+                                    {% if task.end_date < current_date %}
+                                    <div
+                                        class="flex justify-center items-center border-b border-gray-200 text-white bg-red-500 rounded-tr-md">
+                                        <p>{{task.formatted_end_date}}</p>
+                                    </div>
+                                    {% else %}
+                                    <div
+                                        class="flex justify-center items-center border-b border-gray-200 text-white bg-yellow-500 rounded-tr-md">
+                                        <p>{{task.formatted_end_date}}</p>
+                                    </div>
+                                    {% endif %}
                                 {% endif %}
 
                                 {% if task.status == 'Closed' %}
-                                <div
-                                    class="flex justify-center items-center border-b border-gray-200 text-white bg-green-700 rounded-tr-md">
-                                    <p>{{task.formatted_end_date}}</p>
-                                </div>
+                                    {% if task.end_date < current_date %}
+                                    <div
+                                        class="flex justify-center items-center border-b border-gray-200 text-white bg-red-500 rounded-tr-md">
+                                        <p>{{task.formatted_end_date}}</p>
+                                    </div>
+                                    {% else %}
+                                    <div
+                                        class="flex justify-center items-center border-b border-gray-200 text-white bg-green-700 rounded-tr-md">
+                                        <p>{{task.formatted_end_date}}</p>
+                                    </div>
+                                    {% endif %}
                                 {% endif %}
                             </div>
 
@@ -333,7 +370,7 @@
 
                             {% if task.status == 'Working On' %}
                             <div
-                                class="w-full flex justify-center items-center text-white text-center bg-orange-500 rounded-t-md py-5 px-3">
+                                class="w-full flex justify-center items-center text-white text-center bg-yellow-500 rounded-t-md py-5 px-3">
                                 <p>{{task.name}}</p>
                             </div>
                             {% endif %}
@@ -364,7 +401,7 @@
 
                             {% if task.status == 'Working On' %}
                             <div
-                                class="text-white bg-orange-500 border-r border-gray-200 flex justify-center items-center text-center py-3 text-sm">
+                                class="text-white bg-yellow-500 border-r border-gray-200 flex justify-center items-center text-center py-3 text-sm">
                                 <p>{{task.status}}</p>
                             </div>
                             {% endif %}
@@ -379,7 +416,7 @@
 
                             {% if task.status == 'Working On' %}
                             <div
-                                class="text-white bg-orange-500 border-r border-gray-200 flex justify-center items-center text-center py-3 text-sm">
+                                class="text-white bg-yellow-500 border-r border-gray-200 flex justify-center items-center text-center py-3 text-sm">
                                 <p>{{task.start_date}}</p>
                             </div>
                             {% endif %}
@@ -401,7 +438,7 @@
 
                             {% if task.status == 'Working On' %}
                             <div
-                                class="text-white bg-orange-500 flex justify-center items-center text-center py-3 text-sm">
+                                class="text-white bg-yellow-500 flex justify-center items-center text-center py-3 text-sm">
                                 <p>{{task.end_date}}</p>
                             </div>
                             {% endif %}