From 354fe7064c4b691360f5f22b377d3eb0aa95186e Mon Sep 17 00:00:00 2001 From: yomguy Date: Fri, 14 Dec 2012 14:47:14 +0100 Subject: [PATCH] fix titles, admin select width, locales.. --- teleforma/admin.py | 3 + teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 9037 -> 9506 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 148 ++++++++++++------ teleforma/locale/fr/LC_MESSAGES/djangojs.mo | Bin 585 -> 587 bytes teleforma/static/admin/extra.css | 19 +++ .../teleforma/inc/document_simple_list.html | 2 +- .../teleforma/inc/media_package_list.html | 2 +- .../teleforma/inc/question_list.html | 4 +- .../templates/teleforma/seminar_detail.html | 22 ++- teleforma/templatetags/teleforma_tags.py | 11 +- teleforma/views/core.py | 1 - teleforma/views/pro.py | 13 +- 12 files changed, 159 insertions(+), 66 deletions(-) create mode 100644 teleforma/static/admin/extra.css diff --git a/teleforma/admin.py b/teleforma/admin.py index f19461c8..f5f32fa0 100644 --- a/teleforma/admin.py +++ b/teleforma/admin.py @@ -72,6 +72,9 @@ class SeminarAdmin(admin.ModelAdmin): filter_horizontal = ['professor', 'media', 'media_preview', 'docs_1', 'docs_2', 'docs_correct'] + class Media: + css = { 'all': ('admin/extra.css',) } + admin.site.unregister(User) admin.site.register(User, UserProfileAdmin) diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 9582235a18cae9e67679933c5992d078c3f39249..b05773f06fb030df166791dad3500fb8ad3e0a8c 100644 GIT binary patch literal 9506 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\n" "Language-Team: LANGUAGE \n" @@ -18,7 +18,7 @@ msgstr "" #: models/ae.py:46 models/core.py:177 models/crfpa.py:108 models/crfpa.py:146 #: models/pro.py:166 models/pro.py:206 models/pro.py:221 models/pro.py:232 -#: models/pro.py:263 +#: models/pro.py:265 msgid "user" msgstr "utilisateur" @@ -91,12 +91,12 @@ msgstr "titre" msgid "code" msgstr "cote" -#: models/core.py:150 models/core.py:376 models/pro.py:120 models/pro.py:264 +#: models/core.py:150 models/core.py:376 models/pro.py:120 models/pro.py:266 msgid "date modified" msgstr "date de modification" -#: models/core.py:151 models/core.py:420 models/pro.py:58 models/pro.py:95 -#: models/pro.py:150 models/pro.py:211 +#: models/core.py:151 models/core.py:420 models/core.py:478 models/pro.py:58 +#: models/pro.py:95 models/pro.py:150 models/pro.py:211 msgid "rank" msgstr "rang" @@ -150,7 +150,7 @@ msgstr "date de début" msgid "end date" msgstr "date de fin" -#: models/core.py:225 models/core.py:423 models/core.py:478 models/pro.py:50 +#: models/core.py:225 models/core.py:423 models/core.py:479 models/pro.py:50 msgid "readers" msgstr "" @@ -277,38 +277,38 @@ msgstr "iej" msgid "student" msgstr "étudiant" -#: models/crfpa.py:147 models/pro.py:238 +#: models/crfpa.py:147 models/pro.py:239 #: templates/telemeta/profile_detail.html:82 msgid "Address" msgstr "Adresse" -#: models/crfpa.py:148 models/pro.py:239 +#: models/crfpa.py:148 models/pro.py:240 msgid "Postal code" msgstr "Code postal" -#: models/crfpa.py:149 models/pro.py:240 +#: models/crfpa.py:149 models/pro.py:241 msgid "City" msgstr "Ville" -#: models/crfpa.py:150 models/pro.py:241 +#: models/crfpa.py:150 models/pro.py:242 msgid "Country" msgstr "Pays" -#: models/crfpa.py:151 models/pro.py:242 +#: models/crfpa.py:151 models/pro.py:243 #: templates/telemeta/profile_detail.html:91 msgid "Language" msgstr "Langue" -#: models/crfpa.py:152 models/pro.py:243 +#: models/crfpa.py:152 models/pro.py:244 #: templates/telemeta/profile_detail.html:83 msgid "Telephone" msgstr "Téléphone" -#: models/crfpa.py:153 models/pro.py:244 +#: models/crfpa.py:153 models/pro.py:246 msgid "Expiration_date" msgstr "Date d'expiration" -#: models/crfpa.py:154 models/pro.py:245 +#: models/crfpa.py:154 models/pro.py:247 msgid "Password initialized" msgstr "Mot de passe initialisé" @@ -372,11 +372,12 @@ msgstr "document 2" msgid "corrected document" msgstr "document corrigé" -#: models/pro.py:138 +#: models/pro.py:138 templates/teleforma/seminar_media_audio.html:56 +#: templates/teleforma/seminar_media_video.html:102 msgid "Seminar" msgstr "Sémimaire" -#: models/pro.py:146 models/pro.py:205 models/pro.py:220 models/pro.py:262 +#: models/pro.py:146 models/pro.py:205 models/pro.py:220 models/pro.py:264 msgid "seminar" msgstr "séminaire" @@ -436,19 +437,27 @@ msgstr "Évaluation" msgid "seminars" msgstr "séminaires" -#: models/pro.py:255 +#: models/pro.py:238 +msgid "Company" +msgstr "" + +#: models/pro.py:245 +msgid "Fax" +msgstr "" + +#: models/pro.py:257 msgid "Auditor" msgstr "Auditeur" -#: models/pro.py:265 +#: models/pro.py:267 msgid "progress" msgstr "" -#: models/pro.py:269 +#: models/pro.py:271 msgid "Revision" msgstr "Révision" -#: models/pro.py:270 +#: models/pro.py:272 msgid "Revisions" msgstr "Révisions" @@ -727,15 +736,15 @@ msgstr "" msgid "Write" msgstr "" -#: templates/teleforma/answer_form.html:23 +#: templates/teleforma/answer_form.html:21 msgid "Answer to the following question" msgstr "Réalisez les consultations fictives suivantes" -#: templates/teleforma/answer_form.html:37 +#: templates/teleforma/answer_form.html:35 msgid "Save" msgstr "" -#: templates/teleforma/answer_form.html:41 +#: templates/teleforma/answer_form.html:39 msgid "Submit it" msgstr "Soumettre" @@ -749,7 +758,7 @@ msgstr "Supports écrits" #: templates/teleforma/course_document.html:73 #: templates/teleforma/inc/conference_list.html:25 #: templates/teleforma/inc/media_list.html:36 -#: templates/teleforma/inc/media_package_list.html:36 +#: templates/teleforma/inc/media_package_list.html:35 #: templates/telemeta/lists.html:69 templates/telemeta/search_criteria.html:97 #: templates/telemeta/inc/module_revisions.html:17 msgid "Title" @@ -758,13 +767,15 @@ msgstr "Titre" #: templates/teleforma/course.html:18 templates/teleforma/course.html.py:34 #: templates/teleforma/seminar_detail.html:34 #: templates/teleforma/seminars.html:80 -#: templates/teleforma/inc/media_package_list.html:41 +#: templates/teleforma/inc/media_package_list.html:40 msgid "Description" msgstr "Description" #: templates/teleforma/course.html:19 templates/teleforma/course.html.py:35 #: templates/teleforma/course.html:52 #: templates/teleforma/course_media.html:142 +#: templates/teleforma/seminar_media_audio.html:64 +#: templates/teleforma/seminar_media_video.html:110 #: templates/telemeta/profile_detail.html:86 msgid "Date added" msgstr "Date d'ajout" @@ -794,7 +805,7 @@ msgstr "Session" #: templates/teleforma/course_media.html:133 #: templates/teleforma/inc/conference_list.html:27 #: templates/teleforma/inc/media_list.html:39 -#: templates/teleforma/inc/media_package_list.html:38 +#: templates/teleforma/inc/media_package_list.html:37 #: templates/telemeta/inc/user_list.html:48 msgid "Professor" msgstr "Professeur" @@ -806,6 +817,7 @@ msgstr "S T O P" #: templates/teleforma/course_conference.html:37 #: templates/teleforma/course_media.html:73 +#: templates/teleforma/seminar_media_video.html:68 msgid "Audio" msgstr "" @@ -853,6 +865,7 @@ msgstr "ID Conférence" #: templates/teleforma/course_conference_audio.html:36 #: templates/teleforma/course_media.html:76 +#: templates/teleforma/seminar_media_audio.html:22 msgid "Video" msgstr "" @@ -877,32 +890,43 @@ msgstr "Enregistrer et diffuser" #: templates/teleforma/course_media.html:27 #: templates/teleforma/course_media.html:79 +#: templates/teleforma/seminar_media_audio.html:25 +#: templates/teleforma/seminar_media_video.html:20 +#: templates/teleforma/seminar_media_video.html:71 #: templates/teleforma/inc/media_list.html:50 -#: templates/teleforma/inc/media_package_list.html:49 +#: templates/teleforma/inc/media_package_list.html:48 msgid " published" msgstr " publié" #: templates/teleforma/course_media.html:34 #: templates/teleforma/course_media.html:79 +#: templates/teleforma/seminar_media_audio.html:25 +#: templates/teleforma/seminar_media_video.html:27 +#: templates/teleforma/seminar_media_video.html:71 #: templates/teleforma/inc/media_list.html:52 -#: templates/teleforma/inc/media_package_list.html:51 +#: templates/teleforma/inc/media_package_list.html:50 msgid " rejected" msgstr " rejeté" #: templates/teleforma/course_media.html:62 +#: templates/teleforma/seminar_media_audio.html:10 +#: templates/teleforma/seminar_media_video.html:56 #: templates/teleforma/inc/document_list.html:22 -#: templates/teleforma/inc/document_simple_list.html:16 +#: templates/teleforma/inc/document_simple_list.html:15 #: templates/teleforma/inc/media_list.html:56 -#: templates/teleforma/inc/media_package_list.html:55 -#: templates/teleforma/inc/question_list.html:16 +#: templates/teleforma/inc/media_package_list.html:54 msgid "Download" msgstr "Télécharger" #: templates/teleforma/course_media.html:141 +#: templates/teleforma/seminar_media_audio.html:63 +#: templates/teleforma/seminar_media_video.html:109 msgid "Mime type" msgstr "Type mime" #: templates/teleforma/course_media.html:143 +#: templates/teleforma/seminar_media_audio.html:65 +#: templates/teleforma/seminar_media_video.html:111 msgid "Date modified" msgstr "Date de modification" @@ -910,7 +934,7 @@ msgstr "Date de modification" msgid "Media ID" msgstr "ID Média" -#: templates/teleforma/courses.html:23 templates/teleforma/seminars.html:25 +#: templates/teleforma/courses.html:23 #: templates/telemeta/profile_detail.html:16 msgid "My courses" msgstr "Mes matières" @@ -937,10 +961,44 @@ msgstr "Aide" msgid "Informations" msgstr "Informations" -#: templates/teleforma/seminar_detail.html:73 +#: templates/teleforma/seminar_detail.html:43 +msgid "Step 1 : read the following documents" +msgstr "Étape 1 : lisez les documents suivants" + +#: templates/teleforma/seminar_detail.html:49 +msgid "Step 2 : view the following conferences" +msgstr "Étape 2 : visionnez les conférences suivantes" + +#: templates/teleforma/seminar_detail.html:55 +msgid "Step 3 : read the following documents" +msgstr "Étape 3 : lisez les documents suivants" + +#: templates/teleforma/seminar_detail.html:61 +msgid "Step 4 : answer to the following questions" +msgstr "Étape 4 : réalisez les consultations fictives suivantes" + +#: templates/teleforma/seminar_detail.html:68 +msgid "Step 5 : read the following corrected documents" +msgstr "Étape 5 : lisez les documents corrigés suivants" + +#: templates/teleforma/seminar_detail.html:83 msgid "Progression" msgstr "Progression" +#: templates/teleforma/seminar_media_audio.html:58 +#: templates/teleforma/seminar_media_video.html:104 +msgid "Professors" +msgstr "Professeurs" + +#: templates/teleforma/seminar_media_audio.html:66 +#: templates/teleforma/seminar_media_video.html:112 +msgid "Media package ID" +msgstr "ID Media pakage" + +#: templates/teleforma/seminars.html:25 +msgid "My seminars" +msgstr "Mes séminaires" + #: templates/teleforma/inc/conference_list.html:8 msgid "Live conferences" msgstr "Conférences en direct" @@ -954,8 +1012,8 @@ msgstr "Voir" #: templates/teleforma/inc/conference_list.html:19 #: templates/teleforma/inc/media_list.html:23 #: templates/teleforma/inc/media_list.html:29 -#: templates/teleforma/inc/media_package_list.html:23 -#: templates/teleforma/inc/media_package_list.html:29 +#: templates/teleforma/inc/media_package_list.html:22 +#: templates/teleforma/inc/media_package_list.html:28 msgid "Click here" msgstr "Cliquez ici" @@ -963,30 +1021,23 @@ msgstr "Cliquez ici" msgid "No document" msgstr "Aucun document" -#: templates/teleforma/inc/document_simple_list.html:7 -msgid "Read the following documents" -msgstr "Lisez les documents suivants" - #: templates/teleforma/inc/media_list.html:8 msgid "Passed conferences" msgstr "Conférences en différé" #: templates/teleforma/inc/media_list.html:17 -#: templates/teleforma/inc/media_package_list.html:17 +#: templates/teleforma/inc/media_package_list.html:16 msgid "Play" msgstr "Lire" -#: templates/teleforma/inc/media_package_list.html:7 -msgid "Play the following conferences" -msgstr "Visionnez les conférences suivantes" - -#: templates/teleforma/inc/media_package_list.html:43 +#: templates/teleforma/inc/media_package_list.html:42 msgid "Duration" msgstr "Durée" -#: templates/teleforma/inc/question_list.html:7 -msgid "Answer to the following questions" -msgstr "Réalisez les consultations fictives suivantes" +#: templates/teleforma/inc/question_list.html:15 +#, fuzzy +msgid "Submitted" +msgstr "Soumettre" #: templates/telemeta/base.html:99 msgid "Desk" @@ -1224,7 +1275,6 @@ msgid "Grouped message" msgstr "Message groupé" #: templates/telemeta/users.html:74 -#, fuzzy msgid "No users" msgstr "Aucun utilisateur" diff --git a/teleforma/locale/fr/LC_MESSAGES/djangojs.mo b/teleforma/locale/fr/LC_MESSAGES/djangojs.mo index 25d2600cf3cdaa2def73735f1359ecd358555e23..47f1e117e7faf4195896899aafc665d1360fa18a 100644 GIT binary patch delta 39 scmX@fa++m=iD(%k1H%*s1_m}D=4N7GumI9R8$InAnbL|TcQ76V0F{yl&j0`b delta 36 pcmX@ja*}0&iD(HU1H%*s1_m}D=44`EumI8m8$InACwDO(1OS0L2Jrv@ diff --git a/teleforma/static/admin/extra.css b/teleforma/static/admin/extra.css new file mode 100644 index 00000000..e3c29f6d --- /dev/null +++ b/teleforma/static/admin/extra.css @@ -0,0 +1,19 @@ + +.selector { + width: 960px; + float: left; +} + +.selector select { + width: 460px; + height: 17.2em; +} + +.selector-available, .selector-chosen { + float: left; + width: 460px; + text-align: center; + margin-bottom: 5px; +} + + diff --git a/teleforma/templates/teleforma/inc/document_simple_list.html b/teleforma/templates/teleforma/inc/document_simple_list.html index 5c076a12..a699b05a 100644 --- a/teleforma/templates/teleforma/inc/document_simple_list.html +++ b/teleforma/templates/teleforma/inc/document_simple_list.html @@ -4,7 +4,7 @@
-

