From 90e3a3b0a5d0868437b4c6add2eefdf8dec124f8 Mon Sep 17 00:00:00 2001 From: Horilla Date: Sat, 2 Aug 2025 16:24:07 +0530 Subject: [PATCH] [UPDT] STATIC: Updated country.js file --- .../condition_edit_form.html | 7 - .../templates/dynamic_fields/common/form.html | 8 - horilla_views/templates/generic/form.html | 158 ++++++++---------- static/images/ui/company_avatar.jpg | Bin 0 -> 9519 bytes static/index/country.js | 58 ++++--- 5 files changed, 104 insertions(+), 127 deletions(-) create mode 100644 static/images/ui/company_avatar.jpg diff --git a/base/templates/multi_approval_condition/condition_edit_form.html b/base/templates/multi_approval_condition/condition_edit_form.html index 85aaed1e6..48d7da083 100644 --- a/base/templates/multi_approval_condition/condition_edit_form.html +++ b/base/templates/multi_approval_condition/condition_edit_form.html @@ -174,10 +174,3 @@ - diff --git a/dynamic_fields/templates/dynamic_fields/common/form.html b/dynamic_fields/templates/dynamic_fields/common/form.html index 1ff4984f2..dd12dd593 100644 --- a/dynamic_fields/templates/dynamic_fields/common/form.html +++ b/dynamic_fields/templates/dynamic_fields/common/form.html @@ -83,11 +83,3 @@ - diff --git a/horilla_views/templates/generic/form.html b/horilla_views/templates/generic/form.html index b6efea7d2..bb3947304 100644 --- a/horilla_views/templates/generic/form.html +++ b/horilla_views/templates/generic/form.html @@ -1,93 +1,81 @@ {% load widget_tweaks %} {% load i18n %} {% load generic_template_filters %} + {% if form.verbose_name %} -
-

- {{form.verbose_name}} -

