From ee1fd8b65dcfe37d42531259f858088e3e2e2726 Mon Sep 17 00:00:00 2001 From: Yoan Le Clanche Date: Tue, 29 Nov 2022 17:11:39 +0100 Subject: [PATCH] Skin missing time modal and update relative messages : https://trackers.pilotsystems.net/prebarreau/0569 https://trackers.pilotsystems.net/prebarreau/0570 --- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 36826 -> 36778 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 2 +- teleforma/static/teleforma/css/teleforma.css | 22 ++++++++++++++++++ .../templates/teleforma/seminar_detail.html | 4 +++- teleforma/views/pro.py | 18 ++++++++------ 5 files changed, 37 insertions(+), 9 deletions(-) diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 4027046e958be6616d473d3a1177e2f7f13b1f79..be449c8f4f164d4f9af7b3c7c11cf1a4b3a93072 100644 GIT binary patch delta 2153 zcmXZcZD^KN7{Kx4dfb~^H7(n8vu!SesX?s*C%F%~NC^`)Gt_~UA4YV{c5dupr7>WhC_f?>?V?_jT^`a-Hj(`#!rj@6g`7 z*XB=6{tY4A{X__h@Xl-qE3pSB;;)#)aZiR&hrPH4hp-iEk`S)OZoCTnumF$Xcs!1? z@J%empD-Usu>}81LNYdS(NpOHH(@a^mf|(of@Qc7uf=w}5?@5$AHqr;!b1E8XX1IZ zUs+oSRalKKJP)0}87JW4wwTE(8qByAGq^r>+=Mm62|8eZY(I)O5T8I3`!2r!6Wv+Z z7QzfDMH9UhZC`*^b~#$P)`SNq-V!_PKnFaBMR+j2??(r|gYNVUx}&q`L?bu}FQOaC z-<~d5g7&XK`_-cJHlXV!cf<}0;)^BdS+0s5)}fg{h9=gICej-{idJG6?e`9SuY1W&09c@B)s<-_eQx#+$KlM|z1G(FB^&{`a6e zUxv=pf{x#S`M4R~SQbsN6EmzIcJpAz9`ttR&=S9l4tN7C?Yo%4kI~QRGt9?xXaz2y zcOcV|_A5uvz6$L(0}F6AdX%?e;(&!b*r5g8=~{H5&1eE!V|xdBH*)Cbbr4N_5Z(FP z=+5590z8c-`YHN;B>D>$5RZ0Hf4|?$G&s?eo#}$rXa#1WnKq#lFGCYtfhOD<;|(~S zxD8GC70kn9(c@?$gE2mZbBI6KN&U?vuQOe+7%g=by2E;O!8!5$LNuY(=q-K}J?lN_ z(d|PMIE;ljh#t)_I__(9zTaZ|xTGunLsgJzV?yx_465Y{zXhpt4 z6Z#&#r03D`qp`hocRKGRbiM1xV$Q#w2TOK4I?+6I!R8n*M}JVO(F8W4XPJ$04?1CA z^i{Ny{b+)3p-1r{I_?KFu}fI)_g}Ur&A1-@Wj02aq6@D>6WoUGunSG(*%0M|*Z}VN~?O%gVoJB9y UcJ$7?Fwi;u!~+A5WLqcx55g-o1poj5 delta 2202 zcmXZceMr?;9LMqF)77*mU1ny*&!=2ZkQHN&{6mUS(WB5tmOeTaXUs7y#60ZBZ8(ep+~68B8E@hw9Kb|; ziV64<=i?tZ0W<22@nJrW$NBZf9SdAUhZfk1$=HZfunkl3G^XQKoQOZ7-ap0}IE+a+ ze!nsEFda3n1ZU!U)WShj{0OFC{eCi2CM|R*<93Y44mCjN!mX-uQHqhwT| zRQv#QP#gIOmB>=m_?4(}rKq?SsCC^Pc0jFt(SSP37CYbsD$qGpVpma#^jn{yDlvi@ zH?_%IAQz|6UVvKYQ`;`ZEZWrGJg9_6Q5jx9O}J(4LtUz0Fdm;`9zI8%sqaf; zrsD+E{0}h>i%@ZjF&kInV%(04umfkXzWIrV3_6BUmo2f`TQCz7XlJ7W7hoZNjJibC z=)(vq!M&)`HlgCQq2`}NAD%@e)P+j$I>xiU`JM+2>_G+YLzVbv)P&zqrTrUKf&WpT zQ~Uuha2l!tnW#Ik1T}62>g?B`4?n|1EJq!sA6-q@!-EF2p>}!{72qr?feW_(Th!g? zLw#P4P>BzrcK#=7XKyhPM^TB!MZNc_)-2Tf{3!L;_q%`&1zLq#a6PI5TTq#XP=T9J z2}V%~x7+qf%%y!9HU9y|;&bauR3byR{RWF@zl&0TWwPj?x8NtJQm;Ynune_ez`oyu zN~jfei%+4>`Ulj}-9sht1e0(Gbu=TWc`1jycn+$+(B(mYsMV;FS6f4vOuGgZNaGYZ zirV=%s2v?gC3qgk;SJP=?%-4$K+S)FO7u1A$p5qN-L%8r=QIa3a4jm4&vEPstRd7w z4c4zwM|Q@xJ5iOpiJ91kvv3d{jA`-ub5QN2n4|B%oQGsO>QUe6VNAg;)Mt4eweWq^ z4hOBTQ9JqvRgt7tFQG}OOPY?FpKtq%QE``{)>}8$=KRZeP|2!Lfr6+7Beva)`a!j# z5;%=I%P!mQK?NMJK15Y=5S8F7)KUD4nm47*OKc8K)AwJ(gEB5t2Uc4fQ460yC3po@ z@*Ai`ZrgT0DuH{p|A}q?iaN>>)Vw#S4UVF|j@To{Y*a}Scu>ZvsP=T6hqFILjk^6`p#pcIE>$;b+}-Yjx!-MC=!8R&u(PZ8eAvHhx8JEOhy= 1: + missing = "%dh%02d" % (hours, minutes % 60) if progress == 100 and not validated and self.template_name == 'teleforma/seminar_detail.html': - messages.info(self.request, _( - "You have successfully terminated your e-learning seminar. A training testimonial will be available as soon as the pedagogical team validate all your answers (48h maximum).")) + if delta_sec < 0: + messages.info(self.request, _( + "You have successfully terminated your e-learning seminar. A training testimonial will be available as soon as the pedagogical team validate all your answers (48h maximum).")) + else: + messages.warning(self.request, _("Your connexion time is not sufficient. In order to get your testimonial, you " + "still have to work at least %(time)s.") % {'time': missing}) elif progress < 100 and validated and self.template_name == 'teleforma/seminar_detail.html' and missing_steps == set('5'): messages.info(self.request, _( "All your answers have been validated. You can now read the corrected documents (step 5).")) @@ -275,11 +284,6 @@ class SeminarView(SeminarAccessMixin, DetailView): messages.warning(self.request, _( "You still need to complete step %(step)s in order to get yout testimonial.") % {'step': missing_steps.pop()}) if progress == 100 and validated and delta_sec < 0: - minutes = -delta_sec / 60 - hours = minutes / 60 - missing = "%d minutes" % minutes - if hours >= 1: - missing = "%dh%02d" % (hours, minutes % 60) messages.warning(self.request, _("Your connexion time is not sufficient. In order to get your testimonial, you " "still have to work at least %(time)s.") % {'time': missing}) context['popup_message'] = _("Your connexion time is not sufficient. In order to get your testimonial, you " -- 2.39.5