From d1a2929b739a1f13704105dc62a3f3a02549211d Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Thu, 14 Sep 2023 20:40:05 +0300
Subject: [PATCH] Create task from project done

---
 osinaweb/db.sqlite3                           | Bin 294912 -> 307200 bytes
 .../__pycache__/admin.cpython-310.pyc         | Bin 1231 -> 1251 bytes
 .../__pycache__/models.cpython-310.pyc        | Bin 5975 -> 6390 bytes
 .../__pycache__/views.cpython-310.pyc         | Bin 6502 -> 7201 bytes
 osinaweb/osinacore/admin.py                   |   2 +-
 osinaweb/osinacore/migrations/0020_task.py    |  28 ++++++
 .../__pycache__/0020_task.cpython-310.pyc     | Bin 0 -> 1188 bytes
 osinaweb/osinacore/models.py                  |  18 ++++
 osinaweb/osinacore/views.py                   |  50 ++++++++++
 .../osinaweb/__pycache__/urls.cpython-310.pyc | Bin 2428 -> 2472 bytes
 osinaweb/osinaweb/urls.py                     |   2 +-
 osinaweb/templates/create-epic.html           |   2 +-
 osinaweb/templates/create-task.html           |   2 +-
 osinaweb/templates/createtask-project.html    |  49 ++++-----
 osinaweb/templates/project-details.html       |  93 ------------------
 15 files changed, 126 insertions(+), 120 deletions(-)
 create mode 100644 osinaweb/osinacore/migrations/0020_task.py
 create mode 100644 osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-310.pyc

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 74d4e51c31f48be46735fb40a1cab59c23a5b91e..63cdcbc9b492d40014efa2fca9f1b7b6cfa44ec6 100644
GIT binary patch
delta 1897
zcmdT^Z%k8H6u*Do>+37+yOd`wf67|wP&x*EZTTZa&`LliO6$}xmpLf(!K$uBXdH<%
z6h<}-`=D#Wg=LD#5<e`)#MPwxvT2<A7vjLgZ%d4ym1HiNWYI0zeXm+%e?INgZr(e&
z=bqm^=iGCD_oPxqse46d%B%+g0A1{VHcp*=IZ$#C)b{M=*%C)qG(#78LRQHyWaY|O
zl9aK9<~Nz}bTVPDXTs*NFu9puP78%yh+ob`3g6`ezRf&vI)jPPSUfV27*Q3)uk<D(
zqeuOUKTxAI)%faMzPjf6re=RrZJ@!g1pFDi5t{G@%Su{sRl${vPq}JwNN)g#bQlyD
zm17Ugd(%Ckk7|!`n#;^^Z7GD|^o+N&P6kDebx3tMHej$p?1j-Ik@!%e_wCrwNF*6c
z#78%qSmLs@D=jFSIB6G|VIfN-xrlSx)<S6k<jm`>pFtc((`jMHyb;|;-=m9Ynw|6>
z9Cw6y0G(Up6EXE2J+HP%+@&clZL2H9tedLksCrCIs(E`(%^|vTh=I3QdTWTBsv}DG
zGDLZ$9EnEr4%l3`H5&FXV^dpt-ywVE#kPB992Uj25S}-REn>A;B8nNGD`IRT9CX69
z9K%))Zi3He70RtVmqoY4!E%_7x;L}u&=)6gSgK45%kxI5QSwREQYCYL%0jPi$J_=v
z%wq`UkS@D*xi`~t_qz#fg)dN{58mXY8(@ESsSmDN;9&OKIBeaAWvPP-*I^}+I#~US
zCD|%-z-i0hwN}OKp&#L;D*`G5D2~dgF@+qoDupNq07BWXQ|L8F7yICTw6B5Q>Vpl`
zl7Nm6ZcL)=jY+)2Qe^`Lpo15V8-Cy(bBTfrraRb+#-R*4jEjaVhH}eE^Fzjk*0Vu-
zHh2c#;f>~-;3``Iw0ss{%3ez$7H4q|Kfy-4&EDgM6G57qLU#JnIb6^(VH_0fT^=~$
ziN&MpSUz?Awt6)N_Qs;UzJRZ>Zcy>9H@`yR6e{l5PWd;a+ZF0|x!2>}t}6Fak8aO<
z{i<O1c;Nfv$w>b(bv<&u)=B#!uvmXD>7cod^VcgLdU77SXXmhiSI3egk@Rs<rri`f
zsCN>X=~o|P8||D#7JBJCF6OkL^!7a7LeI@&BmIWrN?Lmw33Ty1K2YFcwYu<^!pQWu
zPjHy-nL_65!v$<DBn*Vf1NM=}<X7?_V;%m9=-i<{U&FjZqm0?0NrAVJX@(5}5+b+B
zMG|7z?SzJw@HWP!50`LhwZ~utHd_U>RUA-9liHu}E%oNmuo};+b=liX*n43%%yDK!
z<^Wk@0)SfP^ACwy#<`jCdSn953Zu260>YiDt9@)(9ZB{iMvlhfL#|M~zdz?}YmI;F
zGq(Z7VD>^2uvLiKHqaT1#nyI2qd8n-O~9wme7+i`-k`M{L>>XwR3EYFvypM6?&c~X
z8xV(~_!PJb$nRt|V@=)Ht$Z267>HWK6~xPc9G1ScbeKOk-7@VIFSD08C*ld~5OvMs
zjazg^4UZ&_r~^rjeoX^)0i|)kzn&Jmb^0;-F#7!i_}>_~26cP>6Z_j<Z4Vx3r@|B}
X`oF&c=*hBXVMa8vfEQ@h9RBoAS{WtI

delta 791
zcmZuvUr19?7(eHJ_j>2_-m^c<l`fi=F{}M^=~(!uC5qZ`Swc)oUAlB)+t5+bi_;1N
zd(Z|Qg(B&#uwvZk_NG<@A!LG2Mdf4QLrBnr5_GnFNjmWTzH@&3zVCeBcTQ^EkV+Y*
zO7v|Aq2?XK%wL~A>e<_d9OqgEb^@}=5FIDm<QLg2IFz}TBqe3mzHpMU6|D@+UIr$M
z#IQUM(xUE^;<jc41&Xj1j511#RvZ4VxLq$Ki+mng<O^tzCKkEc-5no^#=^bv;YfER
z5$(O}7~->DNjQoz4x}fY&BqMLV1Ww!uTU^yaN@qfaI8PxeL31c98N~#v5|5utH2<4
zrbX8Qj!Y{09*3-S);+-xfV{MLVpa+3E^(qaARz2(NVkW~%E5;9LI~ss(&Fh^R`k3^
z34~r<fq-0_7C&a02NGSZ2VU`ieKQ6|v`obw{FZC?(!@AdtwI>TmatKM7sGY!V30#p
zT*T$<V!Nz{KH&Kbpanz=Q=Emz{b+&OQXEy^-vf@DSQ_WlrE%~}HY1Wy6YyJnykJhd
z22O4i8&Q*HSz{wTd6~R@(kIpyLUq%Av+AFMHK71$&FvL<tZGc(M>CK4B6WG5|A}eW
zbN-RKJOkS-|9!gjj87fDY3dTqJ|CWFOolHGMRpB6F&rO^^d@sG-IxKZ@OS&|A(*Ij
z791@%pjR||JouLVfAQJJ+Lba()i#`I^mjB`JNzdDjn=Z9LQOs8zu=d1fOUj@D2{9(
zvO%_(Z7BN0XOf#T{jmUoC0_*At^gQ|f<$gJZ4i+lS!EVv+Im8RD^P=5=$#cPKH{;v
ze0EnAi#SV2DKeD~3{<)*J$ARtUg-@cBC*_wY24N7>IyjLblG9<tQzJWEaz{TN~8QF
Jo!Jiqe*jZ;<G26-

diff --git a/osinaweb/osinacore/__pycache__/admin.cpython-310.pyc b/osinaweb/osinacore/__pycache__/admin.cpython-310.pyc
index 8675bb1dc5821436f7e8df5008191ce1416184ef..0be67e8778577c4bcd6f7a3081b6f44a4892209d 100644
GIT binary patch
delta 68
zcmX@l`IwV0pO=@50SNdNm{VDqC-TWK-kPX=mLruhi*o^2s>sGKH<%bjC!b~B%XW(;
XB(XSqau<s-qr&8MEb=Toi~@`RWrPwx

delta 51
zcmaFNd7hImpO=@50SLCcGNis?n#d=^cy6Nh+087BSC|+@Cf{V<J9!R^GNat&11$1P
G0*nBC*$$Ne

diff --git a/osinaweb/osinacore/__pycache__/models.cpython-310.pyc b/osinaweb/osinacore/__pycache__/models.cpython-310.pyc
index ac762040058678445ba054a18d8832baa72f5195..1127e5325deeb0ecc18ebd448799bfd3b573c57d 100644
GIT binary patch
delta 524
zcmY+A&o2W(6vubEyX|VXwQZ*@LR*!PjSvzC2XP?r<Dv;oB<s|ei65<2-VzR?;`fgr
z40qz>D6Zn}FOc-$E-p?YPTp`~Ci9v1-hAg}=KI|F(H$xWgMJ0aLrUdc4QHW7lDumV
zkh)=oHL>Kj!jhcK`?gevveblPr|<hn#cH|rRJH6PFTplm#l$;UEW4b+E~e0m$lcz*
zgr`VsALBz@t`}h_CW#Z+7w>wLC`8A}fq0Cr(jz=Nl^XdFsWFKmvax#6WwnT1I)Jh#
z3iT&=dih`W)9wV@Q863)B&Q-DPav^9SrZGiL3EhS6{b5TSLZe6<t9^^?^tz$n1`6b
zYL1Ch%hfCET5-a^8s@=T<WC%Be*AZ!s^#)-;q?n200trly+~VyExCEV{F7xU%#~)+
z*%Dkx(T)UKQLDfnhC@(?9J8so4x~glO4~LucQn2@Hw`0FJ1WtEsOo%m3G%Qa3mf9i
z%Gl=^-r#a6LRu8TsS!&@tI#fsfK-gxF;R)H|CkQaRgj*6^cK#=ou06&M&Cl2Ef;w|
Q!J?ZHJ&9&5;*0yf0a5RE7ytkO

delta 248
zcmexncwLV#pO=@50SG*HGo+popU5Y}$g@$Kn~^O=Hkd(EZnGa_y@0YN(=8VNg4DdC
zW}reKhs`-Bzc@9es0GL^QUekpnwvieMl*`G0@+<aT+9X}I2d>s#TbiPCnt)?POcRW
zVr-jyLAXM)11QxGQUkIUq=tu)1Ej74sIC&I=C()?WA|h~QSr$MBBGP4M1RQl02R(b
z*1^Xp!YII41QPet6qzh8Q6~Vhxd>!*Q8$R_nQR~;E^v#(CO1E&G$+-L5hz%!F!`c{
IB9j<90Mk=9!T<mO

diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc
index 5c60a206611bd9f97cfc02afb2e87db523519c9d..453de3359021ab2e4eabdd40fa7bf9415b09f467 100644
GIT binary patch
delta 1674
zcmZux-A^1<6rX!{c6N4Vc6Rw*DowRTVai9MFS1Z9rJ8<Nu}E7irP(es(*o_XcxU?o
z4j~OZmIrhE1G;Y|rj4fhWYqM@#KahF8sk0~qlq6+J~U~JDXHgNU>6KC+25Y~yXXAw
zxpU7wzrRxIu?vZWq2S|YBK}g_2X+ga{G{U?tMv^p<Ml2pOKfbv*Ega#2kzfuvl@F0
zYq2+ytE?QG6@_WvEjnEE!La^3TLq!Fn;Fy+eFO)fWTfE>y^S4&Ut%p;@hY-TbV&5j
zY%dKk6#vR~{_K<+WD6Iw`MK<d?0l0e{9Ms5=7P&z8(jBfF@Ht$OBvBjD%I5n<Z4Ut
zbghLG7PlFXaHg$Unm7dCscCo+e`F3)%wdAp(Y>ulpc$kPQruuE#yMv)Mi)nsbUDK2
zqoP4SiVlFs+k53UDF6A?da7Nt4Vj}85#%en2uQ_Ix8^HT?KiEun>ZEd2o_f(>N6`U
zj=|4n3*0bAledt5ELY`LM4Ui=H#-hb&AseRC?)HjOIE*6mKOdH{l!}ZLvYh>h4-xf
zWT~RTP~#->FT$_ZfO&`9h6&z5&Ve(D9_^mwz_$0pmx<%%rxlk|@O|<n$k_en=N0ZW
zhULr$mGK!VU7H*<zpikjl3PaZ+Y0wCYE5Vl<rqFrH9#TR0B-7t`BTMZ3_eTUWp9I9
z)0a9&>^MOk!Fjk>vyc4+KOkPX|D@(2+mj=Hf}owiBk&0>5?q2m>vpp~(CRx{j}Wn!
zpo3r^!OH~lkg{aCaJs&m<zTtqX?KYrxv`qOpP%qWki8oCVkVdOgKaB3s?TUt1!5BF
z8wS}Lj5dt0Jbcvf+gVDaY<hm+imBP+RAEMzJKh~W<!vO09*!nvC|;&5l?pUm-vC<w
zraZg_Q&)U%^B%0iAB}B?Un4J>cY-W=6(VRk#(J$)MWtT#s#KKAFx=F|I$^OX(|HXe
zU52pvkSKKqS@2KL2$gBYW0$#@gBNNYc-9cJkYcyFr<K@36uKMJiyK5734K0Zj7+Q3
zJdAk83R{SeDl>+vAQzoG$`pFfDl_c5f_|FxQ>CA=;isYB_*TDSEMy@M<Dn5oLoJMj
zx@WHF3ub8E)=Q{XjC+e#7@sySF)y*g7p$TgT1#w1@f2)d_K-;8CWI`Q>ZdLuSC0BO
ziXtbre|9m8Q;xn<fVfUd|8u8a5)%OhS@3t`9+%Fite(RDwc{xz)=#OL4;@fBMprqD
z<+0NevN&YMDz!y%l^VhMc#ym1XNefb^9u%1#^4s){&HT+Y^Fx|8jn^ijoRJTSNlh|
zQW2f0KZ^HJX2|J)ubRHua}aHDh=AInI7V=SV2I!(+)a1x8YA-pL7srhNot5)lq5V&
Z+iV=n=FYffFmB_|fPv;#4UJZt{RbvQYrg;h

delta 991
zcmY+DKTH#G6vz2pkE88f?+$2F{suy8?6s6c7h5O=Aqs;06N6GvD7_PFT3UWB3xg~U
zj_NZ}6CFroz(fOKFfkE>CK?@dFfOb{!$M-hKwQ+{yF!Ug?vwYv@9(AWmP0>J${B~l
zUc!EFB#ZH(@vdA)Cf5TKM9{;dC0gsoLy{Fp4s6ylibl4}vNUtUNaQt+hT)2}k!Wz!
z>Jvk(o`w;vux{-j5!kWUkv%9CeYR7FF=(?@H>_GHk3tZ^F|6{m8tp<0R$T?RY*n(A
zX%fd<_&-u9?SvP$UGX%gbs@UVv`xE0vhdknO?q%#fVQ)k#t+is#6>khjd<P&8rfu`
z<$6AyqEW2xfUUAhSQ4emCFbT1W^w#qiKo5LDAmC$@se_z#rAMno|7!JpXv4F97Lri
z(g$(LBi_MQ=Me+2taxEVYFC~VYY3|uV)`-gIy%Ltm^O?UF}3@Si1@6iT|n)g+$XLT
zrBO3&QH}~PO$~-+KkUd6;dQ~?WbQ?!OMF+X7-JQ)!pB1RvEql2+Ae%4xU%Yp6}3nF
zR?HrUef2pRgq89(HHPX0q7pF)zsf!22RJJ{WNIT+@s%`8qaH{25DA2iFc8<k@2n?b
z=ye9XXHjTE1P~s?355BFUqx#M9ynXbG`x3ez8Ms-U93E9q-PA8n_9>jbS|DYa{o<m
zyTXEbV6!mh>LS14k!zHsVAu7192eOZbt9Lc$!tEEnKLhu9V?gA4;Ew@nn2Sy%v{^-
zG>2~C1(>y{>P9}EOc{Fc@Ww%NAMb9%EOT!MTIQKrn5EeZcYD;-?057f6g$TN+(F`l
zEqAzVo>dNNeweTM<c(mzPDBr)7txOxKnx*9AXeL~PNA7XU^%T}*Xxuc>5RURGNOb@
Xxy$gjw%KO46HaE274~broJ{@!J1XK>

diff --git a/osinaweb/osinacore/admin.py b/osinaweb/osinacore/admin.py
index 034f32ae..9f1a1161 100644
--- a/osinaweb/osinacore/admin.py
+++ b/osinaweb/osinacore/admin.py
@@ -29,5 +29,5 @@ admin.site.register(Project, ProjectAdmin)
 admin.site.register(Milestone)
 admin.site.register(Epic)
 admin.site.register(Note)
-
+admin.site.register(Task)
 
diff --git a/osinaweb/osinacore/migrations/0020_task.py b/osinaweb/osinacore/migrations/0020_task.py
new file mode 100644
index 00000000..f692723e
--- /dev/null
+++ b/osinaweb/osinacore/migrations/0020_task.py
@@ -0,0 +1,28 @@
+# Generated by Django 4.2.5 on 2023-09-14 14:59
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('osinacore', '0019_alter_epic_end_date_alter_epic_start_date'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Task',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=250)),
+                ('status', models.CharField(choices=[('Open', 'Open'), ('Working On', 'Working On'), ('Closed', 'Closed')], max_length=200, null=True)),
+                ('extra', models.BooleanField(default=False)),
+                ('description', models.TextField()),
+                ('start_date', models.CharField(max_length=200)),
+                ('end_date', models.CharField(max_length=200)),
+                ('epic', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='osinacore.epic')),
+                ('project', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='osinacore.project')),
+            ],
+        ),
+    ]
diff --git a/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d145d613d16e066fd516355528c54748f3bffe6b
GIT binary patch
literal 1188
zcmZWoPjBQj6px)uCdvHScDHod<-m$tBs4R-Hzb6%JEaK0ZVxR&nu~Gc*VJhe2Rj4X
zUg6sB0NnT*91sUSfv=qU36OeVc~07G5sv)i-_L%}`Mvk7CX>X&@#p(K{2qATUk=<I
z$a&9kni(452~v6$S&@paC~=sU{wny)6TS$3^h5xp82sR`27(@V>EIH5yp-CclDX!s
zRJE~Tr394bRp$2YjtvCQahl)IfVU#TTTwxBvhpD)Frx4wEQTV$Zy-W3ya<k|h>(j!
zERqX?Xyj1tiSaK)Oz_<F!bkQVvN8H>bZ0gp{3-d_L;il}JGu6K@E^2=XoPyk#iR&}
zX>m`yBeuI}5C6CGZoiYq;?V`g|J@LeQT=;1et9Dsa}X;dYn~|$cD7hN{fP0h1<jz5
z8G~9d!CSb?nU?FeV{LHA&8ekQ9PU~A`EDB6F<-ZeWg5^)*ioZp#q}9Gg)<u)(2|$(
z9PIcz&_~Jut9b=BaQ5;FlbaH(2!G8=sPp#3hIm!GHmQ$)8SFPu>-+8yy-L1T`c&5W
zll@vh=qMX5OAILV7Q)Lv9Ov6%cA{hkM!O2)HS4mp19;tPju#CD9P@SA+K~X0Y1z0g
zu*n^D(T#c=xMZA9-zIA2aO&%aE^e%9hK&O)SlTK(Y_uvMYtJ`tk6%+M)l=sY9!n^N
zd6jP3h;=z&%qEOs1FlQJ^_a15*SvIjaYz7a7f@#swNMvfwCpnc(siu%9W#C*^Bv6n
zo(pZ`<q6mQa{NN65_o;Raftf+WwM7QmwEjK)+Q7MuXAOoII>YE#wBC8+&Nh8?0#w!
z)xh;L`PI`;@xIPneKY?Gi)!Xj$r7L}<r&O(!JM|LnIB-Ot0!Ob#({k!+e}sSE+xJF
z9*+8j>%95xJDe{T&lar3#+o%}+P(52PV)hp$fJJnCKyn%MW<w&Oi6-sN*?1!{|^3%
z-gM{F(8j%<nK<h5)u-suTXNPv_1TS5{h^cO?z$D%ubv@iqmTQ_d_oYJ5X}aS$hQA4
Dl$Boc

literal 0
HcmV?d00001

diff --git a/osinaweb/osinacore/models.py b/osinaweb/osinacore/models.py
index a136f81a..08bdc19a 100644
--- a/osinaweb/osinacore/models.py
+++ b/osinaweb/osinacore/models.py
@@ -158,3 +158,21 @@ class Note(models.Model):
     date = models.DateTimeField(null=True,blank=True)
     user = models.ForeignKey(User, on_delete=models.CASCADE, null=True,blank=True)
     color = ColorField(default='#FF0000',blank=True)
+
+
+class Task(models.Model):
+    name = models.CharField(max_length=250)
+    project = models.ForeignKey(Project, on_delete=models.CASCADE, null=True)
+    epic = models.ForeignKey(Epic, on_delete=models.CASCADE, null=True)
+    STATUS_CHOICES = (
+        ('Open', 'Open'),
+        ('Working On', 'Working On'),
+        ('Closed', 'Closed')
+    )
+    status = models.CharField(max_length=200, choices=STATUS_CHOICES, null=True)
+    extra = models.BooleanField(default=False)
+    description = models.TextField()
+    start_date = models.CharField(max_length=200)
+    end_date = models.CharField(max_length=200)
+
+    
\ No newline at end of file
diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py
index 37723c6a..d4f607f7 100644
--- a/osinaweb/osinacore/views.py
+++ b/osinaweb/osinacore/views.py
@@ -101,9 +101,11 @@ def detailed_project(request, project_id):
 @login_required
 def createtask_project(request, project_id):
     project = get_object_or_404(Project, project_id=project_id)
+    epics_of_my_project = Epic.objects.filter(project=project)
     context = {  
 
     'project' : project,
+    'epics_of_my_project' : epics_of_my_project,
 
     }
     return render(request, 'createtask-project.html', context)
@@ -127,8 +129,10 @@ def create_project(request):
 @login_required
 def create_epic(request, project_id):
     project = get_object_or_404(Project, project_id=project_id)
+
     context = {       
     'project' : project,
+ 
 
     }
     return render(request, 'create-epic.html', context)
@@ -328,3 +332,49 @@ def save_epic(request):
         # Redirect to the detailed project page
         redirect_url = reverse('detailed-project', args=[project.project_id])
         return redirect(redirect_url)
+
+
+@login_required
+def save_task(request):
+    if request.method == 'POST':
+        name = request.POST.get('name')
+        status = request.POST.get('status')
+        project_id = request.POST.get('project')
+        epic_id = request.POST.get('epic')
+        extra = request.POST.get('extra') 
+        description = request.POST.get('description')   
+        start_date = request.POST.get('start_date')   
+        end_date = request.POST.get('end_date')   
+
+        try:
+            project = Project.objects.get(id=project_id)
+        except Project.DoesNotExist:
+            # Handle the case where the project with the provided ID doesn't exist
+            # You might want to display an error message or redirect to an appropriate page.
+            pass
+
+        try:
+            epic = Epic.objects.get(id=epic_id)
+        except Epic.DoesNotExist:
+            # Handle the case where the epic with the provided ID doesn't exist
+            # You might want to display an error message or redirect to an appropriate page.
+            pass
+
+        # Create the Task object with the Project and Epic instances
+        task = Task(
+            name=name,
+            status=status,
+            project=project, 
+            epic=epic,
+            extra=extra,
+            description=description,
+            start_date=start_date,
+            end_date=end_date
+        )
+
+        # Save the Task object to the database
+        task.save()
+
+        # Redirect to the detailed project page
+        redirect_url = reverse('detailed-project', args=[project.project_id])  
+        return redirect(redirect_url)
\ 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 9050fd04c54c52124e738ecf80f22cf47e02f907..f54119c65effb54aa2f3bafe3eea6de5f874eeec 100644
GIT binary patch
delta 172
zcmew(v_e=rpO=@50SMlhGN;M_S&u;+WFQCRH~?|+rj6S386{F#QY=#0vXoOSQ#gB>
z)1{(RQmld*G_5yZVbo)ls^Th6EK7|qNi5FRzr_h>`)R6fW@X>QC|$%4H0c(1X;Dr=
sVo6DAQC{&%h9YsGSdsYT>m11fAd6TSc=&l3!H{LL7pDOWA0x*D0OM;XtpET3

delta 128
zcmZ1>{6|PTpO=@50SGqjWk`L*$-wX!#6bqKK#l_t7cbeUJ)e;)T{22J#UhwN({l48
zMm<($KTVa*TI_om#cpwz7UdKqmXxFx<rS}FC=vteDH5B^$eAo)2V}A^@bL36f+6eV
K5>5jqjt2m~^%}td

diff --git a/osinaweb/osinaweb/urls.py b/osinaweb/osinaweb/urls.py
index f24600d7..7ea1fb95 100644
--- a/osinaweb/osinaweb/urls.py
+++ b/osinaweb/osinaweb/urls.py
@@ -19,7 +19,6 @@ from osinacore import views
 from django.contrib.auth.decorators import login_required
 
 urlpatterns = [
-
     # Pages urls
     path('admin/', admin.site.urls),
     path('login', views.signin, name='signin'),
@@ -51,4 +50,5 @@ urlpatterns = [
     path('save_note/', views.save_note, name='save_note'),
     path('save_project/', views.save_project, name='save_project'),
     path('save_epic/', views.save_epic, name='save_epic'),
+    path('save_task/', views.save_task, name='save_task'),
 ]
diff --git a/osinaweb/templates/create-epic.html b/osinaweb/templates/create-epic.html
index 8563bb5d..78eb42ee 100644
--- a/osinaweb/templates/create-epic.html
+++ b/osinaweb/templates/create-epic.html
@@ -5,7 +5,7 @@
 <div class="w-full px-10 mb-4">
     <div class="w-full bg-white h-fit shadow-md rounded-md p-5">
         <h1 class="text-3xl text-slate-800 text-center font-semibold">
-            Create Epic for {{project.name}}
+            Create Epic For {{project.name}}
         </h1>
         <form class="mx-auto w-full flex flex-col gap-3 justify-center items-center mt-5" method="POST" action="{% url 'save_epic' %}">
             {% csrf_token %}
diff --git a/osinaweb/templates/create-task.html b/osinaweb/templates/create-task.html
index 6a5fcfb2..cad9074e 100644
--- a/osinaweb/templates/create-task.html
+++ b/osinaweb/templates/create-task.html
@@ -41,7 +41,7 @@
                 <option value="">No</option>
             </select>
 
-            <textarea type="text" placeholder="Task Description" rows="5" cols="5"
+            <textarea  type="text" placeholder="Task Description" rows="5" cols="5"
             class="w-full py-3 px-3 border border-gray-300 outline-none rounded-md resize-none"></textarea>
     
             <div class="w-full">
diff --git a/osinaweb/templates/createtask-project.html b/osinaweb/templates/createtask-project.html
index ce1b0231..92f29179 100644
--- a/osinaweb/templates/createtask-project.html
+++ b/osinaweb/templates/createtask-project.html
@@ -7,59 +7,62 @@
 <div class="w-full px-10 mb-4">
     <div class="w-full h-full shadow-md rounded-md mt-5 py-5 px-3 bg-white">
         <h1 class="text-3xl text-slate-800 text-center font-semibold">
-            Create Task
+            Create Task For {{project.name}}
         </h1>
 
-        <div class="w-full flex flex-col gap-3 justify-center items-center mt-5">
-            <input type="text" placeholder="Task Name"
+        <form class="w-full flex flex-col gap-3 justify-center items-center mt-5" method="POST" action="{% url 'save_task' %}">
+            {% csrf_token %}
+            <input required name="name" type="text" placeholder="Task Name"
                 class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md">
 
-            <select id=""
-                class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 cursor-not-allowed" disabled>
-                <option value="" selected disabled>{{project.name}}</option>
+            <select  required name="project" id=""
+                class="hidden w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500">
+               
+                <option value="{{project.id}}">{{project.name}}</option>
+
             </select>
 
-            <select id=""
+            <select required name="epic" id=""
                 class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500">
                 <option value="" selected disabled>Select Epic</option>
-                <option value="">Epic 1</option>
-                <option value="">Epic 2</option>
-                <option value="">Epic 3</option>
+                {% for epic in epics_of_my_project %}
+                <option value="{{epic.id}}">{{epic.title}}</option>
+                {% endfor %}
             </select>
 
-            <select id=""
+            <select required name="status" id=""
                 class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500">
                 <option value="" selected disabled>Status</option>
-                <option value="">Open</option>
-                <option value="">Working On</option>
-                <option value="">Closed</option>
+                <option value="Open">Open</option>
+                <option value="Working On">Working On</option>
+                <option value="Closed">Closed</option>
             </select>
 
-            <select id=""
+            <select required name="extra" id=""
                 class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500">
                 <option value="" selected disabled>Extra</option>
-                <option value="">Yes</option>
-                <option value="">No</option>
+                <option value="True">Yes</option>
+                <option value="False">No</option>
             </select>
 
-            <textarea type="text" placeholder="Task Description" rows="5" cols="5"
+            <textarea required name="description" type="text" placeholder="Task Description" rows="5" cols="5"
                 class="w-full py-3 px-3 border border-gray-300 outline-none rounded-md resize-none"></textarea>
 
             <div class="w-full">
                 <label class="text-gray-500">Start Date:</label>
-                <input type="date" id="date" name="date"
+                <input required name="start_date" type="date" id="date" name="date"
                     class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-1">
             </div>
 
             <div class="w-full">
                 <label class="text-gray-500">End Date:</label>
-                <input type="date" id="date" name="date"
+                <input required name="end_date" type="date" id="date" name="date"
                     class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-1">
             </div>
 
             <div class="inbox-box border border-gray-300 py-1 px-3 w-full rounded-md">
                 <div class="flex items-center justify-between">
-                    <input required name="cv" type="file" id="actual-btn" accept=".pdf,.docx" hidden multiple />
+                    <input name="cv" type="file" id="actual-btn" accept=".pdf,.docx" hidden multiple />
                     <span id="file-name" class="text-gray-500 text-base focus:outline-none outline-none">Upload
                         Document(s)</span>
                     <label for="actual-btn"
@@ -86,11 +89,11 @@
             </script>
 
             <div class="w-full flex justify-center items-center mt-3">
-                <button
+                <button type="submit"
                     class="w-fit py-1 px-3 bg-blue-500 rounded-md outline-none text-white border border-blue-500 text-xl cursor-pointer hover:bg-white hover:text-blue-500">Add
                     Task</button>
             </div>
-        </div>
+        </form>
     </div>
 </div>
 
diff --git a/osinaweb/templates/project-details.html b/osinaweb/templates/project-details.html
index 23b39849..9e4120ab 100644
--- a/osinaweb/templates/project-details.html
+++ b/osinaweb/templates/project-details.html
@@ -463,99 +463,6 @@
                         </div>
                     </div>
 
-                    <!-- TASK 2 -->
-                    <div class="w-full bg-white h-fit rounded-md border border-gray-300 mt-3">
-                        <!-- 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>
-                                </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">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">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">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">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">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">Timline</button>
-                            </div>
-                        </div>
-                    </div>
                 </div>
             </div>