fix infos, seminar completed when answers are validated

diff --git a/teleforma/admin.py b/teleforma/admin.py
index 12145d275b6c8c268c78dd50907dd483ee719ac8..c1a88651418459e3fdb23e283945f851c0ca6259 100644 (file)
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@ -4,7 +4,6 @@ from django.contrib import admin
 from django.contrib.auth.models import User
 from django.contrib.auth.admin import UserAdmin
 
-
 class ProfileInline(admin.StackedInline):
     model = Profile
 

diff --git a/teleforma/forms.py b/teleforma/forms.py
index 5db524d962567a884f47efc7bd65a7181571fb1e..64ce45621cf9213a0ef845119c9876506bfadee2 100644 (file)
--- a/teleforma/forms.py
+++ b/teleforma/forms.py
@@ -20,7 +20,7 @@ class AnswerForm(ModelForm):
 
     def __init__(self, *args, **kwargs): 
         super(AnswerForm, self).__init__(*args, **kwargs)
-        self.fields['answer'].widget.attrs['cols'] = 95
+        self.fields['answer'].widget.attrs['cols'] = 81
         self.fields['answer'].widget.attrs['rows'] = 40
         self.fields['status'].widget = HiddenInput()
 

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index bb0049f10b8eb5332eea40671e2d075ce6061aac..120f5d663615238a7589b90cce6a4bf53ac6c987 100644 (file)
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 e142496334c7649af0b3a39d7319ec8bbe4bcae8..0cde3e1d26f2c58eed1f29201001745175392bb2 100644 (file)
--- 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: 2012-12-15 23:08+0100\n"
+"POT-Creation-Date: 2012-12-17 17:57+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"
 "Language-Team: LANGUAGE <lists@parisson.com>\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: 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:265
+#: models/pro.py:166 models/pro.py:207 models/pro.py:222 models/pro.py:234
+#: models/pro.py:267
 msgid "user"
 msgstr "utilisateur"
 
@@ -27,7 +27,7 @@ msgstr "utilisateur"
 msgid "period"
 msgstr "période"
 
-#: models/ae.py:49 models/crfpa.py:114 models/pro.py:237
+#: models/ae.py:49 models/crfpa.py:114 models/pro.py:239
 msgid "platform only"
 msgstr "plateforme seulement"
 
@@ -63,11 +63,13 @@ msgstr "nom"
 
 #: models/core.py:89 models/core.py:101 models/core.py:121 models/core.py:133
 #: models/core.py:148 models/core.py:197 models/core.py:307 models/core.py:373
-#: models/core.py:393 models/crfpa.py:48 models/pro.py:148 models/pro.py:190
+#: models/core.py:393 models/crfpa.py:48 models/pro.py:148 models/pro.py:191
+#: templates/teleforma/seminar_detail.html:60
+#: templates/teleforma/seminars.html:97
 msgid "description"
 msgstr "description"
 
-#: models/core.py:96 models/core.py:103 models/core.py:195 models/pro.py:189
+#: models/core.py:96 models/core.py:103 models/core.py:195 models/pro.py:190
 msgid "organization"
 msgstr "organisation"
 
@@ -91,12 +93,12 @@ msgstr "titre"
 msgid "code"
 msgstr "cote"
 
-#: models/core.py:150 models/core.py:376 models/pro.py:120 models/pro.py:266
+#: models/core.py:150 models/core.py:376 models/pro.py:120 models/pro.py:268
 msgid "date modified"
 msgstr "date de modification"
 
 #: 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
+#: models/pro.py:95 models/pro.py:150 models/pro.py:212
 msgid "rank"
 msgstr "rang"
 
@@ -198,7 +200,7 @@ msgstr "stream en direct"
 msgid "credits"
 msgstr "crédits"
 
-#: models/core.py:375 models/pro.py:119
+#: models/core.py:375 models/pro.py:119 models/pro.py:172
 msgid "date added"
 msgstr "date d'ajout"
 
@@ -277,38 +279,38 @@ msgstr "iej"
 msgid "student"
 msgstr "étudiant"
 
-#: models/crfpa.py:147 models/pro.py:239
+#: models/crfpa.py:147 models/pro.py:241
 #: templates/telemeta/profile_detail.html:82
 msgid "Address"
 msgstr "Adresse"
 
-#: models/crfpa.py:148 models/pro.py:240
+#: models/crfpa.py:148 models/pro.py:242
 msgid "Postal code"
 msgstr "Code postal"
 
