From 13fb9701e545e6647307a385b246771b4c8879ac Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Fri, 22 Sep 2023 20:21:48 +0300
Subject: [PATCH] ss

---
 osinaweb/db.sqlite3                           | Bin 376832 -> 385024 bytes
 .../__pycache__/views.cpython-310.pyc         | Bin 15167 -> 17750 bytes
 osinaweb/osinacore/views.py                   |  44 ++-
 .../osinaweb/__pycache__/urls.cpython-310.pyc | Bin 4267 -> 5219 bytes
 osinaweb/osinaweb/urls.py                     |   6 +-
 osinaweb/templates/create-project.html        |   2 +-
 .../edit_pages/edit-project-type.html         |   4 +-
 .../templates/edit_pages/edit-reference.html  |   4 +-
 osinaweb/templates/edit_pages/edit-tag.html   |   4 +-
 osinaweb/templates/index.html                 |   4 +-
 osinaweb/templates/project-types.html         |   2 +-
 osinaweb/templates/references.html            |   2 +-
 osinaweb/templates/tags.html                  |   2 +-
 osinaweb/templates/tasks.html                 | 272 +++++++-----------
 14 files changed, 144 insertions(+), 202 deletions(-)

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 8b38b2f3aa2151f0bdde4d45a195b4500b1c1774..c647587dead3be2d1c3e219bd7860b80e43bf2b9 100644
GIT binary patch
delta 13755
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

