From 92e9517b7e7b960d3eef895b56cdf02277f191fe Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 14 Mar 2024 19:18:19 +0100 Subject: [PATCH 1/6] add langs pdf and split from file-scheme --- ...Model_Certificat_html_941e7b967953b3f3.jpg | Bin 0 -> 6245 bytes .../certificates/course-credential_ca.html | 126 ++++++++++++++++++ .../certificates/course-credential_es.html | 126 ++++++++++++++++++ .../federation-membership_ca.html | 122 +++++++++++++++++ .../federation-membership_es.html | 122 +++++++++++++++++ idhub/templates/idhub/user/credential.html | 23 ++-- idhub/urls.py | 2 +- idhub/user/views.py | 66 +++++---- 8 files changed, 551 insertions(+), 36 deletions(-) create mode 100644 idhub/static/images/4_Model_Certificat_html_941e7b967953b3f3.jpg create mode 100644 idhub/templates/certificates/course-credential_ca.html create mode 100644 idhub/templates/certificates/course-credential_es.html create mode 100644 idhub/templates/certificates/federation-membership_ca.html create mode 100644 idhub/templates/certificates/federation-membership_es.html diff --git a/idhub/static/images/4_Model_Certificat_html_941e7b967953b3f3.jpg b/idhub/static/images/4_Model_Certificat_html_941e7b967953b3f3.jpg new file mode 100644 index 0000000000000000000000000000000000000000..12e9a3ea3555b618f8c349d9be41e24ccc6fff22 GIT binary patch literal 6245 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 S9)$prp8I!h!1UDr!T2wU()I)Z literal 0 HcmV?d00001 diff --git a/idhub/templates/certificates/course-credential_ca.html b/idhub/templates/certificates/course-credential_ca.html new file mode 100644 index 0000000..1d1913f --- /dev/null +++ b/idhub/templates/certificates/course-credential_ca.html @@ -0,0 +1,126 @@ +{% load i18n static %} + + + +Certificat + + + + + + + + + +
+
+
+ +
+
+
+
+ + 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" }}
+ 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 }} +
+
+ +
+
+ +
+
+ +
+
+ Pepa Martínez Peyrats
+ Directora
+ Lafede.cat - Federació d'Organitzacions per a la Justícia Global +
+
+ {% if qr %} +
+
+ +
+
+ {% endif %} +
+
+ Organitza: + Amb el suport de: + Amb la col·laboració de: +
+
+
+ +
+
+
+
+ + diff --git a/idhub/templates/certificates/course-credential_es.html b/idhub/templates/certificates/course-credential_es.html new file mode 100644 index 0000000..32056c6 --- /dev/null +++ b/idhub/templates/certificates/course-credential_es.html @@ -0,0 +1,126 @@ +{% load i18n static %} + + + +Certificado + + + + + + + + + +
+
+
+ +
+
+
+
+ + 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" }}
+ 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 }} +
+
+ +
+
+ +
+
+ +
+
+ Pepa Martínez Peyrats
+ Directora
+ Lafede.cat - Federación de Organizaciones por la Justícia Global +
+
+ {% if qr %} +
+
+ +
+
+ {% endif %} +
+
+ Organiza: + Con el soporte de: + Con la colaboración de: +
+
+
+ +
+
+
+
+ + diff --git a/idhub/templates/certificates/federation-membership_ca.html b/idhub/templates/certificates/federation-membership_ca.html new file mode 100644 index 0000000..3b83531 --- /dev/null +++ b/idhub/templates/certificates/federation-membership_ca.html @@ -0,0 +1,122 @@ +{% load i18n static %} + + + +Certificat + + + + + + + + + +
+
+
+ +
+
+
+
+

A qui correspongui,

+

+ Pepa Martínez Peyrats, com a directora de Lafede.cat - Federació d'Organitzacions per a la Justícia Global, +

+
+
+ +
+
+ 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 }} +
    • +
+
+
+
+ I per deixar-ne constància als efectes oportuns, signo el present certificat en data de {{ issue_date_now }} +
+
+ +
+
+ +
+
+ +
+
+ Pepa Martínez Peyrats
+ Directora
+ Lafede.cat - Federació d'Organitzacions per a la Justícia Global +
+
+ {% if qr %} +
+
+ +
+
+ {% endif %} +
+ + diff --git a/idhub/templates/certificates/federation-membership_es.html b/idhub/templates/certificates/federation-membership_es.html new file mode 100644 index 0000000..ef4a06f --- /dev/null +++ b/idhub/templates/certificates/federation-membership_es.html @@ -0,0 +1,122 @@ +{% load i18n static %} + + + +Certificado + + + + + + + + + +
+
+
+ +
+
+
+
+

A quién corresponda,

+

+ Pepa Martínez Peyrats, como directora de Lafede.cat - Federación de Organizaciones para la Justícia Global, +

+
+
+ +
+
+ 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 }} +
    • +