-#: models/crfpa.py:149 models/pro.py:241
+#: models/crfpa.py:149 models/pro.py:243
 msgid "City"
 msgstr "Ville"
 
-#: models/crfpa.py:150 models/pro.py:242
+#: models/crfpa.py:150 models/pro.py:244
 msgid "Country"
 msgstr "Pays"
 
-#: models/crfpa.py:151 models/pro.py:243
+#: models/crfpa.py:151 models/pro.py:245
 #: templates/telemeta/profile_detail.html:91
 msgid "Language"
 msgstr "Langue"
 
-#: models/crfpa.py:152 models/pro.py:244
+#: models/crfpa.py:152 models/pro.py:246
 #: templates/telemeta/profile_detail.html:83
 msgid "Telephone"
 msgstr "Téléphone"
 
-#: models/crfpa.py:153 models/pro.py:246
+#: models/crfpa.py:153 models/pro.py:248
 msgid "Expiration_date"
 msgstr "Date d'expiration"
 
-#: models/crfpa.py:154 models/pro.py:247
+#: models/crfpa.py:154 models/pro.py:249
 msgid "Password initialized"
 msgstr "Mot de passe initialisé"
 
@@ -332,11 +334,13 @@ msgstr "Type de séminaire"
 msgid "sub title"
 msgstr "sous-titre"
 
-#: models/pro.py:92
+#: models/pro.py:92 templates/teleforma/seminar_detail.html:57
+#: templates/teleforma/seminars.html:94
 msgid "public concerned"
 msgstr "public concerné"
 
-#: models/pro.py:93
+#: models/pro.py:93 templates/teleforma/seminar_detail.html:56
+#: templates/teleforma/seminars.html:93
 msgid "level"
 msgstr "niveau"
 
@@ -372,12 +376,15 @@ msgstr "document 2"
 msgid "corrected document"
 msgstr "document corrigé"
 
-#: models/pro.py:138 templates/teleforma/seminar_media_audio.html:56
-#: templates/teleforma/seminar_media_video.html:102
+#: models/pro.py:138 templates/teleforma/answer_form.html:77
+#: templates/teleforma/seminar_detail.html:154
+#: templates/teleforma/seminar_media_audio.html:56
+#: templates/teleforma/seminar_media_video.html:104
+#: templates/teleforma/inc/answer_list.html:21
 msgid "Seminar"
 msgstr "Sémimaire"
 
-#: models/pro.py:146 models/pro.py:205 models/pro.py:220 models/pro.py:264
+#: models/pro.py:146 models/pro.py:206 models/pro.py:221 models/pro.py:266
 msgid "seminar"
 msgstr "séminaire"
 
@@ -401,7 +408,7 @@ msgstr "Question"
 msgid "answer"
 msgstr "réponse"
 
-#: models/pro.py:170
+#: models/pro.py:170 templates/teleforma/seminar_detail.html:40
 msgid "validated"
 msgstr "validé"
 
@@ -409,55 +416,56 @@ msgstr "validé"
 msgid "date submitted"
 msgstr "date de soumission"
 
-#: models/pro.py:183
+#: models/pro.py:184 templates/teleforma/answer_detail.html:28
+#: templates/teleforma/answer_form.html:80
 msgid "Answer"
 msgstr "Réponse"
 
-#: models/pro.py:191
+#: models/pro.py:192
 msgid "comments"
 msgstr "commentaires"
 
-#: models/pro.py:193 models/pro.py:208
+#: models/pro.py:194 models/pro.py:209
 msgid "template"
 msgstr "modèle"
 
-#: models/pro.py:200
+#: models/pro.py:201
 msgid "Testimonial template"
 msgstr "Modèle d'attestation"
 
-#: models/pro.py:215
+#: models/pro.py:216
 msgid "Testimonial"
 msgstr "Attestation"
 
-#: models/pro.py:226
+#: models/pro.py:228
 msgid "Evaluation"
 msgstr "Évaluation"
 
-#: models/pro.py:234
+#: models/pro.py:236
 msgid "seminars"
 msgstr "séminaires"
 
-#: models/pro.py:238
+#: models/pro.py:240
 msgid "Company"
 msgstr ""
 
-#: models/pro.py:245
+#: models/pro.py:247
 msgid "Fax"
 msgstr ""
 
