From: Guillaume Pellerin Date: Thu, 22 Aug 2013 13:05:12 +0000 (+0200) Subject: Merge branch 'crfpa' into ae-dev X-Git-Tag: 2.8.1-ae~119 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=92a7f32468d537c1eb03551be8c9e46bfe6610bb;p=teleforma.git Merge branch 'crfpa' into ae-dev Conflicts: teleforma/admin.py teleforma/locale/fr/LC_MESSAGES/django.mo teleforma/locale/fr/LC_MESSAGES/django.po teleforma/models/core.py teleforma/templates/postman/email_user_init.txt teleforma/templates/teleforma/course_conference.html teleforma/templates/teleforma/course_conference_audio.html teleforma/templates/teleforma/course_detail.html teleforma/templates/teleforma/course_media.html teleforma/templates/teleforma/courses.html teleforma/views/core.py teleforma/views/crfpa.py --- 92a7f32468d537c1eb03551be8c9e46bfe6610bb diff --cc teleforma/admin.py index 43822466,8abc983a..c4bb5b16 --- a/teleforma/admin.py +++ b/teleforma/admin.py @@@ -30,8 -31,8 +31,8 @@@ class ProfileInline(admin.StackedInline model = Profile class UserProfileAdmin(UserAdmin): - inlines = [CRFPAStudentProfileInline, - ProfessorProfileInline, ProfileInline] + inlines = [AEStudentProfileInline, - ProfessorProfileInline, ProfileInline] ++ ProfessorProfileInline, ProfileInline] class TrainingAdmin(admin.ModelAdmin): model = Training diff --cc teleforma/locale/fr/LC_MESSAGES/django.mo index d3b6b026,9a6df9e5..8612d015 Binary files differ diff --cc teleforma/locale/fr/LC_MESSAGES/django.po index 60f15c8f,bddeb09e..c4ee59d5 --- a/teleforma/locale/fr/LC_MESSAGES/django.po +++ b/teleforma/locale/fr/LC_MESSAGES/django.po @@@ -6,7 -6,7 +6,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2012-11-02 15:11+0100\n" -"POT-Creation-Date: 2013-07-22 22:04+0200\n" ++"POT-Creation-Date: 2013-08-22 15:04+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@@ -16,14 -16,13 +16,13 @@@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" - #: models/ae.py:46 models/core.py:173 models/crfpa.py:108 models/crfpa.py:146 -#: models/ae.py:46 models/core.py:199 models/crfpa.py:108 models/crfpa.py:149 ++#: models/ae.py:46 models/core.py:203 models/crfpa.py:108 models/crfpa.py:149 #: models/pro.py:101 models/pro.py:140 msgid "user" msgstr "utilisateur" - #: models/ae.py:47 models/core.py:128 models/core.py:205 models/core.py:403 - #: models/core.py:442 models/core.py:485 models/crfpa.py:64 - #: models/crfpa.py:109 -#: models/ae.py:47 models/core.py:131 models/core.py:241 models/core.py:487 -#: models/core.py:530 models/core.py:572 models/crfpa.py:64 ++#: models/ae.py:47 models/core.py:131 models/core.py:248 models/core.py:494 ++#: models/core.py:537 models/core.py:579 models/crfpa.py:64 msgid "period" msgstr "période" @@@ -31,7 -30,7 +30,7 @@@ msgid "platform only" msgstr "plateforme seulement" - #: models/ae.py:51 models/core.py:175 -#: models/ae.py:51 models/core.py:201 ++#: models/ae.py:51 models/core.py:205 msgid "courses" msgstr "matières" @@@ -55,18 -50,18 +54,18 @@@ msgstr "Brouillon msgid "Public" msgstr "Publié" - #: models/core.py:88 models/core.py:100 models/core.py:120 models/core.py:132 - #: models/core.py:189 models/core.py:381 models/crfpa.py:47 models/crfpa.py:63 + #: models/core.py:91 models/core.py:103 models/core.py:123 models/core.py:135 -#: models/core.py:225 models/core.py:465 models/crfpa.py:47 models/crfpa.py:63 ++#: models/core.py:232 models/core.py:472 models/crfpa.py:47 models/crfpa.py:63 msgid "name" msgstr "nom" - #: models/core.py:89 models/core.py:101 models/core.py:121 models/core.py:133 - #: models/core.py:147 models/core.py:190 models/core.py:296 models/core.py:362 - #: models/core.py:382 models/crfpa.py:48 models/pro.py:124 + #: models/core.py:92 models/core.py:104 models/core.py:124 models/core.py:136 -#: models/core.py:150 models/core.py:226 models/core.py:380 models/core.py:446 -#: models/core.py:466 models/crfpa.py:48 models/pro.py:124 ++#: models/core.py:151 models/core.py:233 models/core.py:387 models/core.py:453 ++#: models/core.py:473 models/crfpa.py:48 models/pro.py:124 msgid "description" msgstr "description" - #: models/core.py:96 models/core.py:103 models/core.py:188 models/pro.py:123 -#: models/core.py:99 models/core.py:106 models/core.py:224 models/pro.py:123 ++#: models/core.py:99 models/core.py:106 models/core.py:231 models/pro.py:123 msgid "organization" msgstr "organisation" @@@ -74,149 -69,160 +73,164 @@@ msgid "Master domain" msgstr "" - #: models/core.py:115 models/core.py:145 models/core.py:203 -#: models/core.py:118 models/core.py:148 models/core.py:239 ++#: models/core.py:118 models/core.py:149 models/core.py:246 msgid "department" msgstr "département" - #: models/core.py:140 models/core.py:208 models/core.py:400 models/core.py:483 -#: models/core.py:143 models/core.py:244 models/core.py:484 models/core.py:570 ++#: models/core.py:143 models/core.py:251 models/core.py:491 models/core.py:577 msgid "course type" msgstr "type de matière" - #: models/core.py:146 models/core.py:361 models/pro.py:46 models/pro.py:83 -#: models/core.py:149 models/core.py:445 models/pro.py:46 models/pro.py:83 ++#: models/core.py:150 models/core.py:452 models/pro.py:46 models/pro.py:83 msgid "title" msgstr "titre" - #: models/core.py:148 models/core.py:366 models/crfpa.py:62 -#: models/core.py:151 models/core.py:450 models/crfpa.py:62 ++#: models/core.py:152 models/core.py:457 models/crfpa.py:62 msgid "code" msgstr "cote" - #: models/core.py:149 models/core.py:365 models/pro.py:68 -#: models/core.py:152 ++#: models/core.py:153 + msgid "tweeter title" + msgstr "" + -#: models/core.py:153 models/core.py:449 models/pro.py:68 ++#: models/core.py:154 models/core.py:456 models/pro.py:68 msgid "date modified" msgstr "date de modification" - #: models/core.py:150 models/core.py:383 -#: models/core.py:154 models/core.py:467 ++#: models/core.py:155 models/core.py:474 msgid "number" msgstr "" - #: models/core.py:151 models/crfpa.py:67 -#: models/core.py:155 models/crfpa.py:67 ++#: models/core.py:156 models/crfpa.py:67 msgid "synthesis note" msgstr "note de synthèse" - #: models/core.py:152 models/crfpa.py:70 -#: models/core.py:156 models/crfpa.py:70 ++#: models/core.py:157 models/crfpa.py:70 msgid "obligations" msgstr "obligations" - #: models/core.py:153 models/crfpa.py:91 -#: models/core.py:157 models/crfpa.py:91 ++#: models/core.py:158 models/crfpa.py:91 msgid "magistral" msgstr "magistral" - #: models/core.py:166 models/core.py:207 models/core.py:398 models/core.py:481 -#: models/core.py:192 models/core.py:243 models/core.py:482 models/core.py:568 ++#: models/core.py:160 ++msgid "types" ++msgstr "types" ++ ++#: models/core.py:196 models/core.py:250 models/core.py:489 models/core.py:575 #: models/pro.py:45 msgid "course" msgstr "matière" - #: models/core.py:183 models/core.py:209 -#: models/core.py:218 models/core.py:245 ++#: models/core.py:225 models/core.py:252 msgid "professor" msgstr "professeur" - #: models/core.py:197 models/core.py:213 -#: models/core.py:233 models/core.py:249 ++#: models/core.py:240 models/core.py:256 msgid "room" msgstr "salle" - #: models/core.py:202 - #, fuzzy -#: models/core.py:238 ++#: models/core.py:245 msgid "public_id" - msgstr "publié" + msgstr "public id" - #: models/core.py:211 -#: models/core.py:247 ++#: models/core.py:254 msgid "session" msgstr "session" - #: models/core.py:215 -#: models/core.py:251 ++#: models/core.py:258 msgid "comment" msgstr "commentaire" - #: models/core.py:216 -#: models/core.py:252 ++#: models/core.py:259 msgid "begin date" msgstr "date de début" - #: models/core.py:217 -#: models/core.py:253 ++#: models/core.py:260 msgid "end date" msgstr "date de fin" - #: models/core.py:218 models/core.py:409 models/core.py:445 models/core.py:490 -#: models/core.py:254 models/core.py:496 models/core.py:533 models/core.py:577 ++#: models/core.py:261 models/core.py:503 models/core.py:540 models/core.py:584 msgid "readers" msgstr "" - #: models/core.py:285 models/core.py:313 models/core.py:401 models/core.py:479 -#: models/core.py:369 models/core.py:397 models/core.py:485 models/core.py:566 ++#: models/core.py:376 models/core.py:404 models/core.py:492 models/core.py:573 msgid "conference" msgstr "conférence" - #: models/core.py:293 -#: models/core.py:377 ++#: models/core.py:384 msgid "host" msgstr "" - #: models/core.py:294 -#: models/core.py:378 ++#: models/core.py:385 msgid "port" msgstr "" - #: models/core.py:295 models/core.py:405 models/core.py:489 -#: models/core.py:379 models/core.py:489 models/core.py:576 ++#: models/core.py:386 models/core.py:496 models/core.py:583 msgid "type" msgstr "type" - #: models/core.py:297 -#: models/core.py:381 ++#: models/core.py:388 msgid "source password" msgstr "" - #: models/core.py:298 -#: models/core.py:382 ++#: models/core.py:389 msgid "admin password" msgstr "" - #: models/core.py:305 models/core.py:316 -#: models/core.py:389 models/core.py:400 ++#: models/core.py:396 models/core.py:407 msgid "streaming server" msgstr "serveur de diffusion" - #: models/core.py:317 -#: models/core.py:401 ++#: models/core.py:408 msgid "Streaming type" msgstr "Type de flux" - #: models/core.py:319 -#: models/core.py:403 ++#: models/core.py:410 msgid "streaming" msgstr "diffusion" - #: models/core.py:355 -#: models/core.py:439 ++#: models/core.py:446 msgid "live stream" msgstr "stream en direct" - #: models/core.py:363 -#: models/core.py:447 ++#: models/core.py:454 msgid "credits" msgstr "crédits" - #: models/core.py:364 models/pro.py:67 -#: models/core.py:448 models/pro.py:67 ++#: models/core.py:455 models/pro.py:67 msgid "date added" msgstr "date d'ajout" - #: models/core.py:367 -#: models/core.py:451 ++#: models/core.py:458 msgid "published" msgstr "publié" - #: models/core.py:368 -#: models/core.py:452 ++#: models/core.py:459 msgid "mime type" msgstr "Type mime" - #: models/core.py:369 models/pro.py:86 -#: models/core.py:453 models/pro.py:86 ++#: models/core.py:460 models/pro.py:86 msgid "weight" msgstr "" - #: models/core.py:390 -#: models/core.py:474 ++#: models/core.py:481 msgid "document type" msgstr "type de document" - #: models/core.py:407 -#: models/core.py:491 models/crfpa.py:111 ++#: models/core.py:498 models/crfpa.py:111 + msgid "iej" + msgstr "iej" + -#: models/core.py:493 ++#: models/core.py:500 msgid "annal" msgstr "annale" - #: models/core.py:408 models/core.py:444 -#: models/core.py:494 ++#: models/core.py:501 + msgid "year" + msgstr "année" + -#: models/core.py:495 models/core.py:532 ++#: models/core.py:502 models/core.py:539 msgid "file" msgstr "fichier" @@@ -582,7 -586,7 +594,7 @@@ msgid "of msgstr "de" #: templates/postman/email_user.txt:22 - #: templates/postman/email_user_init.txt:28 -#: templates/postman/email_user_init.txt:23 ++#: templates/postman/email_user_init.txt:22 #: templates/postman/email_visitor.txt:18 msgid "" "Note: This message is issued by an automated system.\n" @@@ -679,6 -683,33 +691,33 @@@ msgstr " msgid "Write" msgstr "" + #: templates/teleforma/annals.html:6 templates/teleforma/annals.html.py:54 + #: templates/telemeta/base.html:113 templates/telemeta/base.html.py:123 + msgid "Annals" + msgstr "Annales" + + #: templates/teleforma/annals.html:15 + #: templates/telemeta/profile_detail.html:16 + msgid "My courses" + msgstr "Mes matières" + + #: templates/teleforma/annals.html:49 + #: templates/teleforma/inc/document_list.html:36 + msgid "No document" + msgstr "Aucun document" + + #: templates/teleforma/annals.html:70 + #: templates/teleforma/inc/conference_list.html:18 + #: templates/teleforma/inc/document_list.html:20 + msgid "View" + msgstr "Voir" + -#: templates/teleforma/annals.html:74 templates/teleforma/course_media.html:64 ++#: templates/teleforma/annals.html:74 templates/teleforma/course_media.html:65 + #: templates/teleforma/inc/document_list.html:22 + #: templates/teleforma/inc/media_list.html:56 + msgid "Download" + msgstr "Télécharger" + #: templates/teleforma/course.html:14 #: templates/teleforma/inc/document_list.html:7 msgid "Documents" @@@ -700,8 -731,8 +739,8 @@@ 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/telemeta/profile_detail.html:86 -#: templates/teleforma/course_media.html:147 ++#: templates/teleforma/course_media.html:148 + #: templates/telemeta/profile_detail.html:81 msgid "Date added" msgstr "Date d'ajout" @@@ -717,8 -748,8 +756,8 @@@ msgstr "Conférences #: templates/teleforma/course_conference.html:40 #: templates/teleforma/course_conference.html:71 #: templates/teleforma/course_conference_audio.html:68 - #: templates/teleforma/course_media.html:83 - #: templates/teleforma/course_media.html:131 -#: templates/teleforma/course_media.html:86 -#: templates/teleforma/course_media.html:136 ++#: templates/teleforma/course_media.html:87 ++#: templates/teleforma/course_media.html:137 #: templates/teleforma/inc/conference_list.html:26 #: templates/teleforma/inc/media_list.html:37 msgid "Session" @@@ -727,7 -758,7 +766,7 @@@ msgstr "Session #: templates/teleforma/course.html:51 #: templates/teleforma/course_conference.html:72 #: templates/teleforma/course_conference_audio.html:67 - #: templates/teleforma/course_media.html:133 -#: templates/teleforma/course_media.html:138 ++#: templates/teleforma/course_media.html:139 #: templates/teleforma/inc/conference_list.html:27 #: templates/teleforma/inc/media_list.html:39 #: templates/telemeta/inc/user_list.html:48 @@@ -740,28 -771,28 +779,28 @@@ msgid "S T O P msgstr "S T O P" #: templates/teleforma/course_conference.html:37 - #: templates/teleforma/course_media.html:73 -#: templates/teleforma/course_media.html:76 ++#: templates/teleforma/course_media.html:77 msgid "Audio" msgstr "" #: templates/teleforma/course_conference.html:70 - #: templates/teleforma/course_media.html:130 -#: templates/teleforma/course_media.html:135 ++#: templates/teleforma/course_media.html:136 msgid "Course" msgstr "Matière" #: templates/teleforma/course_conference.html:75 - #: templates/teleforma/course_media.html:136 -#: templates/teleforma/course_media.html:141 ++#: templates/teleforma/course_media.html:142 #: templates/teleforma/inc/media_list.html:43 msgid "Comment" msgstr "Commentaire" #: templates/teleforma/course_conference.html:76 - #: templates/teleforma/course_media.html:137 -#: templates/teleforma/course_media.html:142 ++#: templates/teleforma/course_media.html:143 msgid "Begin date" msgstr "Date de début" #: templates/teleforma/course_conference.html:77 - #: templates/teleforma/course_media.html:138 -#: templates/teleforma/course_media.html:143 ++#: templates/teleforma/course_media.html:144 msgid "End date" msgstr "Date de fin" @@@ -777,17 -808,17 +816,17 @@@ msgstr "Oui #: templates/teleforma/course_conference.html:79 #: templates/teleforma/course_conference_audio.html:69 - #: templates/teleforma/course_media.html:139 -#: templates/teleforma/course_media.html:144 ++#: templates/teleforma/course_media.html:145 msgid "Room" msgstr "Salle" #: templates/teleforma/course_conference.html:81 - #: templates/teleforma/course_media.html:145 -#: templates/teleforma/course_media.html:150 ++#: templates/teleforma/course_media.html:151 msgid "Conference ID" msgstr "ID Conférence" #: templates/teleforma/course_conference_audio.html:36 - #: templates/teleforma/course_media.html:76 -#: templates/teleforma/course_media.html:79 ++#: templates/teleforma/course_media.html:80 msgid "Video" msgstr "" @@@ -810,33 -846,27 +854,27 @@@ msgstr "Nouvelle conférence msgid "Record and stream" msgstr "Enregistrer et diffuser" - #: templates/teleforma/course_media.html:27 - #: templates/teleforma/course_media.html:79 -#: templates/teleforma/course_media.html:28 -#: templates/teleforma/course_media.html:82 ++#: templates/teleforma/course_media.html:29 ++#: templates/teleforma/course_media.html:83 #: templates/teleforma/inc/media_list.html:50 msgid " published" msgstr " publié" - #: templates/teleforma/course_media.html:34 - #: templates/teleforma/course_media.html:79 -#: templates/teleforma/course_media.html:35 -#: templates/teleforma/course_media.html:82 ++#: templates/teleforma/course_media.html:36 ++#: templates/teleforma/course_media.html:83 #: templates/teleforma/inc/media_list.html:52 msgid " rejected" msgstr " rejeté" - #: templates/teleforma/course_media.html:62 - #: templates/teleforma/inc/document_list.html:22 - #: templates/teleforma/inc/media_list.html:56 - msgid "Download" - msgstr "Télécharger" - - #: templates/teleforma/course_media.html:141 -#: templates/teleforma/course_media.html:146 ++#: templates/teleforma/course_media.html:147 msgid "Mime type" msgstr "Type mime" - #: templates/teleforma/course_media.html:143 -#: templates/teleforma/course_media.html:148 ++#: templates/teleforma/course_media.html:149 msgid "Date modified" msgstr "Date de modification" - #: templates/teleforma/course_media.html:144 -#: templates/teleforma/course_media.html:149 ++#: templates/teleforma/course_media.html:150 msgid "Media ID" msgstr "ID Média" @@@ -862,6 -883,6 +891,20 @@@ msgstr "Nouvelle note msgid "Help" msgstr "Aide" ++#: templates/teleforma/media_pending.html:7 ++msgid "Peding media" ++msgstr "" ++ ++#: templates/teleforma/media_pending.html:27 ++#, fuzzy ++msgid "Testimonials" ++msgstr "Attestation" ++ ++#: templates/teleforma/media_pending.html:45 ++#, fuzzy ++msgid "No testimonial" ++msgstr "attestation" ++ #: templates/teleforma/inc/conference_list.html:8 msgid "Live conferences" msgstr "Conférences en direct" @@@ -1161,17 -1165,42 +1187,35 @@@ msgstr "moi msgid "No" msgstr "Non" - #: views/core.py:142 -#: views/core.py:151 ++#: views/core.py:144 msgid "Access not allowed." msgstr "Accès non autorisé." - #: views/core.py:143 -#: views/core.py:152 ++#: views/core.py:145 msgid "" "Please login or contact the website administator to get a private access." msgstr "" "Merci de vous connecter ou bien contactez l'administateur du site pour " "obtenir un accès privé." -#: views/core.py:205 ++#: views/core.py:198 + msgid "" + "You do NOT have access to this resource and then have been redirected to " + "your desk." + msgstr "" + "Vous n'avez pas accès à cette ressource et avez été redirigé vers votre " + "bureau." + -#: views/core.py:495 ++#: views/core.py:506 + msgid "A new live conference has started : " + msgstr "Une nouvelle conférence en direct a commencé : " + -#~ msgid "AE students" -#~ msgstr "Etudiants AE" - -#, fuzzy -#~ msgid "types" -#~ msgstr "type" - + #~ msgid "Training" + #~ msgstr "Formation" + + #~ msgid "CRFPA student" + #~ msgstr "Etudiant CRFPA" + #~ msgid "amount" #~ msgstr "montant" diff --cc teleforma/templates/postman/email_user_init.txt index 868e8a45,6a57488d..fb50a2ec --- a/teleforma/templates/postman/email_user_init.txt +++ b/teleforma/templates/postman/email_user_init.txt @@@ -1,8 -1,8 +1,8 @@@ {% load i18n %}{% load telemeta_utils %}{% load teleforma_tags %}{% autoescape off %}{% trans "Hello" %} {{ usr.first_name }} {{ usr.last_name }}, -Suite à votre inscription à la formation estivale 2013 du Pré-Barreau, nous vous invitons à initialiser votre compte sur notre plateforme e-learning interactive et multi-média. Pour cela, merci de cliquer sur le lien suivant puis d'indiquez votre adresse e-mail : +Suite à votre inscription à la formation Avocats Etrangers du Pré-Barreau, nous vous invitons à initialiser votre compte sur notre plateforme e-learning interactive et multi-média. Pour cela, merci de cliquer sur le lien suivant puis d'indiquez votre adresse e-mail : - http://{{ site.name }}/accounts/password_reset/ + http://{{ site.domain }}/accounts/password_reset/ Vous recevrez alors un second e-mail vous invitant à initialiser votre mot de passe personnel. Une fois la procédure accomplie, vous pourrez vous connecter à l'adresse suivante : @@@ -11,15 -11,14 +11,13 @@@ http://{{ site.domain } à l'aide de votre nom d'utilisateur : {{ usr.username }} -Cette plateforme vous permet d’accéder tout au long de votre formation aux différents documents - fascicules de cours (selon la formule choisie), fascicules d’actualisation, sujets et corrigés - ainsi qu’à l’ensemble de vos enseignements à la demande ou en direct. +Cette plateforme vous permet d’accéder tout au long de votre formation aux différents documents - fascicules de cours (selon la formule choisie), fascicules d’actualisation, sujets et corrigés - ainsi qu’à l’ensemble de vos enseignements à la demande ou en direct. La messagerie intégrée vous donne aussi la possibilité de communiquer avec les administrateurs et les professeurs. Une page d'aide sera bientôt disponible pour vous assister lors de la découverte de ces nouveaux services. - - Nous vous rappelons que votre formation commencera le lundi 5 novembre 2012. - + La messagerie intégrée vous donne aussi la possibilité de communiquer avec les administrateurs et les professeurs. + Une page d'aide est disponible pour vous assister lors de la découverte de ces nouveaux services. {% trans "Best regards" %}, {% trans "The site administrator" %} {% trans "of the" %} {% organization %} -- {% blocktrans %}Note: This message is issued by an automated system. -Do not reply, this would not be taken into account.{% endblocktrans %}{% endautoescape %} +Do not reply, this would not be taken into account.{% endblocktrans %}{% endautoescape %} diff --cc teleforma/templates/teleforma/course_media.html index 5d222e78,d311d6d5..c5d642a8 --- a/teleforma/templates/teleforma/course_media.html +++ b/teleforma/templates/teleforma/course_media.html @@@ -14,8 -14,8 +14,9 @@@ {% if user.is_staff %} diff --cc teleforma/views/core.py index 70cc6c63,218fef48..73357e03 --- a/teleforma/views/core.py +++ b/teleforma/views/core.py @@@ -82,25 -82,32 +82,25 @@@ except pass -def render(request, template, data = None, mimetype = None): - return render_to_response(template, data, context_instance=RequestContext(request), - mimetype=mimetype) - def format_courses(courses, course=None, queryset=None, types=None): - if queryset: - for c in queryset: - if c and c.code != 'X': - courses.append({'course': c, 'types': types.all(), - 'date': c.date_modified, 'number': c.number}) - elif course: - if course.code != 'X': - courses.append({'course': course, 'types': types.all(), - 'date': course.date_modified, 'number': course.number}) - return courses - + if settings.TELEFORMA_E_LEARNING_TYPE == 'CRFPA': + from teleforma.views.crfpa import format_crfpa_courses + return format_crfpa_courses(courses, course, queryset, types) + + elif settings.TELEFORMA_E_LEARNING_TYPE == 'AE': + from teleforma.views.ae import format_ae_courses + return format_ae_courses(courses, course, queryset, types) + - def get_courses(user, date_order=False, num_order=False): + def get_courses(user, date_order=False, num_order=False, num_courses=False, period=None): if settings.TELEFORMA_E_LEARNING_TYPE == 'CRFPA': from teleforma.views.crfpa import get_crfpa_courses - return get_crfpa_courses(user, date_order, num_order) - + return get_crfpa_courses(user, date_order, num_order, period) + elif settings.TELEFORMA_E_LEARNING_TYPE == 'AE': from teleforma.views.ae import get_ae_courses - return get_ae_courses(user, date_order, num_order) - + return get_ae_courses(user, date_order, num_order, period) + def stream_from_file(__file): chunk_size = 0x10000 diff --cc teleforma/views/crfpa.py index 42493e43,68930fa8..30cd4ff4 --- a/teleforma/views/crfpa.py +++ b/teleforma/views/crfpa.py @@@ -74,24 -71,24 +71,24 @@@ def get_crfpa_courses(user, date_order= } for course in s_courses: - courses = format_courses(courses, course=course, + courses = format_crfpa_courses(courses, course=course, types=s_courses[course]) - synthesis_note = student.training.synthesis_note + synthesis_note = training.synthesis_note if synthesis_note: - courses = format_courses(courses, + courses = format_crfpa_courses(courses, queryset=Course.objects.filter(synthesis_note=True), types=synthesis_note) - obligation = student.training.obligation + obligation = training.obligation if obligation: - courses = format_courses(courses, + courses = format_crfpa_courses(courses, queryset=Course.objects.filter(obligation=True), types=obligation) - magistral = student.training.magistral + magistral = training.magistral if magistral: - courses = format_courses(courses, + courses = format_crfpa_courses(courses, queryset=Course.objects.filter(magistral=True), types=magistral)