From 08466669580af530651630ee116de70b22821c71 Mon Sep 17 00:00:00 2001 From: emile Date: Sat, 27 Apr 2024 22:41:28 +0300 Subject: [PATCH] new --- osinaweb/db.sqlite3 | Bin 1204224 -> 1204224 bytes .../__pycache__/models.cpython-310.pyc | Bin 13133 -> 12921 bytes .../__pycache__/urls.cpython-310.pyc | Bin 4008 -> 4060 bytes .../__pycache__/views.cpython-310.pyc | Bin 18005 -> 18194 bytes .../add/__pycache__/urls.cpython-310.pyc | Bin 1829 -> 1900 bytes .../add/__pycache__/views.cpython-310.pyc | Bin 12686 -> 13201 bytes osinaweb/osinacore/add/urls.py | 1 + osinaweb/osinacore/add/views.py | 30 +++++- .../edit/__pycache__/urls.cpython-310.pyc | Bin 1764 -> 1875 bytes .../edit/__pycache__/views.cpython-310.pyc | Bin 10508 -> 11076 bytes osinaweb/osinacore/edit/urls.py | 15 +-- osinaweb/osinacore/edit/views.py | 32 ++++++- .../migrations/0076_alter_reference_date.py | 18 ++++ .../0076_alter_reference_date.cpython-310.pyc | Bin 0 -> 647 bytes osinaweb/osinacore/models.py | 7 +- .../add_templates/add-department-modal.html | 32 +++++++ .../add_templates/add-projecttype-modal.html | 12 +++ .../add-staffposition-modal.html | 12 +++ .../edit_templates/edit-department.html | 46 +++++++++ .../edit_templates/edit-project-type.html | 10 ++ .../edit_templates/edit-reference.html | 2 +- .../edit_templates/edit-staff-position.html | 14 ++- .../templates/listing_pages/departments.html | 89 ++++++++++++++++++ .../listing_pages/project-types.html | 8 +- .../templates/listing_pages/references.html | 2 +- .../listing_pages/staff-positions.html | 10 +- osinaweb/osinacore/templates/main.html | 18 ++++ osinaweb/osinacore/urls.py | 1 + osinaweb/osinacore/views.py | 13 +++ osinaweb/static/js/pop-modals.js | 5 +- 30 files changed, 349 insertions(+), 28 deletions(-) create mode 100644 osinaweb/osinacore/migrations/0076_alter_reference_date.py create mode 100644 osinaweb/osinacore/migrations/__pycache__/0076_alter_reference_date.cpython-310.pyc create mode 100644 osinaweb/osinacore/templates/add_templates/add-department-modal.html create mode 100644 osinaweb/osinacore/templates/edit_templates/edit-department.html create mode 100644 osinaweb/osinacore/templates/listing_pages/departments.html diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index fa3ec6ffc255828415b76f637686076c32d9e2e6..bb2a1ce505b3ff878463ff321e10ce188d2cd5c4 100644 GIT binary patch delta 1536 zcmah}Yitx%7`-!hX1BAuGj|7C+HN6TEUlJy>+Hs1fhaKj3PD?8%UZoh>rj!&fo)om@vti z+{es!&iCDOzo9e1p)X-8@Re&b5;!q-^@s3ESIT};8#*|hirbL<*g3auNQfg*(dg{d@ zn*rJc=p*o%A5F_r$BU|n`P3gp=ZSYx=ZZTFRCWRM5P0qgl>zJ6J*hf}Odnupfo*!s zQMiWl`CWqFES=n6nr z&@J>6wvLlAb!eOnqC#{FAdo}U)& zovyxpgWYnJsKWF(SA@lJE~36Z&OK)#D)F^1*5!Nu^03i0MggD`_~0TP8X8G=DKksVksv;(EkJV5u*Z)gF{>jAz-xO*=}nIWVg zLr_{>Y4ulR<=)eX767_~ZleYLyDNx8w}Fu)u>le!NghydU$9zd;S+{IY@Fod2E!MI zDZ`+a*F72*jI`mNV|*6>z=}Ru67xq|@t0*NJ>6q>J}{(Ll3n>D%71rczvwLy1zGaR z`6Dg&cT~$U{+G0Da~oi&U4WgojG0QAZ0;MwIeN)@EO~+bMQ!aYbEnyvAAY@wgkG*;pOeA@sDjZ`HzQ5F|6Z}VXq23xa0d;|g83P}u=%x7a_xbosiKIZ)^gmRxA_;!y zUy94iLe9kc9w``Wj1L5>69MlQ*XHg0;ip6WeZ7jy6Lf|p_lBxiU;L^6RqXY6yz=lP z$vj=EI&qp0!{vG#pwSpWH_=zS)si$*RCaplWX*mB$2~8xO4&*k;Do-^D4~3`OSnCXJ0p! z;K_Q9!?P1GgKG&T6#J&ydi$n^>gq!E)OUO(OiyEX0(1;Dq9xpUu9M^08Fr_hhQek9 tlEpO0T^IPb2@8V9of=%4m8qSr%OT!(r{wmFa*50765UR9W`SQ9`xB?S#R>ob delta 1197 zcmaizdrVtZ9LLXn_4ak|>4h%zP%S->p0eJ!dzj~$0j4jSQ|3$W1Brg*bC5Ri<~~ z>YEa$!#dQdn-wqNhg1mrQddMi79z~4g^B~IbCvlDJfA0OFf{*_`e16NvI*Nt{ZYAu zO{Z>G1r$VHIbp-l=9^>=(Z;N#+6)#2$}J(xII3IcvS%j^ImcM5!(?;t_M_%%J8v`1 ze&W~Ak9-#MQJbm8ZnTeWh~pa~CT)m#nO+0G1~^;;a1HJuT@sHVeG(_7i%I+$c;vWu z*c%f2`@G>HIlC&&iw8+ipgPg!YH_x<%N{K#kd6AfXQjQ@akyImPXY}&379P=U&E=x zswHIy{juT-^&4fC3X?=WMUFl#(&LV6gygtJF1}4OvIqrVk?30L!E(kR;5LB2z&*H~ zDb!s^(gXp@d-SoBciJgprS0W9~q= zU9{Eo1wF(4!J4q8FP@0lx~1CJ*ae(ayb2l+HNkeFo(a~9E6>kztD~e;lxAPRN|k0% zp74l*P#uj10)C%h8?eV>!9?5_84gE0RxuVBpPOQ(xhdG-QsQt6z+JeN33ClrsBr=m zG>C&kfv}Io2vGX3UZ@`yY7fBQ;m>d{bKo9S=HPS{NdQdx3F_E)Wx0I-AHe<0>bFqZ zU)JeXh#JLxL{D&oa+K#3#Njak-KmEMB<*$XzA{f1RZ(fc%xW*IYgKvdXNucYn*LGa zlXnZ`6B-}(IMp)NURUE82?_oozc1Q565)phk?)U+!+o(}G~)K#N6_ax@V%x%J~-rZ zbeiG=9>4dD)Bl{iyE)!w=xgk>w#H2f|H#=4 z-%r?L;(5E2zQKJ&9l3aDl$Y;stNXv!pc#_NMo+%aO}c_nqocj4!|JMU=oZ7VQ`XLb zgr(EjTkUNT;=`?p9=AJiJl4_ZI^!H^Y;FHf44E(U@KH&Z=eR+lP%hD51Iv|vyG|xc zhLcfc3VjD2<1h-8Vn7gM;gIMSx{MYjqrL&OSP4);rHMXEeM*s}6JN%@!%Emb=92c- zBS|bb#jU<2t*mh0sBoM@A8zX0DE}_EiuyM=HQL$WEa-=IPJ=o&I1@RRJ(h=hzt^=& jx7N8vB8z4g0K5)6U>3W?hFFeS$iy?vNDDjMQ;|ObJaKC( diff --git a/osinaweb/osinacore/__pycache__/models.cpython-310.pyc b/osinaweb/osinacore/__pycache__/models.cpython-310.pyc index 80b0c54f56c35f3ef7a2f411b6d0bc71d0ed7f7d..b16808f2fa1100f99fbbb98a8da57d333fc7e668 100644 GIT binary patch literal 12921 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 delta 248 zcmca3ze1ijpO=@50SJz~(M~Iy$Scbzvr)T&iJdvcubHu#Y4R2(Wlq*C-IS0Nu3qNJ z_n3lYqKs3GQ`u8FvrK^4G$p>5$($j|I3*#NK{Ii446{7z=4l*N%#3E61$n#~Cnxe6 zDu@D&FA@V0;y@ybuOu@$JGCS}CAB0mGpD#nV)7>5EH+7yywqeRJ|9Nu$@zR*Y^opu z)yebuiWv`07Ur+@o6(%<PJdY96IX*L{Q+(!3C;2RxPViYW9p|%RI>u+sa#X?&0BKM_iU0rr diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc index c00748e15279e0a11993837ae5588647aefb2288..f058def191f741762afe36e798d679767ed5a3b8 100644 GIT binary patch delta 1320 zcmZvbZERCz6vywm?Jlyu-BG%BTf1y^-TJb2-MV7g*6bysAIJz{fTTp1%Do#MUDrIl zGm#Gt9bb%MLXU}w2`Eux5TlYC6F(67Lj2?#kVR91VN)g;!v+I<$zFU;N2VXVAAa|_ z=lswA+~?f;%)Ac8H^4e!u~Z8D>KqJ@Tp2lOb;I)c&{Z*_#uY_Tj|(@Yyzb6VkOeKu3jGP%*=e0o$Z zwEZU)IjoIm0~MvpCpYAH+2_W9&*fq>{9WDxL0Ec>FJ#eZFs_*mYzEJG-8kj5;&)9c z_z}-HyJ{?XHZi6i(uTDc^J?KeUc-LiHLUbVn}chlL#bJ|f5NkcvZKLhG_IN@c74Nf zsQFp=i7Q)77dAX@l(TEi2Vs_HoHCo`&R3DE_#mALiC2b3Ai}B=3`C4p)M1 zZ1=weH}Nxn*nX2|%6l@4Mv?Ey$maD$|2c5oBK0?f+Z-inGOwgHmHoy|Yw+u!6&CPX zuo3QXKM(wZb)mGhK-8kL)h3O$lKPUWE);||EJF7`=<}tIl6-0vw5>0J|*LXblc{m{LVh^a~55h6R zpBzV9u+d@1Z^I7hZ;CDB?XVA;&=zsPs_u)J03PV=Z52=}@PU-1bUv@<6vmqgfhy*s zl83lEnsl$xvaG4pCbV>RSj&v73~0V0o{jE-C@x3iV9`6;0c0D+bt;i*RfXTjTzIg< z219tHqXxF1oOI)vjwzeUJ1rTx&}iVFz=3Ts58TJWSRFVq6H7}@DtGa6uXFN$CQ!j@ zadYSIrhog@72|C%jnTMAbOY|Lt;4Z+x3iqLl2?)UDphD1EvqsaFT}TRD(7UtlO8+T zwwbElq&^atnZ;_5fi>u%ZC`@ZT;2$6iM~R>v_721Vxk4S=uddzaom~cg;V%iA_hVI zV&VgU5UO3T!q2$Sbqeb7M7IYv=;P~U@IO-22G3nVDC@qJDUVlI9; z=lTDi|MR>roa1l6&#!}Prm4wcDtsQ zwu#5Ir?qMRe?TidYEz#vQFD!61 z=w9H(^Q3-4>Vl;nie_QaQWtsgYf?{RhwV&c|-t&@F81{YhRU`{#teD92Tmja=nfO*e9dV&y&z z_xa%tH-=i+DmSUpK2{_1pM;}?+t{Hh_;O!B`kP+=!JOZR=lZrPiohp2dCe&_gCGbX ztvegoUGq|(3{W$dA83HqbuL$>T)C{5G{*fl)yujlW(~zeCUlP;Esw*PF>=L8qi|Sf zb*kF%U}8VqkLMEoAe+|{0Ny4#zDc5sp4@=hh=T5<8^$o4Yyl4rCg1Zs!N=4@?h@_% z?tOrv-Zp`)BBa{DkL{^kqo2A18{H>T4rTg(2eEG+B#2+6R-FIMY}sh|wqM!yJT)}) z5iUW300?zS5Y~l;&Bj*1Gm#L6(+??Dx0A*l=k98QQ80=+b746>C|Q~dVbs?yPw7T} zdQvYJ@|9zhEpfL~2!IDzhq;ix0E&Y`yu8fl##MRa7Q^`2KsRi|D+3Ye#QMN)cnfzA zCLwB820sE&v1RC0_ys>4dLKfV9d3t4oE&~iiSw|kBR^9r>3O3tQ(`A6SjD;F4D?_i z6NVV3Ggt zfZvStK-ydz`IwXw4^K)Dl6QdjN5FyGN0W_1ys%Gw+TO=$I zRtPr;w+MF#cL_3udI&y3kkCr#AVdiX!cIbxkS5S*7NvkqV9~z?hsRv-CGHt3fg3N3 GjsFY6*hH%U diff --git a/osinaweb/osinacore/add/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/add/__pycache__/urls.cpython-310.pyc index f36e1851473d5bd5962e0b65ed8d9fd1a250da91..4f73352754fd469e0a1e0637eae3e416ee071be2 100644 GIT binary patch delta 164 zcmZ3=_l8e9pO=@50SE&8bkpXsGcY^`agc#5kmCTv#dRCCvl%5)8B*LKLY%+|DW|Ixs&6zl!0RZ@D5&-}J diff --git a/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/add/__pycache__/views.cpython-310.pyc index 725635fb682cf0fa96905e737641623d1a3afd3f..fd644263f0c339738f04757926fea092be316b6a 100644 GIT binary patch delta 1174 zcmaKq?MqW}6vywmPn&m}n7Yu?W-iy}oHHtW0;30CM6n)(UI-y$zq^{L8+ShfV`5=1 zf-sQt56l;84_3$uBnj5@0})yDB46|eL=^Q-i0XH)mPQZvaz6L>`<}CV&-w0mF)?zy zH0|*ilDN#nk!116NNEk69|^yMRy3diwqOgKDmTm7Cbs#UGz6VNR^1_mwiYH~pssd( zoUtx$_GWtG+{{MBF2c-A+~U1vAICm_jeE}6yCj^b54enF1$nP`#nQH`H_hTbU+`{y z_27i)Cjr#e;^h!eii0AuNdYc(LtY-0@(P1d7*KLjx60&`vK105Ew9_E${jhCJGr!| zDWkyDVVP;e@_?4p@+G4ZNZerh5Ohe)kyBDIpmSHQO=8ZRKBS0AOJde;@j1&)7$-Cf zT$UG9Tc{AioNH;2EC%bty4xBPI)3o@^bGw>#i@o0j8;18e6+12Tqe-#=Uf>p-EAf~ z@6VX{+3@0(`jvwqi(#uox=c2}4YIh)LI38|oQf)|-`$FJRV07&NfQG3v`56>e1gCF zBnzM9KYZ#~FiOcOe;5VAC{-9mKB@ol$+{%^u*e{L*3*r6Nbw@`uUu}=F-qI^_%v(H z&sy7;PEVG{lgUgvo8qZ-pY6<3f0f_+4`=jW&P?K0|7&Q(m+PwGTH*b=T7Wim25RBD zNNmHdz#tqENw20DU`-X~13rM8SRHH-+!@>t3A_+o4bz2*;5=ydACHrbX?=#;8^^Wb zb|~WU@KMd43!jDCWorySdTMpHP_d&a+46{%qEjhUwlEi+UTYuWG2scpJ_9|pn!(wo z3YUGP?$Ex7pPE*|eKaDiz;Rb34YN2Ex$P}d@+_g3aF=io&oq0>?$h!C;US@jW6c}k zIlgV)+4_P6g|O6>!|rOXgr^cGP2QDaR*?!`5$spJ#8|WuZeV{j>Uks7kQ|GJAQlQ0 zZbkhNnxH~Dg4QJA8sR!&iZD%>CA`6}Edl63|Aqs8p8;~Ihzb#vi%(jYEyngz_yNXh B9xVU> delta 737 zcmYL{O=}ZT6oz{yCXGoZiT!{kX;KrDI1`&MVuRG8pmrfjx)59hBn`==Mw`wsGZBOo z@dv1cgDVwR+7=6447Mt%ZK`fmjM7~|@h`Yk5WPntxtI63+=QuQ)$G*XFv_S->FaAbl<-;K0y+aH1AY!kKUse&CmoC-9Udmw@tn!^Bq7Stbp?20c9JrUsNvcVL-oaA*oe za5`$oOk{FsP#s}is)H~}xI&Ngn$!So&M@S8O)pj|imX-js=S2lh~OLGShAZHZJYx* zHZ6awW~<2t>I&`#$5DuGfg8U^J+Ny0iuwVI03MM zVl2Wq7rOxG@j=W7hOrg<368FmzB3zhg~zH9GyX!s#M z%RJ}$p5MF|lL<3y;#8snd-yQn&Ap+Fw}f|uMFQn^`F>QPT2?oy@RHDC$dBmN(sfBM zu#ckGwL)Df7j;S9!2`)G%Q(k`J*XyM~j z2HxX->a_hM9nh~-_t2mAx&MWJru`1#6Ly?qIG-MZ`>3Up{60Grxm-?!oG2I@=_4T0 z8`x2;@@3*d7{oS!Zf;xxOf!qU)qx#ZczrM8F1|lgY(2+>@KFq-iJo E1)JH%mH+?% diff --git a/osinaweb/osinacore/add/urls.py b/osinaweb/osinacore/add/urls.py index bd222b07..f5aefc7d 100644 --- a/osinaweb/osinacore/add/urls.py +++ b/osinaweb/osinacore/add/urls.py @@ -21,6 +21,7 @@ urlpatterns = [ path('epic//', views.add_epic, name='addepic'), path('note/', views.add_note_modal, name='addnotemodal'), path('dailyreport/', views.add_daily_report, name='adddailyreport'), + path('department/', views.add_department_modal, name='adddepartmentmodal'), path('projecttype/', views.add_projecttype_modal, name='addprojecttypemodal'), path('staffposition/', views.add_staffposition_modal, name='addstaffpositionmodal'), path('businesstype/', views.add_businesstype_modal, name='addbusinesstypemodal'), diff --git a/osinaweb/osinacore/add/views.py b/osinaweb/osinacore/add/views.py index 80127020..f6c01766 100644 --- a/osinaweb/osinacore/add/views.py +++ b/osinaweb/osinacore/add/views.py @@ -494,27 +494,50 @@ def add_daily_report(request): return render(request, 'add_templates/add-daily-report.html', context) + +@staff_login_required +def add_department_modal(request, *args, **kwargs): + if request.method == 'POST': + name = request.POST.get('name') + department = Department( + name = name, + + ) + department.save() + + # Reload the parent page + return HttpResponse('') + return render(request, 'add_templates/add-department-modal.html') + + @staff_login_required def add_projecttype_modal(request, *args, **kwargs): + departments = Department.objects.all().order_by('name') if request.method == 'POST': name = request.POST.get('name') projecttype = ProjectType( name = name, + department = get_object_or_404(Department, id= request.POST.get('department')) ) projecttype.save() # Reload the parent page return HttpResponse('') - return render(request, 'add_templates/add-projecttype-modal.html') + context ={ + 'departments': departments, + } + return render(request, 'add_templates/add-projecttype-modal.html', context) @staff_login_required def add_staffposition_modal(request): + departments = Department.objects.all().order_by('name') if request.method == 'POST': name = request.POST.get('name') staffposition = StaffPosition( name = name, + department = get_object_or_404(Department, id= request.POST.get('department')) ) @@ -522,7 +545,10 @@ def add_staffposition_modal(request): # Reload the parent page return HttpResponse('') - return render(request, 'add_templates/add-staffposition-modal.html') + context ={ + 'departments': departments, + } + return render(request, 'add_templates/add-staffposition-modal.html', context) @staff_login_required diff --git a/osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc index d35e37c3c020116c01e9d7ef93065943dcf2fec2..52e5e30874be2808a0fb4a45c823a0ffc7e3aae3 100644 GIT binary patch delta 363 zcmaFDdznu=pO=@50SLH*b<;MoGcY^`agc#HkmCTv#abJ+#Tg}18B;VGV@BT5PXO>K9DwqV3p$J0wx6u{V0BrctKHqR%&udNo7H5 zm1=QGVp>{3esN|=W_}*TFccw>d6PFVi83lrKE|XZsvji)G9sz8I5RJ`xEO4P?BqX8 zGRpcD#4P(bclgK2H07fEt!8aGD=J~Wo-}uyCfdr#LZh+nHU*$ SCU0j`;AiAx;bVkBj+X$=*lof9 delta 301 zcmcc2_k>qFpO=@50SNXuXr)=QGcY^`agc!+kmCTv#WEYU#TmKMg`&h#G=mv5wI)X~ z9+4L+Ni5FRw<#_uvI4Q~mSf2=Il~}>KU{~;h)We0U1WFRqAf|XNdXQAcoVcD8O zN0@F-rjloVPlY*D{Fr0)V>)#@Al`WGMH4T)FiX5xLUyra7smI0N+?~{g~XGbU*Ge* z&w1YW|GfX6seMa5)`Z1klEig&U&mm}BhywtdthPPcIJp$)NSfrN2N*DtEe5_QYf5z zmObHQAv))Jlnv7j*CDG}jV2>p8;TBVsdNji7+v9FB>cQK6wjNAflxKC6bt1|d)D5f zVb4~3-crozkEwiw>@KIRHmb(7{^ATZx_w?5J6*jh#II4@4~zSHoK{$UcBWF5XW5t` zBONfRh8JYsAx4{Ksu0b{{neVJ$*YlyS*Eg+vWS{8@{D;_Vv<&)R!*{RNwZ`m)tHep z26fYEdD0-XS9NlyScbO&W?)1hUz6mC1JMCZJDiNB(ycUJ*V-47^X7G7o)n28tFD|s zi8ndm1$@9Rzz^tk8!^(C!3tafpp+W~LKXB^o!fW_&q;KN%x*_C%p@sg6R{eDjhSRC zbF(T|B|BuE7QumXJ>v&av5YcnN{b8*CKIWc7E27L(rq|g8h1OhLZ78%vP9t?Z0&z3 z z5_R|}W{%Kr^?5cyS&xS6G?Wz#*WfU{vGTrUG(3~ z9>=C$2Bv_Mz^lM(!0P}35ujHftvlmfj0!^8#bhfZZ_}r-cCb70`)20d&+G&Z;3}zT7P6fiye$< zhgUa`4V(c!(q$|v4z@^tC~a&(Y`@X=F{VBN=7F#Dq}>6(`A?yhUqCFEiv~uS1tRkj z7h!RNbanH6&lFE@O=ifmA(^OAJh;#B_&M+e@Fj4L##=mh>cm2e*ITX={5<{L(rGK4 z9;&TtKu@ra-Jp2zezuhRH25@o{A(oWzWfHGfO$XBcDh9FTk(B6<`r4v`0Vit!>RlMHc1`(@1c; z$tv?@kGxdS`(A) J^iTWd{{U-Jw@&~7 delta 1426 zcma*nOGs2v7zgk|x7OlHE_Ls=a<3rihOOkn{fi3KWom$#f9(X(Nij>u+}q>ikmA5nXaK1~&`JXcz* zD0Nk(auD|y&+}sf>N6*V`*f>Di^@tkr+KrUhN8nsjxz6Nc-y~A62E@pJ}7Q?sGv;M zz!X)zs)W_EX0^yb%Jalil{tda4Ei8mE~dy5kLlDH=#wELDOm(_BY>Ye#E;jAMlnJz zUuw}nZV1n-$YC60wTroYG3qrL;#ppekvjTq^f3?3n{rt;SqYlwkqXQW?1G47 zi9U`DLd5hCDOl36Ko%&4O1z0!jKyoWY-6mMQmtts_!;XSRzcm?eBE_1+ZRxvxRh!) z_s}nEu9%c*Q`mW$w572=TCn|TyokguffjHXTme_XHP8xN;DkWdFKt69I@&=PxCuId z9drT{C@{Uhd#$&}s&Ez+KQoS+ap9?Dl|mEX@v@ zw#E7B)VyCT$=4hd;|a1S+4Ei1?$VM~)wJQ^8-iiOmI@)+kz-mf^`*?I&0$L4C{v%d z+~rn^T*XRRO_@^1d+_eXg|fHW?EF~Q*qHPc8;RrGET4T+W$IboOz+^u0V@3l6|LM=K(hB{p>u&4v*n=D2_h^OZB1k9J~PIU;=o-OE3vu zfhn-G7Sy=Y)VS4ix^CHs^%`t^3NX5Iezj}Que{~}4`cotFb&><8Gu8*KOk5V2RfMs zoGHONiO-3FJlRfD^2hW_Oi}>8LA(y&8^W7FALs`oU=+-PIeM4iWQDYlu#aiTk?8mf Dc}F+_ diff --git a/osinaweb/osinacore/edit/urls.py b/osinaweb/osinacore/edit/urls.py index 87dd8d29..c8ef0e2f 100644 --- a/osinaweb/osinacore/edit/urls.py +++ b/osinaweb/osinacore/edit/urls.py @@ -8,14 +8,15 @@ urlpatterns = [ path('business//', views.edit_business, name='editbusiness'), path('staff//', views.edit_staff, name='editstaff'), path('project//', views.edit_project, name='editproject'), - path('task/', views.edit_task, name='edittask'), - path('task-status/', views.edit_task_status_modal, name='edittaskstatusmodal'), + path('task//', views.edit_task, name='edittask'), + path('task-status//', views.edit_task_status_modal, name='edittaskstatusmodal'), path('epic/', views.edit_epic, name='editepic'), - path('projecttype/', views.edit_project_type, name='editprojecttype'), - path('staffposition/', views.edit_staff_position, name='editstaffposition'), - path('businesstype/', views.edit_business_type, name='editbusinesstype'), - path('reference/', views.edit_reference, name='editreference'), - path('tag/', views.edit_tag, name='edittag'), + path('department//', views.edit_department, name='editdepartment'), + path('projecttype//', views.edit_project_type, name='editprojecttype'), + path('staffposition//', views.edit_staff_position, name='editstaffposition'), + path('businesstype//', views.edit_business_type, name='editbusinesstype'), + path('reference//', views.edit_reference, name='editreference'), + path('tag//', views.edit_tag, name='edittag'), #Mark Points diff --git a/osinaweb/osinacore/edit/views.py b/osinaweb/osinacore/edit/views.py index e62aed19..eaa5275f 100644 --- a/osinaweb/osinacore/edit/views.py +++ b/osinaweb/osinacore/edit/views.py @@ -285,28 +285,50 @@ def edit_epic(request, *args, **kwargs): +@staff_login_required +def edit_department(request, department_id): + + department = get_object_or_404(Department, id=department_id) + + if request.method == 'POST': + department.name = request.POST.get('name') + department.save() + + return redirect('departments') + + return render(request, 'edit_templates/edit-department.html', {'department': department}) + + @staff_login_required def edit_project_type(request, projecttype_id): projecttype = get_object_or_404(ProjectType, id=projecttype_id) + departments = Department.objects.all().order_by('name') if request.method == 'POST': projecttype.name = request.POST.get('name') + projecttype.department = get_object_or_404(Department, id=request.POST.get('department')) projecttype.save() return redirect('projecttypes') - return render(request, 'edit_templates/edit-project-type.html', {'projecttype': projecttype}) + return render(request, 'edit_templates/edit-project-type.html', {'projecttype': projecttype,'departments': departments}) @staff_login_required -def edit_staff_position(request): +def edit_staff_position(request, staffposition_id): + staffposition = get_object_or_404(StaffPosition, id=staffposition_id) + departments = Department.objects.all().order_by('name') + + if request.method == 'POST': + staffposition.name = request.POST.get('name') + staffposition.department = get_object_or_404(Department, id=request.POST.get('department')) + staffposition.save() - context = { + return redirect('staffpositions') - } - return render(request, 'edit_templates/edit-staff-position.html', context) + return render(request, 'edit_templates/edit-staff-position.html', {'staffposition': staffposition,'departments': departments}) diff --git a/osinaweb/osinacore/migrations/0076_alter_reference_date.py b/osinaweb/osinacore/migrations/0076_alter_reference_date.py new file mode 100644 index 00000000..5ce6c16e --- /dev/null +++ b/osinaweb/osinacore/migrations/0076_alter_reference_date.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.5 on 2024-04-27 19:36 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('osinacore', '0075_remove_ticketattachment_ticket_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='reference', + name='date', + field=models.DateField(), + ), + ] diff --git a/osinaweb/osinacore/migrations/__pycache__/0076_alter_reference_date.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0076_alter_reference_date.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..0ee882ddec2863005cd1f322abfb747626fa97d8 GIT binary patch literal 647 zcmYjPKX27A5ci+tkwjENATcu`B0AJsobqlltCF|?(I zwTzOtL@~uLiQ+&v{3~y{%9f0kv8h7Mw;WPqCE(rHmKNQ1G-<|_@oI;zW9h$${atOPbt zr#+y5SBTH2vQM=MDHvf;*i(ad46lmSn?8U$OkEsLf${)nO*mF|ge^xuh`W#3$^7}! zeDvUa14j1%eXlQ|IRJkW?AR=2ug#-(a!lZZ*P*kfnJ8!mIG-G~k;B@~!E-pCokUP` z^Ck^a^+L$B8xpqVK_nV>#|xKUeu3)KP6c5+yUub(8C}rqZ*e{4kLoOz^Qc{QJRLh7 bI3;h6nY{ + + + + + Osina + + + + + + + +
+ {% csrf_token %} +

Add Department

+ +
+ +
+ +
+ +
+
+ + \ No newline at end of file diff --git a/osinaweb/osinacore/templates/add_templates/add-projecttype-modal.html b/osinaweb/osinacore/templates/add_templates/add-projecttype-modal.html index 0ee4df1d..436a7e2e 100644 --- a/osinaweb/osinacore/templates/add_templates/add-projecttype-modal.html +++ b/osinaweb/osinacore/templates/add_templates/add-projecttype-modal.html @@ -22,6 +22,18 @@ class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-4" required> + +
+ + +
+
+ + +
+ + +
+
+ + + + + + + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/osinacore/templates/edit_templates/edit-project-type.html b/osinaweb/osinacore/templates/edit_templates/edit-project-type.html index a3b9c4af..151d4c8e 100644 --- a/osinaweb/osinacore/templates/edit_templates/edit-project-type.html +++ b/osinaweb/osinacore/templates/edit_templates/edit-project-type.html @@ -19,6 +19,16 @@ +
+ + +
+
diff --git a/osinaweb/osinacore/templates/edit_templates/edit-reference.html b/osinaweb/osinacore/templates/edit_templates/edit-reference.html index ef7c3755..f5101b4c 100644 --- a/osinaweb/osinacore/templates/edit_templates/edit-reference.html +++ b/osinaweb/osinacore/templates/edit_templates/edit-reference.html @@ -20,7 +20,7 @@
-
diff --git a/osinaweb/osinacore/templates/edit_templates/edit-staff-position.html b/osinaweb/osinacore/templates/edit_templates/edit-staff-position.html index aa507de8..12563226 100644 --- a/osinaweb/osinacore/templates/edit_templates/edit-staff-position.html +++ b/osinaweb/osinacore/templates/edit_templates/edit-staff-position.html @@ -8,14 +8,24 @@ Edit Staff Position -
+ {% csrf_token %}
- +
+ + +
+
diff --git a/osinaweb/osinacore/templates/listing_pages/departments.html b/osinaweb/osinacore/templates/listing_pages/departments.html new file mode 100644 index 00000000..fda1ac24 --- /dev/null +++ b/osinaweb/osinacore/templates/listing_pages/departments.html @@ -0,0 +1,89 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + + +
+
+

Departments

+ + +
+
+
+ + +
+
+
+ +
+
+ +
+ + + + + + + + + + + + + {% for department in departments %} + + + + + + {% endfor %} + +
+ Business Type + + Actions +
+

{{department.name}}

+ 		+
+ +
+ +
+ +
+ +
+
+
+
+
+
+ + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/osinacore/templates/listing_pages/project-types.html b/osinaweb/osinacore/templates/listing_pages/project-types.html index 4080dff0..c84926e2 100644 --- a/osinaweb/osinacore/templates/listing_pages/project-types.html +++ b/osinaweb/osinacore/templates/listing_pages/project-types.html @@ -37,6 +37,10 @@ class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap"> Project Type + + Department + Actions @@ -51,7 +55,9 @@

{{type.name}}

- + +

{{type.department.name}}

+
diff --git a/osinaweb/osinacore/templates/listing_pages/references.html b/osinaweb/osinacore/templates/listing_pages/references.html index b629524e..e1acd6aa 100644 --- a/osinaweb/osinacore/templates/listing_pages/references.html +++ b/osinaweb/osinacore/templates/listing_pages/references.html @@ -57,7 +57,7 @@ -

{{reference.formatted_date}}

+

{{reference.date}}

diff --git a/osinaweb/osinacore/templates/listing_pages/staff-positions.html b/osinaweb/osinacore/templates/listing_pages/staff-positions.html index 10d8dfd9..37cd6bf3 100644 --- a/osinaweb/osinacore/templates/listing_pages/staff-positions.html +++ b/osinaweb/osinacore/templates/listing_pages/staff-positions.html @@ -38,6 +38,10 @@ class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap"> Position + + Department + Actions @@ -52,10 +56,12 @@

{{position.name}}

- + +

{{position.department.name}}

+
- +
diff --git a/osinaweb/osinacore/templates/main.html b/osinaweb/osinacore/templates/main.html index 9555930b..d79f2280 100644 --- a/osinaweb/osinacore/templates/main.html +++ b/osinaweb/osinacore/templates/main.html @@ -379,6 +379,15 @@