-#: models/pro.py:257
+#: models/pro.py:259
 msgid "Auditor"
 msgstr "Auditeur"
 
-#: models/pro.py:267
+#: models/pro.py:269
 msgid "progress"
 msgstr ""
 
-#: models/pro.py:271
+#: models/pro.py:273
 msgid "Revision"
 msgstr "Révision"
 
-#: models/pro.py:272
+#: models/pro.py:274
 msgid "Revisions"
 msgstr "Révisions"
 
@@ -469,7 +477,7 @@ msgstr "Page non trouvée"
 msgid "Server error"
 msgstr "Erreur du serveur"
 
-#: templates/admin/base.html:21 templates/telemeta/base.html:102
+#: templates/admin/base.html:21 templates/telemeta/base.html:98
 msgid "Home"
 msgstr "Accueil"
 
@@ -497,7 +505,7 @@ msgstr ""
 msgid "Sent Messages"
 msgstr "Messages"
 
-#: templates/postman/base.html:17 templates/telemeta/base.html:115
+#: templates/postman/base.html:17
 msgid "Archives"
 msgstr ""
 
@@ -715,14 +723,12 @@ msgid "Conversation"
 msgstr ""
 
 #: templates/postman/view.html:9 templates/telemeta/inc/user_list.html:72
-#, fuzzy
 msgid "Message"
-msgstr "Messages"
+msgstr "Message"
 
 #: templates/postman/view.html:25
-#, fuzzy
 msgid "Rejected"
-msgstr "rejeté"
+msgstr "Rejeté"
 
 #: templates/postman/view.html:25
 msgid ":"
@@ -736,6 +742,14 @@ msgstr ""
 msgid "Write"
 msgstr ""
 
+#: templates/teleforma/answer_detail.html:38
+msgid " validate"
+msgstr "valider"
+
+#: templates/teleforma/answer_detail.html:39
+msgid " reject"
+msgstr " rejeter"
+
 #: templates/teleforma/answer_form.html:46
 msgid "Answer to the following question"
 msgstr "Réalisez la consultation fictive suivante"
@@ -748,14 +762,56 @@ msgstr "en"
 msgid "words"
 msgstr "mots"
 
-#: templates/teleforma/answer_form.html:60
+#: templates/teleforma/answer_form.html:61
 msgid "Save"
 msgstr ""
 
-#: templates/teleforma/answer_form.html:63
+#: templates/teleforma/answer_form.html:62
 msgid "Submit it"
 msgstr "Soumettre"
 
+#: templates/teleforma/answer_form.html:70
+#: templates/teleforma/seminar_detail.html:148
+#: templates/teleforma/seminars.html:112
+msgid "Progressions"
+msgstr "Progressions"
+
+#: templates/teleforma/answer_form.html:74
+#: templates/teleforma/seminar_detail.html:151
+#: templates/teleforma/seminars.html:115
+msgid "General"
+msgstr "Général"
+
+#: templates/teleforma/answers.html:6 templates/teleforma/answers.html:62
+#: templates/telemeta/base.html:111
+msgid "Answers"
+msgstr "Consultations"
+
+#: templates/teleforma/answers.html:19
+#: templates/teleforma/inc/answer_list.html:41
+msgid " validated"
+msgstr "validé"
+
+#: templates/teleforma/answers.html:25
+#: 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:28
+#: templates/teleforma/seminar_media_video.html:73
+#: templates/teleforma/inc/answer_list.html:41
+#: templates/teleforma/inc/media_list.html:52
+#: templates/teleforma/inc/media_package_list.html:50
+msgid " rejected"
+msgstr " rejeté"
+
+#: templates/teleforma/answers.html:40 templates/teleforma/seminars.html:35
+msgid "My seminars"
+msgstr "Mes séminaires"
+
+#: templates/teleforma/answers.html:67
+msgid "No answer"
+msgstr "Aucune réponse"
+
 #: templates/teleforma/course.html:14
 #: templates/teleforma/inc/document_list.html:7
 msgid "Documents"
@@ -773,8 +829,6 @@ msgid "Title"
 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:40
 msgid "Description"
 msgstr "Description"
@@ -783,7 +837,7 @@ msgstr "Description"
 #: 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/teleforma/seminar_media_video.html:112
 #: templates/telemeta/profile_detail.html:86
 msgid "Date added"
 msgstr "Date d'ajout"
