From cbc38b466e27c8870426206cee039f1c25b515fe Mon Sep 17 00:00:00 2001 From: emile Date: Thu, 20 Jun 2024 16:26:47 +0300 Subject: [PATCH] ss --- .../__pycache__/urls.cpython-310.pyc | Bin 1775 -> 1924 bytes .../__pycache__/views.cpython-310.pyc | Bin 7369 -> 8191 bytes .../payment/__pycache__/views.cpython-310.pyc | Bin 7838 -> 7838 bytes osinaweb/db.sqlite3 | Bin 1368064 -> 1376256 bytes .../__pycache__/admin.cpython-310.pyc | Bin 1939 -> 1966 bytes .../custom_context.cpython-310.pyc | Bin 3028 -> 3223 bytes .../__pycache__/models.cpython-310.pyc | Bin 14355 -> 14833 bytes .../__pycache__/urls.cpython-310.pyc | Bin 4188 -> 4182 bytes .../__pycache__/views.cpython-310.pyc | Bin 20835 -> 20806 bytes .../add/__pycache__/urls.cpython-310.pyc | Bin 2154 -> 2148 bytes .../add/__pycache__/views.cpython-310.pyc | Bin 15455 -> 15457 bytes osinaweb/osinacore/add/urls.py | 2 +- osinaweb/osinacore/add/views.py | 8 +++--- osinaweb/osinacore/admin.py | 1 + .../edit/__pycache__/urls.cpython-310.pyc | Bin 2259 -> 2251 bytes .../edit/__pycache__/views.cpython-310.pyc | Bin 13036 -> 13034 bytes osinaweb/osinacore/edit/urls.py | 2 +- osinaweb/osinacore/edit/views.py | 14 +++++------ ...name_staffposition_jobposition_and_more.py | 21 ++++++++++++++++ .../migrations/0084_staffposition.py | 23 ++++++++++++++++++ ...ition_jobposition_and_more.cpython-310.pyc | Bin 0 -> 691 bytes .../0084_staffposition.cpython-310.pyc | Bin 0 -> 988 bytes osinaweb/osinacore/models.py | 22 +++++++++-------- .../osinacore/templates/add-edit-main.html | 8 +++--- ...-modal.html => add-jobposition-modal.html} | 4 +-- ...f-position.html => edit-job-position.html} | 10 ++++---- ...taff-positions.html => job-positions.html} | 8 +++--- osinaweb/osinacore/templates/main.html | 8 +++--- osinaweb/osinacore/urls.py | 2 +- osinaweb/osinacore/views.py | 8 +++--- 30 files changed, 94 insertions(+), 47 deletions(-) create mode 100644 osinaweb/osinacore/migrations/0083_rename_staffposition_jobposition_and_more.py create mode 100644 osinaweb/osinacore/migrations/0084_staffposition.py create mode 100644 osinaweb/osinacore/migrations/__pycache__/0083_rename_staffposition_jobposition_and_more.cpython-310.pyc create mode 100644 osinaweb/osinacore/migrations/__pycache__/0084_staffposition.cpython-310.pyc rename osinaweb/osinacore/templates/add_templates/{add-staffposition-modal.html => add-jobposition-modal.html} (93%) rename osinaweb/osinacore/templates/edit_templates/{edit-staff-position.html => edit-job-position.html} (81%) rename osinaweb/osinacore/templates/listing_pages/{staff-positions.html => job-positions.html} (94%) diff --git a/osinaweb/customercore/__pycache__/urls.cpython-310.pyc b/osinaweb/customercore/__pycache__/urls.cpython-310.pyc index 0c9882ffc1544edae07259fa0dcb12517521a5bc..21d7fc8375becf565c401b91c747239861161307 100644 GIT binary patch delta 253 zcmaFQ+rqD%&&$ij00f1J*=eWP85kaeILJU6$Z-JT;-rn*j*M!lj4Ar5ELjpM1}R*< z%s`$YkSCd91mdNOM@gj^2Qz4zY%XJ5$D|;TT#%TTnxmVOnVgzeoLa0O#Rn0A3QSgF z>D8*@P0qCKy1yczlVAx6Z*%=pb} nA{`}(Y(_jpTRd3bWPP?CMw7{V*tB>V`B?ZE`Ivy1nd24!sFq18 delta 105 zcmZqSf6uF(&&$ij00bP~5owC-3=EG!9AqE~{^^Ge2jcde2g6T0GUA(e*gdg diff --git a/osinaweb/customercore/__pycache__/views.cpython-310.pyc b/osinaweb/customercore/__pycache__/views.cpython-310.pyc index f8675f8cda6a1ed7a6e1a1b816a6f2793a9cc3c5..8ad04fad0f6c7ba160981a4c4adf19c27445a77e 100644 GIT binary patch delta 945 zcmZvZ%}*0S7{+&Y`>`Kw6)2^xD3U<6;DU-6y+}}qA)%BYdf>9z>lw+3bsun+dHb2HcAO?Zp0*Qs|K4!B+tN>8}too}0< zsWlX!ITD>|I_>YIBOD<|O~h5QEiEPUaXeb~bkhs$|$K1YB)=-&{Q{SB(8 zu8Iw+x2{SJs;{ofj^KD4uj6z4j_62^48>h>Sy{n;hl7%%tO@j0<%zN~JdzrlxcX>3 z{dB}yr0-gmCa2Q1x*VLG8cmIjPMt4PqtnCV)7BE*o)oK!4)fW0%`gikSe1%ap?(`I zS}31I*4c7})p>+1Wgb@3|+HFVhHEGO*omOceEb zWU6M?K=U@T`!YChTC1#&fYnMDtD7Og@SNcV!%K!&46hkB7~U|vB`3k?&;`Q{)&7PC z0R7`#)NkgS0UHq^0@&aM9=L+XCI+X)hCm%SxCtKPG=$x&<)d?17I zRCI^xNsrrX)dO{`TW(sD8*~tF1JmS3yc6uvpzfrKU>0i_<%_0{5&eE;R`Ug@nl!%La?CTpX@u*I;;u*a}Z chT9WhmSozWwMa7Huh1#WKvcwLJ{$sn0E!O^L;wH) delta 265 zcmexwf6|gKpO=@50SG=cMWkI*o5&}_n6OdXpHVDDCq=h~AxbSpFGU|ntEX@VGiVxY zUco3RI(faM=wuH`A8vj|28JSCpyr~E$%k#^_q z1}W?T5xtWyN{CMGmgZwrn>R0XpD delta 20 acmbPdJI|IopO=@50SM-^CvD`OEC&EHx&+Dq diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 81e88f1d726ada0dcf6c20873da8b6007c384259..47c8fa6bd126d514753adaa52c94f15d75b88fe3 100644 GIT binary patch delta 3450 zcmai03s9R?7XI)5|4IJ5{y!nmKq*allx=MTe?p#M*M@}BLXkj9c(`r|AqfeP1VVx0 zqfJsFkYSFG_ZE`Oacnka z?c8*7_H8-~DO{86ME_SO>(P>$q+#k5Q!fLm6s0Zz`KeNMNot$Agp{5a-aI8ghYJ;@ zae`<9VV~$3tk5P5`$pVu2vm|4Q%BahaWIm)y#6)t*VHQ;SWuF>ykS+5v?*^5VFHm@ zFzoS027T^Oq$`TJp&rWO+D8m6!DdUfVST@`x}ct&i5gp@ zJG`zyRKHQj>hv1csL`=%t*(;QRcf_m7L(q{YNu`pJhGOOGY=x~fx0Qlfg=ovO&!0# zgC$C++f#zsGZgg{HAziS4^F)}I|?Z32z7}1HFZ1krkS6bev8!GKnb4!xD6C%NKu9q zril`$Gengkt23lvYWgkv1>_kM0jX)A0T-ch8n|$w37LI_!dKeh#aF>f&iN8JOlD(P zu9C!5#S1Y&?%{~nz~%VlG?48Boj3^(9*a{^=j$9%!O!Mw-JFelIj?`2kG^GQr2Y>0FP`+RD< zZ`jutiTVcj&8Yb3CqO@nn^6g`-6WHyGWumU6OAA;-u~fWitWp|By}WVUF{ zS}lCPkt`H6>hvtjYWGHkd!wR1M#Uscs6-4D92J+##1ZjEu~_u3=rPfV$SPvcL0%FH z%M&F$3}~xtu>UlE4V5THoZ&iK>hsoYIC&ahNhOLh68OexTqD#Z3K3gwv8DdG>1Vsv zC)9}3n3Tgolt)XPVDp64X_*?y)brU=o=~CH+A3wYug^EMERoXdGt%#Atj=h7dpzO5 z4>YdJh?l9XOB5iL^#-M!9Rcytkmw*@Y z{|h?QD#D6qlE$Qu9$!9D$enmx>SBps@xI~&=cH2rM}wz7kZvU5cmI;| zzzBy39$LdUVNz^A$yg*$Ne0FL5SIx*6<$kTCQp$J;lRhS{pmlh)IpaLs2E^ayecsy zPzFtS+!G9U`$pkOCtU{bbkZUM0S?~dq+RI&cgacHa8wKk9;|ZF&!Z7u1#g*FWId;Dr_UP+4|o#_4$$}Eh(2(DE=9>B z0;Ow+2Ha=%1czhZP>)_892~TS2MqyJ)E5~I`}%qVJv};vk*~*T?(1CgmnN@=zdf8)46lDtakIcXuMQC?#D`a8ACJBvYgd z-4!QyRmM>hR%xvZWsqgf`sMLn-eoG-N}Z)l$Flkg))n81l!MEZE8K&=u&3X*+{V(J zb$i0y?tavBkzwVM{-rZk>I`KTt;JlS=RP?v&zaDmNJ_{FjQ=Pf=e3a&^lj3J!BX*oK~m{5Z9v&+HhO{>;Yx)->vkM&^$pF!kGy&8#*RP^E{l& zz&d!t8O0=g`9;N3Q2Q6fb~yHe;;|o#Aru_UdV<^YlHwo`RU|tEN>3FYZ-IY1E6;_q zGYS%ZGow(zXJ!<)zzZ)cPI8scDXchm&nt=^Vjnn~bqpL;sPoZ1Mf|fEqoo@p-$<AS92w=P=0`m*!}$|VMh)+Gj#y#i%b71#sceTZav>Bn4YCXUadDgqsM z69zbWR<3~26hXoV+UTiIrHTt z0}>4WC`fV^LBSzVI02OYS@99feOdAPL$eANh^D|3gp4C)*(wT6qEmA1_-o3)|Zfo4sMxlJD%?a+9uH@9x~1}wcJy^g4}y303ckNP#u z=GfIcUWMLhNfgIpyoO|pH5B7=3bQ{8^8tMpqthsQo!*6JhvsH~>R4sIx=~li9%~#4 zS(~bT?qF?SzfNngbUVX?jqQ&9ZB}!zSwGNhtEgs!(RRCT%sXmoXx8Y4{Cz`x4K7E2 zhpwZe-tXVm-o@5$VYg_SO~$TWzK*DAM{H+vmwwP)Z?m^)y1n73-|pT%6lw2j9^TUB z?6C%2!RFd6TQ~PQT=gBb+5uZ#TfI~39IJ^8ZXI*A_r?s(Y{V9*>9etct)ZB^X-jRb zy<=?Ni=k#y%jP@!Ay*tGcnTGKjx delta 3436 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 U#6gpq-RVv`pTGB`c>vw|3#;3&Q2+n{ delta 435 zcmbO(c}1KrpO=@50SF@Y1g8BG-pKceiBAZ~ifAw60^Ss{g^aZVDdH&-EetgRE)30#wSqOgH3Bt)HS9GU zHB2>}DUx&8gBdiXCVymEBl%JSXtpL}krbG^#hH>=k{TbMUXnU_32QB*-()2=Ek^dq ztJw;fG{q+ev#*i6#Zi)(n_88hms%tY)KkO;ByO<y7HbMkmgAVE&68YORFs-m z5)V>&OSGgM$gYe}%P%d8&j1p|@rmjAMfxDk29wWoC^1G&{>0%b#la%LEW*sk%*4#Z zh=6Rriu^Zcb53QHw*_f%0TE^(!W=}nfe0HA;V@aATio*&Ye{}eVr7vCNJtb&XmS;~ zgV-TJ;ua^u_E3;uFo*~O$#55g-4AwfkuOkWavQe>D@ZDO@@8&B#-Pbhxr^BR!RjZ+ J@>nuD0|3AAZ>azP diff --git a/osinaweb/osinacore/__pycache__/models.cpython-310.pyc b/osinaweb/osinacore/__pycache__/models.cpython-310.pyc index bd2736db193f7b786a023c76697a167753de25bd..d601880e013081ccb0aea4f74e74b6d6dfbf1394 100644 GIT binary patch delta 3107 zcmZ`*Yj9K75!Omq59?)Fen^fizcF0f_<@Nb0n#RT>_8hFifI@@#!-E*U11@KBN-b8 z7bqUw(l{!GuhAkL;kf zsqWlQd-m+^*|WQ6&&9;eq&x0%*$wn-Qd7Nuf8db21XjLMryBho25p75a>Ssm)M2Z8 zzbUjxTeZQUJ}?t9_5zhKb(Q^d`Lo zDZ^ISYTRwmU<`&~H;|5ToeH6Y?}6yp|W7AOs%r_$|aXB!}=$-ii**s@cXMRLehJmf`kF$lDyR+gk$Bn?iBT|PX-l{#71^PSAz}(2?#ZpJV9UIF znMa$!10LD~KOTxfflw2{&kif+@4LnH z#UL5&qWmr5wH9FBy@950GRX^y^#p0NOqk#(iUDTW=IcWQnODlG@eLEXkKVb|ct8eu zn1Wnl6x;D11*H^)GfEpA#C3&bkYc6Wy`(Touh_w`motJ>g`ZfGnc+lHJ%#H^Q9m5P z2YowWLPnsup&^n>;T*P0fA~2 zhv+Y@bcK`svV5g>+NuxrL!v`qIyc##LrksB~Y0i zj`ir#D6xOe>_OZaY;~|LnE-JBUkkPtpQ7OptbHda_4E65I}iEQc&_ zSV|`TMW#;T>58Cvipa}YR_=o-E=24qPp*2Ir(Fc9k@l{1CiIy21q~;S;s{SkXdtR< z(j?r>X=IRv$fdFnPGfUk30%iD6)i2&xh@vi$iQxjR~Wv`y)4hBN#-hEstCZe^vqs4 zL>u2qyc6K}H6FBv$k;?)`ZqFR8rg}Qh2T`neiw2G zefvN}=zI-|w>V{@gW<3|^Bf)rme;FrRA#TQek07{uj_s4B^LS(0iAKnqv3%h9q{*< zH_4C*5mQOLQ@=a#I~FvD@?<3B1rSN?oQufe#dU?x(0s@?KOwS0^A62);6E2XVv(of z4g5-j-@|TY+Q+j@y~DjA@Gg<7vQy4oL^kSoW$&GC*g=OwZ9L(4pOxAfuHfay#jpvD zO;4@PN|_)thPyxoAyqCjw~atG%TEF!8BZ~HoZ*M~e$z7OMn|*0oW04oc#$cYvp+EP z0YTc;HXy>>fZ8K^RLfYGVgDnCJ$Qv=Ht<&5MA!^oIzVoE=t8uT%lyIhY4dQ+EKOdQ z9fcc__zuCOA{H<$xiw7f$0JMbgEwTeiQ~shn(oWQk>^SnN(s_RDzZ(_bekA6`EHa3 zg$(ro51*CIFim6xhg*EqSJ@H11*Tipz#x9sQcJvrOPAx`RwX~l?%PP1yRwt}@>MB+ zaH&?sj*CAru;ZaTEgXsN6nY{q=02drpZTs|3J9~Shk(e(2#c0ob?OQEAt5~*X2rb>`xs6!j516y@WIZULT;CW8=knpAmc5I zhl@aPxW!e5YYZRJPJMWOS?6`({+TwUNmOFpIoDYd zsx43V=X1}wALsk#A6d+J(r$ODh5j~N*)sCvZHGKH&@$7iSrz@(O&0A7`J{Cez=t2% z9)og>+mAstIvoQL!a>J=sKcv{+n_ezr2G}2EALgG1?a|^lFy(qf1>mRz#1HKy#VV_ zac_hT`Fq`W0&L3v&=Ue!g|C5Q+a&EHx>PTf>&gz;Vimeecki>r{F9au&^>zj zJ~dW3X|Y>k0dkhN;F21w7wM5i(!lA8W>s{O0{vnuz8`AB>lIBfj!pir6RsjBm^fY4 z2RrdIe+>jN>Zrty%9idev_r4~LJ-6}SvGYjlg=j0L^>t55woBqQl=qN1tmUgCdLgh zj_Jy#29rc78d*PqYVm@XtoGAz5v79PDoh*;hVbVB2c+=rKrLkOc5fd{VoNXzV>lBH zl|M*Z_t6kph6nRwK{qHFN#njy8|gd~8igYmsTzkp(u&>Eif8bjRby&FA z&z;83;bcxX3Xb7)E@g`Eu;fwfk1T;xI2zeTT3v`Fq7N{84?~dQE{1P1e3#*SIMEex z>?U$QK2+NZyD1y|xVO6m->$u{<444wvKC72Nbkrb4b#xY3%p4q(3l-h4I9ZMv470$ z9Bz#El<`?&1H%Mjw5RGQk!NURxu8^w9lVN%^X}-}P1mDcu7`O;j$o};iXC0mcyDvL zB9EHj2voBCT^d=1fTQRK@$hWi?0BkfyNp^R-nqCQKE&;ddvAT27K$Gb6v}iXJ1i0z znJF@n7U;;UA`H(lJkJp18zWOho~M!Z5OB4qR4*!hr2Ev|&29B29LMMCE8MTrvMH-L zOh4iVIimZdfZSww1F*A0E>YrBdThw~))8;z`spx7Tg#U7EL zyKwK)%?&@{6Wk2<5e!hSeuXEE3|tgzH4oKoEe0AFe=Zw3m)7_`A^B`3xWGf+3}Ad| z9Ug2Pbj=+*AToHlJB;fa>=;4nW{JFj87My!?hd$@djm72%l~`?vi1*o5oI4 zyog_J))r(^_%!Xbzyd2hvKxdzoTmK|e5d)!Ek|g{)oTROOwxx)%_dIJ&y@9A>D_5D znn-P{TbB~Q;6*bG?F=XLf6`h2-jqGy2=#z^cniPOnxqHfwbqlN$9T=R2sB%)B$K9o zHIy|>@dQq^)xjZrzO6@jikCc%=N%P}gG9FAzuNBEb3?vzCdBMUCNV7Llj%j?=w!H^ z;g<~C2nr5%LwrH9-H`4kubgDy1SqCPnJ~t331RSSBi`i7EjEsWvR$xyRQzzy_ARS^Mtse#S+BX*rp>zfrtxduf0l*Tg0eoIqdq6zXWlV}qT`s#;Klac;a~AW zM{JSwk8I@$bJwh&c678>9wK>6{jWeQaM(GL^x<0_YuY&h#2E(Zpcc#~JqH%gb+uLHzS_qnGb4D)bIhGL*k%>H+W?jb_8aFg=TN6(v+6y$dPLDxgg9Gk1nyo)Qh;E)gKlwB-k zmgLL&{RWB^E8&dnSxG#%;wGi&O1!?JDk?K&18?|Kv9lu)n$_GMn;l}lp+2= zbD5n3;v|!U3^}?!fQx$lz?~(6KaKjMACqA3{PC1Hc4-6i*J{l;-aEZD&6}lO{Lh4t z70pkhkS`xUHiFB#Sc9)I#cfWUW{{4SIl{3P>|()Q6Kt3Gm`n`fGb_s*SJTurYaLt2 cuJk#5B|gQc`og|i`YrJV@chb%O%1630fQ!}UH||9 diff --git a/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc index 16710dd7985243102b91a4cd6048a9c9048b1e7d..c9075a3b0575ba8ad12d4070831360dc866a39e6 100644 GIT binary patch delta 57 zcmcbka7}?XpO=@50SMHTOVXk?@=oUv=FQ4aD#$O+EXmBzE7p(V0dhC*<`7|J0ZDAW I%G=Ha0N9HWc>n+a delta 63 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 delta 4123 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 delta 489 zcmYk&%_{_990zc}Su0jkYTF#dE@I7wu%opr4svjELCIy?%xuQn?9R-Vn~OMXN&QZH z;x7=*QP!3mP!g7X@p=&!CC+$$n}a!g=6U(fcb=Yyg}Vh_<#}5Pdm5I;!(-e0MGJUv z+v2c=!x2?i3`L#Ch`X~a$Rb)Pg2V2#YA%}W5QB^fUN=Jj;vX)DtvV!0!QwK;1rd^% z65e3X-1PJUq}ardjjajTH+NfW01hzQ*2Mg2)8Ww6+XuMXW7aEh6LwXTWR3M0F+E6q z?5!P{XC2c3r`Xpu1Zi`*YZM@ldGA!^H67`OxW!?yw(OLKXBZXhAdPFH6Ee6Zo&kCTCh_D zL)J31l_hdS8l8SGJmQEy(EmgW79vk@457SugSm>o5=GLAzv6%eo+(xAdtoDFmx=fO mL9k*|AOoNH9Y_dCitG_7VxKr93ItG#m1xF#yB*JaSAPMk6r0BY diff --git a/osinaweb/osinacore/add/urls.py b/osinaweb/osinacore/add/urls.py index 1b80bbb5..cc4a74e7 100644 --- a/osinaweb/osinacore/add/urls.py +++ b/osinaweb/osinacore/add/urls.py @@ -29,7 +29,7 @@ urlpatterns = [ 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('jobposition/', views.add_jobposition_modal, name='addjobpositionmodal'), path('businesstype/', views.add_businesstype_modal, name='addbusinesstypemodal'), path('reference/', views.add_reference_modal, name='addreferencemodal'), path('tag/', views.add_tag_modal, name='addtagmodal'), diff --git a/osinaweb/osinacore/add/views.py b/osinaweb/osinacore/add/views.py index e8f0e7ff..4f90aa72 100644 --- a/osinaweb/osinacore/add/views.py +++ b/osinaweb/osinacore/add/views.py @@ -550,25 +550,25 @@ def add_projecttype_modal(request, *args, **kwargs): @staff_login_required -def add_staffposition_modal(request): +def add_jobposition_modal(request): departments = Department.objects.all().order_by('name') if request.method == 'POST': name = request.POST.get('name') - staffposition = StaffPosition( + jobposition = JobPosition( name=name, department=get_object_or_404( Department, id=request.POST.get('department')) ) - staffposition.save() + jobposition.save() # Reload the parent page return HttpResponse('') context = { 'departments': departments, } - return render(request, 'add_templates/add-staffposition-modal.html', context) + return render(request, 'add_templates/add-jobposition-modal.html', context) @staff_login_required diff --git a/osinaweb/osinacore/admin.py b/osinaweb/osinacore/admin.py index 86697b32..4fea3d9f 100644 --- a/osinaweb/osinacore/admin.py +++ b/osinaweb/osinacore/admin.py @@ -49,5 +49,6 @@ admin.site.register(BusinessType) admin.site.register(PointActivity) admin.site.register(Connection) admin.site.register(Reaction) +admin.site.register(JobPosition) admin.site.register(StaffPosition) diff --git a/osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc index 4247db50ffade6a903624ea15a07471b164cec38..23440bffd90e7648bbdd9b36992d67f9e5f5a026 100644 GIT binary patch delta 86 zcmcaCcv_G*pO=@50SLCJl%&OOtcv+A)pO=@50SLqn#igZg26IyKxt@W`$5_h=ig1|~N5-d`rre&JxXvAn(8zMmt zE=&waBuMZDR0S!R7y(`ALKi|BiD=@6fG*s*^8V9eT(qRj;+r$)oO|cL|G68X^^hP6 z!d?}BHXL$$#iXDy74Ewzw#LMGSPqMw@vBa{Whp++Q{JtduS1ST+`CfR|N5lsd<(Zu z+QVNdZ9r^o$ZS9{Q(b|MchaoMNfYJj-H6vsm8_@VVj_=ugx#cXh9dfIHnZL-%L&H% zP&i}lX8lTG(`sb{B-qy2ZTe}8vO9FvUe4ny_BJ+{ShXKzY?$^}CfOK$sBGqOm1C48 z$>%oHFUJq{5LYDKqpwaw_XC9EKqqj4!(FUMmLwz|1A5>I@D#8D6F?bo8khvefGMCE zNC0Nw86W}$KnI6gBiU3cyGnY#l}R@Ye(Ev+RapYa4~S77yf8$ zURy)(QascqjiOOG$U{VrINW7$16P%*$Quk-j02e+=?dMY1RdBmZ1$k;Bo@HfN%Cuhp1q z0@4BvdF%CAjo14c*>a-QcaD|3g$~8}cZf1a`*NsS`w`!nN$C7Lox~@s-qAP&T>0(B yL9hKq>d)v&-}_DfDYil<53kkqAlVD_0RzAwkOby{MPLb723CLyA@hvO7}% delta 1329 zcmb``Ur1AN6bEpBqm*S=7fx{VUbeNByXKbGiwq(m3i2V69x7q!Xj=|+i@Td(1bYl5 zu{b?Muo`Jff6Z1|TmR=O=*2P>=F57E^u^a6r2D-$nGX~9&>lXVdwzGn{mwbR{SGV# zxCqB>D^otk%$cBPlGF1$s-m(l7(5?|hU8Er9KF~;D^??~CS7Y;caPlHE9!Ebnx+ok zsFMy;Tm6xWPJ@<8@w+N(0{)QPr9J=R?QD=%1)iM3D7!*G>uM-32y7_1DjZ;JSY0}0 ziLqk)! zv0F+x(rs`DjDS&a7mR^>APmkah(>8EVhKD12Ji?x1{N>@OyD$l0>;54@Pen{pa7E~ z0=9r21yL_q5kFf?XzK|)J_j$r6kXjNWNBKo31n=@wxfnWdaKKN+;<@w@UJW4K3;#I zAeu@#KiQq_=3*z-4osJwme!5Vmg9PTQMt=^Ru1)t$U0&3B0PdJ%b2sucO(< zHkM5q_Y5!&C(o5h42vUlv&rKvT%SVc%_VgndlYU?(Xyz;WjawpUARb61t?b#t2en) z8H&4(8H!G;%H6@{liluaX8wfz)KPs#q}7b*3(f6qD*rdS?alvTbl&8=Jy@@&VnCc4rnu7YCg#p=uk_(br8uRFboL9K?/', views.edit_department, name='editdepartment'), path('projecttype//', views.edit_project_type, name='editprojecttype'), - path('staffposition//', views.edit_staff_position, name='editstaffposition'), + path('jobposition//', views.edit_job_position, name='editjobposition'), path('businesstype//', views.edit_business_type, name='editbusinesstype'), path('reference//', views.edit_reference, name='editreference'), path('tag//', views.edit_tag, name='edittag'), diff --git a/osinaweb/osinacore/edit/views.py b/osinaweb/osinacore/edit/views.py index 70d9bd88..b8321d68 100644 --- a/osinaweb/osinacore/edit/views.py +++ b/osinaweb/osinacore/edit/views.py @@ -363,19 +363,19 @@ def edit_project_type(request, projecttype_id): @staff_login_required -def edit_staff_position(request, staffposition_id): - staffposition = get_object_or_404(StaffPosition, id=staffposition_id) +def edit_job_position(request, jobposition_id): + jobposition = get_object_or_404(JobPosition, id=jobposition_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() + jobposition.name = request.POST.get('name') + jobposition.department = get_object_or_404(Department, id=request.POST.get('department')) + jobposition.save() - return redirect('staffpositions') + return redirect('jobpositions') - return render(request, 'edit_templates/edit-staff-position.html', {'staffposition': staffposition,'departments': departments}) + return render(request, 'edit_templates/edit-job-position.html', {'jobposition': jobposition,'departments': departments}) diff --git a/osinaweb/osinacore/migrations/0083_rename_staffposition_jobposition_and_more.py b/osinaweb/osinacore/migrations/0083_rename_staffposition_jobposition_and_more.py new file mode 100644 index 00000000..c1fd3636 --- /dev/null +++ b/osinaweb/osinacore/migrations/0083_rename_staffposition_jobposition_and_more.py @@ -0,0 +1,21 @@ +# Generated by Django 4.2.5 on 2024-06-20 12:26 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('osinacore', '0082_pinnedproject'), + ] + + operations = [ + migrations.RenameModel( + old_name='StaffPosition', + new_name='JobPosition', + ), + migrations.RemoveField( + model_name='staffprofile', + name='staff_position', + ), + ] diff --git a/osinaweb/osinacore/migrations/0084_staffposition.py b/osinaweb/osinacore/migrations/0084_staffposition.py new file mode 100644 index 00000000..cd077ba6 --- /dev/null +++ b/osinaweb/osinacore/migrations/0084_staffposition.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.5 on 2024-06-20 12:30 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('osinacore', '0083_rename_staffposition_jobposition_and_more'), + ] + + operations = [ + migrations.CreateModel( + name='StaffPosition', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('date', models.DateField()), + ('position', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='osinacore.jobposition')), + ('staff', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='osinacore.staffprofile')), + ], + ), + ] diff --git a/osinaweb/osinacore/migrations/__pycache__/0083_rename_staffposition_jobposition_and_more.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0083_rename_staffposition_jobposition_and_more.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..de4d14c42d6b9fc56e5d439f2fd758b39576a5be GIT binary patch literal 691 zcmYjPv2N5r5Zzs`FFxmv0s*1}(YZNC&`_W#1p*0?fH={(S@}G3Cm-uw<8_EqLz|AD z;7|C5ZK?7LAOW-XosyMiJa7DFJoCJEK2I5)>qq_iCui(e0Jo1Ma6;yukOKx>vxXO( zv)2p+MBf-h$hYEaR0xnumc`e^V;T2pQ*XMmudQ)aNZmd$ffF*fAcw5rz^I&WcoCu8 z#-TCDD?#xDVwk|emDq^l022DZ)K5?MoipL5*43u0Y=_0&qoe0fRa+Z_&~|o06DdsM58v3;9#C;&H7HXy=o5n%V>EN2g6h|`Mt^5Os@*l9nzXTidgRJbdzK|W zQA0v0pDIO!bBz?wl=^&L>OcwzutfuCsv2D3_)K-fWNH*+x4qih)m{lz8lX)(T(p;6MDtC^+(U8+6OsHUW5ETN tf2ACs$)ACBmPLL#PO*U1pu&*9S#gZ+QzM_e7^OU>i^*KLi8Jva`VZ%R$s7Ox literal 0 HcmV?d00001 diff --git a/osinaweb/osinacore/migrations/__pycache__/0084_staffposition.cpython-310.pyc b/osinaweb/osinacore/migrations/__pycache__/0084_staffposition.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..12d92ce005b99c5b9d427472c9bde7a5333ec3dc GIT binary patch literal 988 zcmY*Y&2G~`5MHl0j^iZ#K~NPAs0TRY5?2Bt4hXe0Ekd*fDeWbfm6I7qcKs992_?P4 zHSYjNUTF_pIPnSyQD*HnEo<#)W@mP0zHi5QyX`SrKendfGn=uW#<;x%89TI#E(u^@ zB`mcDR>}w5GB!`_fq2cp2JwY~Kr60&wg)xfeb%Y{qC2d^wUAx) z6Sv|vc+gzfOlrFHSz7fiFtn&qj>};2b#a>b%bsOvuQ3z3WF(vZcbE` z25K(PaIPB#swhaJ3)HQTsD^og(p1y}C|JAKbuR8LJL}#m-?6pGW=TSgXOb93y2Gcr zu9Xd6Y}{O`5U4zi66|obPIRj~BnY%93p!zh2^7bjHSNl>2Pw5D2^`E4B)ui&hgp!6 ze2@h=!3;1PMOY|KnRIinM0jMLTG3cB-Fg*`cM1D}Nv#__f>f#A0Z|r>v$sTn196az zbIoC>-4X+Ftlj?pi99|%Jk<5Q-TvNgZ(n=)1g{3_J5!Gg0waEZ@=uAy!pD@bVUk31 z^m|yGP4kK0CvMZN!(d{Jcl3UvJoQUf{0z@ar7B+?p5w4m%n0~51MJfDvmRKR7XKsux|d~C$I*?dP#1 - +
-

