From 1ffe5f181252106abce846033ea40712dd687ee9 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 12 Jun 2013 13:09:29 +0200 Subject: [PATCH] add knowledge validation testimonial --- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 18962 -> 18974 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 55 +++++++++--------- ...tml => seminar_testimonial_knowledge.html} | 2 +- .../seminar_testimonial_payback.html | 10 ++-- .../templates/teleforma/testimonials.html | 4 +- teleforma/templatetags/teleforma_tags.py | 4 ++ teleforma/urls.py | 4 +- teleforma/views/pro.py | 8 +-- 8 files changed, 47 insertions(+), 40 deletions(-) rename teleforma/templates/teleforma/{seminar_testimonial_presence.html => seminar_testimonial_knowledge.html} (98%) diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 2fe435a999095db88ab65297317332c6d9582611..6dca9a69825870e1ea4f8ccd101facb0c3e0e92c 100644 GIT binary patch delta 4597 zcmX}udvI0N702;&lbd%SgqsH`h5!jQBqS-IV31dUM3QJshCzt3mJ|RjmI$tPn#FePyY(`!cVaW-bBs+#`;nHy?!!AGTslP za1d&}JaZ(5(=S4;Tio9XIk7a#7|?>#Fb?Ng{|W3#zX>(I0X6Sg48t9$4R)cfw_-dV zLfv;9HUC2_#SR>g83Vio7Yqn_6KWaI4UO0v*I^R6HohMN^xsBh{sF2I7p&ij+Mo-S zNZvqigF;k-MP@nbz|-vdf)EX5T#G7QGb-cNn21lKO1}fO(0;pq7?tQdsD#d;N`46= z@Xyx2irTOnwa&j$>qcaH`-W0!Xu~YjLV2i446_MEsD&#~3r|NSItMlXan$@;RDvtb z^{7hx1Xal$sDr+S!|*7wUdXvlLkWC|D)DVph6!2TjRR1n9)U_^68iCB)O}T`jb|h8 zqq7K==tfimo6(QkF$H(q_+bpNzw<7Qa4uZL8F(3|VE!P-xd%63DZYqfu^Y27``eB) z1go$B*Wzk?9bd)VdkOp)$6+`(=>QXvGdkrM!TwGIjYw?9G+d3TxE-VMbyVhWqn_nC z^H1of|GC+X+TaF8<1N(uJE%&;4)!XXg1RpUL)y52h9-LoM(a>JiLEJ?o|B zD!cw;)cq}(jK4t5f6K;CnHNy|{RMT|BWjrrEUA0z0G zLOr_i)}LgSp%SV@tvd%}um;1h0d@b19O|zN-(x^0-+<}38I{0()W!!;3m!o&aKgsl zL*4g2Cg4TXTmG3{{}-wfw@~Z(bG?mYQ2Qo?tdWLVC=>NP&9(8-W(n#fm8gYgVLzOQ z`g*NFy{ubNzY7OZ^L~fA?+j}F3)cU{`k|{dbi!^_MmJFjd~Flrc*QjyK%Fcd^$z5q z7A{1Ua)R|Iqc*Ox@#*Fq8()Z8Zwbch``<`IUx&4*xBO+)iH@QYJBK<^2R`LPO+J2AjB`{z){8H2w29A`B1#*NS;<@v9s5zoLT)WX|PZ}A?~ zf=93?9>Xp80rth2BfV!EL{(q|#^EN^IxVOJ{2XY)AbhpR)1GsLEV1Kf_r1e@CtJ6>9z+)VCtB(3?L1b%4RB@%%#SuZ6}kpbbk< zCn!UG4QF5$Hls4%g_`%0`AZvr1y#92r~{qBKG=cU=msjWZ&3S1kMis_iux<_J`89= zCaSb~s0~M;793;O%TWtXLsg~*Rq93?{~>Drc2uIRHohPANZZXbs7G@-L_?+O#xlHZ zmOSWX_&h4HpP}aM#WZ{qb;9$=-yF_09E`EN+A8sVsKg4bUx5qgPeCPq1a-jB2^y-v z8M|;1^$0p`!auD4C8~6HP!)-=mZK`U3bo$GyYl>h zN<-iG7f=%q<0kwqD)Y(Xyc;V}C!C2Yeb9UcmB>C+g6*gcPT2T|Hr|POjDLYjG-*8h zg=qApp=XwjN+b{UNG4jp0`)R2!ueQ>v+(zrj{}RmKTxWW*TC70{6;w+;{ohB!TST{ z80uix@pEjRNd5Konmx&JsxgE*!BrfB-Kb1cioMFDV;21!^HEfyLDb6@LcQfJs0!@G z2t0^>eAC8%gR1oDVxGSyUb2BtQGWwo#|U&vyq7H!^^28&dWQXNJO{PVa8v^0QSZhy zv(~Qv0JYC1)T3)bt#_b=`s>2GHsO6#1ummb+KG`E{*X5>7Vn{-f|@rRRe=XliIt!d zuSDH99rftu+IY2%FF_?xAEKesNG-4tb;Gk5gDOW z`J35=QS`q+Rpth&V!p{^+7=yK_1XtW0=MVjrG*q%RsEyZQG;Xo}Hq52}66%NPEb4dQ8fsyGnfKDh zqL2O*w>bE?4yVH8I^SW~7EzD)B3# z%xz50@GWtlPcHBA2z@{Iy^IgJ-N_@18fYCSwh@mK>j-_iiKmF!L_Bv)#Hqw-LZ3q( z&O*03WvTCpwzDbcquuox$#KD&reNLjhWfhdWo^4NeBo{F1GmKVSy5eAUsu1x34Z^{ zn!EorInDLKx@GRHAy@swM}6mkwy}8y@o_~#-CiB6Yp8cS$ECF`D?A(CHhWB1ygR=% MIjp+bZ7O~7zX*i384fEpqR@_;0mJR(?}hoVAT zD8d!miHsXXWwC&v9T7+ysamDrut|rK7J)9*p{+BDR4eWGm;3Kb-^}52&bep#pZ~e< zkr$u$ZF%0eKdx6O+Hsui8IBW!JI#F5D`u(VN2VpGc_?=MCf}`l@O-BK0g9_}652E_(Q2mYA3)@fuuR=Xvi*dLKHE%m= z{2r{pgE#?ip#m%%=shnV81g1eqa%R_wU~r0sD;*HB5p%Pz8jT^ebzpT+TdMOAaQqk z8}vg3=r@O=PCUw<7oq|#4^dI-s!@zUdZ_i6$Nk|mFgR)2xA9%6Z@l5o`*emhvBr#QS+)$8_z`E zKc^NIXb2U+GZ>DWF$K3-|C^Y|{>~vPVLUj2v+)$pz?>|{>5orf1-9dOyoy6GGuv^7 zV-@D&DqM}ba1Uk=cAQ~&8Vm6j>Hy=J%o&|Bj9`Cf36)4(j%oN9rs8Id#$Bk$-$LEx zhvr!fr~OCsDr$pk7>%E!#(#~&B8a00tCgTgJ@dvE`m*#QQe&p@|8LTvhUUu`YTQxOymwLSAGh`yYlkjU(Fw1jGVvKIfG=%8B(J#o`=UCmsdtPnrxv2GOF;3tA02O^5+E8zKJL*ISP=URVI?)MS>vNn- zsEzCI@@zEQP$vvodmUEuay*BLME0jVg2aE_<2d6OH|AblDfb_w5=X}x)WRE4Z}B$N zf_t$q9>fiJ4D}N{ZH#xf%TO739DCy$)H)kb2iS_5za6#D9@O}^vA4eeovPqRn1Y|6 zCR|5N__wuV?(ClGb zQ70%yeGR9gB5t(jL35?`uSR8TE$Sfc*bm=8ZP0}Z=oD(7-ZoU)Cpfj{^oEFV-9wsQX9pqt-#{2C)K!sb~Y;Tb*PNGs0@VK?ZHk| z>JQj}PHVr1J$H@D&;?AzE2x0J!8{iuUo z!mAjVNd5;=nNmV}uoZQJb2uEkQIW=$dYOsGLA2A&iKsvqqh7jJ)Z4xum4P2)1n$6a z+-3bgLuLA%Qtn>^Kd_E7sJ{U(VFZ4Gdg;DK{bGfcc~_By>Q6^4G#C}YDAc=AVa~Vb z&8U4=qpof}YQ0y=$iE)EWdk}<8Tbfw($g4;U!lg`!u}Xr?u{Fa%0MpaFbbcw{vTQUC#V2kMvXg)+NcW^;BS!s`6N`pHK+|1Vl*yAtrJ9T zxXRpsn)i~qAIVh6>7t?^gbz>~o=0tX8MW}=Q5)YtZTKzfuA?fvc7N2oY%>q_bsUG9 zKLvFqvrw6tk1<$_;rc^AKt%(ZP#Xs^8rN9+`#6mDR@4tu7wUK5B5K}E)JuB{efXeT z6rUP1pISW4O1CaPar6VU@+rTg%%*fv^oiC4K07Fll(#8UDUVa;xVz#r03* zVz)bfn6KK6Nf?~`DDCN#1C+y*eUwtSG-0W4o_io6)3?GsmyjE1rq`t`r%a|CqUaO! zaK4emaS$G%@bl!fP#&h7rJSVb6J@cMQ@=v_lyZ#nB;^dH)@@9@Cvqt@_IoWcy-x|1 ze^P!*X>d;^<_?%Z?YoqP6n(NhoFh2R9gtL66T>EdrIl+>M61<*fHx?!C=XfR1zcct zG12P$$>jW+l1b6)ILYlwO7s=E=aLE|V%cMvo0go>XD(0l*-e@0meNyCP5-^UPN{Go zP0sKwayKVe_Nk&B&b(K#%)OR8rl^V9QOZ`z6v`TkKG!H~Df)$uV@5H~puA7fXTOJ2 z=hmex^#wXkq9RhHa7+8mUX;y=cbtCW+&KE z7ibDJJ>mpcEpO=gr`4?+{%QEgv7_(qC>xO**U_H;+c1AoP;={of#xQEeS^PsMW8L< iKlZY}K0q%^cQh1)#iiD*a27SUH1-Vp{{=%8FZ~y^Z3!#@ diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po index 684add6f..bfc79243 100644 --- a/teleforma/locale/fr/LC_MESSAGES/django.po +++ b/teleforma/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-06-12 12:50+0200\n" +"POT-Creation-Date: 2013-06-12 13:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@ -339,7 +339,7 @@ msgstr "étudiant" #: models/crfpa.py:147 models/pro.py:267 #: templates/teleforma/seminar_testimonial.html:36 -#: templates/teleforma/seminar_testimonial_presence.html:36 +#: templates/teleforma/seminar_testimonial_knowledge.html:36 #: templates/telemeta/profile_detail.html:80 msgid "Address" msgstr "Adresse" @@ -460,7 +460,7 @@ msgstr "date de validation" #: models/pro.py:186 templates/teleforma/answer_detail.html:45 #: templates/teleforma/answer_form.html:115 -#: templates/teleforma/seminar_testimonial_presence.html:43 +#: templates/teleforma/seminar_testimonial_knowledge.html:43 msgid "Answer" msgstr "Réponse à la consultation" @@ -477,8 +477,8 @@ msgid "Testimonial template" msgstr "Modèle d'attestation" #: models/pro.py:249 templates/teleforma/seminar_testimonial.html:13 +#: templates/teleforma/seminar_testimonial_knowledge.html:13 #: templates/teleforma/seminar_testimonial_payback.html:13 -#: templates/teleforma/seminar_testimonial_presence.html:13 #: templates/teleforma/inc/testimonial_list.html:7 #: templates/teleforma/inc/testimonial_step.html:7 views/pro.py:631 msgid "Testimonial" @@ -593,7 +593,7 @@ msgstr "" #: templates/postman/base_folder.html:42 #: templates/teleforma/seminar_testimonial.html:37 -#: templates/teleforma/seminar_testimonial_presence.html:37 +#: templates/teleforma/seminar_testimonial_knowledge.html:37 msgid "Subject" msgstr "" @@ -978,7 +978,7 @@ msgstr "Audio" #: templates/teleforma/course_conference.html:70 #: templates/teleforma/course_media.html:130 #: templates/teleforma/seminar_testimonial.html:38 -#: templates/teleforma/seminar_testimonial_presence.html:38 +#: templates/teleforma/seminar_testimonial_knowledge.html:38 msgid "Course" msgstr "Matière" @@ -1176,12 +1176,12 @@ msgid "Training testimonial" msgstr "Attestation de formation" #: templates/teleforma/seminar_testimonial.html:34 -#: templates/teleforma/seminar_testimonial_presence.html:34 +#: templates/teleforma/seminar_testimonial_knowledge.html:34 msgid "Last name" msgstr "Nom" #: templates/teleforma/seminar_testimonial.html:35 -#: templates/teleforma/seminar_testimonial_presence.html:35 +#: templates/teleforma/seminar_testimonial_knowledge.html:35 msgid "First name" msgstr "Prénom" @@ -1190,51 +1190,49 @@ msgid "Training type" msgstr "Type de formation" #: templates/teleforma/seminar_testimonial.html:40 -#: templates/teleforma/seminar_testimonial_presence.html:39 +#: templates/teleforma/seminar_testimonial_knowledge.html:39 #: templates/teleforma/inc/media_package_list.html:38 msgid "Duration" msgstr "Durée" #: templates/teleforma/seminar_testimonial.html:40 +#: templates/teleforma/seminar_testimonial_knowledge.html:39 #: templates/teleforma/seminar_testimonial_payback.html:95 -#: templates/teleforma/seminar_testimonial_presence.html:39 #: templates/teleforma/inc/seminar_description.html:12 msgid "hours" msgstr "heures" #: templates/teleforma/seminar_testimonial.html:41 -#: templates/teleforma/seminar_testimonial_presence.html:41 +#: templates/teleforma/seminar_testimonial_knowledge.html:41 msgid "Training begin date" msgstr "Date de début de formation" #: templates/teleforma/seminar_testimonial.html:42 -#: templates/teleforma/seminar_testimonial_presence.html:44 +#: templates/teleforma/seminar_testimonial_knowledge.html:44 msgid "Training end date" msgstr "Date de fin de formation" -#: templates/teleforma/seminar_testimonial_payback.html:90 -#: templates/telemeta/search_criteria.html:120 -#: templates/telemeta/search_criteria.html:139 -msgid "to" -msgstr "au" - -#: templates/teleforma/seminar_testimonial_presence.html:28 +#: templates/teleforma/seminar_testimonial_knowledge.html:28 #: templates/teleforma/testimonials.html:69 -msgid "Remote presence testimonial" -msgstr "Attestation de suivi à distance" +msgid "Knowledge validation testimonial" +msgstr "Attestation de validation des acquis" -#: templates/teleforma/seminar_testimonial_presence.html:40 +#: templates/teleforma/seminar_testimonial_knowledge.html:40 msgid "Validation mode of the training" msgstr "Mode de validation des acquis de la formation" -#: templates/teleforma/seminar_testimonial_presence.html:40 +#: templates/teleforma/seminar_testimonial_knowledge.html:40 msgid "Reply to questions" msgstr "Réalisation de consultations juridiques fictives" -#: templates/teleforma/seminar_testimonial_presence.html:42 +#: templates/teleforma/seminar_testimonial_knowledge.html:42 msgid "Knowledge validation dates" msgstr "Date de validation des acquis" +#: templates/teleforma/seminar_testimonial_payback.html:90 +msgid "until" +msgstr "au" + #: templates/teleforma/seminars.html:116 msgid "Access" msgstr "Accéder" @@ -1654,6 +1652,11 @@ msgstr "" msgid "Year of recording" msgstr "" +#: templates/telemeta/search_criteria.html:120 +#: templates/telemeta/search_criteria.html:139 +msgid "to" +msgstr "" + #: templates/telemeta/search_criteria.html:132 msgid "Year of publication" msgstr "année de publication" @@ -1776,8 +1779,8 @@ msgstr "conditions de validation d'une consultation" msgid "You have successfully submitted your evaluation" msgstr "Vous avez soumis votre évaluation avec succès" -#~ msgid "until" -#~ msgstr "au" +#~ msgid "Remote presence testimonial" +#~ msgstr "Attestation de suivi à distance" #~ msgid "Subtitle" #~ msgstr "Sous-titre" diff --git a/teleforma/templates/teleforma/seminar_testimonial_presence.html b/teleforma/templates/teleforma/seminar_testimonial_knowledge.html similarity index 98% rename from teleforma/templates/teleforma/seminar_testimonial_presence.html rename to teleforma/templates/teleforma/seminar_testimonial_knowledge.html index ef8d2548..8c6bac65 100644 --- a/teleforma/templates/teleforma/seminar_testimonial_presence.html +++ b/teleforma/templates/teleforma/seminar_testimonial_knowledge.html @@ -25,7 +25,7 @@
diff --git a/teleforma/templates/teleforma/seminar_testimonial_payback.html b/teleforma/templates/teleforma/seminar_testimonial_payback.html index 5747b896..3b9e8c9f 100644 --- a/teleforma/templates/teleforma/seminar_testimonial_payback.html +++ b/teleforma/templates/teleforma/seminar_testimonial_payback.html @@ -46,13 +46,13 @@ @frame price-ht { -pdf-frame-content: price-ht; - top: 730px; + top: 729px; left: 377px; } @frame price-ttc { -pdf-frame-content: price-ttc; - top: 730px; + top: 729px; left: 477px; } @@ -87,7 +87,7 @@
- {{ first_revision.date|date:'j F Y' }} {% trans "to" %} {% if testimonial.date_modified %}{{ testimonial.date_modified|date:'j F Y' }}{% else %}{{ testimonial.date_added|date:'j F Y' }}{% endif %} + {{ first_revision.date|date:'j F Y' }} {% trans "until" %} {% if testimonial.date_modified %}{{ testimonial.date_modified|date:'j F Y' }}{% else %}{{ testimonial.date_added|date:'j F Y' }}{% endif %}
@@ -97,11 +97,11 @@
- {{ seminar.price }} + {{ seminar.price|integer }}
- {{ seminar.price }} + {{ seminar.price|integer }}
diff --git a/teleforma/templates/teleforma/testimonials.html b/teleforma/templates/teleforma/testimonials.html index 663e247d..af766716 100644 --- a/teleforma/templates/teleforma/testimonials.html +++ b/teleforma/templates/teleforma/testimonials.html @@ -66,9 +66,9 @@ - {% trans "Remote presence testimonial" %} + {% trans "Knowledge validation testimonial" %} {% trans "validated on" %} {{ testimonial.date_added }} - + diff --git a/teleforma/templatetags/teleforma_tags.py b/teleforma/templatetags/teleforma_tags.py index c43c99fe..d3ff6bb4 100644 --- a/teleforma/templatetags/teleforma_tags.py +++ b/teleforma/templatetags/teleforma_tags.py @@ -311,3 +311,7 @@ def untreated_answer_count(): return ' (' + str(len(answers)) + ')' else: return '' + +@register.filter +def integer(value): + return int(value) \ No newline at end of file diff --git a/teleforma/urls.py b/teleforma/urls.py index 8bea98a5..b4e87353 100644 --- a/teleforma/urls.py +++ b/teleforma/urls.py @@ -111,8 +111,8 @@ urlpatterns = patterns('', name="teleforma-seminar-testimonial-download"), url(r'^desk/testimonials/$', TestimonialListView.as_view(), name="teleforma-testimonials"), - url(r'^desk/seminars/(?P.*)/testimonial-presence/$', TestimonialPresenceView.as_view(), - name="teleforma-seminar-testimonial-presence"), + url(r'^desk/seminars/(?P.*)/testimonial-knowledge/$', TestimonialKnowledgeView.as_view(), + name="teleforma-seminar-testimonial-knowledge"), url(r'^desk/seminars/(?P.*)/testimonial-payback/$', TestimonialPaybackView.as_view(), name="teleforma-seminar-testimonial-payback"), diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index d5300b86..f97c9255 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -655,13 +655,13 @@ class TestimonialListView(ListView): return super(TestimonialListView, self).dispatch(*args, **kwargs) -class TestimonialPresenceView(TestimonialView): +class TestimonialKnowledgeView(TestimonialView): - template_name = 'teleforma/seminar_testimonial_presence.html' + template_name = 'teleforma/seminar_testimonial_knowledge.html' pdf_template_name = template_name def get_context_data(self, **kwargs): - context = super(TestimonialPresenceView, self).get_context_data(**kwargs) + context = super(TestimonialKnowledgeView, self).get_context_data(**kwargs) seminar = context['seminar'] context['answers'] = Answer.objects.filter(question__in=seminar.question.all(), user=self.request.user, @@ -670,7 +670,7 @@ class TestimonialPresenceView(TestimonialView): @method_decorator(login_required) def dispatch(self, *args, **kwargs): - return super(TestimonialPresenceView, self).dispatch(*args, **kwargs) + return super(TestimonialKnowledgeView, self).dispatch(*args, **kwargs) class TestimonialPaybackView(TestimonialView): -- 2.39.5