@@ -825,7 +879,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
+#: templates/teleforma/seminar_media_video.html:70
 msgid "Audio"
 msgstr ""
 
@@ -888,7 +942,7 @@ msgid "End"
 msgstr "Fin"
 
 #: templates/teleforma/course_conference_record.html:23
-#: templates/teleforma/courses.html:41 templates/teleforma/seminars.html:41
+#: templates/teleforma/courses.html:41 templates/teleforma/seminars.html:51
 msgid "New conference"
 msgstr "Nouvelle conférence"
 
@@ -899,26 +953,16 @@ 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/seminar_media_video.html:21
+#: templates/teleforma/seminar_media_video.html:73
 #: templates/teleforma/inc/media_list.html:50
 #: 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: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/seminar_media_video.html:58
 #: templates/teleforma/inc/document_list.html:22
 #: templates/teleforma/inc/document_simple_list.html:15
 #: templates/teleforma/inc/media_list.html:56
@@ -928,13 +972,13 @@ msgstr "Télécharger"
 
 #: templates/teleforma/course_media.html:141
 #: templates/teleforma/seminar_media_audio.html:63
-#: templates/teleforma/seminar_media_video.html:109
+#: templates/teleforma/seminar_media_video.html:111
 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
+#: templates/teleforma/seminar_media_video.html:113
 msgid "Date modified"
 msgstr "Date de modification"
 
@@ -947,85 +991,110 @@ msgstr "ID Média"
 msgid "My courses"
 msgstr "Mes matières"
 
-#: templates/teleforma/courses.html:48 templates/teleforma/seminars.html:48
+#: templates/teleforma/courses.html:48 templates/teleforma/seminars.html:58
 msgid "My notes"
 msgstr "Mes notes"
 
-#: templates/teleforma/courses.html:58 templates/teleforma/seminars.html:58
+#: templates/teleforma/courses.html:58 templates/teleforma/seminars.html:68
 msgid "New note"
 msgstr "Nouvelle note"
 
-#: templates/teleforma/courses.html:104 templates/teleforma/seminars.html:109
+#: templates/teleforma/courses.html:104 templates/teleforma/seminars.html:127
 msgid "Status"
 msgstr "Status"
 
-#: templates/teleforma/help.html:11 templates/telemeta/base.html:124
-#: templates/telemeta/base.html.py:137
+#: templates/teleforma/help.html:11 templates/telemeta/base.html:114
+#: templates/telemeta/base.html.py:127
 msgid "Help"
 msgstr "Aide"
 
-#: templates/teleforma/seminar_detail.html:21
-#: templates/teleforma/seminars.html:98
+#: templates/teleforma/seminar_detail.html:51
 msgid "Informations"
 msgstr "Informations"
 
-#: templates/teleforma/seminar_detail.html:44
-msgid "Step 1 : read the following documents"
-msgstr "Étape 1 : lisez les documents suivants"
+#: templates/teleforma/seminar_detail.html:55
+#: templates/teleforma/seminars.html:92
+msgid "keywords"
+msgstr "mots clés"
 
-#: templates/teleforma/seminar_detail.html:48
-msgid "Step 1 : read the following document"
-msgstr "Étape 1 : lisez le document suivant"
+#: templates/teleforma/seminar_detail.html:58
+#: templates/teleforma/seminars.html:95
+msgid "duration"
+msgstr "durée"
 
-#: templates/teleforma/seminar_detail.html:56
-msgid "Step 2 : view the following conferences"
-msgstr "Étape 2 : visionnez les conférences suivantes"
+#: templates/teleforma/seminar_detail.html:76
+msgid "Step 1 : read these documents"
+msgstr "Étape 1 : lire ces documents"
 
-#: templates/teleforma/seminar_detail.html:60
-msgid "Step 2 : view the following conference"
-msgstr "Étape 2 : visionnez la conférence suivante"
+#: templates/teleforma/seminar_detail.html:80
+msgid "Step 1 : read this document"
+msgstr "Étape 1 : lire ce document"
 
-#: templates/teleforma/seminar_detail.html:68
-msgid "Step 3 : read the following documents"
-msgstr "Étape 3 : lisez les documents suivants"
+#: templates/teleforma/seminar_detail.html:88
+msgid "Step 2 : attend these conferences"
+msgstr "Étape 2 : assister à ces conférences"
 