{% trans "Read the following documents" %}

+

{{ title }}

diff --git a/teleforma/templates/teleforma/inc/media_package_list.html b/teleforma/templates/teleforma/inc/media_package_list.html index b364076f..b5cb6259 100644 --- a/teleforma/templates/teleforma/inc/media_package_list.html +++ b/teleforma/templates/teleforma/inc/media_package_list.html @@ -4,7 +4,7 @@
-

{% trans "Play the following conferences" %}

+

{{ title }}

diff --git a/teleforma/templates/teleforma/inc/question_list.html b/teleforma/templates/teleforma/inc/question_list.html index 08399f5e..f6118e9c 100644 --- a/teleforma/templates/teleforma/inc/question_list.html +++ b/teleforma/templates/teleforma/inc/question_list.html @@ -4,7 +4,7 @@
-

{% trans "Answer to the following questions" %}

+

{{ title }}

@@ -12,7 +12,7 @@ {% for question in questions.all %} - + {% endfor %} diff --git a/teleforma/templates/teleforma/seminar_detail.html b/teleforma/templates/teleforma/seminar_detail.html index da55c81a..5ee4b5fc 100644 --- a/teleforma/templates/teleforma/seminar_detail.html +++ b/teleforma/templates/teleforma/seminar_detail.html @@ -40,26 +40,36 @@ {% with seminar.docs_1 as docs %} - {% include "teleforma/inc/document_simple_list.html" %} + {% with _("Step 1 : read the following documents") as title %} + {% include "teleforma/inc/document_simple_list.html" %} + {% endwith %} {% endwith %} {% with seminar.media as media_packages %} - {% include "teleforma/inc/media_package_list.html" %} + {% with _("Step 2 : view the following conferences") as title %} + {% include "teleforma/inc/media_package_list.html" %} + {% endwith %} {% endwith %} {% with seminar.docs_2 as docs %} - {% include "teleforma/inc/document_simple_list.html" %} + {% with _("Step 3 : read the following documents") as title %} + {% include "teleforma/inc/document_simple_list.html" %} + {% endwith %} {% endwith %} {% with seminar.question as questions %} - {% include "teleforma/inc/question_list.html" %} + {% with _("Step 4 : answer to the following questions") as title %} + {% include "teleforma/inc/question_list.html" %} + {% endwith %} {% endwith %} {% if validated %} {% with seminar.docs_correct as docs %} - {% include "teleforma/inc/document_simple_list.html" %} + {% with _("Step 5 : read the following corrected documents") as title %} + {% include "teleforma/inc/document_simple_list.html" %} + {% endwith %} {% endwith %} - {% endif %} + {% endif %} {% endblock course_content %} diff --git a/teleforma/templatetags/teleforma_tags.py b/teleforma/templatetags/teleforma_tags.py index b3449c15..ef9f5669 100644 --- a/teleforma/templatetags/teleforma_tags.py +++ b/teleforma/templatetags/teleforma_tags.py @@ -214,4 +214,13 @@ def sub(value, arg): @register.filter def div(value, arg): "Divides the value by the arg" - return int(value) / int(arg) \ No newline at end of file + return int(value) / int(arg) + +@register.filter +def submitted(question, user): + answers = Answer.objects.filter(question=question, user=user, status=3) + if answers: + return True + else: + return False + diff --git a/teleforma/views/core.py b/teleforma/views/core.py index a0cbfe7c..fec6bc89 100644 --- a/teleforma/views/core.py +++ b/teleforma/views/core.py @@ -358,7 +358,6 @@ class DocumentView(DetailView): courses = get_courses(request.user) seminars = get_seminars(request.user) document = Document.objects.get(id=pk) - document.readers.add(request.user) if get_course_access(document, courses) or get_seminar_access(document, seminars): document.readers.add(request.user) fsock = open(document.file.path, 'r') diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index 5322fa68..503aaa2e 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -79,7 +79,7 @@ def seminar_progress(user, seminar): questions = Question.objects.filter(seminar=seminar, status=3) for question in questions: total += question.weight - answer = Answer.objects.filter(question=question, validated=True, user=user) + answer = Answer.objects.filter(question=question, status=3, user=user) if answer: progress += question.weight @@ -106,12 +106,14 @@ def total_progress(user): return 100 def seminar_validated(user, seminar): - validated = False + validated = [] for question in seminar.question.all(): - answers = question.answer.filter(user=user) + answers = Answer.objects.filter(question= question, user=user, validated=True) if answers: - validated = validated and answers[0].validated - return validated + validated.append(True) + else: + validated.append(False) + return not False in validated class SeminarView(DetailView): @@ -239,6 +241,7 @@ class MediaPackageView(DetailView): def get_context_data(self, **kwargs): context = super(MediaPackageView, self).get_context_data(**kwargs) media_package = self.get_object() + media_package.readers.add(self.request.user) seminar = media_package.seminar.get() all_seminars = get_seminars(self.request.user) context['all_seminars'] = all_seminars -- 2.39.5
{{ question.title }} n°{{ question.rank }}{% if question|submitted:user %}{% endif %}