From 7fd912e1d7452e6cc7374e9f7b51b84ceda2c61b Mon Sep 17 00:00:00 2001 From: nataly Date: Thu, 18 Jan 2024 09:26:32 +0200 Subject: [PATCH] New changes. --- osinaweb/db.sqlite3 | Bin 638976 -> 638976 bytes .../__pycache__/views.cpython-311.pyc | Bin 69017 -> 69247 bytes osinaweb/osinacore/views.py | 9 +++++ .../osinaweb/__pycache__/urls.cpython-311.pyc | Bin 12036 -> 12161 bytes osinaweb/osinaweb/urls.py | 1 + osinaweb/static/dist/output.css | 16 ++++++++ osinaweb/static/js/pop-modals.js | 2 + .../details_pages/business-details.html | 13 ++++++- .../details_pages/customer-details.html | 13 ++++++- .../details_pages/project-details.html | 17 +++++++-- .../details_pages/staff-details.html | 13 ++++++- .../templates/details_pages/task-details.html | 13 ++++++- osinaweb/templates/epic-fetched-tasks.html | 24 ++++++++++++ osinaweb/templates/index.html | 31 ++++++++-------- .../listing_pages/business-types.html | 13 ++++++- .../templates/listing_pages/businesses.html | 13 ++++++- .../templates/listing_pages/customers.html | 13 ++++++- .../listing_pages/daily-reports.html | 13 ++++++- .../listing_pages/project-types.html | 13 ++++++- .../templates/listing_pages/projects.html | 13 ++++++- .../templates/listing_pages/references.html | 13 ++++++- .../listing_pages/staff-positions.html | 13 ++++++- osinaweb/templates/listing_pages/staffs.html | 13 ++++++- osinaweb/templates/listing_pages/tags.html | 13 ++++++- osinaweb/templates/listing_pages/tasks.html | 13 ++++++- .../popup_modals/add-userstory-modal.html | 35 ++++++++++++++++++ osinaweb/templates/recent-activities.html | 12 +++++- 27 files changed, 306 insertions(+), 36 deletions(-) create mode 100644 osinaweb/templates/popup_modals/add-userstory-modal.html diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 5a877bdd1669af57ba10126fab6e3c9646112b5b..3729612a36a1430003f455d2be6bd2e609e72df2 100644 GIT binary patch delta 663 zcmZo@P;Y2ZpCHXBIZ?)$QF3Dfk1iwU=3HG4CdRbQW%_*u%ZG zn9lxzv6qQGW3!{eB{q3EW=BRN10xe%10!7nLj?nKD+>iIK(je*vs)@0rzDrKYnxuz54FN&&rfj733q3MU(bxS}j) zN^xRJBEnn)Gb>Y51xMd@D_1rkX5Vh*%5iEJa|-*Ct?Zl!m^hcPpJqS8zL$L)(3mSM zY^=VdisKD&JA9HzS#y=F6EUKy2XJmp~2aSzLAxg0iK0{l_|Pry3Wq!8BVz_=Beox UzPYBk;lY8p6TtShC7i+D09sVd^#A|> delta 252 zcmVSb}x=_14aeolLw%GvxuNJ z1(Q%9Cxhdqx8tP&AxZ;A2Zxsj@BxjpK_K%6hllq8w}mvHU`9)~LK1Gg&f1llnJ77JaM2OtG4vq2y!3%6Y>1&}2XHy|)KIx#RhF*zfYRCLn`vhM*CvCWAGL zRdY+M3(*)&w9!`kxirBT)6<&Nw8y25X*rDxb&1V^XkBuo#`ON)aDv5n+Rh)pbKkwc zyS)3o@7-_KZ!~|m$=vashzP5Jf7?&&aGTy=+p&uX>`n8TOs)|D+HG2p;I_KP1`KaA z<6Y3yZ&to*T);4ErfYma&o&Pdu}sRpk5uBC8K6~K9YQ>FpLK!D$swexFhCP5v*VdF z?>^2#S4p11?$Lj4**zvHwZdCbSy3?G>vER)(w#0>pGu!w`utwGsE<-ob7s7w6B`O( zC{UIlU7qK%I~WZH-y2CP|&e7kSY-{gHZtrw0gTpoGhrMa2fRV62~yuI|S=Nga%ttrIhY+e}T*Ccl$l_-Lf-y#pIw&Ybi7KA#DraBWcvUFH1i` z+eHY@#7-fjXi4o5ej9#W+gGb#)k(dnwnEromF0j_2=x>_Qx`)otn13mH`evnd~CTu zO||K|`DaxkLa~vP&tw#>Tt7VQdkr6eQ|r51E7{=|s#u|_`2Cg`eaMC}_vLY_Jli%R z&ykIZ)`jdA&i(h5vRf~`)25-q5-g2o)S>LPbs5@XCMD{}>Ozf4>i(=l#dvL=kC@{1 zCyw^cuPAf--7dR{TYF=(SA>&mONRCWyJhNiTe_Mu-7L0*=X+(Tr+i*wPWh0;o%|SB z+1f}*uXDf#tFOdcRpI3m>Ek=6`K>t1JlJkh$8E7)OIU2^i2fH;1w(nugO4qoMs3Ts zECRol-`Sa?>(&V-(6~qA@EfFKZW%F*1vF1O3H)lM?^In zR?(3?gS2(Leoeo#$7Zsr$E4EY^^r9czb~$R$5gY*U{+T^5~O&VwJ$D4d3z8&_{uN7@~q z(sjd9?I1Xm+q}tj$YFZ}>s$~wL#m^#hlYw2I(sNf+s2AN=m{TOF=}tKXw@T*6l=j8 zYBs1r*#llGJjP@Dk=c*l{N0k^`1&tw8gFk)eb{^``2Hoh};||*|LEZz{3&^9a z6aBScvG{~8PxxB5+YMV&gIdikHG0($R?~VE992iMDf)EjU^P9H;iCKkkfOkOU<7sB zXVZbxj<9_os))nr>(c|Z1HAr`ZvR|Z2B;V+WV=17?fmCZ3f421=6q3U#*jiQ?Cspz zTG8gKDw#{2&ZJo0M`boqA&Wco+A~!~?IRXH)1%Ih6nq@>8hZ;bEo)3*c}rt2 zmOpJw(SFO6v-*w3*FkyZLLVXNy$eA~99_Q<#cSV^=v%i}NbJLkziaulon`IS8;;ii>Mff(G14Iw_itWYDb zn3sGJCp8a^J^@P@k70kMuRs}ZQ$=%(I7us-yNgq_vw5m^hB=SucbmIww#%sLOTa$? zng8RL{-zraF@rw6@vh}2+-_0z&2c@>ql(*Dw=gtBmhnXP`T3s+YH|ByBkX^pD>p}J zU$Qt{?|bX2QTvKTx1M@?jS&B!11*EKCRX_L>n#(7aMJKQBU!!t&Oq&JRxj7~}Ggd^d$jL)q(HC`0RDBzGyuNZWd;CWvl8Ef5}$Dr-!ZZjfbRwA17N&M3~PyDEHPRo zW}I9Lz{rrevL!B6i3?4>Ev7T#j*+-mB;Iw2w@l)c%Z~s!!4l_F;!LR%Ao1KJS|`yo ziAG7ZMPl3X`nt^~5f?4^e+@4UzH^}l!&Q?I;xFrtv*F++lStPhCX1^Ei)h7zwovhs F`QJd6)@A?z delta 3771 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 t-SJKH;lL+}%#OESIHFx}Z`t zJ~W${upS;Tu5J@?B@s90H)5|%89y`{i*#%(f449Gddq0y{<`PBW5matVe(V4U`|wW%7}kNLDFScHNGKjtQ{l~^w zk7Ps%Q6-GyhxP_8hD#mWMIW#Qjy)@jIPZAfoaRdOCrH@p&X#RA?lkYTOUOx)Q#Pb= z&{@Hy@thj7PB)w9ogNl{Q0H8glC@S4^$toM0Z>sZm)$A8l6$MHIxf17GX1z6y z|5P1|%gW3aHIBQK9X4D_?K^7xQeFAUWrf-c_>Y=0{Znadu0GwZ0e|f((>JE^Xth#x zquQa=s_{X!oy||G?GCl?2&Xd?ZgrDFXYSJ8)KLpTJre4ns7D@Un$xWmUUb`_(G~or z+r(dGOIf$gqt++1dh>38mOpb8BPb}LAVooWnp2G#{E6El%mU0|$!!i^1DMxpS#RoU zJ~sbby8yTWxpAZS=Z!xRn6OJH1Aj^teiNP?cVY>TwimuLI6N~o2hR(S=4 zRrM?>fHi#EV-eB-H}F>;v#<`ZfggHInU?`x(avDYxu~O=_(upDmCz_fqw=euY-&oy zZi-r;B^|>Ag(VcGC@g0{>Cm6PXH{t;?T;vaz51d$HKlf6r1gV%-D~8#^l5zHb-?Qn z;(K08s2}W*X8ZO7w6>e{O%fE7P>iCOJOIj|rqt&R^g=Hg5(!F3C_zy|9s*?;n|&4` z3^0Z_ePu!fAc`k_CVrgtf7^F@&thtR3i2=E2R^fK8Q=;&VcT2woEfJOW< zgC&6LnADUB%K%BGudo8JiXX4FWKsZY|I;H4%BH4x_Zw-=bI0ry+O^Ao(ZQ>qGh4o$ z+R5xk32Ks16Gct3pNDS=c~a=e1@;Dxd;|rGBov@1Ab0U;{C%w*KIujLbFEqEfuiT} z-wa*==*6}=OQsJXsBQOjK0q6SB>c#i><1;JDeCR%{KiU9L_!gYBJuzjgPOrE@?L#@ zoglx2{1o}+ArOW&p)zNnHg=7}_>e{{Z*t77YLZ delta 1757 zcmZ{lOH3PA6hQsCL}RGaE}DQn81u2QJqAMwA+$IKL);RK0b_oi0BL|RgipdJI3*uU zs!Bzwlu|tuQT6AjX|dE+a)gw!smij;H_~gRZrVlFb!Qb->ZUVuvC>G*NON`1yXU<- zo;Odvclo_Z>%P@mY*4Qcf8UoLd}Os5e|hZr!WtAMNirFvV(F#%lvdU*HJ`=IVEFdQ z*CvDE8}-KPmepVorJ3&&2H)X<_vGg%4*q=g6V5nyaL;ktbnuU zWr#9}D(7^e(@1`B+09*QtEaWqYP5N()YzuS36J)en;vcap{KH2pD|^`?);9#P78S( zg*F-57_=$VMqQYBp&+4z4puk!XmCiE$-|(^MsDZDGbUm z$Y4-eLgU&CJ6%U%`FX)kAt*zTK~PyiVYSdhe?hIZy`KUJc{y$k>o@kV&77+d#NQGCn?Y8{tl2O~>9kbG}YH1}P+DNH9n!cTw4VPEp(bN6DblVLINr zx}3xU19Wte!jcS243?CzNq^DZ1*I|XW=$~?6s+7uEcK9pz;jWAUJ@7h{un}EVNxJp z#2R~OT%wSYA;lo2^rJFRP`o)e6T-ARNkNoBWFRVWR7OnXimOx@MH<5i+s-{Vv)AQA z6gp+-WYDQ3Q4n?AatUc%CvF01l5F|y++~Ef$%LQht{_Zl70Wcjj7d8HJ_#vx+_7Ts z6tf9=2ZeSS+8MMfvnb4w$925_D#Co>2kAS~LeCFSh|3UX5LXsZStLRo&n+QbBeA+N z%XNfhy)n0fv`X%)-WtLUtx0Ab;ZC86FL##t&mYB}eXe)W*gSsd@}2eFOirZGDnl!S zRwaY=4)gJrS7#%S`VR#P5g8&3B1+hdhqWO1bHl8@<7kt@h};Mx3`UeLR4)9Vf<^?5 zH_7dKJNFhsH~Fld=Pn}jkfVA&6GiAPETn&boj*A#BxOi4NGdTj`U*y6*8M1u-=Gkd zA$pUxHi#G~<`P&PB8vepH;gbs zJ`M2PD8d-|QLQ8qrpR9bzHb^~#%us?tC@1n>?u|iq+LmB7G<-@%%UQpGLOpk$-N?0 e=F3~DIV77y%p6h{bYZJRSter*Zg{Bvd;AL@OdHGq diff --git a/osinaweb/osinaweb/urls.py b/osinaweb/osinaweb/urls.py index 6946ced2..f3c06861 100644 --- a/osinaweb/osinaweb/urls.py +++ b/osinaweb/osinaweb/urls.py @@ -71,6 +71,7 @@ urlpatterns = [ path('add-status/', views.add_status_modal, name='addstatus'), path('add-note/', views.add_note_modal, name='addnote'), path('add-file/', views.add_file_modal, name='addfile'), + path('add-user-story/', views.add_user_story_modal, name='adduserstory'), path('add-credentials/', views.add_credentials_modal, name='addcredentials'), path('update-status//', views.update_status_modal, name='updatestatus'), path('add-point//', views.add_point_modal, name='addpoint'), diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css index 0fefbc05..22898fbf 100644 --- a/osinaweb/static/dist/output.css +++ b/osinaweb/static/dist/output.css @@ -790,6 +790,10 @@ video { margin-top: 0.5rem; } +.mt-20 { + margin-top: 5rem; +} + .mt-3 { margin-top: 0.75rem; } @@ -874,6 +878,10 @@ video { height: 150px; } +.h-\[210px\] { + height: 210px; +} + .h-\[25px\] { height: 25px; } @@ -882,6 +890,10 @@ video { height: 2px; } +.h-\[305px\] { + height: 305px; +} + .h-\[30px\] { height: 30px; } @@ -910,6 +922,10 @@ video { height: 60px; } +.h-\[630px\] { + height: 630px; +} + .h-\[70px\] { height: 70px; } diff --git a/osinaweb/static/js/pop-modals.js b/osinaweb/static/js/pop-modals.js index 48e093ea..d69355c9 100644 --- a/osinaweb/static/js/pop-modals.js +++ b/osinaweb/static/js/pop-modals.js @@ -62,6 +62,8 @@ document.addEventListener("DOMContentLoaded", function () { addButtonClickListener("usersActivityIcon", "400px", "600px"); addButtonClickListener("addStatusButtonMobile", "500px", "80px"); addButtonClickListener("userRecentActivitiesButton", "400px", "600px"); + addButtonClickListener("addUserStoryButton", "400px", "180px"); + // DELETE BUTTONS diff --git a/osinaweb/templates/details_pages/business-details.html b/osinaweb/templates/details_pages/business-details.html index fa81ed98..b84e7ddf 100644 --- a/osinaweb/templates/details_pages/business-details.html +++ b/osinaweb/templates/details_pages/business-details.html @@ -146,7 +146,8 @@ - diff --git a/osinaweb/templates/details_pages/customer-details.html b/osinaweb/templates/details_pages/customer-details.html index 1e78184b..cbf3e010 100644 --- a/osinaweb/templates/details_pages/customer-details.html +++ b/osinaweb/templates/details_pages/customer-details.html @@ -248,7 +248,8 @@ - diff --git a/osinaweb/templates/details_pages/project-details.html b/osinaweb/templates/details_pages/project-details.html index 26259b29..b8bb9d18 100644 --- a/osinaweb/templates/details_pages/project-details.html +++ b/osinaweb/templates/details_pages/project-details.html @@ -240,7 +240,7 @@ @@ -377,6 +377,7 @@ +
@@ -444,7 +445,6 @@
-

Tags:

@@ -522,7 +522,17 @@ -
diff --git a/osinaweb/templates/details_pages/staff-details.html b/osinaweb/templates/details_pages/staff-details.html index 6a92418b..8715fff4 100644 --- a/osinaweb/templates/details_pages/staff-details.html +++ b/osinaweb/templates/details_pages/staff-details.html @@ -138,7 +138,8 @@
- diff --git a/osinaweb/templates/details_pages/task-details.html b/osinaweb/templates/details_pages/task-details.html index 80f40c22..8c8de620 100644 --- a/osinaweb/templates/details_pages/task-details.html +++ b/osinaweb/templates/details_pages/task-details.html @@ -357,7 +357,8 @@ - diff --git a/osinaweb/templates/epic-fetched-tasks.html b/osinaweb/templates/epic-fetched-tasks.html index 7e6aedb9..c6700fe3 100644 --- a/osinaweb/templates/epic-fetched-tasks.html +++ b/osinaweb/templates/epic-fetched-tasks.html @@ -15,6 +15,13 @@
+ {% if task.status == 'Closed' %} +
+

{{task.status}}

+
+ {% endif %} + {% if task.status == 'Open' %}
@@ -29,6 +36,15 @@
{% endif %} + + {% if task.status == 'Closed' %} +
+

{{task.formatted_start_date}}

+
+ {% endif %} + + {% if task.status == 'Open' %}
@@ -43,6 +59,14 @@
{% endif %} + + {% if task.status == 'Closed' %} +
+

{{task.formatted_end_date}}

+
+ {% endif %} + {% if task.status == 'Open' %}
diff --git a/osinaweb/templates/index.html b/osinaweb/templates/index.html index c00d83f9..9f89d7fc 100644 --- a/osinaweb/templates/index.html +++ b/osinaweb/templates/index.html @@ -49,8 +49,8 @@ - -
@@ -507,7 +495,17 @@ - diff --git a/osinaweb/templates/listing_pages/business-types.html b/osinaweb/templates/listing_pages/business-types.html index 36d1d396..2410b40b 100644 --- a/osinaweb/templates/listing_pages/business-types.html +++ b/osinaweb/templates/listing_pages/business-types.html @@ -155,7 +155,8 @@ - diff --git a/osinaweb/templates/listing_pages/businesses.html b/osinaweb/templates/listing_pages/businesses.html index c7649220..97dfcc15 100644 --- a/osinaweb/templates/listing_pages/businesses.html +++ b/osinaweb/templates/listing_pages/businesses.html @@ -185,7 +185,8 @@ - diff --git a/osinaweb/templates/listing_pages/customers.html b/osinaweb/templates/listing_pages/customers.html index 9763b76e..da09570c 100644 --- a/osinaweb/templates/listing_pages/customers.html +++ b/osinaweb/templates/listing_pages/customers.html @@ -193,7 +193,8 @@ - diff --git a/osinaweb/templates/listing_pages/daily-reports.html b/osinaweb/templates/listing_pages/daily-reports.html index 08ba528c..61fc6311 100644 --- a/osinaweb/templates/listing_pages/daily-reports.html +++ b/osinaweb/templates/listing_pages/daily-reports.html @@ -155,7 +155,8 @@ - diff --git a/osinaweb/templates/listing_pages/project-types.html b/osinaweb/templates/listing_pages/project-types.html index 5055b5c9..ffb6a716 100644 --- a/osinaweb/templates/listing_pages/project-types.html +++ b/osinaweb/templates/listing_pages/project-types.html @@ -156,7 +156,8 @@ - diff --git a/osinaweb/templates/listing_pages/projects.html b/osinaweb/templates/listing_pages/projects.html index 8d6e14eb..ef5a5fa4 100644 --- a/osinaweb/templates/listing_pages/projects.html +++ b/osinaweb/templates/listing_pages/projects.html @@ -207,7 +207,8 @@ - diff --git a/osinaweb/templates/listing_pages/references.html b/osinaweb/templates/listing_pages/references.html index 4368f2ff..55f7ae48 100644 --- a/osinaweb/templates/listing_pages/references.html +++ b/osinaweb/templates/listing_pages/references.html @@ -165,7 +165,8 @@ - diff --git a/osinaweb/templates/listing_pages/staff-positions.html b/osinaweb/templates/listing_pages/staff-positions.html index 10f83a60..15ffb626 100644 --- a/osinaweb/templates/listing_pages/staff-positions.html +++ b/osinaweb/templates/listing_pages/staff-positions.html @@ -159,7 +159,8 @@ - diff --git a/osinaweb/templates/listing_pages/staffs.html b/osinaweb/templates/listing_pages/staffs.html index c106fa89..a8df81fd 100644 --- a/osinaweb/templates/listing_pages/staffs.html +++ b/osinaweb/templates/listing_pages/staffs.html @@ -167,7 +167,8 @@ - diff --git a/osinaweb/templates/listing_pages/tags.html b/osinaweb/templates/listing_pages/tags.html index b18cd7af..08749087 100644 --- a/osinaweb/templates/listing_pages/tags.html +++ b/osinaweb/templates/listing_pages/tags.html @@ -158,7 +158,8 @@ - diff --git a/osinaweb/templates/listing_pages/tasks.html b/osinaweb/templates/listing_pages/tasks.html index d5cdde71..37c78fbb 100644 --- a/osinaweb/templates/listing_pages/tasks.html +++ b/osinaweb/templates/listing_pages/tasks.html @@ -463,7 +463,8 @@ - diff --git a/osinaweb/templates/popup_modals/add-userstory-modal.html b/osinaweb/templates/popup_modals/add-userstory-modal.html new file mode 100644 index 00000000..54b3188a --- /dev/null +++ b/osinaweb/templates/popup_modals/add-userstory-modal.html @@ -0,0 +1,35 @@ +{% load static %} + + + + + + + Osina + + + + + + + +
+ {% csrf_token %} +

Add User Story

+ +
+ + +
+ +
+ +
+
+ + \ No newline at end of file diff --git a/osinaweb/templates/recent-activities.html b/osinaweb/templates/recent-activities.html index 12de5855..31e52bad 100644 --- a/osinaweb/templates/recent-activities.html +++ b/osinaweb/templates/recent-activities.html @@ -4,11 +4,13 @@ +{% if latest_statuses_time_ago %} {% for latest in latest_statuses_time_ago %}
-
+
user profile @@ -43,5 +45,11 @@
+{% endfor %} +{% else %} -{% endfor %} \ No newline at end of file +
+

No statuses at the moment.

+
+ +{% endif %} \ No newline at end of file