-#: templates/teleforma/seminar_detail.html:72
-msgid "Step 3 : read the following document"
-msgstr "Étape 3 : lisez le document suivant"
+#: templates/teleforma/seminar_detail.html:92
+msgid "Step 2 : attend this conference"
+msgstr "Étape 2 : assister à cette conférence"
 
-#: templates/teleforma/seminar_detail.html:80
-msgid "Step 4 : answer to the following questions"
-msgstr "Étape 4 : réalisez les consultations fictives suivantes"
+#: templates/teleforma/seminar_detail.html:100
+msgid "Step 3 : read these documents"
+msgstr "Étape 3 : lire ces documents"
 
-#: templates/teleforma/seminar_detail.html:84
-msgid "Step 4 : answer to the following question"
-msgstr "Étape 4 : réalisez la consultation fictive suivante"
+#: templates/teleforma/seminar_detail.html:104
+msgid "Step 3 : read this document"
+msgstr "Étape 3 : lire ce document"
 
-#: templates/teleforma/seminar_detail.html:93
-msgid "Step 5 : read the following corrected documents"
-msgstr "Étape 5 : lisez les documents corrigés suivants"
+#: templates/teleforma/seminar_detail.html:112
+msgid "Step 4 : answer to these questions"
+msgstr "Étape 4 : réaliser ces consultations fictives"
 
-#: templates/teleforma/seminar_detail.html:97
-msgid "Step 5 : read the following corrected document"
-msgstr "Étape 5 : lisez le document corrigé suivant"
+#: templates/teleforma/seminar_detail.html:118
+msgid "Step 4 : answer to this question"
+msgstr "Étape 4 : réaliser cette consultation fictive"
 
-#: templates/teleforma/seminar_detail.html:113
-msgid "Progression"
-msgstr "Progression"
+#: templates/teleforma/seminar_detail.html:127
+msgid "Step 5 : read these corrected documents"
+msgstr "Étape 5 : lire ces documents corrigés"
+
+#: templates/teleforma/seminar_detail.html:131
+msgid "Step 5 : read this corrected document"
+msgstr "Étape 5 : lire ce document corrigé"
 
 #: templates/teleforma/seminar_media_audio.html:58
-#: templates/teleforma/seminar_media_video.html:104
+#: templates/teleforma/seminar_media_video.html:106
 msgid "Professors"
 msgstr "Professeurs"
 
 #: templates/teleforma/seminar_media_audio.html:66
-#: templates/teleforma/seminar_media_video.html:112
+#: templates/teleforma/seminar_media_video.html:114
 msgid "Media package ID"
 msgstr "ID Media pakage"
 
-#: templates/teleforma/seminars.html:25
-msgid "My seminars"
-msgstr "Mes séminaires"
+#: templates/teleforma/inc/answer_list.html:19
+#: templates/telemeta/profile_detail.html:60
+#: templates/telemeta/inc/user_list.html:19
+msgid "Last Name"
+msgstr ""
+
+#: templates/teleforma/inc/answer_list.html:20
+#: templates/telemeta/profile_detail.html:59
+#: templates/telemeta/inc/user_list.html:20
+msgid "First Name"
+msgstr ""
+
+#: templates/teleforma/inc/answer_list.html:22
+msgid "Date submitted"
+msgstr "date de soumission"
+
+#: templates/teleforma/inc/answer_list.html:23
+msgid "Summary"
+msgstr ""
+
+#: templates/teleforma/inc/answer_list.html:24
+msgid "Action / status"
+msgstr ""
 
 #: templates/teleforma/inc/conference_list.html:8
 msgid "Live conferences"
@@ -1063,56 +1132,51 @@ msgid "Duration"
 msgstr "Durée"
 
 #: templates/teleforma/inc/question_list.html:15
-#, fuzzy
+msgid "submitted on"
+msgstr "soumise le"
+
+#: templates/teleforma/inc/question_list.html:15
+msgid "saved on"
+msgstr "enregistrée le"
+
+#: templates/teleforma/inc/question_list.html:16
 msgid "Submitted"
-msgstr "Soumettre"
+msgstr "Soumise"
 
-#: templates/telemeta/base.html:99
+#: templates/telemeta/base.html:95
 msgid "Desk"
 msgstr "Bureau"
 
-#: templates/telemeta/base.html:107
+#: templates/telemeta/base.html:103
 msgid "Messaging"
 msgstr "Messagerie"
 