delta 1844
zcmaLXd2AF_7y$5@dGqGjIli{gExYvC(sCtsnQp0D8m{F=S_^2A7O>?gbP=$%EsBbi
z5-^0wVIdRaRW)F-+Jr1HsNpav4I(Nak^m)86%d6|6fqn|U-#Q4`j7iE`6ZL@d*A!M
zm!0|}N%i$fTfHVd!ExMN_LQ)P-!|k?iM{bJJ-KJm`)LUq6}WDE0H4E3*aRQL0`qvJ
zpRd?xtdH{$a~{{YG3zw-f(hQna{nNyZ%Q9BhPQ8T5ImA+KmwV{+b0`@RBCv15^Vg&
z@8;#m6@OZFT)H-r(_3MRG0xng%{R|Q+)cd3HXXcfWQ#Mhg+Dfdr0aq$ck|;TA>RSb
z5gzhlrgDvgKj9W!i^SKT14SZ)>r+!x<J=l1#Fx7bc6=F{Ik*8o!9_R&2Vp-nv(VSU
zZr(ym9KJ~)R<aCdIp~5r@H6}XXQ2b`!_nTwg5L%E@FgK$;<#*$<LtAS1b?aqtsLBg
z-{2Sc5iYQuPq2iZ-CJQN>|{wBK$^qzhQK+kw}e@7ti}Zn9>86=%?{HES6R}(Yczv>
z42Vg&M_jDL1t3F{WwVNduV4qv0iW4vwwP5$Ztr3fNHUyY3K95Vj%8VS0V|M`WsS(P
zg6zT$BzipQs@gxjG8_&sjjqtb+VIMX-l!aFdcdhlCENM`Yh)MfVvW2Cw3PK>+O5OL
zEEax<W8=BQ#?>>d4mPfna2(p;5bTA$EPMyZ1%}DyKFK~bhD>4!ZP@p(a2dX5q1|u=
z&cnAX<uDv(2~8k`1gEWtjBQGgpq*nQ>SDLm0jHrI`Z?}y@*${P-@*LMit4(s-TpTj
z&Eh)#dx}l_+~N_C6jpaAaXLU8(w!j7cRBOCu~*-$Rl3Hh$?{z`wac>7kdZ+P*A<5v
z$F}&KRE4%owpWCx=A0>_SC#l|Uv_T(@Z9{IJbzwbcrZ93Qc$^FvdhY7t!d@wSowiG
ze_*&}1udtujHdb4u#&yMQuq|!fpt&`g%E%w^C7#oc6M=F%{sHx9Ajphs?lY9XB;rz
zHX4j2MuCxSxb+A6W&NoBk-kN*)l2lzdWNoOH?`B6qrIiA)fQ{hG)qf#-FIDbwYhe?
zHoIzEvt6TH16;CtLp`Og*{{B-)~gljR5eSDSN>4WDF>DJl=VtjDO9qRMERb4QT{^S
zDQ}dQ%QNI$*(3cWbxKF2-O_7PwNxyPkWwU`UZG#oPv|yUM@#4^nog;BUHn?yBkmAa
ziSxveI8ao{O>&CtBX5w^WImZlh7v=#&2f>MxZl~|dmK$Bo(7j)9->~ML5-=zlw(RU
zX-qLDi7CY7V{$$A=hq;wAghs=k(ZDckyTM_c_Q@^&)Pxwav+k4WFP~Obi{|GA*o0T
zl8p36yod+sha@3xBoXP0^g$Akcq9%1#6*lJ&iD{*<?Ur5YVy$@y?nGsFCXpE%SU_k
z@-Os6d->;)l}H^@i_{>`A=O9~@+`6fS&l42o<Wu(VWbjSf-FWVkVVKsWC1cCDM!kX
zr;&NcTx1SXij*L;k*APZNHOvx@&qyynSo44ijc>VLZkqhhCGH$MW!H=kx9rzWI`1C
Uvmy%7Z-vdi6_z7zr4NVw0|KV`#sB~S

diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc
index d051294b8ccdf28a5355ad2a82ad1ea1a3ef8901..ff92ef670c54c21a7c79db95815c3e6d06d370cb 100644
GIT binary patch
delta 7358
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

delta 5052
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
M<Fw@GzXC7$58^9dMF0Q*

diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py
index 8c5887bd..fe5afc1c 100644
--- a/osinaweb/osinacore/views.py
+++ b/osinaweb/osinacore/views.py
@@ -80,10 +80,10 @@ def my_projects(request, *args, **kwargs):
 
     if user.is_superuser:
         # Superadmin can see all projects
-        projects = Project.objects.all()
+        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()
+        projects = Project.objects.filter(Q(manager=user.staffprofile) | Q(members=user.staffprofile)).distinct().order_by('-project_id')
 
     
     context = {
@@ -96,8 +96,10 @@ def my_projects(request, *args, **kwargs):
 
 @login_required
 def my_tasks(request, *args, **kwargs):
+    my_tasks = Task.objects.all().filter(assigned_to=request.user.staffprofile).order_by('-id')
     
     context = {
+        'my_tasks' : my_tasks
 
     }
     return render(request, 'tasks.html', context)
@@ -963,27 +965,41 @@ def edit_staff_position(request):
 
 
 @login_required
-def edit_project_type(request, *args, **kwargs):
+def edit_project_type(request, projecttype_id):
+
+ projecttype = get_object_or_404(ProjectType, id=projecttype_id)
     
-    context = {
+ if request.method == 'POST':
+     projecttype.name = request.POST.get('name')
+     projecttype.save()
 
-    }
-    return render(request, 'edit_pages/edit-project-type.html', context)
+     return redirect('projecttypes')
+
+ return render(request, 'edit_pages/edit-project-type.html', {'projecttype': projecttype})
 
 
 @login_required
-def edit_reference(request, *args, **kwargs):
+def edit_reference(request, reference_id):
+ reference = get_object_or_404(Reference, id=reference_id)
     
-    context = {
+ if request.method == 'POST':
+     reference.name = request.POST.get('name')
+     reference.date = request.POST.get('date')
+     reference.save()
 
-    }
-    return render(request, 'edit_pages/edit-reference.html', context)
+     return redirect('references')
+
+ return render(request, 'edit_pages/edit-reference.html', {'reference': reference})
 
 
 @login_required
-def edit_tag(request, *args, **kwargs):
+def edit_tag(request, tag_id):
+ tag = get_object_or_404(Tag, id=tag_id)
     
-    context = {
+ if request.method == 'POST':
+     tag.name = request.POST.get('name')
+     tag.save()
 
-    }
-    return render(request, 'edit_pages/edit-tag.html', context)
\ No newline at end of file
+     return redirect('tags')
+
+ return render(request, 'edit_pages/edit-tag.html', {'tag': tag})
\ No newline at end of file
diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-310.pyc
index 279d9eaf1d778826c5edb97dab0f3cd724f0a1b5..949a0d9cfb5583cffe661fbbfabac551ff71573e 100644
GIT binary patch
delta 1126
zcmZXT$!`-e6vi`dfHuu|QYaE)FZ4hqP{bxAR1mb#eF@|O7Sbr>IcN&aq%#hs!xDCA
zp{OM{{sm5D*d;azi3`gSi369G6BnfZ1K6I4NkgQO-tV)Y{rr8(<Cght*w*z}g#W&O
z)al~tS-c)SjLvO;R9B)=DA4629WVxs({-~NXNPkqxQZF)BT!U)p7T){SA2nU7fdMj
zICsNE#g{nuz-7f(IQK$Ha!Fixl?#1vO>MZ&xgTyQzR7t2ZYjRac@XX>zRP(CCKXR{
z9)^1XlN3$S7>$n{<KJ<(KaKW9ND8LYk+uh!F@K?MYjl(0vP>>luw9E;cHT`AyhQMq
z)t}G~=#a6_O*ph*JB)9MSEFZS0ICFj!cxIM)i9&AHgR#u$w`u^mHgi^qLsWj1&b9N
zdxU0Lk~CJ4*C2ovtZb6hSIR(S8TV``iqg}?a<=F)dz3nS<Z28SPZwP)PhIgIu~@;9
z7ZWIFO%i#bti4tthhwpc0!_ACdA7ewFfBMpjGA5EW+6B<M;)5ahD{1(iyT!+#A_BE
zEOREffERMtics}dilWBKrvJ1y?S~F_wm3@j%yev<4Yj5HlW{{cg2c^A<mH?`)k1=V
z%`jpajVVJ7CI64!pe0DNy!T)4BJL;!_L-p(fn%n~C@e)BM846i<Pl=Uav~i!<=I3&
zrE;1nj3!vTjt>%g7({P!W5_BBO?;_ls=dYxTC0^m8RNz}^o#%D7w`r&kGG(o<-x=b
zV<-BCccHI%H~ND2pwH#W#Kv~?0Utu|@nQ51cc8bp6TQJ*=r!&}uW%1~iF?rt+=rgy
We)J3vpr?2c`FIFD!NbwHHR-=j5Q@YA

delta 173
zcmaE?v09NYpO=@50SG+Ycv9~RPUMqe+Qht3XBM+elvAoxDpx8`mNO8$q!jcrnKMK=
zr4$A;Xclcg#G=ZwnS(Qoaq}Fme#XrKJdundnvA!2Q}UBbb5rw5;*0Y0OZ+rlH#73{
zGfq|%=-7NpfRl0ZOF^5-TZJYtJz|*bE?mwp&-9Q_ndvT{3ez1vRi@jM&kF1En=qZ>
ZGi5r>XU24j&z$MxWKIz|7M6n&&H(2TGLHZN

diff --git a/osinaweb/osinaweb/urls.py b/osinaweb/osinaweb/urls.py
index 7dc91c2e..8ca94787 100644
--- a/osinaweb/osinaweb/urls.py
+++ b/osinaweb/osinaweb/urls.py
@@ -96,9 +96,9 @@ urlpatterns = [
     path('editcustomer/', views.edit_customer, name='editcustomer'),
     path('editbusiness/', views.edit_business, name='editbusiness'),
     path('editstaff/', views.edit_staff, name='editstaff'),
-    path('editprojecttype/', views.edit_project_type, name='editprojecttype'),
-    path('editreference/', views.edit_reference, name='editreference'),
-    path('edittag/', views.edit_tag, name='edittag'),
+    path('editprojecttype/<int:projecttype_id>', views.edit_project_type, name='editprojecttype'),
+    path('editreference/<int:reference_id>', views.edit_reference, name='editreference'),
+    path('edittag/<int:tag_id>', views.edit_tag, name='edittag'),
     path('editstaffposition/', views.edit_staff_position, name='editstaffposition'),
    
 ]
diff --git a/osinaweb/templates/create-project.html b/osinaweb/templates/create-project.html
index 6e348956..9c9af77b 100644
--- a/osinaweb/templates/create-project.html
+++ b/osinaweb/templates/create-project.html
@@ -48,7 +48,7 @@
                 <option value="Cancelled">Cancelled</option>
             </select>
 
-            <select required name="members" id=""
+            <select required name="project_type" id=""
                 class="w-full h-[100px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500"
                 multiple>
                 <option value="" selected disabled>Project Type</option>
diff --git a/osinaweb/templates/edit_pages/edit-project-type.html b/osinaweb/templates/edit_pages/edit-project-type.html
index 44052f51..ce9a63ea 100644
--- a/osinaweb/templates/edit_pages/edit-project-type.html
+++ b/osinaweb/templates/edit_pages/edit-project-type.html
@@ -8,12 +8,12 @@
             Edit Project Type
         </h1>
 
-        <form id="hiddenContent"  method="POST" action="{% url 'save_projecttype' %}">
+        <form id="hiddenContent"  method="POST" action="{% url 'editprojecttype' projecttype.id %}">
             {% csrf_token %}
     
             <div class="w-full flex justify-center items-center">
                 <input name="name" type="text" placeholder="Project Type Name"
-                value="name1"
+                value="{{projecttype.name}}"
                 class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4"
                 required>
             </div>
diff --git a/osinaweb/templates/edit_pages/edit-reference.html b/osinaweb/templates/edit_pages/edit-reference.html
index 40c53f3e..72c7e8e6 100644
--- a/osinaweb/templates/edit_pages/edit-reference.html
+++ b/osinaweb/templates/edit_pages/edit-reference.html
@@ -8,12 +8,12 @@
             Edit Reference
         </h1>
 
-        <form id="hiddenContent" method="POST" action="{% url 'save_reference' %}">
+        <form id="hiddenContent" method="POST" action="{% url 'editreference' reference.id %}">
             {% csrf_token %}
         
             <div class="w-full flex flex-col  justify-center items-center">
                 <input name="name" type="text" placeholder="Reference Name"
-                value="Reference 1"
+                value="{{reference.name}}"
                 class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4"
                 required>
 
diff --git a/osinaweb/templates/edit_pages/edit-tag.html b/osinaweb/templates/edit_pages/edit-tag.html
index 9f8606fe..0b631bb8 100644
--- a/osinaweb/templates/edit_pages/edit-tag.html
+++ b/osinaweb/templates/edit_pages/edit-tag.html
@@ -8,12 +8,12 @@
             Edit Tag
         </h1>
 
-        <form id="hiddenContent" method="POST" action="{% url 'save_tag' %}">
+        <form id="hiddenContent" method="POST" action="{% url 'edittag' tag.id %}">
             {% csrf_token %}
         
             <div class="w-full flex justify-center items-center">
                 <input name="name" type="text" placeholder="Tag Name"
-                value="Tag1"
+                value="{{tag.name}}"
                 class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4"
                 required>
             </div>
diff --git a/osinaweb/templates/index.html b/osinaweb/templates/index.html
index e02bd631..2c0d0fc1 100644
--- a/osinaweb/templates/index.html
+++ b/osinaweb/templates/index.html
@@ -126,11 +126,11 @@
 
                             <div class="flex justify-start items-center gap-2">
                                 <p class="text-gray-400  text-base">Files:</p>
-                                <p class="text-slate-700 text-base">Documentation.pdf, Project.doc</p>
+                                <p class="text-slate-700 text-base"></p>
                             </div>
                             <div class="flex justify-start items-center gap-2">
                                 <p class="text-gray-400  text-base">Tags:</p>
-                                <p class="text-slate-700 text-base">Live Streaming, Media Streaming</p>
+                                <p class="text-slate-700 text-base"></p>
                             </div>
 
                             <div class="flex justify-start items-center gap-2">
diff --git a/osinaweb/templates/project-types.html b/osinaweb/templates/project-types.html
index 3ef18f52..877af42b 100644
--- a/osinaweb/templates/project-types.html
+++ b/osinaweb/templates/project-types.html
@@ -99,7 +99,7 @@
                                 <p class="text-gray-500">{{type.name}}</p>
                             </div>
                             <div class="w-[40%] h-full flex justify-center items-center gap-3">
-                                <a href="{% url 'editprojecttype' %}">
+                                <a href="{% url 'editprojecttype' type.id %}">
                                     <div class="text-[15px] text-blue-500 cursor-pointer">
                                         <i class="fa fa-edit"></i>
                                     </div>
diff --git a/osinaweb/templates/references.html b/osinaweb/templates/references.html
index 48989bcc..91e70e51 100644
--- a/osinaweb/templates/references.html
+++ b/osinaweb/templates/references.html
@@ -105,7 +105,7 @@
                                 <p class="text-gray-500">{{reference.formatted_date}}</p>
                             </div>
                             <div class="w-[20%] h-full flex justify-center items-center gap-3">
-                                <a href="{% url 'editreference' %}">
+                                <a href="{% url 'editreference' reference.id %}">
                                     <div class="text-[15px] text-blue-500 cursor-pointer">
                                         <i class="fa fa-edit"></i>
                                     </div>
diff --git a/osinaweb/templates/tags.html b/osinaweb/templates/tags.html
index a0d55613..df71fbb7 100644
--- a/osinaweb/templates/tags.html
+++ b/osinaweb/templates/tags.html
@@ -99,7 +99,7 @@
                                 <p class="text-gray-500">{{tag.name}}</p>
                             </div>
                             <div class="w-[40%] h-full flex justify-center items-center gap-3">
-                                <a href="{% url 'edittag' %}">
+                                <a href="{% url 'edittag' tag.id %}">
                                     <div class="text-[15px] text-blue-500 cursor-pointer">
                                         <i class="fa fa-edit"></i>
                                     </div>
diff --git a/osinaweb/templates/tasks.html b/osinaweb/templates/tasks.html
index d11a1482..3b612c56 100644
--- a/osinaweb/templates/tasks.html
+++ b/osinaweb/templates/tasks.html
@@ -100,188 +100,114 @@
             <!-- ALL TASKS -->
             <div class="w-full mt-10">
                 <!-- TASKS TABLE -->
-                <div class="w-full bg-white h-fit rounded-md border border-gray-300 mt-5">
-                    <!-- TABLE HEADER -->
-                    <div class="w-full flex h-[70px] rounded-t-md">
-                        <div
-                            class="w-[55%] flex justify-center items-center border-r border-b border-gray-300 bg-green-700 rounded-tl-md">
-                            <p class="text-xl text-white">Task Name</p>
-                        </div>
-                        <div class="w-[15%] flex justify-center items-center border-r border-b border-gray-300">
-                            <p class="text-xl text-slate-700">Open</p>
-                        </div>
-                        <div class="w-[15%] flex justify-center items-center border-r border-b border-gray-300">
-                            <p class="text-xl text-slate-700">1/2/2021</p>
-                        </div>
-                        <div class="w-[15%] flex justify-center items-center border-b border-gray-300">
-                            <p class="text-xl text-slate-700">1/2/2022</p>
-                        </div>
-                    </div>
-
-                    <!-- TABLE BODY -->
-                    <div class="w-full h-fit flex">
-                        <!-- LEFT SIDE OF TABLE BODY -->
-                        <div class="w-[55%] h-fit bg-white p-3 rounded-bl-md">
-                            <!-- 1st row -->
-                            <div class="w-full flex flex-col gap-2">
-                                <div class="flex justify-start items-center gap-2">
-                                    <p class="text-gray-400  text-base">Project:</p>
-                                    <p class="text-slate-700 text-base">Osina Project</p>
-                                </div>
-
-                                <div class="flex justify-start items-center gap-2">
-                                    <p class="text-gray-400  text-base">Epic:</p>
-                                    <p class="text-slate-700 text-base">epic</p>
-                                </div>
-
-                                <div class="flex justify-start items-center gap-2">
-                                    <p class="text-gray-400  text-base">Assigned To:</p>
-                                    <p class="text-slate-700 text-base">Nataly</p>
-                                </div>
-
-                                <div class="flex justify-start items-center gap-2">
-                                    <p class="text-gray-400  text-base">Files:</p>
-                                    <p class="text-slate-700 text-base">Documentation.pdf, Project.doc</p>
-                                </div>
-                                <div class="flex justify-start items-center gap-2">
-                                    <p class="text-gray-400  text-base">Tags:</p>
-                                    <p class="text-slate-700 text-base">Live Streaming, Media Streaming</p>
-                                </div>
 
-                                <div class="flex justify-start items-center gap-2">
-                                    <p class="text-gray-400  text-base">Extra:</p>
-                                    <p class="text-slate-700 text-base">Yes</p>
-                                </div>
+                {% for task in my_tasks %}
+                <div class="w-full h-fit bg-white p-3 rounded-md shadow-md mt-5">
+                    <div class="w-full bg-white h-fit rounded-md border border-gray-300">
+                        <!-- TABLE HEADER -->
+                        <div class="w-full flex h-[70px] rounded-t-md">
+                            {% if task.status == 'Open' %}
+                            <div
+                                class="w-[55%] flex justify-center items-center border-r border-b border-gray-300 bg-green-700 rounded-tl-md">
+                                <p class="text-xl text-white">{{task.name}}</p>
+                            </div>
+                            {% endif %}
+                            {% if task.status == 'Working On' %}
+                            <div
+                                class="w-[55%] flex justify-center items-center border-r border-b border-gray-300 bg-yellow-400 rounded-tl-md">
+                                <p class="text-xl text-white">{{task.name}}</p>
+                            </div>
+                            {% endif %}
+                            <div class="w-[15%] flex justify-center items-center border-r border-b border-gray-300">
+                                <p class="text-slate-700">{{task.status}}</p>
+                            </div>
+                            <div class="w-[15%] flex justify-center items-center border-r border-b border-gray-300">
+                                <p class="text-slate-700">{{task.formatted_start_date}}</p>
+                            </div>
+                            <div class="w-[15%] flex justify-center items-center border-b border-gray-300">
+                                <p class="text-slate-700">{{task.formatted_end_date}}</p>
                             </div>
                         </div>
-
-                        <!-- RIGHT SIDE OF TABLE BODY -->
-                        <div class="w-[45%] h-fit bg-white flex flex-wrap justify-start rounded-br-md">
-                            <button
-                                class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500">Close</button>
-                            <button
-                                class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500"
-                                id="updateStatusButton" data-modal-url="{% url 'updatestatus' %}">Update
-                                Status</button>
-                            <button
-                                class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500"
-                                id="addTimeButton" data-modal-url="{% url 'addtime' %}">Add
-                                Time</button>
-                            <button
-                                class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-red-500 text-white"
-                                id="deleteTaskButton" data-modal-url="{% url 'deletetask' %}">Delete</button>
-                            <button
-                                class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-blue-500 text-white">Update</button>
-                            <button
-                                class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500"
-                                id="showPointsButton" data-modal-url="{% url 'showpoints' %}">Show
-                                Points</button>
-                            <button
-                                class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500"
-                                id="addPointButton" data-modal-url="{% url 'addpoint' %}">Add
-                                Point</button>
-                            <a href="./task-details.html" class="w-[33.33%]">
-                                <button
-                                    class="w-full p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500">Details</button>
-                            </a>
-                            <button
-                                class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500 rounded-br-md"
-                                id="timelineButton" data-modal-url="{% url 'timeline' %}">Timeline</button>
-                        </div>
-                    </div>
-                </div>
-
-                <!-- TASKS TABLE -->
-                <div class="w-full bg-white h-fit rounded-md border border-gray-300 mt-5">
-                    <!-- TABLE HEADER -->
-                    <div class="w-full flex h-[70px] rounded-t-md">
-                        <div
-                            class="w-[55%] flex justify-center items-center border-r border-b border-gray-300 bg-green-700 rounded-tl-md">
-                            <p class="text-xl text-white">Task Name</p>
-                        </div>
-                        <div class="w-[15%] flex justify-center items-center border-r border-b border-gray-300">
-                            <p class="text-xl text-slate-700">Open</p>
-                        </div>
-                        <div class="w-[15%] flex justify-center items-center border-r border-b border-gray-300">
-                            <p class="text-xl text-slate-700">1/2/2021</p>
-                        </div>
-                        <div class="w-[15%] flex justify-center items-center border-b border-gray-300">
-                            <p class="text-xl text-slate-700">1/2/2022</p>
-                        </div>
-                    </div>
-
-                    <!-- TABLE BODY -->
-                    <div class="w-full h-fit flex">
-                        <!-- LEFT SIDE OF TABLE BODY -->
-                        <div class="w-[55%] h-fit bg-white p-3 rounded-bl-md">
-                            <!-- 1st row -->
-                            <div class="w-full flex flex-col gap-2">
-                                <div class="flex justify-start items-center gap-2">
-                                    <p class="text-gray-400  text-base">Project:</p>
-                                    <p class="text-slate-700 text-base">Osina Project</p>
-                                </div>
-
-                                <div class="flex justify-start items-center gap-2">
-                                    <p class="text-gray-400  text-base">Epic:</p>
-                                    <p class="text-slate-700 text-base">epic</p>
-                                </div>
-
-                                <div class="flex justify-start items-center gap-2">
-                                    <p class="text-gray-400  text-base">Assigned To:</p>
-                                    <p class="text-slate-700 text-base">Nataly</p>
-                                </div>
-
-                                <div class="flex justify-start items-center gap-2">
-                                    <p class="text-gray-400  text-base">Files:</p>
-                                    <p class="text-slate-700 text-base">Documentation.pdf, Project.doc</p>
-                                </div>
-                                <div class="flex justify-start items-center gap-2">
-                                    <p class="text-gray-400  text-base">Tags:</p>
-                                    <p class="text-slate-700 text-base">Live Streaming, Media Streaming</p>
-                                </div>
-
-                                <div class="flex justify-start items-center gap-2">
-                                    <p class="text-gray-400  text-base">Extra:</p>
-                                    <p class="text-slate-700 text-base">Yes</p>
+        
+                        <!-- TABLE BODY -->
+                        <div class="w-full h-fit flex">
+                            <!-- LEFT SIDE OF TABLE BODY -->
+                            <div class="w-[55%] h-fit bg-white p-3 rounded-bl-md">
+                                <!-- 1st row -->
+                                <div class="w-full flex flex-col gap-2">
+                                    <div class="flex justify-start items-center gap-2">
+                                        <p class="text-gray-400  text-base">Project:</p>
+                                        <p class="text-slate-700 text-base">{{task.project.name}}</p>
+                                    </div>
+        
+                                    <div class="flex justify-start items-center gap-2">
+                                        <p class="text-gray-400  text-base">Epic:</p>
+                                        <p class="text-slate-700 text-base">{{task.epic.title}}</p>
+                                    </div>
+        
+                                    <div class="flex justify-start items-center gap-2">
+                                        <p class="text-gray-400  text-base">Assigned To:</p>
+                                        <p class="text-slate-700 text-base">{{task.assigned_to.first_name}}
+                                            {{task.assigned_to.last_name}}</p>
+                                    </div>
+        
+                                    <div class="flex justify-start items-center gap-2">
+                                        <p class="text-gray-400  text-base">Files:</p>
+                                        <p class="text-slate-700 text-base"></p>
+                                    </div>
+                                    <div class="flex justify-start items-center gap-2">
+                                        <p class="text-gray-400  text-base">Tags:</p>
+                                        <p class="text-slate-700 text-base"></p>
+                                    </div>
+        
+                                    <div class="flex justify-start items-center gap-2">
+                                        <p class="text-gray-400  text-base">Extra:</p>
+                                        <p class="text-slate-700 text-base">{{task.extra}}</p>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-
-                        <!-- RIGHT SIDE OF TABLE BODY -->
-                        <div class="w-[45%] h-fit bg-white flex flex-wrap justify-start rounded-br-md">
-                            <button
-                                class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500">Close</button>
-                            <button
-                                class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500"
-                                id="updateStatusButton" data-modal-url="{% url 'updatestatus' %}">Update
-                                Status</button>
-                            <button
-                                class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500"
-                                id="addTimeButton" data-modal-url="{% url 'addtime' %}">Add
-                                Time</button>
-                            <button
-                                class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-red-500 text-white"
-                                id="deleteTaskButton" data-modal-url="{% url 'deletetask' %}">Delete</button>
-                            <button
-                                class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-blue-500 text-white">Update</button>
-                            <button
-                                class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500"
-                                id="showPointsButton" data-modal-url="{% url 'showpoints' %}">Show
-                                Points</button>
-                            <button
-                                class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500"
-                                id="addPointButton" data-modal-url="{% url 'addpoint' %}">Add
-                                Point</button>
-                            <a href="./task-details.html" class="w-[33.33%]">
+        
+                            <!-- RIGHT SIDE OF TABLE BODY -->
+                            <div class="w-[45%] h-fit bg-white flex flex-wrap justify-start rounded-br-md">
+                                <button
+                                    class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500">Close</button>
+                                <button
+                                    class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500 updateStatusButton"
+                                    data-modal-url="{% url 'updatestatus' %}">Update
+                                    Status</button>
                                 <button
-                                    class="w-full p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500">Details</button>
-                            </a>
-                            <button
-                                class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500 rounded-br-md"
-                                id="timelineButton" data-modal-url="{% url 'timeline' %}">Timeline</button>
+                                    class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500 addTimeButton"
+                                    data-modal-url="{% url 'addtime' %}">Add
+                                    Time</button>
+                                <button
+                                    class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-red-500 text-white deleteTaskButton"
+                                    data-modal-url="{% url 'deletetask' %}">Delete</button>
+                                <a href="{% url 'edittask' %}" class="w-[33.33%]">
+                                    <button
+                                        class="w-full p-2 border border-gray-200 text-base h-[70px] bg-blue-500 text-white">Edit</button>
+                                </a>
+                                <button
+                                    class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500 showPointsButton"
+                                    data-modal-url="{% url 'showpoints' %}">Show
+                                    Points</button>
+                                <button
+                                    class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500 addPointButton"
+                                    data-modal-url="{% url 'addpoint' %}">Add
+                                    Point</button>
+                                <a href="{% url 'detailed-task' task.task_id %}" class="w-[33.33%]">
+                                    <button
+                                        class="w-full p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500">Details</button>
+                                </a>
+                                <button
+                                    class="w-[33.33%] p-2 border border-gray-200 text-base h-[70px] bg-gray-300 text-gray-500 rounded-br-md timelineButton"
+                                    data-modal-url="{% url 'timeline' %}">Timeline</button>
+                            </div>
                         </div>
                     </div>
                 </div>
+                {% endfor %}
+
+             
             </div>
         </div>
     </div>