From 09ab17a00fd31a3ed5445955d5de70cfdea35928 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 15 Mar 2024 13:57:32 +0100 Subject: [PATCH] change some fields of certificates --- .../excel_examples/course-credential.xlsx | Bin 8944 -> 8947 bytes .../excel_examples/federation-membership.xlsx | Bin 8991 -> 9001 bytes .../certificates/course-credential_ca.html | 6 +++--- .../certificates/course-credential_es.html | 6 +++--- .../federation-membership_ca.html | 4 ++-- .../federation-membership_es.html | 4 ++-- idhub/user/views.py | 2 ++ 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/examples/excel_examples/course-credential.xlsx b/examples/excel_examples/course-credential.xlsx index e2216a4e9c5f279c38390b83d905fad00c4a2a3b..70b45169d2e9e7b9832ccbe0a9014dfb0e6211ec 100644 GIT binary patch delta 2290 zcmY*ac{~&T8{eFBLS9_pj1t^;-{W6GzX4v`6yVn!GLP zBTY0uEeYK9qBl|K%4}V zhJgqRXMb!4!VoL1FyFayNEh_mF5y5^Wrgd7VXLqm8 zal38fFR+>DE2cI8arvWx&!aCTg~BOsvRYvfzc}>G9No zL6i~o&gE?@?J}nG^jrz`Nl!RY`pDpX;BB9KW{yS{GD})*ZehMpmOJXfg*#jOcNV0i zgc?`!r;JCc*A7k-pqK5$hY40;>CH@~m6)^QL%(V^@#q-*M^9%Sx)1srH1f z4N2As=#gV6HWO2;w0M*It-~gj`)&5-RqnTMHYb2g(2w^(rrM8!J&yRTm>WNcNEi(k zG~RK#+(TL)j=Fk2NSlz6hFo4~xjn}^JjI?!JU>PhbN6cLsyc`#V z%&74Bn6~gJt1tpqCV%p#M2qhAs=2#vH5U`ZB_i=qnyg1e6)5GSN!rjz2|cfmoo*>O zWgs|{o37E5lJpduSm89u&^=sJQuPBcjvOo1utP_CG0~D*BogA#(H_$Fe3aU%t3qm! ztnti7Ql7-Z@SWVmrg)KvM0C-{0j|(zYk#fpMVX5PJ~2!78=$HOahKl=}D?9%M73K0S!Qk9K11jxfR&2E(*$!p9k zL%Y(6Jmzciw4^cc2N?=hQVFP6C=z-$N5r7{LAxeT2_qtoH7ITQY83ZiT|;C1YL09-iJyH6ZAm5!$4S#?fwhDA zE;6_j$`_M==qahEJX$Cdn!67CH(>cDTji%krd{pCf+3XY*sMF9#_OrU`%q1#Hz1}P zO=&`zkE{!@xiaXCFWKH2TxG@<^^Z3FBYe^Em`Pt!&Jj>U;Ryk~wZ7RhYLlOJ1y2y;)6nG1bdv?IACE7UHo5SA(5|F{KJ}iYI~k7=xh%;ko1U`Yo+q zhcF5|Q~jIBVf!;38C?RbhDk^E7b3ympewWQ*f*Xa_XNLm^tlj&>t+&CXR*0%t!whM zA8Q}c6l`Q)`UNWOgjc9qu;|c?W$;p!>HJTKI-V2-wo(>h95j@}>3!DJ9AT}j&i&&R zcEw{j<_AllUs&l>dv|iNVDg5{&+V-3qrb`mHDuM|_R2EG^}9<1{wMonKe_iDB{!AV z`z`z7kdfb#j)5Y6&5+ZeC=R}X8gWnrX39Z(*l`ZtfEjS`9n4N(FW#Bcl4K1<6X-AR z&lj=Rqkjxnag8m}^1HKd$yZ`_I delta 2281 zcmZ8ic{CJiAD%IjnMq_AQI;8FMj=Z=mTdWC&5|L^M6Nvz*=f=wjC~zTB1@JLcS80h zJKb#IBHCm(;UfD|uBP*y)AzmqJiq7n{+@H*bDsBopLOk3ZFUm_5Eub~LZN^)Q$jgA z1_(OB3OOM5S3zJ=U}1Jrz;?fiUDiM_v*XJq4`LQ{4prtbb@`+wFpetC$*cCpC!d#} zAh2YWdGiIdccKYVS0h3&v5>ki2Mvl(h8eilS?x?T(?1&q8S4@X6`iqGI}r3iP0z#} zsViHX8pYb`M8qZX0y6Zu1 z?R;qt%=r<07G)R4PH*n9l2I9-XN&)leOB%f{hy+498N_d$#&c^cz3<}9;iveredR@;T&H!6{#LQ(D${SO>MFfM?)!!xVCk+@ zT{{UJybYpdoIp2ft?prE2F1&_7`7T zj4XF{y#7Ed1@npx>k&4Bcgb5-JuxbHVeq5zhqq48&;A&J1=oq%c6*WtG^YXy*6YL+ z0MCN~oD&;anJ*9a#OP|QegYN$3=y8wx_6wMUX)GW>W#Rs7%MWoC;Ox@-)HD{KTESl%xZS(UULHEsSxM;+I03p5o~|p zX^|d2rPI?32QgYbias)NZ;g5J^<$dhq98MyU|=^p4dFBbk}s5K?~aE3+L3sa?4d{yoojLS}s%fZKcd~ zeMPRA@iKaoSm(G~?-$xfrg`^o3B4oV>@dkFjik_j7&5?iW$L@`gNd8fkOm8fuhYg0 z*?7zIE%kWH`Yl>pMZ|UxSXrB}4IdPnDvamLLaS}S*Tnu9(TOpFBljcL#HOm_A7`S~ zHsODpbs&Q}mJn++t@5}ce-2%p5fUU{WYHOtpSKtS8iH>{gN97Eq>p;!NNuz%WfSZ}F&vIw+0 zM&Z+GujPJAL|$ChP*ZxWjP-Fwnf4ge;66YXG5^e{xyaWqnZP;fNT=xKO5PGFyF6it zHcv#C7>{|}Nj9d)zGgH6i4yB#5VTBN_-QytZeQPG4t1fem z%LQ~XBqXr?rFvp8kM9CY&@?%QF?fzLDYVXhY>I&V)ZW@5G`GyxUw;o=^}T}{iohr{ zBraq>qlYv!Etjd^`b$j#Vl!bTB~6_c6f&x zZ8S5h*D&mj)BN9s^3rchrVY$IgJ)1Pq4aT)j6nZknKb?UNPLB)V{NfpH9n^0Y+wsU zBB&6mZR2XTt^tj!iNI3!?kJEOibQrC#4}#wtiAo*i!bcfz&#$Q`>^l7*cJEc1X(_p zY>*k^xb}`T^$h^esQ0-RggVRx89pq4AaOIO7qj5Wemn7|ZC&wnXQ4sK+=YJbigsUe zTJ3;Kw4q)BmwlwC5|?30OV-&hxA9~@o$49LX1W469HS=qte~V_ftxJ#IaokBZKC2<7Q^?^9A#kl8GkgDK;J)hQC8^# zW4U;8;d0m3ilofguNJ~%<|Lq4$x*+UAr#^F?EtQ?4HKR|Ho zSDu?86@KneW02ZR97ZZL5sp%0;&s$jCT5@%nK+6vf*s9UGM^(=QdkxFll^`nj^5{Q z3r~#{7GWw&h53O{YL76Isrdb{@ZaVEfR|Jl8pTwcNAm-%sJdu0lM#>D1!^Q3$z&x* P%!T?IEy}8i{3-tz@wpB$ diff --git a/examples/excel_examples/federation-membership.xlsx b/examples/excel_examples/federation-membership.xlsx index cfae58c724f14ed61a90a49dbd47b45d5783f530..7aa9db8f51ef0324ebd3d5e320306297bd67d1c7 100644 GIT binary patch delta 2622 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 delta 2603 zcmY+Gc{Cf?7sq2s1fgk55LE1Y>`RNW8(YIrOYCd4Xi-B;Ren`fic}?1)mW=`W8WLQ z7%64!YHF*k)>wzyM*Q(Ro%he@+;_hBo%_!B-1lywQKk{Z(u{$T0{{kt0TA;Fh$tOB z#Joz0PV9n?^lJ397|-Z&!2=MCkrqQ)of&8hVE=`t!xV zo=sz7Aw#Nh!6xD94QfEI_sj@X^13?aq*SDpTRFWq@gy1ieJHXx;EhW0_wF&7klJWg z%J$p%@aEMdO%H{>F{OW&hUPlPL!vvw608Zhw@u>hC+cUOjh@GbBGJZ7ka>?qF)J8X zhImf2m;J6iM)!d|S|P)o`BlVvT+~&*)tl%QV6*nFqIvL`ef`X4MVqZO{IxXfo?^0@ zXEct(EYMY?8k$lwcHq44fqfV_Ov#Lix4ZqJ_C-6Elwd?;u1zMzdVlcyYK{8X^VfCP zFzT61HXUDxnN4mK#U4gl!t*T3y_;hgN9q*%q**m!#+X8vtnZy=Xh^4-wg;dgx-PS~ zp!U+#G|elARRgQrabG(OYS#MlT^hoENtEo=4_geZOl!y-=+e)E!l`Pa8h>$X2)Q=_ z59&-R3VOfylo82l%Hs0Uhk3*ZwFYvoTccbj&mx^Z*SDA83-$1WAjZxh>aOY zvZFfIcnxyGku^R>^SqU!l36uMeb>wHe_rH&-Jg#r7{H`dOCqCLT<$7=0ryl6N?*;0 zCM)!mR;MX-l+6eq=Qo_n&AYr{idMayG|hTsnm%L&67_b==Sx6YOvp(dsdx|M@?kEa zEO-d`?8FCyyxBw6?532biIo_b`wP*90aO@vmnQ`;Z1%%E+&wUy9Mq#;D<7l9k&zK( zrHJyc1o`yX&D*84){)+HOu0pX1{;si4`;h9>5TFmSxx#5~H+epp zYDAj8g1kHIOzk~slU?*<=`6h8dooqvKk`Z8_sVd_>$|-oxqf>X{BoqL78?{UJkNCE z4m}WDLo0}_o4GvksgTUF0kK{C&a2>>npo>J?Tv4-EQlzXM34O@MsTX?_J5--D&pEM zIs0{%gS}Ah-R=8r_4BEES5Jv^%L~@m&P)qR%6=uLek0o$Fv=c^ei|-Kv8-c0d|hA% zd=AfYDjwGCH7Ln)GZ2?0elDmSpx0q9vCVpfUouwHQ7#cvF)dT_nRvZAp&u=qMg;NSM zqyr`Ga29LnufYn6D51=EqoRtU^e9g%H7e{JHq+9BjMeu9!dJKg=Q>jyPjg+{$tlZh z_plm~0aG8hdO6-qj=p3ADNdzqd*RKVqQdSuIa4MV)gew900`Lc!P){VXdMWQWJN9a>O2qwsOP_b_O zk2$f*1DjL=k&7h)azw=Fcj9=o$=_*j0ak?CvCj? z*X~Ma1c`_QWgny_i0_<`ytzHpzAYTDs!R6yupVV1^0a0tv6qgt@06-vo%4>&Xo(b_ z(zoOe;1&_pVAoo`mu6$>uXEwPP6Lu2DbV+I+(9sb7;rF&HKVDHMx3?Pj zN4P4{oD6u;ZX@uJj%;8*PtqSw{U5O#8+NStE_coSj`2(R#dplbtgpDVh#!m{k;~(y z(^b}(>rT*d{mBk7G zKz~vI017xdA%P3c&-Gvak7gRDErg&I;V#5S7mJG&61qqrFSP3(o(t2?Fa6&`-Eb{J V0 LAFEDE.CAT – ORGANITZACIONS PER A LA JUSTÍCIA GLOBAL
CERTIFICA QUE:
- {{ firstName }} {{ lastName }} amb DNI {{ document_id|default:"falta el dni" }}
- Ha realitzat el curs {{ courseName }}, a {{ address|default:"falta address" }} / de manera {{ modeOfInstruction }}, els dies {{ date_course|default:"falta fecha del curso" }}
+ {{ firstName }} {{ lastName }} amb DNI {{ personalIdentifier }}
+ Ha realitzat el curs {{ courseName }}, a {{ address|default:"" }} / de manera {{ modeOfInstruction }}, els dies {{ issued_date }}
La durada del curs ha estat de {{ courseDuration }} hores lectives corresponents a {{ courseDays }} sessions.



- I per deixar-ne constància als efectes oportuns, signo el present certificat en data de {{ issuedDate }} + I per deixar-ne constància als efectes oportuns, signo el present certificat en data de {{ issued_date }}
diff --git a/idhub/templates/certificates/course-credential_es.html b/idhub/templates/certificates/course-credential_es.html index 32056c6..f97ec3b 100644 --- a/idhub/templates/certificates/course-credential_es.html +++ b/idhub/templates/certificates/course-credential_es.html @@ -77,15 +77,15 @@
LAFEDE.CAT – ORGANIZACIONES PARA LA JUSTÍCIA GLOBAL
CERTIFICA QUE:
- {{ firstName }} {{ lastName }} con DNI {{ document_id|default:"falta el dni" }}
- Ha realizado el curso {{ courseName }}, en {{ address|default:"falta address" }} / de manera {{ modeOfInstruction }}, los días {{ date_course|default:"falta fecha del curso" }}
+ {{ firstName }} {{ lastName }} con DNI {{ personalIdentifier }}
+ Ha realizado el curso {{ courseName }}, en {{ address }} / de manera {{ modeOfInstruction }}, los días {{ issued_date }}
La duración del curso ha sido de {{ courseDuration }} horas lectivas correspondientes a {{ courseDays }} sessiones.



- Y para dejar constancia a los efectos oportunos, firmo el presente certificado en fecha de {{ issuedDate }} + Y para dejar constancia a los efectos oportunos, firmo el presente certificado en fecha de {{ issued_date }}
diff --git a/idhub/templates/certificates/federation-membership_ca.html b/idhub/templates/certificates/federation-membership_ca.html index 3b83531..472db16 100644 --- a/idhub/templates/certificates/federation-membership_ca.html +++ b/idhub/templates/certificates/federation-membership_ca.html @@ -87,13 +87,13 @@ CERTIFICA
  • - Que l’entitat {{ legalName }}, amb NIF {{ registrationIdentifier }} i domicili a {{ streetAddress }} {{ postCode }} {{ city }} forma part com a entitat membre de {{ federation }} (ple dret/observadora) de Lafede.cat - Federació d'Organitzacions per a la Justícia Global, des de l’Assemblea General Ordinària celebrada el {{ membershipSince }} + Que l’entitat {{ legalName }}, amb NIF {{ taxReference }} i domicili a {{ streetAddress }} {{ postCode }} {{ city }} forma part com a entitat membre de {{ federation }} (ple dret/observadora) de Lafede.cat - Federació d'Organitzacions per a la Justícia Global, des de l’Assemblea General Ordinària celebrada el {{ issue_date }}



- I per deixar-ne constància als efectes oportuns, signo el present certificat en data de {{ issue_date_now }} + I per deixar-ne constància als efectes oportuns, signo el present certificat en data de {{ issue_date }} diff --git a/idhub/templates/certificates/federation-membership_es.html b/idhub/templates/certificates/federation-membership_es.html index ef4a06f..0550ac6 100644 --- a/idhub/templates/certificates/federation-membership_es.html +++ b/idhub/templates/certificates/federation-membership_es.html @@ -87,13 +87,13 @@ CERTIFICA
  • - Que la entidad {{ legalName }}, con NIF {{ registrationIdentifier }} y domicilio {{ streetAddress }} {{ postCode }} {{ city }} forma parte como entidad miembro de {{ federation }} (por el derecho/observadora) de Lafede.cat - Federación de Organizaciones para la Justícia Global, desde la Asamblea General Ordinaria celebrada el {{ membershipSince }} + Que la entidad {{ legalName }}, con NIF {{ taxReference }} y domicilio {{ streetAddress }} {{ postCode }} {{ city }} forma parte como entidad miembro de {{ federation }} (por el derecho/observadora) de Lafede.cat - Federación de Organizaciones para la Justícia Global, desde la Asamblea General Ordinaria celebrada el {{ issue_date }}



- Y para dejar constancia a los efectos oportunos, firmo el presente certificado en fecha de {{ issue_date_now }} + Y para dejar constancia a los efectos oportunos, firmo el presente certificado en fecha de {{ issue_date }} diff --git a/idhub/user/views.py b/idhub/user/views.py index 50e0dd3..fb5dd63 100644 --- a/idhub/user/views.py +++ b/idhub/user/views.py @@ -286,6 +286,7 @@ class CredentialPdfView(MyWallet, TemplateView): img_foot = self.get_img_footer() qr = self.generate_qr_code(self.url_id) issue_date_now = datetime.datetime.now() + issue_date = context.get('issuedDate', issue_date_now) context.update(dict(self.object.get_datas())) context.update({ @@ -294,6 +295,7 @@ class CredentialPdfView(MyWallet, TemplateView): "image_header": img_head, "image_footer": img_foot, "issue_date_now": issue_date_now.strftime("%d/%m/%Y"), + "issue_date": issue_date.strftime("%d/%m/%Y"), "qr": qr, }) return context