-#: templates/telemeta/base.html:110 templates/telemeta/users.html:6
+#: templates/telemeta/base.html:106 templates/telemeta/users.html:6
 #: templates/telemeta/users.html.py:69
 msgid "Users"
 msgstr ""
 
-#: templates/telemeta/base.html:117 templates/telemeta/search_criteria.html:69
-msgid "Search"
-msgstr ""
-
-#: templates/telemeta/base.html:118
-msgid "Collections"
-msgstr ""
-
-#: templates/telemeta/base.html:119
-msgid "Items"
-msgstr ""
-
-#: templates/telemeta/base.html:122
+#: templates/telemeta/base.html:112
 msgid "Admin"
 msgstr ""
 
-#: templates/telemeta/base.html:134
+#: templates/telemeta/base.html:124
 msgid "Profile"
 msgstr "Profil"
 
-#: templates/telemeta/base.html:136
+#: templates/telemeta/base.html:126
 msgid "Lists"
 msgstr ""
 
-#: templates/telemeta/base.html:139
+#: templates/telemeta/base.html:129
 msgid "Sign out"
 msgstr ""
 
-#: templates/telemeta/base.html:181
+#: templates/telemeta/base.html:171
 msgid "Powered by"
 msgstr ""
 
-#: templates/telemeta/base.html:191
+#: templates/telemeta/base.html:181
 msgid "Legal notices"
 msgstr ""
 
@@ -1197,16 +1261,6 @@ msgstr ""
 msgid "Login as"
 msgstr "Se connecter en tant que"
 
-#: templates/telemeta/profile_detail.html:59
-#: templates/telemeta/inc/user_list.html:20
-msgid "First Name"
-msgstr ""
-
-#: templates/telemeta/profile_detail.html:60
-#: templates/telemeta/inc/user_list.html:19
-msgid "Last Name"
-msgstr ""
-
 #: templates/telemeta/profile_detail.html:61
 msgid "Username"
 msgstr "Nom d'utilisateur"
@@ -1276,6 +1330,10 @@ msgstr "Réinitialisation du mot de passe"
 msgid "Advanced Search"
 msgstr ""
 
+#: templates/telemeta/search_criteria.html:69
+msgid "Search"
+msgstr ""
+
 #: templates/telemeta/search_criteria.html:113
 msgid "Year of recording"
 msgstr ""

diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index bb473a957dc87efbd59a6c3bce718bc8a11800f4..affe27efd4845b323cfc6e1a8664dbd39e59d73f 100644 (file)
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -1682,7 +1682,7 @@ input,textarea{
     }
 
 .messages {
-    padding: 0.5em 1em 1em 1em;
+    padding: 0em 1em 1em 1em;
 }
 
 .info {
@@ -1766,3 +1766,9 @@ form .exceed{
     border-radius: 8px 0px 8px 8px;
     }
 
+
+#id_answer {
+    font: 1em Verdana, sans-serif;
+    line-height: 1.3em;
+    color: #333;   
+}
\ No newline at end of file

diff --git a/teleforma/static/teleforma/images/chronometer.png b/teleforma/static/teleforma/images/chronometer.png
new file mode 100644 (file)
index 0000000..1c6cb4e
Binary files /dev/null and b/teleforma/static/teleforma/images/chronometer.png differ

diff --git a/teleforma/templates/teleforma/inc/question_list.html b/teleforma/templates/teleforma/inc/question_list.html
index b01709e4f21d643875bb863763311a494cce4b6f..9854613dbb4a2f0bc47a0227e3cefd47ea942d46 100644 (file)
--- a/teleforma/templates/teleforma/inc/question_list.html
+++ b/teleforma/templates/teleforma/inc/question_list.html
@@ -11,9 +11,9 @@
     <tbody>
         {% for question in questions.all %}
             <tr>
