From 098ce2b72cce28d7f1fad858372d1f78050e38d8 Mon Sep 17 00:00:00 2001 From: emile Date: Tue, 30 Jan 2024 22:22:52 +0200 Subject: [PATCH] ss --- osinaweb/db.sqlite3 | Bin 643072 -> 651264 bytes .../__pycache__/models.cpython-310.pyc | Bin 9889 -> 10164 bytes .../__pycache__/views.cpython-310.pyc | Bin 31314 -> 33360 bytes .../migrations/0053_pointactivity.py | 23 +++ .../0052_note_project.cpython-310.pyc | Bin 0 -> 760 bytes .../0053_pointactivity.cpython-310.pyc | Bin 0 -> 903 bytes osinaweb/osinacore/models.py | 7 + osinaweb/osinacore/views.py | 23 ++- .../osinaweb/__pycache__/urls.cpython-310.pyc | Bin 7557 -> 8087 bytes osinaweb/osinaweb/urls.py | 3 +- .../add_pages/create-user-story-task.html | 194 +++++++++--------- .../details_pages/project-details.html | 63 +++--- 12 files changed, 186 insertions(+), 127 deletions(-) create mode 100644 osinaweb/osinacore/migrations/0053_pointactivity.py create mode 100644 osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-310.pyc create mode 100644 osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-310.pyc diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index ca83b831bf62f566ca30c5a87f246a01392d043e..baeaa03c5912bce1699c13ce19062d50004d125a 100644 GIT binary patch delta 2849 zcmai03vd(H72UV{c2_HQ_hC2wREByjW6aO;u4GA;Xj8-=8~^w@L#B1t_R3mYmSjoB z#wj&|VM;%Pag?x`K*1rIDQyavQDG+mT9`C5OqpazCc`8pA2-vIWQG)INth%J?MjMl z%x9w6z4P?$o_p_m_r7!A_OZ(C6P0^Q@(y4acF1^hzYC*_93=-ZTWcL@Op)knT5$k< zg+50&(KU4S#842;FsAAg(2(9}>Lz+(Hpol%R{aE2re3cq1YlS4pSA^HcXDR+5C|rJ zRlOQml5bTntXO3>5EkwbhW>>vqQ9ZDXbe5dokknE%lrlY3V)JkxkD+d_yjkr1eR8U za7+!!9pR`F39F&F+!0r|sPV0q)af6r$tQx;ktE&xhKagOy-S^^j--6T1+uFc0tr~Q zsLDXwG*Hk2ffHCdm7o$=rmK3gs*Zph>bghOT?9cju*jXA(;;dKwSKmmXoCBa^w?}1 zo=(mgTY$rTsm8J8Fgfu8TDe!=bJwx#mM zf5U2#5eOf#1W5t_OHW32XQY~X`n~XngoQh((dU2zaC(`DZ<~>77OsL>77N5mD<8bC z`pd6@IxEpcMKt;b*bk`@Dq?KvUrFuQ=YX|K4ngvG9WJlvut_zNz1G$8J;Dd^2(=rI7!A3iXtX-GEN_ky~!p!?EYZ zs!|P9wdejyNF$8$xaV{Ile2iqn{yF%8^cFXGxrb9G9%9%VqQ13(yvgX+tK z!|-X%_9A>$?;0iM0qyrk;F$i3M)+2n;@mif{)=vF{5UwNou42ULT;R2VC?WYmLdrT z$9C(dJ|!A=_Zol=X{%HQKxF__MS6yulaXZ^S)P$rj;X^qKw(^k ziJ{xb0(hRd!?u~@=1S&AsF6PbD5ekJ4?3AZ(kIkw{bO)czo|1{;QIfbhxKGJ_YU@* zqOb=f`qWUTGMFy>#L5IlYmL8y7Ona$W76BsFwYU@gcPHT7B2>gt=f$-SfE}16GLnD zN8z3{$-S+;cND$_6W>kX+M&a6zFv5mv4T_M5DLbwT)_-tOw;2v^bz_yx}q0eg0G^y z^a6;?BJsJ9U_ga_?E_f6gs8;7)@Xrj!11q*({&qY4OVh|SV@>nSb`{Fd|J*e- zSq%#Du+Y&Ti}&{`Q6Z*8x2PS8ARF5D{O*cgWc@ zDOEW{!7h5!kK1N<+G|9qJW-S&4M(cs2$N%h&Om2(Pb?toKP@LCRrv?Ofs0?6b*zDCxFc@wPM|;u{HHFHjVi4Wl z8oSWkU`DqvTqkdk|3(aHr3iqRW4r!H!6k%^P&9f8^*Bx_#+CqL(fp_KD6G0{HZx_= zD`Y&}Z&n{&M#W|cJnO{J8MFi0`2X;~<$L%=+^5_ax1PPp{(Q!+^e>G(;Sxr8%u`Xc=o`Ye6Q zaPbt(95QpBK14IW+|85bO&I?^cZPj-#-MqVp1+q_Zl1TJw1sTg+2H%O9-)m!nepL` z@p#m`wY8~p#Zsl~v4Gs|TRRYROB)6^$ZPt0Ld#{BKkQKZHm~m3>K}}4sm(56l92D> z>m8-d8Nc7wc5F)B;HK^sv8JwW-$w0VlzG0+2*U3b)t;W(wVQiuf*b3l_BHNRsu~G2 z3{*w>RxV!~Ti4vP*)26Ll?QxlV)q1bS69%VJ-~Dm`84askR9#eG|t0*!2X(b>xE-X z89ThblE(@POa*0S0DuzUQwEfQricFb3@_QSD8Z#k3*Xrrm)nENWK~bE=!Z;W2el2(P) z!P7-;i}6IuBX?Z$Rtck}Uxi;7P??+pOrbfZ~ u5F1uuo;9;j!=H72`WhPNjvMzQ<|CXtZZyX~vvih_jPCdvQ->d(5dIHh`&iom delta 1634 zcmaJ>du$X%7@ygh-M#7U?$APel+wC=P;BYru2+PXKw3ajsFeC7#soOpvpsrkuiVvy zM}Q*)h$MY@z(gMAK#V4U6p!9$OARQPCJk5=jgJ78U;qQs3St07=ZZxA$Ne(Do$UAf zeLM5beBXwl$s59xJ5u7e0RZ-j@%Z_yGtZf_4HT>xl*K2RUX3~S&PeAo54XM@VBIV{Z zB|;bfT7eegp^zF*4P}ROBhQ8BV!^G73?0atg6j1hA$9OvB)+RpW4?BbBX3@4xQvqZ z9;TjvPM)z$+Mx5EGjKr$TBy9w)M2<=1lAPhy9+hma~Cf7Xo6M04#e7aQa3H7#Q4TI zXsk0Tjq&<*5qCi6*ZZWDFS3c$4y1NktzXe6SmWcG$XUx`^;7hD%-|oe4(!)1f?1vA zHdfw&qAafll2CmObjS8=4h&9ZK2FB5TTznE{85q?n~i1VoMd4D z&@#4ylj&>>7mgF0I4#mwwwxUJ`cf9Z52wQlc5){g&!5?cJ0$)IL$fO^emx54@ANlj zbir;sT0Dx5;!5{ENeZ&gcQ#;UU-nkPwA#wOs+l(17xQY#jaU#3*F;Q9NVcdp;+DesO zIE>HpvQD%JM!PUJMWSy2QE0JpyFpLIj3*7^(=`6c@!}Vmu}r7M5}lmLZ(PFT%TP9Q zGu4zAimQANvV|FP*Lu^p(jD-$HkwVXO*Q7Lt{RWmSnJ%sI`CKCe6Au1%d7#01zTL$Ouhch$Q5|8Zx;(K`Tgd0761 z5-mePP|5(Cjw!ed<)cofmMO1@d=w(yIY;qNOw+X%K#$Xnw7|G+ylXTVdHPK~tUs@f zXos{G!Ca(mY4IvzsJz8%358IDy1H8>gOWO+o>KeNsNn3uu?oU`ok})uHITLo7#H>9 z;#CF!Pv{_X<094OT#4`6Lsp;!td{^6a#ntWr1tXsNzPm$d2D&2iV&5!I~>Dur^JC@qKN zf&*gH??66qlw>Ph*@y2*{HGqW9J9*@u#H_hBrfybLwKti>*}KIh%QU6j&>RzJwp~q Fe*sLU?EwG) diff --git a/osinaweb/osinacore/__pycache__/models.cpython-310.pyc b/osinaweb/osinacore/__pycache__/models.cpython-310.pyc index eec19d90e74285a446810826c9cf81aac421fd34..7787f23e097abbcdfdf02675d5d627d5d2735f9a 100644 GIT binary patch delta 444 zcmW+yJ4gdT5WUGIx_3z~5~9ZQLZTr;h@KH`tV9s3jEWKD5JbEy68y0_1g%7EMRZCP zOk*PiV-k#=rLBTZEVQ=~EX2-Pci6XYnKv_Uw>(py)wY5`RiZUD_uwpAX|qQKAbIT^tVpHlP3JTknYme_|+JW1@q7pi@~ z@Kp2m-vaz#BbmhyT>%rX)%f5QD@&H*$p5Em%Vf{n3eIg6Hr>fJx3E)ick|q(X}Ppt zn91ge^BVz+1eR}GNcpAUYRO&Y?uuL3a9YgSwEr27v`3=6Lisiz16%cT=o gOuhQWL@t{0CMmmdc_0L1xISPiEIb?zg;|&K2R3VOg#Z8m delta 284 zcmdnuztER2pO=@50SFS0u1a;#oyaG{xM-vHLPoX}-Czbyz0FS;6{Q&6CLdrCpDZB7 zI$23Zb8@_l@#G{avB?R_ER)yBSWn)hA|f^$Xu<&?E(V#!!N9}F$0))muvu1CiJ9@% zWCw)?##fUMDpWDPpKPP}lkxawGo=lTjNc|dS2mdZQROt_#>s^&5|ZnIdf6Bm7(T-c z;bG)qlwvGeKUqOmgo_<0>j1<>>n8K4NvdoBF+mEW1XB_-b1I8c3-XIf;)_cX)6$AI z0mc1_HiJwR-3Day15GX33eo}M`Dw~eE>pY82C}bc8&Hw>U!+#Li$1i GVw?c+ZAlvd diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc index d2a65bf3485fefbe807854b66744fa7db1be7bcc..ac45bc43d6d7590bb09724c11d5def064a9a5cc2 100644 GIT binary patch delta 13912 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 literal 0 HcmV?d00001 diff --git a/osinaweb/osinacore/models.py b/osinaweb/osinacore/models.py index b481741b..9072d3f5 100644 --- a/osinaweb/osinacore/models.py +++ b/osinaweb/osinacore/models.py @@ -259,6 +259,13 @@ class Point(models.Model): time_completed = models.CharField(max_length=200, null=True, blank=True) +class PointActivity(models.Model): + point = models.ForeignKey(Point, on_delete=models.CASCADE, null=True) + start_time = models.DateTimeField() + end_time = models.DateTimeField() + + + class Status(models.Model): text = models.TextField(blank=True) diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index c746c5fa..a90f1c84 100644 --- a/osinaweb/osinacore/views.py +++ b/osinaweb/osinacore/views.py @@ -332,9 +332,14 @@ def createtask_project(request, project_id): @login_required -def create_user_story_task(request): +def create_user_story_task(request, requirement_id): + requirement = get_object_or_404(ProjectRequirement, id=requirement_id) + members_list = list(requirement.project.members.all()) context = { + 'requirement' : requirement, + 'members_list' : members_list, + } return render(request, 'add_pages/create-user-story-task.html', context) @@ -829,6 +834,13 @@ def save_task(request): description = request.POST.get('description') start_date = request.POST.get('start_date') end_date = request.POST.get('end_date') + requirement_id = request.POST.get('requirement') + + if requirement_id: + requirement = get_object_or_404(ProjectRequirement, id =requirement_id) + + else: + requirement = None project_id = request.POST.get('project') @@ -850,7 +862,8 @@ def save_task(request): description=description, start_date=start_date, end_date=end_date, - assigned_to = assigned_to + assigned_to = assigned_to, + requirement = requirement, ) @@ -860,7 +873,11 @@ def save_task(request): # Redirect to the task detailed page task_details_url = reverse('detailed-task', args=[task.task_id]) - return HttpResponseRedirect(task_details_url) + if requirement: + return redirect('detailed-project', project_id=project.project_id) + else: + return HttpResponseRedirect(task_details_url) + diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-310.pyc index 7cd2165864223a22a81c29fe6bb74fea5bae3485..b66428c2920e1836c7936720f418c596c0b28da0 100644 GIT binary patch delta 803 zcmZva+fNfg6vlTCrO}q2)S@lYRuQAN)Y8O|DA+)v#E9Yzqb8e}b?MAQOS{|dZXq;c zHG+vsRh$POK-4!AA5_+BV!YoU^^Jc4&d+!XO;_s^2H1tPPkC9Ie{n^x6@};4_nmR|m zRka{fnYw68MlpAue6PT6PLRoulU($tQ~-`sw6rWu(9w=lBf}m0jY(&-gDtt(Ks2RN zNvB1Ps+z8-le(mhC6Z}b?^9`^m{w_y%DR{){RyFUl~iNUo#fdCR}Z_`GSk^95faa< zN`|KNxUA?jk<@gxuSTpYhTk*Ygxd(sQk~W~D|iF3gy3HRt=Bn)NZC?%jVq=po3O%$ zO%cKSKQ8U6603v!isWO$`qe@umnMx<(e}B#ws9}{>}%b0HN5U$W<2uFHuD8zk3YaO zDbOGAS0^J{Qxxqnik1tu7?|=|Ms+Ejr9`ZiG=gnwV4twD>Zwj`AEMo$;H!tMHfk(T zV^(3&?vI7rPlFm^`Syq2sQJg#F6)R{$4(Xr_V96bHrVCtwLmYc1XX_FcIcLSJ1k=y zeq%TMV)LP)9fR-&55g-Pf|qy*Uf^MPj>GT_kAQ(kVF{1J6FdQrS!*~N6yX7$gZn7K zJsgEaOu=0wuz(ci*_rT`L;-H13O7)L3hFS6MYxXRa1AHmDxQaFoPx_-8F}uK;}2JE GbNmI-?+@bu delta 299 zcmbPk-)ha5&&$ij00f;UR;9jGn8+u?Xtq&Xo=qkyGc_}nE0rfJ3y8B*_VqHEGel*k z>1S}@E$`&y;P5vP}fm?^^3ZE|1Wj;fu^OGmb zc`~~*?VNmHPE_2VX(L|%(+0jkruBS5OzZf9nbz`!Fs+%)EUzh@#59jDnQ1Ox3ez0E mRHoT{X-u>D(wS!RWiZW{>@Kg!TgueUSH{%ESIN>YQ3C)t5m_7n diff --git a/osinaweb/osinaweb/urls.py b/osinaweb/osinaweb/urls.py index c675ad54..294ca4b6 100644 --- a/osinaweb/osinaweb/urls.py +++ b/osinaweb/osinaweb/urls.py @@ -41,7 +41,7 @@ urlpatterns = [ path('createepic//', views.create_epic, name='createepic'), path('createtask/', views.create_task, name='createtask'), path('createtask//', views.createtask_project, name='createtaskproject'), - path('createuserstorytask/', views.create_user_story_task, name='createuserstorytask'), + path('createuserstorytask//', views.create_user_story_task, name='createuserstorytask'), path('createtaskepic/', views.createtask_epic, name='createtaskepic'), path('projecttypes/', views.project_types, name='projecttypes'), path('businesstypes/', views.business_types, name='businesstypes'), @@ -107,7 +107,6 @@ urlpatterns = [ #Save Urls path('save_note/', views.save_note, name='save_note'), path('save_project_note/', views.save_project_note, name='save_project_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/add_pages/create-user-story-task.html b/osinaweb/templates/add_pages/create-user-story-task.html index 3fcdfff1..7a4b4959 100644 --- a/osinaweb/templates/add_pages/create-user-story-task.html +++ b/osinaweb/templates/add_pages/create-user-story-task.html @@ -7,108 +7,114 @@

- Create Task + Create Task for {{requirement.content}}

-
-
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
+
+ {% csrf_token %} +
+
+ + +
-
- - -
+
+ + +
-
- - -
+
+ + +
-
- - -
+
+ + +
-
- -
-
- - Upload - Document(s) - +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ +
+
+ + Upload + Document(s) + +
-
-
- -
- -
+ +
+ +
+
diff --git a/osinaweb/templates/details_pages/project-details.html b/osinaweb/templates/details_pages/project-details.html index b9f1f2e3..fc1a516e 100644 --- a/osinaweb/templates/details_pages/project-details.html +++ b/osinaweb/templates/details_pages/project-details.html @@ -297,36 +297,43 @@ {% if project.projectrequirement_set.all %} {% for requirement in project.projectrequirement_set.all %} - - -

{{requirement.content}}

- - - -

-

- - - - -
- - - - - -
- + + +

{{requirement.content}}

+ + + + {% if requirement.task_set.all %} + {% for task in requirement.task_set.all %} + {{task.name}} + {% endfor %} + {%else%} +

None

+ {% endif %} + + + + + +
+ + + + + +
+ +
+ + +
+
- - -
-
-
- - + + {% endfor %} {% else %}