Staff Positions

+

Job Positions

 @@ -683,10 +683,10 @@ - +
-

Staff Positions

+

Job Positions

 diff --git a/osinaweb/osinacore/templates/add_templates/add-staffposition-modal.html b/osinaweb/osinacore/templates/add_templates/add-jobposition-modal.html similarity index 93% rename from osinaweb/osinacore/templates/add_templates/add-staffposition-modal.html rename to osinaweb/osinacore/templates/add_templates/add-jobposition-modal.html index 38dfa160..1faa4f37 100644 --- a/osinaweb/osinacore/templates/add_templates/add-staffposition-modal.html +++ b/osinaweb/osinacore/templates/add_templates/add-jobposition-modal.html @@ -13,9 +13,9 @@ -
+ {% csrf_token %} -

Add Staff Position

+

Add Job Position

- Edit Staff Position + Edit Job Position

- + {% csrf_token %}
- - Job Position: +
@@ -21,7 +21,7 @@
diff --git a/osinaweb/osinacore/templates/listing_pages/staff-positions.html b/osinaweb/osinacore/templates/listing_pages/job-positions.html similarity index 94% rename from osinaweb/osinacore/templates/listing_pages/staff-positions.html rename to osinaweb/osinacore/templates/listing_pages/job-positions.html index 6a5b4ebf..9a7c5680 100644 --- a/osinaweb/osinacore/templates/listing_pages/staff-positions.html +++ b/osinaweb/osinacore/templates/listing_pages/job-positions.html @@ -24,8 +24,8 @@
+ data-modal-url="{% url 'addjobpositionmodal' %}">Add + Job Position
@@ -51,7 +51,7 @@ - {% for position in staffpositions %} + {% for position in jobpositions %}