-            <td {% if forloop.first %}class="border-top"{% endif %} width="45%"><a href="{% url teleforma-question-answer question.id %}">{{ question.title }} n°{{ question.rank }}</a></td>
-            <td {% if forloop.first %}class="border-top"{% endif %} width="50%">{% if question|submitted:user %}{% trans "submitted on" %} {{ question|submitted:user }}{% elif question|saved:user %}{% trans "saved on" %} {{ question|saved:user }}{% endif %} </td>
-            <td {% if forloop.first %}class="border-top"{% endif %} width="5%" align="center">{% if question|submitted:user %}<img src="{{ STATIC_URL }}telemeta/images/ok.png" style="vertical-align:middle" alt="" title="{% trans "Submitted" %}" />{% endif %}</td>
+            <td {% if forloop.first %}class="border-top"{% endif %} width="35%"><a href="{% url teleforma-question-answer question.id %}">{{ question.title }} n°{{ question.rank }}</a></td>
+            <td {% if forloop.first %}class="border-top"{% endif %} width="60%">{% if question|submitted:user %}{% trans "submitted on" %} {{ question|submitted:user }}{% elif question|saved:user %}{% trans "saved on" %} {{ question|saved:user }}{% endif %} </td>
+            <td {% if forloop.first %}class="border-top"{% endif %} width="5%" align="center">{% if question|submitted:user and not question|validated:user %}<img src="{{ STATIC_URL }}teleforma/images/chronometer.png" style="vertical-align:middle" alt="" title="{% trans "Waiting for validation" %}" />{% elif question|submitted:user and question|validated:user %}<img src="{{ STATIC_URL }}telemeta/images/ok.png" style="vertical-align:middle" alt="" title="{% trans "Validated" %}" />{% endif %}</td>
             </tr>
         {% endfor %}
     </tbody>