+
+
+
+ Y para dejar constancia a los efectos oportunos, firmo el presente certificado en fecha de {{ issue_date_now }} +
+
+ +
+
+ +
+
+ +
+
+ Pepa Martínez Peyrats
+ Directora
+ Lafede.cat - Federació d'Organitzacions per a la Justícia Global +
+
+ {% if qr %} +
+
+ +
+
+ {% endif %} +
+ + diff --git a/idhub/templates/idhub/user/credential.html b/idhub/templates/idhub/user/credential.html index 9e1e0f4..6362a5e 100644 --- a/idhub/templates/idhub/user/credential.html +++ b/idhub/templates/idhub/user/credential.html @@ -9,19 +9,24 @@ {{ subtitle }} -
- {% if object.get_status == 'Issued' %} -
- {% if object.eidas1_did and admin_validated %} - {% trans 'Download as PDF' %} - {% endif %} - {% trans 'Download as JSON' %} + {% if object.get_status == 'Issued' %} + {% if object.eidas1_did and admin_validated %} +
+ {% trans 'Download as PDF (Catalan)' %} +
+
+ {% trans 'Download as PDF (Spanish)' %}
{% endif %} + {% endif %} +
+ {% if object.get_status == 'Issued' %} + {% if object.eidas1_did and admin_validated %} + {% endif %} + {% trans 'Download as JSON' %} + {% endif %} {% if object.get_status == 'Enabled' %} -
{% trans 'Request credential' %} -
{% endif %}
diff --git a/idhub/urls.py b/idhub/urls.py index d0230c9..9ecc8d0 100644 --- a/idhub/urls.py +++ b/idhub/urls.py @@ -73,7 +73,7 @@ urlpatterns = [ name='user_credentials'), path('user/credentials/', views_user.CredentialView.as_view(), name='user_credential'), - path('user/credentials//pdf', views_user.CredentialPdfView.as_view(), + path('user/credentials//pdf/', views_user.CredentialPdfView.as_view(), name='user_credential_pdf'), path('credentials//', views_user.CredentialJsonView.as_view(), name='user_credential_json'), diff --git a/idhub/user/views.py b/idhub/user/views.py index 6db3500..50e0dd3 100644 --- a/idhub/user/views.py +++ b/idhub/user/views.py @@ -209,14 +209,19 @@ class CredentialView(MyWallet, TemplateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) + url_ca = reverse_lazy('idhub:user_credential_pdf', args=[self.object.id, 'ca']) + url_es = reverse_lazy('idhub:user_credential_pdf', args=[self.object.id, 'es']) context.update({ 'object': self.object, + 'url_ca': url_ca, + 'url_es': url_es, }) return context class CredentialPdfView(MyWallet, TemplateView): - template_name = "certificates/4_Model_Certificat.html" + template_name = "certificates/{}_{}.html" + template_name = "certificates/{}_{}.html" subtitle = _('Credential management') icon = 'bi bi-patch-check-fill' file_name = "certificate.pdf" @@ -225,6 +230,7 @@ class CredentialPdfView(MyWallet, TemplateView): if not cache.get("KEY_DIDS"): return redirect(reverse_lazy('idhub:user_dashboard')) pk = kwargs['pk'] + lang = kwargs.get('lang', 'ca') self.user = self.request.user self.object = get_object_or_404( VerificableCredential, @@ -232,6 +238,11 @@ class CredentialPdfView(MyWallet, TemplateView): eidas1_did__isnull=False, user=self.request.user ) + self.credential_type = self.object.schema.file_schema.split(".json")[0] + self.template_name = self.template_name.format( + self.credential_type, + lang + ) self.url_id = "{}://{}/public/credentials/{}".format( self.request.scheme, self.request.get_host(), @@ -247,49 +258,52 @@ class CredentialPdfView(MyWallet, TemplateView): response['Content-Disposition'] = 'attachment; filename={}'.format(self.file_name) return response - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - # this_folder = str(Path.cwd()) + def get_img_sign(self): path_img_sig = "idhub/static/images/4_Model_Certificat_html_58d7f7eeb828cf29.jpg" img_signature = next(Path.cwd().glob(path_img_sig)) with open(img_signature, 'rb') as _f: img_sig = base64.b64encode(_f.read()).decode('utf-8') + return img_sig - path_img_head = "idhub/static/images/4_Model_Certificat_html_7a0214c6fc8f2309.jpg" + def get_img_header(self): + path_img_head = "idhub/static/images/4_Model_Certificat_html_7a0214c6fc8f2309.jpg" img_header= next(Path.cwd().glob(path_img_head)) with open(img_header, 'rb') as _f: img_head = base64.b64encode(_f.read()).decode('utf-8') + return img_head + def get_img_footer(self): + path_img_foot = "idhub/static/images/4_Model_Certificat_html_941e7b967953b3f3.jpg" + img_foot= next(Path.cwd().glob(path_img_foot)) + with open(img_foot, 'rb') as _f: + img_foot = base64.b64encode(_f.read()).decode('utf-8') + return img_foot + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + img_sig = self.get_img_sign() + img_head = self.get_img_header() + img_foot = self.get_img_footer() qr = self.generate_qr_code(self.url_id) + issue_date_now = datetime.datetime.now() - first_name = self.user.first_name and self.user.first_name.upper() or "" - last_name = self.user.first_name and self.user.last_name.upper() or "" - document_id = "0000000-L" - course = "COURSE 1" - address = "ADDRESS" - date_course = datetime.datetime.now() - n_hours = 40 - n_lections = 5 - issue_date = datetime.datetime.now() + context.update(dict(self.object.get_datas())) context.update({ 'object': self.object, "image_signature": img_sig, "image_header": img_head, - "first_name": first_name, - "last_name": last_name, - "document_id": document_id, - "course": course, - "address": address, - "date_course": date_course, - "n_hours": n_hours, - "n_lections": n_lections, - "issue_date": issue_date, - "qr": qr + "image_footer": img_foot, + "issue_date_now": issue_date_now.strftime("%d/%m/%Y"), + "qr": qr, }) return context def build_certificate(self): - doc = self.render_to_response(context=self.get_context_data()) + try: + doc = self.render_to_response(context=self.get_context_data()) + except Exception: + self.template_name = "certificates/4_Model_Certificat_ca.html" + doc = self.render_to_response(context=self.get_context_data()) doc.render() pdf = weasyprint.HTML(string=doc.content) return pdf.write_pdf() @@ -340,7 +354,7 @@ class CredentialPdfView(MyWallet, TemplateView): w = IncrementalPdfFileWriter(_buffer) fields.append_signature_field( w, sig_field_spec=fields.SigFieldSpec( - 'Signature', box=(150, 100, 450, 150) + 'Signature', box=(150, 75, 450, 100) ) ) From 91c125e9ebd301a9e94e834d3368ffc4536c07ef Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 14 Mar 2024 22:10:00 +0100 Subject: [PATCH 2/6] clean --- .../certificates/4_Model_Certificat.html | 111 ------------------ 1 file changed, 111 deletions(-) delete mode 100644 idhub/templates/certificates/4_Model_Certificat.html diff --git a/idhub/templates/certificates/4_Model_Certificat.html b/idhub/templates/certificates/4_Model_Certificat.html deleted file mode 100644 index ae29757..0000000 --- a/idhub/templates/certificates/4_Model_Certificat.html +++ /dev/null @@ -1,111 +0,0 @@ -{% load i18n static %} - - - -Certificado - - - - - - - - - -
-
-
- -
-
-
-
- LAFEDE.CAT – ORGANITZACIONS PER A LA JUSTÍCIA GLOBAL
CERTIFICA QUE:
- {{ first_name }} {{ last_name }} amb DNI {{ document_id }}
- Ha realitzat el curs {{ course }}, a {{ address }} / de manera virtual/presencial, els dies {{ date_course }}
- La durada del curs ha estat de {{ n_hours }} hores lectives corresponents a {{ n_lections }} sessions.
-
-
-
- I per deixar-ne constància als efectes oportuns, signo el present certificat en data de {{ issue_date }} -
-
- -
-
- -
-
- -
-
- Pepa Martínez Peyrats
- Directora
- Lafede.cat - Federació d'Organitzacions per a la Justícia Global -
-
- {% if qr %} -
-
- -
-
- {% endif %} -
- - \ No newline at end of file From 844a7c21f330428388837b311cd66e443f9d3eeb Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 15 Mar 2024 11:04:17 +0100 Subject: [PATCH 3/6] add address --- .../excel_examples/federation-membership.xlsx | Bin 8246 -> 8991 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/examples/excel_examples/federation-membership.xlsx b/examples/excel_examples/federation-membership.xlsx index 3d205903e0fb813ba6d90ea7671502d8c3c6ea8a..cfae58c724f14ed61a90a49dbd47b45d5783f530 100644 GIT binary patch delta 7503 zcmZu$Wmp``wnc*502AEZU4v`Tf#B{0g1ZG6ECja!g1eIhcXu0tTOhc*1qt@ZIq%+^ zbKk2U-Tn1fdv|s1y;oJORWF_`i=nCr{{jeujEoF}uH;ySK?4i_e24JBvVhejYy_-}t@-WG@5+>|Nsx1qvU{O6R-vXNGtRqx^s@V{ z>Z%rk$Zq{}nYJ%|50|ryOf*M_S+CNj@T(0e;yp+hE1_$e3S4+d%BfhplLcqa;~6G) zmg8?L^b;?HjfVwh1NLRr?Z7q&&g%FS9>oDq6IaSpga+?j3C7Pz(T3jPLvmtRtAmWa z=ptFd16#9AMJ*B6)nnZ-ocm)B@zuYBZyV_&2j^aZHBhfFgb&xfC)qy7=ybR$4e)-o zP%`d@DtNoP%K7_JO!)1< zVK=sEO0yNRgsu#4yr$u%X;dl?*b#@>6D@lCn9|wTvB%8BRX9~fzuHF?N*YP`iGVVw z_DnGrX~B+QTX^9HS{SWKa)d5uMWgCxDV?;Zu5lSkuKE4XrQ)VYX5ub1SM|U;%L7eH z8etC%@7Awk7ZKJ225+Ip9g~kXt%+6xMIZ(tGlWlgB@=4d?FB28Qu|?wL#-LqA(1AN z#rLqe@m!_og8Bpb0gwk$N9B)R<sh;Cm1{dvsmssirk z=o%GuC6rIfuN|x&=F}Z>DBQ$VKYk)uw&)a#}D~4%%*$sT; z&~tO}4+b+peIhzA+YJODmTc)a_H?alpoqsEFa^9YjYPA$x1R8;P)JDo1}>G4m=-T4 zr>EWKm6bjmxLdHs8?(yqvc`=;GHp!96pf;vlBib1Au?!<#vf8iNRl#~#Pz&qCHnRH zICtLIx^5@z=o{f+^v0&T-nGZ{y%ElVv8o~%33*{ILG>OM2F4No|76H>-u$cKK0kQb zvAbDY+FSm8avFD#MuVVelja&v1exTbXwgREG+yiEN_@61upy)_sbHe7u#+2?tR3%8iCsj* zuwV+08G73C5qcqwruwP`F`Iy~Pvcwqk7ofN1>TB0-3+f_-h9Y^|Jb1I&$qhgBG2wQ z8Px40+O3iw=I({{GN^oGH@b$~PXb)6=1baVRfCN85wSz9U`AA;!mc<~&yQxUbXo}M zX1y7tIhe(i4C}r`KPq9O;j9=*D#r$5lZmp1{myX^q3ejjjL15gEYh{X{XLk=k-7Ai zn|6k@70$QxX{9F8#C= zh#pI;!7o{Xk~L8CYd^=ukw{ygKT$KyB;O@UeDgS8{L9s-!8`K?lZd#W6-Es?ml3xM zf3=gT)Jyh{mW26N_}p{jUl1S@GaXovDk$dd@zdeTW0%~Hqaq^t)dh5${x=dK%Vx|_ zKcmnb@*jEj;x{Nm#BkZb`myA~6gy+>C#CLW*`csT6gf%!Dv9x_plEi~k?T{gV~KljCPl^;pNqj__vg)*rguw^=Qoug zJH^2uO@uA_1e!Dt!!$kZabodJn8&`$EO>Eu}QevCfts4Wu z_QiOd*apSu$CtcL#_I>vpg}*GB-|6G_pV^5v|+7Id+j`xri0i|Hs7p*9iMtl7Y3R^ z8S?Z918%WnWAUWm{#k8MN*p`zyIojsre86a zCi84NGgDA1iBB&$+f~2pby5bWfx=AB(lJG$&64sjKTR`L6FCtHde4x_1oh>us}@pU z4mI`w<>s5n*ccRo#FlQQe`gx&IO^1tirC5~C$F_{N=yi7Lf3?+ZT z#>kjW9|}_^$E)?TlWmv@Iomc?%5&=TdTwy}20iV1L!N{)fvG{f6!&OO%2Bc4lM50| z1ydwmluD#2xa95-SJUXsoD%I|?nqm8)p_@f-GFIqzb5+@`$^v70R>SRo!1{JyDiC= zgr!-68SMk}h@tMXlg!@mdD7wIv7T&_sN5qA-J&p1W0mrRDsbsFL7teXTD4XB>*cbg za0}>@@8dOY<3M5Oj&0z|&ASbzDg_3Fu0kRYyy!hju=mVedJnPL6TVq|_Nzyh>fB)T z>Q@v8%JB$V`8w1V@e&@479!$Y8B%!OAiJ=c03EP`U1haobihyaN=4X%_qhFAXl;nr|o+alSABBlxD3@IHG)=lX3j?_fJ&^%+n%#kftJ+JZXx z&}^{3ePeXAYU1{00B|?kOZP;HVI5Qv6`}-(`={?s_)%ytDv0|0w(4Rj>1}rRDb>1CsoL989B3pR@mp^T@JnR-=sP zs0$WeD>^!AD)jN!LJA;fFRkbx&0`b6*LSS#BQ;ne17fMrg@Gry2K^8WPYefzBg4UK zId$0vXGq2=_DV_%_OP)yVXCxZf!NR@*m0t0RS9*DyQPN@A(mSbLF$R*r|8@>xX$rZ zrD;_4=Sn6(@OE0FnyvLBF0)LC#F%O1w2CDrT)WBShaMuh?Q>R*?{w72O3mD4OpL~y zJ#cTV?a|2^f_ugl)XN#%YBiHCGQw)yXBc?`b~Zg%5#J-fwS8SWE ztP7)KFYxzo9wVn0=uBnU*?mZG74&Of!)HM#8LLd%Z36cFwJdD-ICwuPr*R#}@9N~3 zaggvMZ^_JLx?-2rqP~Q%&l{KAJA+`b9e4=6(D4);nV;<;l>a?3B+yf8+B&|YXwrQ1ud0M z`{?w|*p%_Z%fn%$e*7rDUU=U{%cYxGq#szF3Wl@YKtUVnE@M}DVLHcs3~AP1NSxt< z+3MoO)TYA4VX~o~)RQGGKCDv-HuNiV^N6_g$L#aJHow zLD|e?Ki<`<#~{8hd|Rt+6M9#$eUsFuGrG|t2<88FHf0!lHnQ7(UX*2}0JgRI^~H|Z z4(z!2bV_y^8~R;{&;GJD@G9?QF%YiO`W2mby|G91_25^2uI?-W)`pdq<#ekJ|6A}k zf%Hpt*BVPLcN1IR&@WhyxbxzHkI>`plV4&~-<|B+DKv22>dpFf6RN1!MvzD8hx8z! ztQJ3%(<$o}49QMPB141nwn^#)^2MC>>I8~dmnZ0!1@U~i%NPe(BW@2n_|$o4pB}tB zV1JjASXDU%&2uS_|J@f7%z1~sk$&l0*`tApTC-Y|Wdl{M#IVAK=vu!#xJp3&BybueWOC7L; zi;ga5mMKcC?@@RVF3Ewi?mj}h*d>>e>zq#G>Pc0X7Bf*iGoC$Hf}(i{1gPj_Oj8R; zs++qpyfTaNbebN{4vo})TUh_GJEkp4HUp(Tp)Jg^(DsKqsC8&U(AfL*i6s}7#9dLd zAZSjVLnY0#<{H- zKR6Hn(IZ`VI9hDf;C;<);;zAP}N5Z9%wckgqC%?hRFB z^z-x3b1>f)W%!!3C?*>PB3gF1VNs}t(v!?Vfd6{zIbx54dOvPI(O zjbmB5dcWwFMHG0SM9eJpFk{LHEq@Q!>OKlo= zPsJ+reR0zx`=-%Hq!7NhaVuzd3Yk-Ch_sd_#UxQ6l?8UjJ6_B20unG5NQE#tF*n*} zk~nut9aCXAFuEFyXZn$LYaHYqb4i$#NUiuw$;Z^mr{8%TGEH)U#~ji#XYQuX8ZA%Tj?-h6+HnJI|ubC@B*waTM7mBq%=*mPFe)MGw(D zlc?Y47FMAs-w(FivI6@i^W$o6Aw{!fKrWoL5Rey`07QvDJGobowuwm3%h?b53b=Y~FUSzsf=-pw1Bc*0*30oy_ zo{_nX#WrpZJ0+;vr9vDCt1#?6C2;;B6BUEK(j0cix&9uXQxGhBU&%0w^RplBU8#?4 zV68=4jksPj8*5y0YTyiZI-k^j&mP-rhbhQCxnK=7ZAN-N-{N?ADQ)7r+ z){=S>h6HlsO6OXt9Yn~JaZ8&qCk@>`KVBqx=*6Aj$uXacvBYU@I$~JNpVFbzOB`%^ zBJ$c0*=!92_l<)oQeJ#n^@&zUK1A!Le8rx}$wyj8wTTZ5dNE2DWzG}^_On(inF$uKid8 zVwSR}zjf$p+)RCZW)()6qu-%6^-;lwdNYvp*c;U`AIYl^f*ZLlv&iKM9LlBC-L2jlt)Li_Vl zzYZu@-}2Dfk{pfLR!On#FAtPg!0$Z$1-Aglj5T2d7#KC+f59yz1CtRvB@Sr2cv&tY zb%<9|Htd1&E-0uhNOIV(TBu4}?<6hLSx(?5xz9en(|T``{$qi0cYo3@hJB2XzvFW2 z85H|N#2IjKw(qVd*kV+hlcF3VTrgZ_|7 zj<=~qAiBjgysy5>MTh~9saj1VyimrVYTy$Zy{P$&uu-7e?rAVQ)u49y&G*3hoL%*$ zMVT3(DF;(yIz|_{2hp-lHX2r7*1*Ex|86_Q@ubM7UdrawOIC8b)7@RRa zk`l`#d$qRU*O;y)EvnVyUV615?LD#!@3i*{vv?8Zt0)Z;ZMCRrApvP zKtn5pDRN++rm1Sj_fCxBJ2L%=6Pmr%nUhSmuC8$V%rgmsgv_?~K6Ln*18IH^_di%N zNCbcqJeoY}fXfLOI1%m}L;@A2Uj?YjsePztB>$q3R_P}aYIHKyLKdg1yEYHc*5tk zdR=Zw%-b=#Qg&1q5{Y%gjIxX-5_)+hS0;{Q@LfX2rG+SPa1wolCOJ@bAR`Pdog_w< z9Re4vZXbH4_fb^Wt&@17ezX#DS#b2G21P654$weeu_niw6U(guE0@ga5TxvvHpcmB%$a^&=cHF>gSzA8JGGR}3E1H<6AO+XgTj~&i zTi!)~tfPDf*HlD4fTNzOZyFBNDtL=F35>H;4sZ?Pkz1@P2+}bG=O=bacd~HLQb0n9 zdv0mgUX|bL*~`B^MH)^IeDm!cV>Kz>3sGBZ54VwsJnkyWqtYiYlZR|en)YI__T>gg zCOY&oJh^(H1>LlU7h=2j*RLwjHqrz(`i6p>M?FiZK{As^72i5`Xjl=m3KZEtHX=;xDLJ={BfOmZ zS$zVXAh1)f%(PO;s44D>e;+|+vd8#%)VUsu;rM9yvn5c|c&(XChiRZt%@n)+8@Qs` z2K73oyW_Qw7|&#pUA;=Vz;+Rdl$I_U%FRJP{iVj^nwV+~WBSYRD;*hc{&$n_#WRkt zr3J_d*49D4zG2V+zl!K*CVFl`uOm7&e}vlXx6ywapx49Jo8eKT)J$A_ZS*w&N>e=3 z;~uy4{=I{~^A+*$tW@eO<8gw6!GXy^`|q^Wz^4L#P%~5s<^cL#Ysa-q1^Vq0nS_(S zcL@*YCVD1v2g+2_>WLRS8ahqXKiznYi4^bn^QNARbT0<-#vMt&g4BrX-o+=)nhntn2#63!Nk|t z)^9jPk9s;?QV7*>9S$ODaeHlyw%UNS<4if{sX^xY6vK0#Kg5J8FHF6$uprkap|9Hm z;sLWqF6P18HS;aTs+iOhzk^|`@5UQ1ygMBOL)-sa58x05*lnIcV)1V(9rZt|0^}FL z%wMX)Bq0Y_s0uxo$9k$3chX~b+(9$BF|PDhH6ic(1YaEf+l@s>J=r3=zVcg!D?pw{ zy#()9RamW8g-7)g#z*g)#ATGanK%W|FkXpEGe35U244UYLUk;HqA|V~Zhi`pZi1(# z`evUl)P^QoU=Ygc>{mhCDkw-)87{2#l9q$E5>;al%r5Rm$9BDERN`{(WxQ02lT%I30D;du$n$H`s)CFNJnFJAFV?(2&AXA3u+Y^>$Xq<>~Lk**@TbKY+A zGeMt12M+Y=jMsAUf}B;P_|21xT}9zN7WbB_rmeBQH-P<4!;sprm2Ro7C#E8bnAwIl zcB>-LO8lW;MlFX$SZgYWWA;fly(D$4o#PDOLv$sFxe&SEoozb?&D6jLXyjINfDO(p z*BT29C`Os>8z69boSu&#m{Cp0b8(V+48}MonN~WJ`$xs1Q|W=ew5OuyTxqEwOVsWH zG?|1KU%>Ee9Pp=!zPBLYr(ftR>OGP_4`;vS)(XM{W7zjpB(+L>HT*mwd30Vo?mtXx)A(H_ICu0BmvCTk2Pm1MMG}dviu@mp?A!=SG0h6h_ z%AX=1==bIcBNIb{M{XB4u=eX|shy0n9J)xI0|k~#zVmAHed-Q>la9WohE3sLqc5Vh zJQ(cwJ9ZXZuWeJF0P9Z@2S(+& zGM+^OPe&J9Ge<|;-vYsZxz+iT1^%rm{HKMz_fn2{`{YW67he`pPvp9As}2* zg@0H)8~k}}#`uT9i)UPY9bc50j(j8Yoq@}x&k_LJ3y|@0) z@7uFx&6>0JZ_dowarXXAwp@cGCPWDV5g&w#iV9+cC|6_B!67_ep?q*`K)lM^9xjZq zqk96m%RVrQ#Rs9b4^ox)S8)BW*T#AU5~k}P{5ePso>?7?LC0p!+7-_C_+s`VdS786 zm*gRacJ+Cnwguk*I$R~u9?4r;v8Df5MTuM5iZ>fT1m@JQJrmO7Fz=3gX;d(zsQP7Q zs5$uXHRrce@I(gO2!Teq0f12F$O>t3?S81Tn8Cy{$@j_T8pK2!aiNIk{h|KRe1(;h z2j#cJ^`_XS1P%EtEvzy)TV3Ei+LVbk#gR9<6WV+^#Q)%q?(DQNRkplxY0(!RqJ)B~ zc6{wU4g!Jb;X$B(eY@`C;Qs_01cKVb;{rpD^ISM>m#m0O4(!HnNRttC8sb2UIK@M$ z337yQqwojc*%$A0yqD3li@F#KrW@@Rbh6G$7TnhN{%%?}#$vt7WlHhckVyK_;^L5+ zeE5@1d})wUIh8e0)q(Z7qu2OWoSonCPJ0b^DNcIm(R^!A+I+5~81PkKFda3w#eMWIB0sC)OXj4f@H_-4-)(1L<45 zm60CZR-<=QtcR8T-#q<=1emP`$~MN~`So`vQVw2jD3HHnPStS^ai;iin zZL{x*?_ATdUcQUtRR5e)pE{*w!Il}Y2;1^3my>zD@ep+|Cna_~d@*_kg@lUteb9FE zauxr&4rQv!LsFHmeRtG?R9(qsUF%H2jqT;JjKyLN4X8-!)^(F5dseKP6}VSV$iLCC zJ9t?3;0?p%6H_E9GmD0Ym z*6;b!7;5eKBBobual+<@R(fnjNebrq3cKjjEwld6=?PCFiGc@}^KyX=3fN+(womNO zi;Q5ym#X50?oRR}NA%SdtsKOu?I zv3aacbw6C81sT#1(!fYO%mQ6K_xzk)^dP>erfh+*P8T8ub?a<)R&3miyt@dSPhV0a zqVd7}_|-`^@c97OOhKZ)#e9|?GYy6}mO-IEi!07C0hEJG5Qi)LD0f^SUD9+s^9%yM z4kICqkbe92xQ>)8Ogl|qHaEY#Bx749!=Yp}7fzJ113@sNgpHP*!Wo8yb21*}%kzA!Z=O&O!wFR3)J4DFm90|c^E!#H! zR?o=l(3Wvhq2~t-lx<3J@<`j+*uCv^<)Nb|9M(aAWO7C+vuhPO@|np%voM39E}7qpJN7~Tfln%G~LFSM~V zl_q1giy1WdCH3Ucv-jyXjZ6bLtrSp1^69LZe<2y8a=fGZHf_+I6}%@I=PdP0^G#dX zTFKO|Dmyrb+VuoSp*30Js|-W*xEm{^0b*()Y6h6;>5gnhQXP1A`Hd^Hrq{?J=ZH4- zo3Zmy=jJugl)F#5!j`W1=4Of&ZI(X^EO?X{i#W*-d*Yl0d}=!?ml~$B#^H@1={=ye zcJWnEgAMKEOe$k3j$Fk}X0+B2m$vx{re9Bs`?ntn_>(W{EKQ$D?>afCJ+RHoeQ$KQ z^#R6OJREA$-*WnS`7YE-!s*trYj944Z_fOdxIV8S`WZ`pxO~3WxIO1)Ys+cywssZS zZ;-EaF04+RL%<+`#6DLN5cOEazHdZyxNb0f&Vt5EyDz?)QOsPjEW^PkW_~YUz=kqbcSVfN?fe5uMsY|+|Sd}DJ_xs0tOB@7q@mA)(jq5R#`H6%Cqz- zt8^5PAyfO}KVehrj3xGeH<>DIR$$(7UI@o;xf18Mu~OoufoaP;gUW2gLD&d8aH0H-GjPG$4n8lPP8e8^}afvp(MCZOU)Ox)ZY2`M* zzHjeiTg=2iv*ETDrR9CER&e|7&w$%NU$ipnYb>F`jbW8U7^kS392&U#-~`C9hx z>3c@eHwXPnB_zOEIE?NK>=b^oc3fSRZXG}|DYuoW@T>!ai=HtCag|Z|rj8kEFBz}D zzm7&)>QXQDd_iqYz*{eY?{QbihiiD6v?nXd{%XI%Wlbe^`kE!^VH*w8^ov0WFM;Oh z_>Neqa<%8r4a&~e-`ELLx!h_M`{)b>^?L=mpU!E9XV>1S{;Z0AKtcaV`bg%Pa z%1(%i&)FB9cG2v9{L@@oS46#$1+|?u?lDw^tMr6S`w!%)$BX>Ejb^&qzdoFl=A5vP zpz0>gCics>w`?3B*9ADtWn6^^*d|Ghxx+tSN=Pa(VrliI`5+V3J8}sSlJ*5`*kyAF zmy-8dh6*b0;snG-!`ee5Y#fU=Emsn@)7BEWic)q(;`{v(9(u;ymxR=^X@(`~Hg03K zea^h+OEz2keA>Bd5^HZP*@b~042Lr_V4l*k(=FZXZk}f|U8ai(G-p&azi`)}iNGYQ5S8Dxts4vQ#;v)CHPG%9& zEGMv=1qgKUIjpqlroWdF&ko8NzndE8$xzB{9k;8Ck1Dp(l=a4aF+f*4{$dorL;AyU zw)IwrrVo??r`b99&UkiaFC&?Ui5cPLrm34Z%pd%-lKGxt)6*I7hE)|{I3z-sP&2b! zAnI85iTAarFWH#GJz%c(*{{LEHTKzHP7KxWLL4Lmg#A_F-4nd3iv5u)(<^MZ1lL;h z#}3;rv!oxsOX{akzP%^O-29YN0?O@VI3gL3EV&83nYPLbtY(p5s^h}?E~!gEX;~`X zb4FKFB0i|?-){p5r+#LUu(e#x$Ox}xksQ~X;j6bFai!6+SzD{UuV8a+*E_62F*ZvJ+KLrag- zR_`Fhv82+g=JxGKs!eD3EQ(e>3^YpW8~f{0l@Biy#7WVnab+NuTP+fOHk)|;77*1Z z!wdqC!7^q5CXFF+M)(3CKBij3-6pmvCk}3h&WubWmA5tfD=8T92HLvDXCu>iS_Cg3 zwi#soCO-WZn=z0g)q4MxTATRq2?zAw=k8uxLG35XW*%T3S(*G#PLUA4Jyp-X%}#Q{ zx6gWq-4^|wG%r>+iRUzV;Zu_hyNt`Sa3_ZMi{YdJi;%k<2@H6NkoVddthb3eCJOd0 zJHb-Hj5l&o-v{KrJ8-bTvMDvir`t;QZHds$W-Z#kW#J{TnlJ&$U>DPqmttYzo zo@rI+$AGF(v{@md8Z(-M2wD!ty(cM$t5x5NMPs91;?7dXaATl<4E;(WIJBi9H!U=m z^4>VS&GrRpW&3{m1IkmL#lE^N<3|F4IPw3JXQ4a<%)mSsM%xi9;v#8r9~VaG`m_=$ z)vF(Hdd)9sxf?)wr!pc+9(xkM>psrfWyeYErYOG)JQt{9eD&MM_aoxa>6>M*`W_jM zuvGDE<@#>ZJontx-SG3ZgM95?9JVWB=OS!{n-Xsw+-lgQB<~{6Ws0m+Q6H8qt`Elb zcYz`-AqhZ31CouyRv)o&y=E?Q4{=)w(q_O4w7FSp(|+Z=jFRzyu1Wv3giMy>3ktN} zm9V?+m65{_bNJD$Z$YIsLQ)S1m$LyK;aIY^Z!FBYMa=&tgXIdj+`CURXPYPB zm}-Sv@3uSb=yBg5OD;-goLr*dl&=Uqj*R<1<2tryn!+nCJw<#g%V?Ir?QuRCbJ2S3 zw(POiba*uAznT-MI1x24l``TuA&C=kB-&?-ouQcdI{*@)kyOVVs?7pvQfpoJ{NX)w zP%%;9)W>^l{$WNn$t8kqr%N}gUV;~T-+yMIrY2Yz#xGo12JXA^qzh2CF61fI^ldX} z^``Aa;lr)xPmE&sdMDz;Jz}qyfJULae5Hv`tqG+&(UYRTu`mGQS2GuyaS_xOSx%B@ z6Wght6{@Pr<!PXstEMUYTVsV_I{mH2-ky^dax8 zKV5wXAA72q5rb4`uERq>D?n`9BVG2(@p_BWG$t*RpAej1QjXB5Uu0fQ+*hjSf&T3x zZ-J~{Uu3FmOP2*`b4XFk^9UT(U?e`IKar4LPl~MMvdHGmXKZBPHi)AO56mVA38Hcp z6_m5}D;M2vO6%9I~c7f!) z78faG-1BYvY;pxzMcWf!K3mDgCVJp47ou!I)!}Y%mHh>HHE|+;ZwtK*A|p3% z=X|?-Gpi7;aD%=BJv#wrg{SQED32fkM%PlIs;mz~Jm7&fWyMiGa4HN3 z>El`4%$?0w(s?1`*Q{sN&GZzuc@-?|A7I$e$yqkNnUcHzjHbLO>&9jwHY9OEx9v|iG^_;AYL}m!lSI00%l7?a+uVxzU+=s|<^YsFt}{LQ z<}EARR$3FLzt0>=jP+Dnk9a}m(xSz;YVa^0^0&BNu@3*PcRZsN8@oNQk-))7@N3hO z&uVm#OUj!t5%~qQZau7=eK?fb1f7sW*W>N=9uc_MIHb~NFp|+Obi$RMtzw@=<+jwp zSYaVIHax4Cbm=lubq~YiOu#Uubto1SDW4*HV!ef&`NXrOZpY*Y{3U(6_!?rH4xjKz z1$_Fg1;bum-)UhV))$xKNuRxQy7=$_4VOZ?K|w3-p!n_bFtwFqf_kzf0WjTr2s2aZt zglBgNdmsiJ5t?1`1O{EZQfrqgKMv6hG+Lp0WKG~%ShVt~KyU?Nh64RQhIe54UL`-n zt-iI{4svkw%D#q9-9E5NO`?%|{--IqDP=z>iT|i3Op`!Mnr1K=LSs^+59Vr7HtbW2 zjnzH;T+W2OXghCvnM}BO_Ook_6xRAoX|pSg5|M+MIh!#H;t~JGJ}S|o&VWk1kz)H- zkpZSmaYbx)UBq$}^0z7c^(eA5JET5)iSlbTQKr+98r!5xJ8oduJ=-r&gw3DBa`mqL zz68UQOzw^}MWpWLK*zrqz|#ZNYZ<}_O*F@r6veS97CVy=dXm=5$@mOkH@o<LunlUvaAo=H5XtEydCs_?^g0k24IJILuE%>zx+$5vi z=<%cmmMW6d*)*hO8DmuD@$??d=6?9iLkl#dEgmua@Uy1R%2*I1rFw6YXA2`RTYF=+ zBF`BI_c|J~tS%frVHOX|Mg4SZqW+F(jqvTje7Gp<4q_-StMwalSts(=JC;nB}W3h=Ueaa(k0WFrS0=h1-44CMjo=_}@=!)neF!3XXO65lfvc=n z`6_tkSsj6?s0|(FCW{p5TY|pXV@%CqL{)0?uNCfnWx+smXVeL&HYm2+IhM7G%_ezu zdQ2yuRz!cxw@%Z*$OBn;03wYv{z4f(NKGHTnTLqdZ8)_C_abK{&y7m{d@17fET77l zvdEYH?3Ko;byvX>PRkY+ET))`F_4Nty+JV>$y*nMGm)f;3DX7lww{e9sZ?-gjBs|gxH z#Kl5@KNdHStSt&E`i%&K&111J|34-Z<^R#R&?M5Se`s6>GA`iDG*&L3?L-~kxW~?z zqgHZL9J7g{I^u&r9N&s)_QA}w#cg3}@Q*$UY0Xg&+gMi300LE(mcucd2W<|>bG*ic zw>G)2pD*SRz>efmK31F$bcXa z-&~>(AC9OU#C8u5L~!(Oir*8lWC|@33Euy(p~x2_uJnSJ8)82+T5Hxp)`f1qmCA0L zQ9Mp0H+y?dzH;9hB)W>+*pyYCl!?_dlSe)`u;yqw$axo_Q1Hc?6FOc~#{4xrb1*%6 z%6@5uWx#7iEq`N+<#igf4>O zGJmujuL(vOmjy!)NsI_NJoVR4lcP_$JQudSCb z{#ry+NqwKoThYUh8_)93bMBI@hO#n-Wb1I2;)U9nrtFs;R^J$A4Cwy)1K4S&CA}(mBZ7){y!7z#-Fn3 z9X$e69wUqPFCYjsi2|jh=B9dj{@;xk@xPSt(V))M4F4$oUC=)^Xn)B^ET|L#A#|7; z;~&MpYb%_;)IcCV9OxA_#Xm}aXJgWTDe>Sz)2W!zp5E)9v;d`~A%K@Bf(p=3{)1ed z1_h)%B2FGpyni7NiJ|T^)TmF$r_h0B(GbG-kw6=0D3qSY{i`+ fHxo@SXDe5u|GSn*$WIesJ|4P{JI5f|)7}380FEX# From 09ab17a00fd31a3ed5445955d5de70cfdea35928 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 15 Mar 2024 13:57:32 +0100 Subject: [PATCH 4/6] 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 From 674f136342bc2859860103500a17ce18ec3099a5 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 15 Mar 2024 14:13:35 +0100 Subject: [PATCH 5/6] send all credential to verifier --- oidc4vp/models.py | 4 ++++ oidc4vp/views.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/oidc4vp/models.py b/oidc4vp/models.py index 35085fd..e6a164a 100644 --- a/oidc4vp/models.py +++ b/oidc4vp/models.py @@ -319,3 +319,7 @@ class OAuth2VPToken(models.Model): "verifiableCredential", [{}] )[-1].get("credentialSubject") return json.dumps(self.user_info, indent=2) + + def get_user_info_all(self): + tk = json.loads(self.vp_token) + return json.dumps(tk, indent=2) diff --git a/oidc4vp/views.py b/oidc4vp/views.py index 851c652..0f60e94 100644 --- a/oidc4vp/views.py +++ b/oidc4vp/views.py @@ -219,7 +219,7 @@ class VerifyView(View): return email_message def get_verification(self): - return self.vp_token.get_user_info() + return self.vp_token.get_user_info_all() class AllowCodeView(View): def get(self, request, *args, **kwargs): From 52175761d6621b9e75546a46845defa1781ddc38 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 15 Mar 2024 19:18:39 +0100 Subject: [PATCH 6/6] fix2 doble http in vc_id --- idhub/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idhub/models.py b/idhub/models.py index 2eae07f..7843d4c 100644 --- a/idhub/models.py +++ b/idhub/models.py @@ -704,7 +704,7 @@ class VerificableCredential(models.Model): cred_path = 'public/credentials' sid = self.hash - url_id = "https://{}/{}/{}".format( + url_id = "{}/{}/{}".format( domain, cred_path, sid