From: Guillaume Pellerin Date: Wed, 12 Jun 2013 11:09:29 +0000 (+0200) Subject: add knowledge validation testimonial X-Git-Tag: 2.8.1-pro~487^2^2 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1ffe5f181252106abce846033ea40712dd687ee9;p=teleforma.git add knowledge validation testimonial --- diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 2fe435a9..6dca9a69 100644 Binary files a/teleforma/locale/fr/LC_MESSAGES/django.mo and b/teleforma/locale/fr/LC_MESSAGES/django.mo differ 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_knowledge.html b/teleforma/templates/teleforma/seminar_testimonial_knowledge.html new file mode 100644 index 00000000..8c6bac65 --- /dev/null +++ b/teleforma/templates/teleforma/seminar_testimonial_knowledge.html @@ -0,0 +1,68 @@ + +{% load i18n %} +{% load telemeta_utils %} +{% load teleforma_tags %} + +{% get_current_language as LANGUAGE_CODE %} +{% get_available_languages as LANGUAGES %} + + + + + +{%block head_title %}{% description %} - {% trans "Testimonial" %}{% endblock %} + +{% block stylesheets %} + +{% endblock %} + +{% block extra_stylesheets %}{% endblock %} + + + + +{% block layout %} +
+ + + +
+ + + + + + + + + + + + {% for answer in answers %}{% endfor %} + +
{% trans "Last name" %} : {{ testimonial.user.last_name|upper }}
{% trans "First name" %} : {{ testimonial.user.first_name|upper }}
{% trans "Address" %} : {{ testimonial.user.auditor.all.0.address }} {{ testimonial.user.auditor.all.0.postal_code }} {{ testimonial.user.auditor.all.0.city }}
{% trans "Subject" %} : {{ seminar.title }}
{% trans "Course" %} : {{ seminar.course }}
{% trans "Duration" %} : {{ seminar.duration|hours }} {% trans "hours" %}
{% trans "Validation mode of the training" %} : {% trans "Reply to questions" %}
{% trans "Training begin date" %} : {{ first_revision.date|date:'j F Y' }}
{% trans "Knowledge validation dates" %} :
{% trans "Answer" %} n°{{ answer.question.rank }} : {{ answer.date_validated|date:'j F Y' }}
{% trans "Training end date" %} : {% if testimonial.date_modified %}{{ testimonial.date_modified|date:'j F Y' }}{% else %}{{ testimonial.date_added|date:'j F Y' }}{% endif %}
+ + + + +
+ {{ seminar.course.department.address|safe }} + + Pro-Barreau signature +
+ +
+ +{% block footer %} + +{% endblock %} + +
+{% endblock layout %} + + + 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/seminar_testimonial_presence.html b/teleforma/templates/teleforma/seminar_testimonial_presence.html deleted file mode 100644 index ef8d2548..00000000 --- a/teleforma/templates/teleforma/seminar_testimonial_presence.html +++ /dev/null @@ -1,68 +0,0 @@ - -{% load i18n %} -{% load telemeta_utils %} -{% load teleforma_tags %} - -{% get_current_language as LANGUAGE_CODE %} -{% get_available_languages as LANGUAGES %} - - - - - -{%block head_title %}{% description %} - {% trans "Testimonial" %}{% endblock %} - -{% block stylesheets %} - -{% endblock %} - -{% block extra_stylesheets %}{% endblock %} - - - - -{% block layout %} -
- - - -
- - - - - - - - - - - - {% for answer in answers %}{% endfor %} - -
{% trans "Last name" %} : {{ testimonial.user.last_name|upper }}
{% trans "First name" %} : {{ testimonial.user.first_name|upper }}
{% trans "Address" %} : {{ testimonial.user.auditor.all.0.address }} {{ testimonial.user.auditor.all.0.postal_code }} {{ testimonial.user.auditor.all.0.city }}
{% trans "Subject" %} : {{ seminar.title }}
{% trans "Course" %} : {{ seminar.course }}
{% trans "Duration" %} : {{ seminar.duration|hours }} {% trans "hours" %}
{% trans "Validation mode of the training" %} : {% trans "Reply to questions" %}
{% trans "Training begin date" %} : {{ first_revision.date|date:'j F Y' }}
{% trans "Knowledge validation dates" %} :
{% trans "Answer" %} n°{{ answer.question.rank }} : {{ answer.date_validated|date:'j F Y' }}
{% trans "Training end date" %} : {% if testimonial.date_modified %}{{ testimonial.date_modified|date:'j F Y' }}{% else %}{{ testimonial.date_added|date:'j F Y' }}{% endif %}
- - - - -
- {{ seminar.course.department.address|safe }} - - Pro-Barreau signature -
- -
- -{% block footer %} - -{% endblock %} - -
-{% endblock layout %} - - - 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):