diff --git a/teleforma/templates/teleforma/seminar_detail.html b/teleforma/templates/teleforma/seminar_detail.html
index 8f57d6b6a1ded1877450f4d122d1a6bd80d18962..3caef4a11cb8f642cec236f0c19fc1c7297bd337 100644 (file)
--- a/teleforma/templates/teleforma/seminar_detail.html
+++ b/teleforma/templates/teleforma/seminar_detail.html
@@ -52,6 +52,7 @@ $(function() {
             </div>
             <div class="course_description">
               <dl class="listing" style="font-size: 1.1em;">
+              <dt>{% trans "course" %}</dt><dd>{{ seminar.course }}</dd>
               {% if seminar.keywords.all %}<dt>{% trans "keywords" %}</dt><dd>{% for kw in seminar.keywords.all %}{{ kw }}, {% endfor %}</dd>{% endif %}
               <dt>{% trans "level" %}</dt><dd>{{ seminar.level }}</dd>
               <dt>{% trans "public concerned" %}</dt><dd>{{ seminar.concerned }}</dd>
@@ -73,11 +74,11 @@ $(function() {
 
           {% with seminar.docs_1 as docs %}
            {% if docs.all.count > 1 %}
-            {% with _("Step 1 : read the following documents") as title %}
+            {% with _("Step 1 : read these documents") as title %}
              {% include "teleforma/inc/document_simple_list.html" %}
            {% endwith %}
            {% else %}
-            {% with _("Step 1 : read the following document") as title %}
+            {% with _("Step 1 : read this document") as title %}
              {% include "teleforma/inc/document_simple_list.html" %}
             {% endwith %}
            {% endif %}
@@ -85,11 +86,11 @@ $(function() {
 
           {% with seminar.media as media_packages %}
            {% if media_packages.all.count > 1 %}
-            {% with _("Step 2 : view the following conferences") as title %}
+            {% with _("Step 2 : attend these conferences") as title %}
              {% include "teleforma/inc/media_package_list.html" %}
             {% endwith %}
            {% else %}
-            {% with _("Step 2 : view the following conference") as title %}
+            {% with _("Step 2 : attend this conference") as title %}
              {% include "teleforma/inc/media_package_list.html" %}
             {% endwith %}
            {% endif %}
@@ -97,11 +98,11 @@ $(function() {
 
           {% with seminar.docs_2 as docs %}
            {% if docs.all.count > 1 %}
-            {% with _("Step 3 : read the following documents") as title %}
+            {% with _("Step 3 : read these documents") as title %}
              {% include "teleforma/inc/document_simple_list.html" %}
            {% endwith %}
            {% else %}
-            {% with _("Step 3 : read the following document") as title %}
+            {% with _("Step 3 : read this document") as title %}
              {% include "teleforma/inc/document_simple_list.html" %}
             {% endwith %}
            {% endif %}
@@ -109,13 +110,13 @@ $(function() {
             
           {% with seminar.question as questions %}
            {% if questions.all.count > 1 %}
-            {% with _("Step 4 : answer to the following questions") as title %}
+            {% with _("Step 4 : answer to these questions") as title %}
              {% include "teleforma/inc/question_list.html" %}
             {% endwith %}
            {% else %}
 
 
-            {% with _("Step 4 : answer to the following question") as title %}
+            {% with _("Step 4 : answer to this question") as title %}
              {% include "teleforma/inc/question_list.html" %}
             {% endwith %}
            {% endif %}
@@ -124,11 +125,11 @@ $(function() {
          {% if validated %}
           {% with seminar.docs_correct as docs %}
            {% if docs.all.count > 1 %}
-            {% with _("Step 5 : read the following corrected documents") as title %}
+            {% with _("Step 5 : read these corrected documents") as title %}
              {% include "teleforma/inc/document_simple_list.html" %}
             {% endwith %}
            {% else %}
-            {% with _("Step 5 : read the following corrected document") as title %}
+            {% with _("Step 5 : read this corrected document") as title %}
              {% include "teleforma/inc/document_simple_list.html" %}
             {% endwith %}
            {% endif %}

diff --git a/teleforma/templates/teleforma/seminars.html b/teleforma/templates/teleforma/seminars.html
index f8717681a0faac7afd46c842150d349caa864e69..b7195fa86304c1460d13fa8ca72c0746bca1dc54 100644 (file)
--- a/teleforma/templates/teleforma/seminars.html
+++ b/teleforma/templates/teleforma/seminars.html
@@ -82,6 +82,12 @@ $(function() {
 
         <div class="course_title">
          <a href="{% url teleforma-seminar-detail seminar.id %}">{{ seminar.title }}</a>
+         <div style="float: right; font-size: 0.9em;">
+          {% if seminar|progress:user == 100 %}
+          <img src="{{ STATIC_URL }}telemeta/images/ok.png" title="{% trans "validated" %}" alt="{% trans "validated" %}"/>
+          {% endif %}
+          </div>
+
         </div>
 
         <div class="course_content">

diff --git a/teleforma/templatetags/teleforma_tags.py b/teleforma/templatetags/teleforma_tags.py
index 7be93e379717a31b6e0e86d6d947000e784e1f85..cc7b85b634439cd34cfd37549f0410510207d1d5 100644 (file)
--- a/teleforma/templatetags/teleforma_tags.py
+++ b/teleforma/templatetags/teleforma_tags.py
@@ -53,6 +53,7 @@ import django.utils.timezone as timezone
 from timezones.utils import localtime_for_timezone
 from django.utils.translation import ugettext_lazy as _
 from teleforma.views import get_courses
+from teleforma.views.pro import seminar_progress
 from urlparse import urlparse
 
 register = template.Library()
@@ -232,7 +233,19 @@ def saved(question, user):
     else:
         return ''
 
+@register.filter
+def validated(question, user):
+    answers = Answer.objects.filter(question=question, user=user, status=3)
+    if answers:
+        return answers[0].validated
+    else:
+        return False
+
 @register.filter
 def summary(text, N):
     return text[:N] + '...'
     
+@register.filter
+def progress(seminar, user):
+    return seminar_progress(user, seminar)
+    

diff --git a/teleforma/urls.py b/teleforma/urls.py
index 2838817e57fba92b4cbd6dedd814288bbdeea189..25bc5871f3305f8e4b08691ea83293e3e28c2b58 100644 (file)
--- a/teleforma/urls.py
+++ b/teleforma/urls.py
@@ -39,6 +39,7 @@ from django.views.generic.base import *
 from teleforma.models import *
 from teleforma.views import *
 from telemeta.views import *
+import forms_builder.forms.urls
 from jsonrpc import jsonrpc_site
 
 htdocs_forma = os.path.dirname(__file__) + '/static/teleforma/'
@@ -98,6 +99,7 @@ urlpatterns = patterns('',
     url(r'^desk/answers/$', AnswersView.as_view(), name="teleforma-answers"),
     url(r'^desk/answers/(?P<pk>.*)/$', AnswerDetailView.as_view(), name="teleforma-answer-detail"),
 
+
     # Postman
     url(r'^messages/', include('postman.urls')),
 

diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py
index 36a2d4e0512e4204ca87d68421a580ce7ac8d3f0..c23f81ed69a837bf4d5dfd0f7615fd6af9f03275 100644 (file)
--- a/teleforma/views/pro.py
+++ b/teleforma/views/pro.py
@@ -78,7 +78,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, status=3, user=user)
+        answer = Answer.objects.filter(question=question, status=3, user=user, validated=True)
         if answer:
             progress += question.weight