- -
-{% endif %} -
- {% if form.instance_ids %} -
- - - -
- {% endif %} -
-
-
-
{{ form.non_field_errors }}
- {% for field in form.visible_fields %} -
-
- - {% if field.help_text != '' %} - - {% endif %} -
- - {% if field.field.widget.input_type == 'checkbox' %} -
- {{ field|add_class:'oh-switch__checkbox' }} -
- {% else %} -
- {{ field|add_class:'form-control' }} - {{ field.errors }} -
- {% endif %} -
- {% endfor %} -
- - {% for field in form.hidden_fields %} {{ field }} {% endfor %} - -
- -
-
+{% endif %} + +
+ {% if form.instance_ids %} +
+ + + +
+ {% endif %} +
+
+
+
{{ form.non_field_errors }}
+ {% for field in form.visible_fields %} +
+
+ + {% if field.help_text != '' %} + + {% endif %} +
+ + {% if field.field.widget.input_type == 'checkbox' %} +
+ {{ field|add_class:'oh-switch__checkbox' }} +
+ {% elif field.name == "country" or field.name == "state" %} +
+ + {{ field.errors }} +
+ {% else %} +
+ {{ field|add_class:'form-control' }} + {{ field.errors }} +
+ {% endif %} +
+ {% endfor %} +
+ + {% for field in form.hidden_fields %} {{ field }} {% endfor %} + +
+ +
+
+
- diff --git a/static/images/ui/company_avatar.jpg b/static/images/ui/company_avatar.jpg new file mode 100644 index 0000000000000000000000000000000000000000..dcb842229b38f0f9e4bb560e72a87badf3e45101 GIT binary patch literal 9519 zcmdUVXIPWj7H$+pK@kuT0fCVgIudD8M?qR3NSDx5YJh+=smdrSooIm2K?o39q=t@+ ziiFUU(5v*`yR;kToN>f*N^0TzHjffSKe>!wcoW?PWn&20~oZ`wbTJ; z&H&Dco)HBAPKE%g0IIX6a{5U{k#p4NPURvs^?7QVi?p;f7inl{FVkP9y>#Ug4GkS5 z-4%KU21W+j%U7AMGB8oD8BUd)Ih{#$?jmI(!zG$al)L|%a`HQX@giUxFiv%b5pb6A z3>D* zn(@NLt4ud}B=3@$uY=@FpT(8qSgy(HKXzy3GcYvq^d`v|+r51AJ~pF_m*2?4D<-Ry z2)w7Nc3;B={e_~J?Q}(o{JAFO`}{eI9h65Rj1-H`oIQW;%=teDP?lt5K6mxD{%0mh z_m_`v@__Cdyw4~(83bIWq6}uFVg#rF%1VZQ`xkZpuU$q6+~59fe4DdG%0FH|UI!Tw z97VUwTV1QCg?UaZRdAtk#*CMp_ibHM;b!Ax7;$rN-Vr}#@uEY|m%}`{&>c`_?k)ILYev3tiFA!)(l{P=y-H-WwUr~CI zy>;0)3F;LB(Jm(*f&<4u zQ^0vkKUmQ?FT^G3g@H<=e8jv=Q0e>8$lB_qzOv}qP;XX}%L%}ax1MfzN5*{w*)J1r ze}7Lmy>nlP^SkS8Nm=yVHpXZo%Nbju3C@|nTX*w5@N%)U!0b(h{-q9()TlT9_TE~n zCRtQt+AeG+^PmxDt6aQORWQiv4ejZECO--&BXQ!EFyc%%=U@PT00a!%j z_7QmDd%n0Q&MRLb0x%f%2>B)0I@6LlVSDje9y?kOl{#aqVJ1W?PCB?;6N#YKXl{FYCvQffe{A6!H4W3^`(EcRKHoQ^RV+W65)dvpi&0DUbb7t$k@$731^Z=7@bJDX zI(#bbrUJh6d>pH!2@sXkX&a#-J;Pf&hI50P4D_zX=&6EW$OonJZ@4^kCR_CM1xXsg z1lIfA-1;8+D9wEwEa_uG!1s!z;@x#_8X>t1MXMurlN@~o!D43)SiN%mw9+4 z4hVXpGVN2O22J2$WGsEbrb%~#{K;Zy~MQLuBr@40p|uR3xi?r8b9~MEi5=D z87)@aK)b{t?^a6+k94};jzk1BCCsQ?-b(dQJ2pJf-zshGfyy@TdW%U2m8zUi=w%cT zM&K%M`7X8S2`PH=GUXxrXQ6phc#HSh?}ALWt{fAEUx^U2RAeH_1Pkq9&Y3<=zd3g; zVBMF^NI`^G=XDc*{su0m=_r-*r7C#1H^RY;s9WOxeW#>z)(9f@x#?wLlYxyRmHvBnF7orufw%cWN_!{`<|%$EDY2q>lJ2 zfYuHRe}A?A^j>l{aento4gNzk4*o;`BF$Q zH>lKF<*!>@LeNVofvo{5xE!C1D#GxP%@P+u{<7sW!|5ZD+x2u!kQs`q3au`ih0^qY znFmTmmNNy0nHY`)o&Y+?3SGmtEAWyX)d<=f{?EFkXuYJ^c^m7{w@5l|yAQ$$+F)SY znwmwMYx!cd!}|E!lAMR3tJAhw>d)2e`STm%(L7*r^%zd^(ha&w4tEX$RHqoG&&|s# zuC9Jo)Y%Fzs=XEwubHgovtPA+{@Y5$_;z}*n8mxGLnoy%g4B1U|GK*h1@}cRD^}~? z^!1hsuO8=>FAZ}$e16)NTv!wPRPjX7$gVHLzRA!b@ro4Q+qdz&pn1l$%k^b8*hQJ+ zQ8^G46@CKHIs^*+^;V?Advjs9YJ+D{Ppx;hWdbBq}7o(n^*1`r36tJyJ!t+NG)BUOGZR6gjS!12IIWi^Cym#{E- z0(j6lj?t(W9#kHTIvAg~Jpq9Ht4;vjpePt|Wa|Vlh|TD={?Y9=Mh^z=$MoQjGpLp@ z{c+{e*NhzAElOAw$_<6;3yIvryhnz%zCV?yog>Lk{Og6|YMa@X$IE)UwF@<--%)D9 zjrs8{?y+#vyM^@e_Y%HqV_=^GrBqc`dg+McnH3%}sUxh7&4SDaVxB43XIp0c?PBQ@ zVIdRt=d=b|SKM6P{aXc6CYLzZZ<{4ddw#v22~2F0iN)bEF@-Gi70+q6W3=59(ymNP zhdD)~1+mCo-O`bb(B}1_G~)8B{)zYPXuOgKL~FWFEwwhYkBdm#c3l)={PBee#6c_t1#6-9eC{o`LjE&qtzi%KU1kq6-%8Gz~On5#G%lWrQ{GYiV4~ zZ_6tACM{cI=7X*$JX~I6_l+=s9eCM|FZwpD^pq{Xx!0ZFuH9|?QoA}wrrYn0;M}q% z)BtU0o&sTYrFq!d?R(=X`C-@$ag2pEG1}5n!akQ(T2>?XLD5B=T#x-oBHlGCp6Qp+ zX?e#{puE*x4BJxE9eUACCco(&|LVhoEmWJCG#Vu#Wh5u%-aXXw@rzVRah^ zvVU6SmSV@-XJ3E#cF}8g^6Pp3l8usaNu!_Me8#HQj16e@(T-c6hvo$E86@=dNKR+M zzjWuZi$kH|ghonZfx{dAEXAmW;Mdq5zQ|Gw@w)3XzA5e_J8~8=0|#l}6;rS9s8Qb@)A!VXx4PA!{filRm{?@A_ z33D-R3-sN3+WBC%k*_U2L@^o@`tnkBB?f6?W=0W5ID{@AmCq!?>WMO4)lAT}JsOzno)llz=nc3ykX9PyFD%|s z7oGQNH`>wj1y5|6nU`=X8Jsl;DuM+D#XKgP8hg64dH#lqB7gC0H_z@#`$U{(NvsrA zvL~|4IR0=iw@-CSZF+|Lm{hGR*a1Ft;xSjBpyLZ9ICN%N6e~%*>Yp_8BU83OoIg7n zy90TrnbTBDHjwUlu=xJ)ilqEQ7n1g9O9Yph%|5=(7aOzpX{y!2notZo+Ene1c)~L2 z%8bOco98)yfeH+_y5`~R_#C2<^f!Kl$YzoJ?0O{FMA|P>Ir`xZlzbf~&It}>Z;ylI z$6go?>EqZ(NJE~px?KhxtgmG`)=k2`trp2m*;~{A2Z07LNUt{{qmoUf)5r2q$$eJt zvY1hNICj*$(6tP++fJ{)9BLX>W$;2TsnVeDb%kyntT`w7Wq%gu=@Mc9P+(HGyB$rm0b98UqGCNz(Qnyhjo4CA6 z52m#mmxrs5@g)`ecC6eEzRpwEH+`6^TMcX9^Ju3Ze1$I9{XBTprK&uqQhi zo%K|*M0biQDR|UNT6Y(LXa<$t%hRpc_FmFnn}6=B8(ldTJJ(Am5m8VP)XwG|4~yC} zH`rSSK?(%yiwZi}>Rc&V!WGM6IXC}+wXUSd3A*CRAXupN>i zm41G#k+OOMczO^oQGl7-k6?Zh7K%dW*9wqu+Ix9cq@u9cSz*D)7dWc~-30{(RPEld zH+L!|E-Z6SP5?Qd)F^H|B_f9hYet;9?8`8lg)ANBx)AgojXP=s?C;`=;qEkdJ|{BH zvK_lmULy^6`hCPrdvbCOyo%3~eK|su5c1Zz!cn|;<%_D;mv&%%o%ZeN+Ma0QVvOQc zkvQUph2oP+DR6J^5#S{jnY)oQauo*DfbEb_PqJ5l%w6^lan~fPk0xhCM^O#v!YUi_ zq*fPFlrkc_;=VjS!suCM_XTb?PsCUsQhML9KF2Id_azq06EU1h@*5xQl4sd8w+D)X zZr&TYv$vLPRTx<4t7H5#iULe?dK)0S8VlnAF+B0~!r2cl;<7A; zQ*{>7iR=;Hc;>W#>`pdLYw1;Xs0Eo$vI7?~l*_Jw8O+&YW34~m5)s=dH*BMZ?;i%g zjnNN6LOo;d`ET|#2j-aD9P_W60yjd+?9D2+U*3&y8Z2g^O=NU76wTY^luGJ#Hr4tj zq!B0BnYgpTEe5OGH0yC@j)oS@5I3W;eynviUevDyFMhH0{&bilLyn&&V%Tjqqr372 z(jV+=E4~0Fz$V5E}iAIjq_a9Hz_Dye>5 zHN(rC$|5;27WTa#W1{l@VJgB!4(6}crsz3aFClpqX=+I@&7S*awHk6ODZdeyo`?Ho z=q}P$;ARzg1T>;3SQae$%!Z2JnF%SPG`I|l^mJR*I5QAo<*lK=eaB>a%v<&WCQe)@ zjrLKK<6fwtZJe9TpmD43zQc{Cls%ZXGei5=nNQ$(m`gHrk@^D+uHJ{R9Tv=yHF)x5 z3YmFpmr>JDEv7Zs-jW}n<+5td228ywiv#CdxG--3Vr?XMK{ zyg%G|Yt`$;N7m|}^dZUAoaK%@uTj)}Cqvu?xT!u1qn7$cn%rAW0fG{*ewt*oUlTR^ z{DOM@&~gz*{+UKp9K78kdm%I1svF!SCOefVG+~?&`&KR|XBRAvTG_Qy@NY`vfk_?J zfYylrV00m>-TB`jWaD7%>KUnSziiRDwq^>WGgnA~FnTCnElIDWie`r~Dh?`4WNu2f z7UV4TQBUX09no@*T+L(853ySx%**(TKOteDPJ4w5s8jw_U#!+7H?w=MRii^DX7Q^E z!_Arzi6WZy-h++eh#V|TA7;ho-z{`&zRn08VdP#e*{HaJvY1=-o~$g?ErdE~=R=(t zvFTzN*5n_H2Jw%LvHR_%Sl+YMf(vPeXqKsDkSfgN z^>#vN*UDQ{kPxX!$WwoQ)y*?8aRc8k7n8pIu~h)7^}Xq9ljPh_+AP_ zmv52K8uVJ-9RId6z$=oR)?q7;b7RD2TJ&}&lFI0FR;#u~Ur!lX_Y}BNA+nvqjeYuE zdXbyG3(v4wW9Esj?~5KSktuO~l%EVd6gjBJWt-{78+>UAL z&)BYg8r$RltJqE&@t`ZgL|McsOS~lI<|gyLPMuyGdW6D~2)1h)ubR`d1_$p&mp~WA zG$1k&WUOITM=y?SDwNGeu#Qp#I}YE?LL`drZ$+Rk_mUDhaAMf6cCtk$^S#kAo*Az>S*EhLDY>y?XL4B+nF7iQv`qEteZ+y+)@a1iq zOhDIAgi6p*INVH&Z89quubk07FO_EI4gNNn#Bu^~+;1X1|2q@Za7>k}!s$VdouP}b z6B`62ML?r6L&J9^6bZt!B=OH7bd#L8xXW89vD0rG%C1CPv8zC;GDkWLO={5Vsfh0e z%=3@St0*kh5Fz-fq&F~*AlWh*^36qG(m}Zoo8W!hz*`yTJA`=9a&8BG6B#EBuSQK) z43;8YnrpNaJr}sD%1E){t*x^3f$_=rezoYu85CuCg9X@1Hey@h3x?{rL}|Q{p<`(w z8`1|+#Az8U4QKSNoX+n_%<5a4P>^4m&P_7S#dwWeA;w>vFXcHF5`)}ngua7KIqHdr zZ8j5=r9DhF9X`M6UoNbm!)z(<_R_wo<{^5ZUK=FD4kPH0IS6r~GRO);;XZAr>7z+% z=w#T8cjMyvh`R$wvYMJHe@4ebxAV8%o;5Z~w9%*Dgb*RZ4Zw7tUv}jKx4i zawdH}z|lZj5U+B0t76TDB_rX&2T7GAS3&+@tXo1Pq@@n;bRb+l>yS8pU)hU~twD#-^#@*f zd^2m@K4x^3Kiy>3L_s4*XA@ahqge8EJ$#rbVQ#(?L?MQAq?zH3KZxNwop0dbdtU!S z49VdFQr_{G?Z{^E8bizy%sU2B%4>WhxAKge5aZE}Y2*!Cl8o!`>D{^9a_oU>W-rsO8Ndl;7@!8<~h|$go|?Rb*|YrfW1UE z!RE-#>a>q$zqg_&v>saWM_MrO=kdubc6xmF{8z_krL=v9>l{wKLGzvdtRdWozsajB zF2=Qzp*zksHwqZcqsYeg+=lLnSd7-n7%XWrF}j1M>{`9k+bky!Z0)Bxrwlz|i$q1{ z&ymD+h8%+MD7?G?wZ74DCyH&26x(|o3Deo2gmDCbf#7-!x)OE#h*&wy_ zuLnHW&CAr2eNgxa^|8=9+BeXcz|?+aFQo!6*((0N3^)1IdQexb=41FP2cw)*K7%rM zjMYR=FcDqC_+Mx9H`iW3Ien9mq_?=1OcE2+{TX~@%_(W9G9?W)Q5FzReRR93fuOPg z7`C2D-v+o!Z0P;?%_jGsU5w8^b626$+*SBAcm1(jjD>4v1`gHEN2Kdb@@UY2IBoYr zJLXqqvI@c)VF9LN_?DZ$T*PPD(EC` z*|wRs`SK+9C;2~HFN6ExQ=?*fX*iL&>P3oxyONn+z;jA5C(lKhbOYYvc@cUIXZ?X8b@AhOa-%(n!-T%D6v_L$PTPA%uFe&>K%9Y; za5gwZbcmOaW9er5@b;uHg6(tAgMB8+r2|Q(m7{UBu=C~W!7K@FSsSPUmv^rSQ)~B| ztJ731HKUZ`2tQ%}iQp;hI8JN7xk23k&B%>G?}BGp6~l1#xSRLczEUcywzki+6u$i! zZMZclu~ykwQ1M2>U?psff5`h%X2ETD$e!XI5SQoEk~r6_wly>HAjfP;=y6%5h3>Mv zIyPiRhG>n3h8<5h&L(sFo&fL`)d66$kKNnXhLetX>P@R*Ws_M^&7^EiShpKrY)ZDe zx*0F8L~*kZquG&-#%8TyL@LxV6$~; z?3I8dUbcqy@AUXG%YU=K(`EYBT;Csm=04;L>)nkLK2RlbbN|Ywfl9CY&EyC@%b~SB zo*v48as6i}>fv5OJ{cE3_iBIJ3A6I?%DT76<`vM^^19%g5;yX_h9}??Kx#&1*nII? zs$SL#Q@8OVu9Mu}{v%X*rYrmF*7)tPg_Z#5*k^y)rMa{%@t$tq!hU7!DAiO;|J3ljXq{i*(XfXccX=3BH zof6jVdp*aFm)jZ=Xg+FGuuN~v1%0u>&29Xjf>ruMsZZh`2f3x}O{{Wc$Kl|~a)Nx} zhgkEf+v4>rbvu`@Z}>l((Qid`7m0-Jg_<8Dovb?CcJZH90&Xu&*4Duw>FT6KfmBsIEN*!PLo=9?gRoE!U)scj7owv^vp08n&d=Q;Co(;yTunTJ+MsD7Rjz4c^p zq`^D#ulI2ZwhQKOOUP8pJ|u$mfRaXiwf>mvD4n+2NlmxFV(hne?FjyUUl4}`yG_EO zq=9!U)4tg)RQ^vt0gTHhmp-R5EOLrkmEXwy{325ai7sQqW!#W?H}I%!!;g>g1RzI5 zgeIBBs|Th?*;Y!m8ku}CA*QS93ujroTtiU$7OOr=DK3j62u2Q1lCeynz&}$|owGtND7U%Q{qYZk z;dS~9e{k-B;zR6a^kDL(&qr~CJ!zHK=} z7SJQ23zz4`^=I*EC}X{QT3=y}g-Cm_BIC-W9Jg3wd!~(s@%WR9upZtflMjD^|NqO? Ig_D8*0Rw6LDF6Tf literal 0 HcmV?d00001 diff --git a/static/index/country.js b/static/index/country.js index 6ae5fc3de..39933fd2d 100644 --- a/static/index/country.js +++ b/static/index/country.js @@ -687,52 +687,56 @@ s_a[252] = "Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands"; function populateStates(countryElementId, stateElementId) { - var selectedCountryIndex = document.getElementById(countryElementId).selectedIndex; - var stateElement = document.getElementById(stateElementId); - var selectedState = stateElement?.dataset.selected; + var countryEl = document.getElementById(countryElementId); + var stateEl = document.getElementById(stateElementId); - stateElement.length = 0; - stateElement.options[0] = new Option("Select State", ""); - stateElement.selectedIndex = 0; + if (!countryEl || !stateEl) return; // Prevents null access + var selectedCountryIndex = countryEl.selectedIndex; + var selectedState = stateEl.getAttribute('data-selected') || ''; + + stateEl.length = 0; + stateEl.options[0] = new Option("Select State", ""); + stateEl.selectedIndex = 0; if (s_a[selectedCountryIndex]) { - state_arr = s_a[selectedCountryIndex].split("|"); + var state_arr = s_a[selectedCountryIndex].split("|"); for (var i = 0; i < state_arr.length; i++) { let stateValue = state_arr[i].replace(/'/g, '`'); let option = new Option(state_arr[i], stateValue); if (selectedState && selectedState === stateValue) { option.selected = true; } - stateElement.options[stateElement.length] = option; + stateEl.options[stateEl.length] = option; } } } function populateCountries(countryElementId, stateElementId) { - var countryElement = document.getElementById(countryElementId); - var selectedCountry = countryElement?.dataset.selected; - if (countryElement) { - countryElement.length = 0; - countryElement.options[0] = new Option("Select Country", ""); + var countryEl = document.getElementById(countryElementId); + var stateEl = document.getElementById(stateElementId); - for (var i = 0; i < country_arr.length; i++) { - let country = country_arr[i].replace(/'/g, '`'); - let option = new Option(country_arr[i], country); - if (selectedCountry && selectedCountry === country) { - option.selected = true; - } - countryElement.options[countryElement.length] = option; + if (!countryEl) return; + + var selectedCountry = countryEl.getAttribute('data-selected') || ''; + countryEl.length = 0; + countryEl.options[0] = new Option("Select Country", ""); + + for (var i = 0; i < country_arr.length; i++) { + let country = country_arr[i].replace(/'/g, '`'); + let option = new Option(country_arr[i], country); + if (selectedCountry && selectedCountry === country) { + option.selected = true; } + countryEl.options[countryEl.length] = option; + } - // trigger state population if needed - if (stateElementId) { - populateStates(countryElementId, stateElementId); // populate on load + if (stateEl) { + populateStates(countryElementId, stateElementId); - countryElement.onchange = function () { - populateStates(countryElementId, stateElementId); - }; - } + countryEl.onchange = function () { + populateStates(countryElementId, stateElementId); + }; } }