{{position.name}}

@@ -61,7 +61,7 @@
- +
diff --git a/osinaweb/osinacore/templates/main.html b/osinaweb/osinacore/templates/main.html index 169b0174..4de64ce0 100644 --- a/osinaweb/osinacore/templates/main.html +++ b/osinaweb/osinacore/templates/main.html @@ -421,10 +421,10 @@ - +
-

Staff Positions

+

Job Positions

 @@ -746,10 +746,10 @@ - +
-

Staff Positions

+

Job Positions

 diff --git a/osinaweb/osinacore/urls.py b/osinaweb/osinacore/urls.py index 50708936..df9afd3a 100644 --- a/osinaweb/osinacore/urls.py +++ b/osinaweb/osinacore/urls.py @@ -48,7 +48,7 @@ urlpatterns = [ path('dailyreports/', views.daily_reports, name='dailyreports'), path('departments/', views.departments, name='departments'), path('projecttypes/', views.project_types, name='projecttypes'), - path('staffpositions/', views.staff_positions, name='staffpositions'), + path('jobpositions/', views.job_positions, name='jobpositions'), path('businesstypes/', views.business_types, name='businesstypes'), path('references/', views.references, name='references'), path('tags/', views.tags, name='tags'), diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index e8674dfc..69f83e34 100644 --- a/osinaweb/osinacore/views.py +++ b/osinaweb/osinacore/views.py @@ -495,17 +495,17 @@ def project_types(request): @staff_login_required -def staff_positions(request): +def job_positions(request): - staffpositions = StaffPosition.objects.all().order_by('-id') + jobpositions = JobPosition.objects.all().order_by('-id') context = { - 'staffpositions' : staffpositions, + 'jobpositions' : jobpositions, } - return render(request, 'listing_pages/staff-positions.html', context) + return render(request, 'listing_pages/job-positions.html', context) @staff_login_required