From 14dc8a4797b9dedc5f16ca8ba60945faddb162fa Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 16 Jan 2013 17:40:14 +0100 Subject: [PATCH] add gender field to auditor, fix some method names --- teleforma/context_processors.py | 14 +- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 11936 -> 12162 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 212 +++--- ...uditor_gender__add_field_auditor_status.py | 651 ++++++++++++++++++ teleforma/models/core.py | 2 + teleforma/models/pro.py | 2 + .../templates/postman/seminar_validated.txt | 6 - teleforma/templates/telemeta/base.html | 2 +- teleforma/views/core.py | 16 +- teleforma/views/pro.py | 10 +- 10 files changed, 791 insertions(+), 124 deletions(-) create mode 100644 teleforma/migrations/0102_auto__add_field_auditor_gender__add_field_auditor_status.py delete mode 100644 teleforma/templates/postman/seminar_validated.txt diff --git a/teleforma/context_processors.py b/teleforma/context_processors.py index 4ac72d6f..5d311a81 100644 --- a/teleforma/context_processors.py +++ b/teleforma/context_processors.py @@ -93,6 +93,7 @@ def all_seminars(request, progress_order=False): seminars = [] professor = user.professor.get() courses = professor.courses.all() + for course in courses: for seminar in course.seminar.all(): seminars.append(seminar) @@ -107,18 +108,9 @@ def all_seminars(request, progress_order=False): seminars = {} if seminars and progress_order == True: - s_list = [] - for seminar in seminars: - d = {} - d['seminar'] = seminar - d['progress'] = seminar_progress(user, seminar) - s_list.append(d) - + s_list = [{'seminar': seminar, 'progress': seminar_progress(user, seminar)} for seminar in seminars] seminars = sorted(s_list, key=lambda k: k['progress'], reverse=False) - sem = [] - for s in seminars: - sem.append(s['seminar']) - seminars = sem + seminars = [s['seminar'] for s in seminars] return {'all_seminars': seminars} diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 3321df8fc6d312734fed3c754d745c4a864629eb..8f7663fb6498db3df413d2cf9e4ba833c3ea8829 100644 GIT binary patch delta 5393 zcmZ|S3w)2)9mnw_i9}Gu{gTMP#4WM7r)q93Rm@B&9ic?>Z-hw5MatU#EwvWytQxW2 zbafk93|ow%))1F8osk-C$tIFBd9G zI?0BAvUFbCGzob8?1dd z>P{wOv8Wq}LoK|!o$rTQ_)ydijKMIy|1&6PBENOWL=EtyxfnIU zQq&F=p&r3nbGw~?7d1f@s^2NAUo<~M&GR+thC*Xlpx*x&6|ghvQS?CF$#8R&ITp1u z6Hr?_+3M3!*QZ)N6Sa^W)FXQa_4+Nf^DkKYN(|^uU#Gx7x1JxGct2{ThfxC^MGf$= zwb!7oyMX$_x`z6&-L>=ec%IsU#;EaPPz&#XT2NQBcYF3<0}Z4>uhVclG0~iky0Z+_ zKsm@iSHKVL)M{imT`B5&p%T^a4C=aC)c9Ae{<+ofpl&cE*53cfSZ@K%P#46ZR@xnP zXGy4MJ`6SRc+?#wTRjCe@oa0)wt7BloJFW{mY_boD^WMFIY2=x*@wD=gZM1Jem_J_ zlzgvenmHG>zy;cS(a2~MGQ-~y`uRr5BgU!9I#zb2@93~GnEqvq@78E^ya#4yyrBT-v3 z5w#<;Q4>6kTF5fgXXPc-g4d$9c$=NyjiJ=bQP&+rebXIB?ZA1|>-;H3>ixfM9sZ5_ zG)KjG9q&c0xErcH(b@-NDD@Gj1&>B8>@jP9-0Cw?&pHFO(8b8NyIX-8Zxco`zuQGY zE8B0rhgxB^I$#ZIfXi0Dg&N=+)EzeJ#TjNwU?t7P>I^&lc)(#qwerCtKUUE^QdmlO~)445A(4nmf}UM z!HyW%AMZ_k33cZ;upZvRIQ*B{A;Ejb52HRrQ&9_@gIZ95)t^Ewbg9*gt-coZYj-PZ zXAU6q1Y9Krz0cJciRZl&?mB9q+o1#1*m}*p+3!p*bs|Rk8B-kr%F+eq})7&T4)t& z+>@wz&S5}Xc7=jg{1s|~&_r**2B?9Wqb6))c1K+|#2km(sT9;}myVjS05xGDYTOm5 ziC3fMTa(E1*NQh;!#k)851ZAfx1$C%z~505eSsR_Yt#b6dwA^)P!mR>`o~zk6Y^)K z>xFs^$DqcU)r0*H{;!mVIyAgN9w$0d2;;lss&EV<`b+jts&I@UjR==Ie(43@>n=Ez zbS75_9}Rbu=(wM}Oa_qtM2|i~KQf7q3*_fyILRgzM2Eil9whwH;*OB%M9+H~(Gg3A zkV&d=B#@KA5+7o7p(!SiA6q?;K|y~&tR}szu?kNUZ5bbl;1>tDGV%oZr79e+k-T7u zuU@=lANQdI-O<#&~nC`Ha~KpC;?9{%c%AJ|f>IdUZFD z`Q#m<<2=!yS2_yG17sx`M^=#-vXcZq1o$4n=}L5b?BNdLS}T8Iiaz9Fs~2NS zvXw+x+kbPG$_%pH8vEj9l1pxA|KFp~jx;3=iH5+=ek7OWH_Hi)oa@icO-c9XCYD`j`DSR*_O`3r zPtMNI@ug(t7Wi{~vr=+>GyVQ7--49PjI@+Ie_GK)?KU*Y$?>OB_N8T~=FjzK?~i3uc9QcqQsk^qQqbHKzvox{|ua(os*N1UQtpM anJ}l37LxYeTJnmr6MFui#k`Ra7Wyr~qcds% delta 5125 zcmYk83shHC7KaalpaPlUgd!p+f`|%ciYcSyt9*=RKE@GWU^<}%CFp35-B5IN#4Jg3 z%#ayhscBQFjX8#oGBGW)vV2w}j+_POW&Sva|3 zqIc=8kkyV>i(=7)Fy}IYoLhf~yw1&ya;^!S2N`lDurVw(uCeh7n2CRf*|jhnyAFoJ z+mL@Qw7I`d42*Qnb8YF2XCNJF;&Pj?3TlCMW^aKFv3Efwv>QgiDi{J!nExZFL@z)B zxEiQ+zO(ULHs1JWisw1kj7}paw18SD0V+Te)B;_hiqRKpq2W;T#zR$NGSu^VPzla5 zdoB#dE;f5HY>NFX)cWNxg!pb79c8@BChRpHg<9|oRKN>RJO0Y-Yfu5|%>Q4gL_+TN z6N`j;E*jnmW1%+G8ERf{=*cm_91lYsK{ixExllWtVJw2m{As8KmO)iymD%M`mD+0l zz2-j*8{mH*YP}C^{PVl1zaFTuiFHtcZ-dxE3mba;SwjLp`t^D)2tz5vU!WgsRM0 zs6f}C*7*S{U{Fi{`Za;tNF3CBFP)A`HxMd;QBVQ1p&pz96)+DfP@#=`kW+Fc=6?z5 zes6_(Dfh!)!YY^yqhp*)g?(WcI1}#B{a;5%fd{qnGae4L^U;uJT{h$t+-#_TE1-^S zlkqjEgx`W%rwS_Z_iX$WRO08M=3Rwa{~rNA=U+!h58gJ0@flQrrcjlMfhv6m^JhRU z*w4m?LoGM~D&eV62`n%!fhzS%s020{w~4y{yXfewDxpfZ&+G$G3mq~01XSSDP)BkJ z>RQ#>_&4Ui4z-~lU~3r6e+rxcm1q*wI-Q}X1@5zfOsEI@Lw%`+LcL7cHvTA7MGBx6 zTmY5$La2n68dpKBvmWZUY%>2IV-?iKs#|mZTIe*6IQSVUcw65e4OJ;Go{k<&hT2IFs0#FldSI|| z4Ai_FsCiGAy#T60rBDH%H?A}PMyUC(KviZBR7H+M*7w{+I?Cj0sI&SOD&wGbeu>RM{@|Ow5Omda~Udue?wK|ruoC#`yZ;7P`^K}8y(&cHw=cr ze5k;MW-osGWZg6)+;%Po%lAm9Z^UVkybgU#01R zLkndYhe2JhaW*j@DxvvM^NXPpUJg~kt;T~;37myt@EfRg>&$=K{LMP}3AFU+sN_jd z0aKxNc)!`hpw2oMPKMKAcX$-0!y7OSc240V1SdiT?$^=Z`4HF$dnDxe-FTx1b;RB# zI(m8bL1lUjDxpuzJ_}W=GkJOi~rDbx;LhI%(P!%$cS!{Je=>vtMz-q)}RybhJn4XF7II{B4r4CRl6nimB% z9tZE_{d4W?a%z6(9j>!4#-mEL7?Z{Q?ZM_tHI9KZ(evmH^j9<<=@tw`_3amQR7F+n_hmWFqPz#_WuPsH zpVh!0d-n{gZ*%EnqhzEvOKP0 zwHHxDpvT`v@DO?r>1XIOq^4JU6w+OK6scW6Q&3-2f$l(+Xe=6mK1WZXKOwcvKHM63 zzsmF_x`aMK9ncY!gziPhkecqs3+Q3g2dPa%^8-Ep2!tW%3zUP>&|&m8>WuC~^{uMD z1HCK!w+sz6=OXwA)CGNowj;G7l!scQIj9V&o%i8}!zlDAT4=sD@M-G{acDH^hxQ_dA%6x|!V@9z^ZXdh{1m zqVr!urzfg!ldThPEH}OaKeT>2{0OZ=XHh4#6)i?;PoQmRH+mEO3aN#nzoCmVXlJyL z+Pi26`mGGwar79con<>(Z7j=;9Z_~LHmUMfYofk0v0HY mpHomYYg+t~ZF;_}I^}<5S2|Xg9Zt(eQ\n" "Language-Team: LANGUAGE \n" @@ -16,21 +16,21 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" -#: models/ae.py:46 models/core.py:200 models/crfpa.py:108 models/crfpa.py:146 +#: models/ae.py:46 models/core.py:202 models/crfpa.py:108 models/crfpa.py:146 #: models/pro.py:142 models/pro.py:186 models/pro.py:201 msgid "user" msgstr "utilisateur" -#: models/ae.py:47 models/core.py:135 models/core.py:348 models/core.py:408 -#: models/core.py:456 models/crfpa.py:64 models/crfpa.py:109 +#: models/ae.py:47 models/core.py:137 models/core.py:350 models/core.py:410 +#: models/core.py:458 models/crfpa.py:64 models/crfpa.py:109 msgid "period" msgstr "période" -#: models/ae.py:49 models/crfpa.py:114 models/pro.py:209 +#: models/ae.py:49 models/crfpa.py:114 models/pro.py:210 msgid "platform only" msgstr "plateforme seulement" -#: models/ae.py:51 models/core.py:186 models/core.py:202 +#: models/ae.py:51 models/core.py:188 models/core.py:204 msgid "courses" msgstr "matières" @@ -54,202 +54,210 @@ msgstr "Brouillon" msgid "Public" msgstr "Publié" -#: models/core.py:92 models/core.py:104 models/core.py:127 models/core.py:139 -#: models/core.py:184 models/core.py:221 models/core.py:325 models/crfpa.py:47 +#: models/core.py:85 +msgid "Mr." +msgstr "" + +#: models/core.py:85 +msgid "Mrs." +msgstr "" + +#: models/core.py:94 models/core.py:106 models/core.py:129 models/core.py:141 +#: models/core.py:186 models/core.py:223 models/core.py:327 models/crfpa.py:47 #: models/crfpa.py:63 models/pro.py:49 msgid "name" msgstr "nom" -#: models/core.py:93 models/core.py:105 models/core.py:128 models/core.py:140 -#: models/core.py:155 models/core.py:222 models/core.py:240 models/core.py:306 -#: models/core.py:326 models/crfpa.py:48 models/pro.py:124 models/pro.py:170 +#: models/core.py:95 models/core.py:107 models/core.py:130 models/core.py:142 +#: models/core.py:157 models/core.py:224 models/core.py:242 models/core.py:308 +#: models/core.py:328 models/crfpa.py:48 models/pro.py:124 models/pro.py:170 msgid "description" msgstr "description" -#: models/core.py:100 models/core.py:107 models/core.py:220 models/pro.py:169 +#: models/core.py:102 models/core.py:109 models/core.py:222 models/pro.py:169 msgid "organization" msgstr "organisation" -#: models/core.py:108 +#: models/core.py:110 msgid "Master domain" msgstr "Domaine maître" -#: models/core.py:109 +#: models/core.py:111 msgid "address" msgstr "adresse" -#: models/core.py:110 +#: models/core.py:112 msgid "Signature image" msgstr "" -#: models/core.py:122 models/core.py:153 models/core.py:454 +#: models/core.py:124 models/core.py:155 models/core.py:456 msgid "department" msgstr "département" -#: models/core.py:147 models/core.py:345 models/core.py:406 models/core.py:459 +#: models/core.py:149 models/core.py:347 models/core.py:408 models/core.py:461 msgid "course type" msgstr "type de matière" -#: models/core.py:154 models/core.py:204 models/core.py:305 models/pro.py:123 +#: models/core.py:156 models/core.py:206 models/core.py:307 models/pro.py:123 msgid "title" msgstr "titre" -#: models/core.py:156 models/core.py:310 models/crfpa.py:62 +#: models/core.py:158 models/core.py:312 models/crfpa.py:62 msgid "code" msgstr "cote" -#: models/core.py:157 models/core.py:309 models/pro.py:97 +#: models/core.py:159 models/core.py:311 models/pro.py:97 msgid "date modified" msgstr "date de modification" -#: models/core.py:158 models/core.py:353 models/core.py:413 models/pro.py:70 +#: models/core.py:160 models/core.py:355 models/core.py:415 models/pro.py:70 #: models/pro.py:126 models/pro.py:191 msgid "rank" msgstr "rang" -#: models/core.py:159 models/crfpa.py:67 +#: models/core.py:161 models/crfpa.py:67 msgid "synthesis note" msgstr "note de synthèse" -#: models/core.py:160 models/crfpa.py:70 +#: models/core.py:162 models/crfpa.py:70 msgid "obligations" msgstr "obligations" -#: models/core.py:161 models/crfpa.py:91 models/pro.py:71 +#: models/core.py:163 models/crfpa.py:91 models/pro.py:71 msgid "magistral" msgstr "magistral" -#: models/core.py:163 +#: models/core.py:165 msgid "types" msgstr "types" -#: models/core.py:177 models/core.py:342 models/core.py:404 models/core.py:458 +#: models/core.py:179 models/core.py:344 models/core.py:406 models/core.py:460 #: models/pro.py:65 templates/teleforma/inc/seminar_description.html:9 msgid "course" msgstr "matière" -#: models/core.py:194 +#: models/core.py:196 msgid "domain" msgstr "domaine" -#: models/core.py:215 models/core.py:460 models/pro.py:75 +#: models/core.py:217 models/core.py:462 models/pro.py:75 msgid "professor" msgstr "intervenant" -#: models/core.py:229 models/core.py:464 +#: models/core.py:231 models/core.py:466 msgid "room" msgstr "salle" -#: models/core.py:237 +#: models/core.py:239 msgid "host" msgstr "hôte" -#: models/core.py:238 +#: models/core.py:240 msgid "port" msgstr "port" -#: models/core.py:239 models/core.py:350 models/core.py:412 models/pro.py:63 +#: models/core.py:241 models/core.py:352 models/core.py:414 models/pro.py:63 msgid "type" msgstr "type" -#: models/core.py:241 +#: models/core.py:243 msgid "source password" msgstr "" -#: models/core.py:242 +#: models/core.py:244 msgid "admin password" msgstr "" -#: models/core.py:249 models/core.py:260 +#: models/core.py:251 models/core.py:262 msgid "streaming server" msgstr "serveur de diffusion" -#: models/core.py:257 models/core.py:346 models/core.py:402 models/core.py:549 +#: models/core.py:259 models/core.py:348 models/core.py:404 models/core.py:551 msgid "conference" msgstr "conférence" -#: models/core.py:261 +#: models/core.py:263 msgid "Streaming type" msgstr "Type de flux" -#: models/core.py:263 +#: models/core.py:265 msgid "streaming" msgstr "diffusion" -#: models/core.py:299 +#: models/core.py:301 msgid "live stream" msgstr "stream en direct" -#: models/core.py:307 +#: models/core.py:309 msgid "credits" msgstr "crédits" -#: models/core.py:308 models/pro.py:96 models/pro.py:149 models/pro.py:192 +#: models/core.py:310 models/pro.py:96 models/pro.py:149 models/pro.py:192 msgid "date added" msgstr "date d'ajout" -#: models/core.py:311 +#: models/core.py:313 msgid "published" msgstr "publié" -#: models/core.py:312 +#: models/core.py:314 msgid "mime type" msgstr "Type mime" -#: models/core.py:313 models/pro.py:127 +#: models/core.py:315 models/pro.py:127 msgid "weight" msgstr "poids" -#: models/core.py:327 +#: models/core.py:329 msgid "number" msgstr "nombre" -#: models/core.py:334 +#: models/core.py:336 msgid "document type" msgstr "type de document" -#: models/core.py:352 +#: models/core.py:354 msgid "annal" msgstr "annale" -#: models/core.py:354 models/pro.py:189 +#: models/core.py:356 models/pro.py:189 msgid "file" msgstr "fichier" -#: models/core.py:356 models/core.py:414 models/core.py:470 +#: models/core.py:358 models/core.py:416 models/core.py:472 msgid "readers" msgstr "" -#: models/core.py:452 models/pro.py:66 +#: models/core.py:454 models/pro.py:66 #: templates/teleforma/inc/seminar_description.html:7 msgid "sub title" msgstr "sous-titre" -#: models/core.py:453 +#: models/core.py:455 msgid "public id" msgstr "id public" -#: models/core.py:462 +#: models/core.py:464 msgid "session" msgstr "session" -#: models/core.py:466 +#: models/core.py:468 msgid "comment" msgstr "commentaire" -#: models/core.py:467 +#: models/core.py:469 msgid "begin date" msgstr "date de début" -#: models/core.py:468 +#: models/core.py:470 msgid "end date" msgstr "date de fin" -#: models/core.py:469 models/pro.py:69 +#: models/core.py:471 models/pro.py:69 msgid "price" msgstr "prix" -#: models/core.py:473 models/pro.py:77 +#: models/core.py:475 models/pro.py:77 #, fuzzy msgid "description documents" msgstr "description" @@ -301,39 +309,39 @@ msgstr "iej" msgid "student" msgstr "étudiant" -#: models/crfpa.py:147 models/pro.py:211 +#: models/crfpa.py:147 models/pro.py:213 #: templates/teleforma/seminar_testimonial.html:37 #: templates/telemeta/profile_detail.html:80 msgid "Address" msgstr "Adresse" -#: models/crfpa.py:148 models/pro.py:212 +#: models/crfpa.py:148 models/pro.py:214 msgid "Postal code" msgstr "Code postal" -#: models/crfpa.py:149 models/pro.py:213 +#: models/crfpa.py:149 models/pro.py:215 msgid "City" msgstr "Ville" -#: models/crfpa.py:150 models/pro.py:214 +#: models/crfpa.py:150 models/pro.py:216 msgid "Country" msgstr "Pays" -#: models/crfpa.py:151 models/pro.py:215 +#: models/crfpa.py:151 models/pro.py:217 #: templates/telemeta/profile_detail.html:89 msgid "Language" msgstr "Langue" -#: models/crfpa.py:152 models/pro.py:216 templates/postman/base.html:11 +#: models/crfpa.py:152 models/pro.py:218 templates/postman/base.html:11 #: templates/telemeta/profile_detail.html:81 msgid "Telephone" msgstr "Téléphone" -#: models/crfpa.py:153 models/pro.py:218 +#: models/crfpa.py:153 models/pro.py:220 msgid "Expiration_date" msgstr "Date d'expiration" -#: models/crfpa.py:154 models/pro.py:219 +#: models/crfpa.py:154 models/pro.py:221 msgid "Password initialized" msgstr "Mot de passe initialisé" @@ -362,9 +370,8 @@ msgid "approximative duration" msgstr "durée approximative" #: models/pro.py:80 -#, fuzzy msgid "documents 1" -msgstr "document 1" +msgstr "documents 1" #: models/pro.py:83 msgid "media" @@ -375,14 +382,12 @@ msgid "media_preview" msgstr "" #: models/pro.py:89 -#, fuzzy msgid "documents 2" -msgstr "document 2" +msgstr "documents 2" #: models/pro.py:92 -#, fuzzy msgid "corrected documents" -msgstr "document corrigé" +msgstr "documents corrigés" #: models/pro.py:94 msgid "form" @@ -407,7 +412,7 @@ msgstr "question" msgid "minimum numbers of characters" msgstr "nombre de caractère minimum" -#: models/pro.py:129 models/pro.py:145 +#: models/pro.py:129 models/pro.py:145 models/pro.py:211 msgid "status" msgstr "status" @@ -429,9 +434,8 @@ msgid "date submitted" msgstr "date de soumission" #: models/pro.py:148 -#, fuzzy msgid "date validated" -msgstr "validé" +msgstr "date de validation" #: models/pro.py:162 templates/teleforma/answer_detail.html:28 #: templates/teleforma/answer_form.html:91 @@ -451,7 +455,7 @@ msgid "Testimonial template" msgstr "Modèle d'attestation" #: models/pro.py:196 templates/teleforma/inc/testimonial_list.html:7 -#: templates/teleforma/inc/testimonial_step.html:7 views/pro.py:462 +#: templates/teleforma/inc/testimonial_step.html:7 views/pro.py:480 msgid "Testimonial" msgstr "Attestation" @@ -463,15 +467,19 @@ msgstr "séminaires" msgid "conferences" msgstr "conférences" -#: models/pro.py:210 +#: models/pro.py:209 +msgid "gender" +msgstr "" + +#: models/pro.py:212 msgid "Company" msgstr "" -#: models/pro.py:217 +#: models/pro.py:219 msgid "Fax" msgstr "" -#: models/pro.py:229 +#: models/pro.py:231 msgid "Auditor" msgstr "Auditeur" @@ -577,9 +585,8 @@ msgid "Undelete" msgstr "" #: templates/postman/base_folder.html:81 -#, fuzzy msgid "No messages." -msgstr "Messages" +msgstr "Aucun message." #: templates/postman/base_write.html:16 #: templates/teleforma/inc/chat_room.html:13 @@ -750,7 +757,7 @@ msgstr " rejeter" #: templates/teleforma/answer_form.html:46 #: templates/teleforma/evaluation_form.html:22 -#: templates/teleforma/seminar_media_video.html:56 +#: templates/teleforma/seminar_media_video.html:60 msgid "My steps" msgstr "Mes étapes" @@ -819,7 +826,7 @@ msgstr "validé" #: 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:82 +#: templates/teleforma/seminar_media_video.html:86 #: templates/teleforma/testimonials.html:83 #: templates/teleforma/inc/answer_list.html:41 #: templates/teleforma/inc/media_list.html:52 @@ -846,7 +853,7 @@ msgstr "Supports écrits" #: templates/teleforma/course_conference_audio.html:66 #: templates/teleforma/course_document.html:73 #: templates/teleforma/seminar_media_audio.html:70 -#: templates/teleforma/seminar_media_video.html:116 +#: templates/teleforma/seminar_media_video.html:120 #: templates/teleforma/inc/conference_list.html:25 #: templates/teleforma/inc/media_list.html:36 #: templates/teleforma/inc/media_package_list.html:28 @@ -865,7 +872,7 @@ msgstr "Description" #: templates/teleforma/course.html:52 #: templates/teleforma/course_media.html:142 #: templates/teleforma/seminar_media_audio.html:80 -#: templates/teleforma/seminar_media_video.html:125 +#: templates/teleforma/seminar_media_video.html:129 #: templates/telemeta/profile_detail.html:84 msgid "Date added" msgstr "Date d'ajout" @@ -894,7 +901,7 @@ msgstr "Session" #: templates/teleforma/course_conference_audio.html:67 #: templates/teleforma/course_media.html:133 #: templates/teleforma/seminar_media_audio.html:74 -#: templates/teleforma/seminar_media_video.html:120 +#: templates/teleforma/seminar_media_video.html:124 #: templates/teleforma/inc/conference_list.html:27 #: templates/teleforma/inc/media_list.html:39 #: templates/teleforma/inc/media_package_list.html:31 @@ -909,7 +916,7 @@ msgstr "S T O P" #: templates/teleforma/course_conference.html:37 #: templates/teleforma/course_media.html:73 -#: templates/teleforma/seminar_media_video.html:79 +#: templates/teleforma/seminar_media_video.html:83 msgid "Audio" msgstr "" @@ -985,7 +992,7 @@ msgstr "Enregistrer et diffuser" #: templates/teleforma/course_media.html:79 #: templates/teleforma/seminar_media_audio.html:25 #: templates/teleforma/seminar_media_video.html:21 -#: templates/teleforma/seminar_media_video.html:82 +#: templates/teleforma/seminar_media_video.html:86 #: templates/teleforma/inc/media_list.html:50 #: templates/teleforma/inc/media_package_list.html:44 msgid " published" @@ -993,7 +1000,7 @@ msgstr " publié" #: templates/teleforma/course_media.html:62 #: templates/teleforma/seminar_media_audio.html:10 -#: templates/teleforma/seminar_media_video.html:67 +#: templates/teleforma/seminar_media_video.html:71 #: templates/teleforma/testimonials.html:66 #: templates/teleforma/inc/document_list.html:22 #: templates/teleforma/inc/document_simple_list.html:9 @@ -1009,13 +1016,13 @@ msgstr "Type mime" #: templates/teleforma/course_media.html:143 #: templates/teleforma/seminar_media_audio.html:81 -#: templates/teleforma/seminar_media_video.html:126 +#: templates/teleforma/seminar_media_video.html:130 msgid "Date modified" msgstr "Date de modification" #: templates/teleforma/course_media.html:144 #: templates/teleforma/seminar_media_audio.html:82 -#: templates/teleforma/seminar_media_video.html:127 +#: templates/teleforma/seminar_media_video.html:131 msgid "Media ID" msgstr "ID Média" @@ -1088,7 +1095,7 @@ msgid "Plan" msgstr "Plan" #: templates/teleforma/seminar_media_audio.html:74 -#: templates/teleforma/seminar_media_video.html:120 +#: templates/teleforma/seminar_media_video.html:124 #: templates/teleforma/inc/media_package_list.html:31 msgid "Professors" msgstr "Professeurs" @@ -1097,7 +1104,7 @@ msgstr "Professeurs" msgid "Audio index" msgstr "Index audio" -#: templates/teleforma/seminar_media_video.html:143 +#: templates/teleforma/seminar_media_video.html:147 msgid "Video index" msgstr "Index vidéo" @@ -1496,18 +1503,18 @@ msgstr "moi" msgid "No" msgstr "Non" -#: views/core.py:93 +#: views/core.py:95 msgid "Access not allowed." msgstr "Accès non autorisé." -#: views/core.py:94 +#: views/core.py:96 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/pro.py:115 +#: views/pro.py:116 msgid "" "You have successfully terminated your e-learning seminar. A training " "testimonial will be available as soon as the pedagogical team validate all " @@ -1517,7 +1524,7 @@ msgstr "" "formation vous sera délivrée dès que vos réponses aux consultations fictives " "auront été validées par notre équipe pédagogique (48h maximum)." -#: views/pro.py:117 +#: views/pro.py:118 msgid "" "All your answers have been validated! You can now download the training " "testimonial below." @@ -1525,16 +1532,21 @@ msgstr "" "Toutes vos consultations fictives ont été validées ! Vous pouvez désormais " "télécharger l'attestion de formation ci-dessous." -#: views/pro.py:159 +#: views/pro.py:160 msgid "You have successfully saved your answer" msgstr "Vous avez enregistré votre consultation avec succès" -#: views/pro.py:161 +#: views/pro.py:162 msgid "You have successfully submitted your answer" msgstr "Vous avez soumis votre consultation avec succès" -#: views/pro.py:335 -msgid "You have successfully sumitted your evaluation" +#: views/pro.py:258 +msgid "Your answer has been validated" +msgstr "Votre consultation a été validée" + +#: views/pro.py:353 +#, fuzzy +msgid "You have successfully submitted your evaluation" msgstr "Vous avez soumis votre évaluation avec succès" #~ msgid "Index" diff --git a/teleforma/migrations/0102_auto__add_field_auditor_gender__add_field_auditor_status.py b/teleforma/migrations/0102_auto__add_field_auditor_gender__add_field_auditor_status.py new file mode 100644 index 00000000..92add742 --- /dev/null +++ b/teleforma/migrations/0102_auto__add_field_auditor_gender__add_field_auditor_status.py @@ -0,0 +1,651 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'Auditor.gender' + db.add_column('teleforma_auditor', 'gender', + self.gf('django.db.models.fields.CharField')(default='', max_length=8, blank=True), + keep_default=False) + + # Adding field 'Auditor.status' + db.add_column('teleforma_auditor', 'status', + self.gf('django.db.models.fields.IntegerField')(default=2), + keep_default=False) + + def backwards(self, orm): + # Deleting field 'Auditor.gender' + db.delete_column('teleforma_auditor', 'gender') + + # Deleting field 'Auditor.status' + db.delete_column('teleforma_auditor', 'status') + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'forms.form': { + 'Meta': {'object_name': 'Form'}, + 'button_text': ('django.db.models.fields.CharField', [], {'default': "u'Submit'", 'max_length': '50'}), + 'email_copies': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}), + 'email_from': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'email_message': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'email_subject': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}), + 'expiry_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'intro': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'login_required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'publish_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'response': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'send_email': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'sites': ('django.db.models.fields.related.ManyToManyField', [], {'default': '[1]', 'to': "orm['sites.Site']", 'symmetrical': 'False'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '100'}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '2'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'generic.assignedkeyword': { + 'Meta': {'ordering': "('_order',)", 'object_name': 'AssignedKeyword'}, + '_order': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'keyword': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'assignments'", 'to': "orm['generic.Keyword']"}), + 'object_pk': ('django.db.models.fields.IntegerField', [], {}) + }, + 'generic.keyword': { + 'Meta': {'object_name': 'Keyword'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'site': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sites.Site']"}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '2000', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'notes.note': { + 'Meta': {'object_name': 'Note'}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'content': ('django.db.models.fields.TextField', [], {}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'date': ('django.db.models.fields.DateField', [], {'default': 'datetime.datetime(2013, 1, 16, 0, 0)'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'markup': ('django.db.models.fields.CharField', [], {'default': "'m'", 'max_length': '1'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'public': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'rendered_content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'topic': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['notes.Topic']"}) + }, + 'notes.topic': { + 'Meta': {'object_name': 'Topic'}, + 'created': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'blank': 'True'}), + 'slug': ('django_extensions.db.fields.AutoSlugField', [], {'allow_duplicates': 'False', 'max_length': '50', 'separator': "u'-'", 'blank': 'True', 'populate_from': "'title'", 'overwrite': 'False'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + 'sites.site': { + 'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"}, + 'domain': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'teleforma.aestudent': { + 'Meta': {'ordering': "['user__last_name']", 'object_name': 'AEStudent', 'db_table': "'teleforma_ae_student'"}, + 'courses': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'ae_student'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.Course']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'period': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'ae_student'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.Period']"}), + 'platform_only': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'user': ('telemeta.models.core.ForeignKey', [], {'related_name': "'ae_student'", 'unique': 'True', 'to': "orm['auth.User']"}) + }, + 'teleforma.answer': { + 'Meta': {'ordering': "['-date_submitted']", 'object_name': 'Answer'}, + 'answer': ('django.db.models.fields.TextField', [], {}), + 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), + 'date_submitted': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'date_validated': ('django.db.models.fields.DateTimeField', [], {'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'question': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'answer'", 'to': "orm['teleforma.Question']"}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '2'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'answer'", 'to': "orm['auth.User']"}), + 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'teleforma.auditor': { + 'Meta': {'ordering': "['user__last_name']", 'object_name': 'Auditor'}, + 'address': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'city': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'company': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'conferences': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'auditor'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.Conference']"}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'expiration_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'fax': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'gender': ('django.db.models.fields.CharField', [], {'max_length': '8', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'init_password': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'language': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'platform_only': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'seminars': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'auditor'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.Seminar']"}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '2'}), + 'telephone': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'auditor'", 'unique': 'True', 'to': "orm['auth.User']"}) + }, + 'teleforma.conference': { + 'Meta': {'ordering': "['-date_begin']", 'object_name': 'Conference'}, + '_meta_title': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'comment': ('teleforma.fields.ShortTextField', [], {'max_length': '255', 'blank': 'True'}), + 'course': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'conference'", 'to': "orm['teleforma.Course']"}), + 'course_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'conference'", 'to': "orm['teleforma.CourseType']"}), + 'date_begin': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'date_end': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'department': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'conference'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['teleforma.Department']"}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'docs_description': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'conference_docs_description'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.Document']"}), + 'expiry_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'gen_description': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'keywords': ('mezzanine.generic.fields.KeywordsField', [], {'object_id_field': "'object_pk'", 'to': "orm['generic.AssignedKeyword']", 'frozen_by_south': 'True'}), + 'keywords_string': ('django.db.models.fields.CharField', [], {'max_length': '500', 'blank': 'True'}), + 'period': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'conference'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['teleforma.Period']"}), + 'price': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'professor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'conference'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['teleforma.Professor']"}), + 'public_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'publish_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'readers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'conference'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'room': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'conference'", 'null': 'True', 'to': "orm['teleforma.Room']"}), + 'session': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '16'}), + 'short_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'site': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sites.Site']"}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '2000', 'null': 'True', 'blank': 'True'}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '2'}), + 'sub_title': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '500'}) + }, + 'teleforma.course': { + 'Meta': {'ordering': "['number']", 'object_name': 'Course'}, + 'code': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'date_modified': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'department': ('telemeta.models.core.ForeignKey', [], {'related_name': "'course'", 'to': "orm['teleforma.Department']"}), + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'magistral': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'number': ('telemeta.models.core.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'obligation': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'synthesis_note': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'types': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'course'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.CourseType']"}) + }, + 'teleforma.coursedomain': { + 'Meta': {'object_name': 'CourseDomain', 'db_table': "'teleforma_domain'"}, + 'courses': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'domain'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.Course']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}) + }, + 'teleforma.coursetype': { + 'Meta': {'object_name': 'CourseType', 'db_table': "'teleforma_course_type'"}, + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}) + }, + 'teleforma.department': { + 'Meta': {'object_name': 'Department'}, + 'address': ('tinymce.models.HTMLField', [], {'blank': 'True'}), + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'domain': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'organization': ('telemeta.models.core.ForeignKey', [], {'related_name': "'department'", 'to': "orm['teleforma.Organization']"}), + 'signature': ('django.db.models.fields.files.ImageField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}) + }, + 'teleforma.document': { + 'Meta': {'ordering': "['rank']", 'object_name': 'Document'}, + 'code': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'conference': ('telemeta.models.core.ForeignKey', [], {'related_name': "'document'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['teleforma.Conference']", 'blank': 'True', 'null': 'True'}), + 'course': ('telemeta.models.core.ForeignKey', [], {'related_name': "'document'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['teleforma.Course']", 'blank': 'True', 'null': 'True'}), + 'course_type': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'document'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.CourseType']"}), + 'credits': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'date_added': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), + 'date_modified': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'file': ('telemeta.models.core.FileField', [], {'default': "''", 'max_length': '1024', 'db_column': "'filename'", 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_annal': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'is_published': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'mime_type': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'period': ('telemeta.models.core.ForeignKey', [], {'related_name': "'document'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['teleforma.Period']", 'blank': 'True', 'null': 'True'}), + 'rank': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'readers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'document'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}), + 'type': ('telemeta.models.core.ForeignKey', [], {'default': 'None', 'related_name': "'document'", 'null': 'True', 'blank': 'True', 'to': "orm['teleforma.DocumentType']"}), + 'weight': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}) + }, + 'teleforma.documenttype': { + 'Meta': {'ordering': "['number']", 'object_name': 'DocumentType', 'db_table': "'teleforma_document_type'"}, + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'number': ('telemeta.models.core.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}) + }, + 'teleforma.iej': { + 'Meta': {'ordering': "['name']", 'object_name': 'IEJ'}, + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}) + }, + 'teleforma.livestream': { + 'Meta': {'object_name': 'LiveStream', 'db_table': "'teleforma_live_stream'"}, + 'conference': ('telemeta.models.core.ForeignKey', [], {'related_name': "'livestream'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['teleforma.Conference']", 'blank': 'True', 'null': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'server': ('telemeta.models.core.ForeignKey', [], {'related_name': "'livestream'", 'to': "orm['teleforma.StreamingServer']"}), + 'stream_type': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'}), + 'streaming': ('telemeta.models.core.BooleanField', [], {'default': 'False'}) + }, + 'teleforma.media': { + 'Meta': {'ordering': "['-date_modified']", 'object_name': 'Media'}, + 'code': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'conference': ('telemeta.models.core.ForeignKey', [], {'related_name': "'media'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['teleforma.Conference']", 'blank': 'True', 'null': 'True'}), + 'course': ('telemeta.models.core.ForeignKey', [], {'default': 'None', 'related_name': "'media'", 'null': 'True', 'blank': 'True', 'to': "orm['teleforma.Course']"}), + 'course_type': ('telemeta.models.core.ForeignKey', [], {'default': 'None', 'related_name': "'media'", 'null': 'True', 'blank': 'True', 'to': "orm['teleforma.CourseType']"}), + 'credits': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'date_added': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), + 'date_modified': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_published': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'item': ('telemeta.models.core.ForeignKey', [], {'default': 'None', 'related_name': "'media'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.MediaItem']"}), + 'mime_type': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'period': ('telemeta.models.core.ForeignKey', [], {'related_name': "'media'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['teleforma.Period']", 'blank': 'True', 'null': 'True'}), + 'rank': ('telemeta.models.core.IntegerField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'readers': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'media'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '1024', 'blank': 'True'}), + 'type': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'}), + 'weight': ('django.db.models.fields.IntegerField', [], {'default': '1', 'blank': 'True'}) + }, + 'teleforma.organization': { + 'Meta': {'object_name': 'Organization'}, + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}) + }, + 'teleforma.period': { + 'Meta': {'object_name': 'Period'}, + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}) + }, + 'teleforma.professor': { + 'Meta': {'object_name': 'Professor'}, + 'courses': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'professor'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.Course']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'user': ('telemeta.models.core.ForeignKey', [], {'related_name': "'professor'", 'unique': 'True', 'to': "orm['auth.User']"}) + }, + 'teleforma.profile': { + 'Meta': {'object_name': 'Profile', 'db_table': "'teleforma_profiles'"}, + 'address': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'city': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'country': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'expiration_date': ('telemeta.models.core.DateField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'init_password': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'language': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'postal_code': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'telephone': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'user': ('telemeta.models.core.ForeignKey', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"}) + }, + 'teleforma.question': { + 'Meta': {'ordering': "['rank']", 'object_name': 'Question'}, + 'description': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'min_nchar': ('django.db.models.fields.IntegerField', [], {}), + 'question': ('tinymce.models.HTMLField', [], {'blank': 'True'}), + 'rank': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'seminar': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'question'", 'to': "orm['teleforma.Seminar']"}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '3'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'weight': ('django.db.models.fields.IntegerField', [], {'default': '1'}) + }, + 'teleforma.room': { + 'Meta': {'object_name': 'Room'}, + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'organization': ('telemeta.models.core.ForeignKey', [], {'related_name': "'room'", 'to': "orm['teleforma.Organization']"}) + }, + 'teleforma.seminar': { + 'Meta': {'ordering': "['rank']", 'object_name': 'Seminar'}, + '_meta_title': ('django.db.models.fields.CharField', [], {'max_length': '500', 'null': 'True', 'blank': 'True'}), + 'concerned': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}), + 'course': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'seminar'", 'to': "orm['teleforma.Course']"}), + 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'docs_1': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'seminar_docs_1'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.Document']"}), + 'docs_2': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'seminar_docs_2'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.Document']"}), + 'docs_correct': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'seminar_docs_correct'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.Document']"}), + 'docs_description': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'seminar_docs_description'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.Document']"}), + 'duration': ('telemeta.models.core.DurationField', [], {'default': "'0'", 'blank': 'True'}), + 'expiry_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'form': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'seminar'", 'null': 'True', 'to': "orm['forms.Form']"}), + 'gen_description': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'index': ('tinymce.models.HTMLField', [], {'blank': 'True'}), + 'keywords': ('mezzanine.generic.fields.KeywordsField', [], {'object_id_field': "'object_pk'", 'to': "orm['generic.AssignedKeyword']", 'frozen_by_south': 'True'}), + 'keywords_string': ('django.db.models.fields.CharField', [], {'max_length': '500', 'blank': 'True'}), + 'level': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'magistral': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'media_previews': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'seminar_media_previews'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.Media']"}), + 'medias': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'seminar'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.Media']"}), + 'price': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'professor': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'seminar'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.Professor']"}), + 'publish_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'rank': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'short_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'site': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['sites.Site']"}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '2000', 'null': 'True', 'blank': 'True'}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '2'}), + 'sub_title': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '500'}), + 'type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'seminar'", 'null': 'True', 'to': "orm['teleforma.SeminarType']"}) + }, + 'teleforma.seminartype': { + 'Meta': {'object_name': 'SeminarType', 'db_table': "'teleforma_seminar_type'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}) + }, + 'teleforma.streamingserver': { + 'Meta': {'object_name': 'StreamingServer', 'db_table': "'teleforma_streaming_server'"}, + 'admin_password': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'}), + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'host': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'port': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'}), + 'source_password': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'}), + 'type': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '32', 'blank': 'True'}) + }, + 'teleforma.student': { + 'Meta': {'ordering': "['user__last_name']", 'object_name': 'Student'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'iej': ('telemeta.models.core.ForeignKey', [], {'related_name': "'student'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['teleforma.IEJ']", 'blank': 'True', 'null': 'True'}), + 'options': ('telemeta.models.core.ForeignKey', [], {'default': 'None', 'related_name': "'options'", 'null': 'True', 'blank': 'True', 'to': "orm['teleforma.Course']"}), + 'oral_1': ('telemeta.models.core.ForeignKey', [], {'default': 'None', 'related_name': "'oral_1'", 'null': 'True', 'blank': 'True', 'to': "orm['teleforma.Course']"}), + 'oral_2': ('telemeta.models.core.ForeignKey', [], {'default': 'None', 'related_name': "'oral_2'", 'null': 'True', 'blank': 'True', 'to': "orm['teleforma.Course']"}), + 'oral_speciality': ('telemeta.models.core.ForeignKey', [], {'default': 'None', 'related_name': "'oral_speciality'", 'null': 'True', 'blank': 'True', 'to': "orm['teleforma.Course']"}), + 'period': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'student'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.Period']"}), + 'platform_only': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'procedure': ('telemeta.models.core.ForeignKey', [], {'default': 'None', 'related_name': "'procedure'", 'null': 'True', 'blank': 'True', 'to': "orm['teleforma.Course']"}), + 'training': ('telemeta.models.core.ForeignKey', [], {'related_name': "'student'", 'to': "orm['teleforma.Training']"}), + 'user': ('telemeta.models.core.ForeignKey', [], {'related_name': "'student'", 'unique': 'True', 'to': "orm['auth.User']"}), + 'written_speciality': ('telemeta.models.core.ForeignKey', [], {'default': 'None', 'related_name': "'written_speciality'", 'null': 'True', 'blank': 'True', 'to': "orm['teleforma.Course']"}) + }, + 'teleforma.testimonial': { + 'Meta': {'object_name': 'Testimonial'}, + 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'rank': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'seminar': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'testimonial'", 'to': "orm['teleforma.Seminar']"}), + 'template': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'testimonial'", 'null': 'True', 'to': "orm['teleforma.TestimonialTemplate']"}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'testimonial'", 'to': "orm['auth.User']"}) + }, + 'teleforma.testimonialtemplate': { + 'Meta': {'object_name': 'TestimonialTemplate', 'db_table': "'teleforma_testimonial_template'"}, + 'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'document': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'testimonial_template'", 'to': "orm['teleforma.Document']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'organization': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'testimonial_template'", 'to': "orm['teleforma.Organization']"}) + }, + 'teleforma.training': { + 'Meta': {'object_name': 'Training'}, + 'code': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'cost': ('telemeta.models.core.FloatField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'magistral': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'training_magistral'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.CourseType']"}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'obligation': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'training_obligation'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.CourseType']"}), + 'options': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'training_options'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.CourseType']"}), + 'oral_1': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'training_oral_1'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.CourseType']"}), + 'oral_2': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'training_oral_2'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.CourseType']"}), + 'oral_speciality': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'training_oral_speciality'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.CourseType']"}), + 'period': ('telemeta.models.core.ForeignKey', [], {'default': 'None', 'related_name': "'training'", 'null': 'True', 'blank': 'True', 'to': "orm['teleforma.Period']"}), + 'procedure': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'training_procedure'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.CourseType']"}), + 'synthesis_note': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'training_synthesis_note'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.CourseType']"}), + 'written_speciality': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'training_written_speciality'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['teleforma.CourseType']"}) + }, + 'telemeta.acquisitionmode': { + 'Meta': {'ordering': "['value']", 'object_name': 'AcquisitionMode', 'db_table': "'acquisition_modes'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.adconversion': { + 'Meta': {'ordering': "['value']", 'object_name': 'AdConversion', 'db_table': "'ad_conversions'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.ethnicgroup': { + 'Meta': {'ordering': "['value']", 'object_name': 'EthnicGroup', 'db_table': "'ethnic_groups'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.genericstyle': { + 'Meta': {'ordering': "['value']", 'object_name': 'GenericStyle', 'db_table': "'generic_styles'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.language': { + 'Meta': {'ordering': "['name']", 'object_name': 'Language', 'db_table': "'languages'"}, + 'comment': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'identifier': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '3', 'blank': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'part1': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '1', 'blank': 'True'}), + 'part2B': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '3', 'blank': 'True'}), + 'part2T': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '3', 'blank': 'True'}), + 'scope': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '1', 'blank': 'True'}), + 'type': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '1', 'blank': 'True'}) + }, + 'telemeta.legalright': { + 'Meta': {'ordering': "['value']", 'object_name': 'LegalRight', 'db_table': "'legal_rights'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.location': { + 'Meta': {'ordering': "['name']", 'object_name': 'Location', 'db_table': "'locations'"}, + 'complete_type': ('telemeta.models.core.ForeignKey', [], {'related_name': "'locations'", 'to': "orm['telemeta.LocationType']"}), + 'current_location': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'past_names'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.Location']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_authoritative': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'latitude': ('telemeta.models.core.FloatField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'longitude': ('telemeta.models.core.FloatField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '150'}), + 'type': ('telemeta.models.core.IntegerField', [], {'default': '0', 'db_index': 'True', 'blank': 'True'}) + }, + 'telemeta.locationtype': { + 'Meta': {'ordering': "['name']", 'object_name': 'LocationType', 'db_table': "'location_types'"}, + 'code': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '64'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'max_length': '150'}) + }, + 'telemeta.mediacollection': { + 'Meta': {'ordering': "['code']", 'object_name': 'MediaCollection', 'db_table': "'media_collections'"}, + 'a_informer_07_03': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'acquisition_mode': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.AcquisitionMode']"}), + 'ad_conversion': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.AdConversion']"}), + 'alt_ids': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'alt_title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'0'", 'blank': 'True'}), + 'booklet_author': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'booklet_description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'cnrs_contributor': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'code': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}), + 'collector': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'collector_is_creator': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'comment': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'conservation_site': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'creator': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'doctype_code': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}), + 'external_references': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_published': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'items_done': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'legal_rights': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.LegalRight']"}), + 'metadata_author': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.MetadataAuthor']"}), + 'metadata_writer': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.MetadataWriter']"}), + 'old_code': ('telemeta.models.core.CharField', [], {'default': 'None', 'max_length': '250', 'null': 'True', 'blank': 'True'}), + 'physical_format': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.PhysicalFormat']"}), + 'physical_items_num': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}), + 'public_access': ('telemeta.models.core.CharField', [], {'default': "'metadata'", 'max_length': '16', 'blank': 'True'}), + 'publisher': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.Publisher']"}), + 'publisher_collection': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.PublisherCollection']"}), + 'publisher_serial': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'publishing_status': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.PublishingStatus']"}), + 'recorded_from_year': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}), + 'recorded_to_year': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}), + 'recording_context': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.RecordingContext']"}), + 'reference': ('telemeta.models.core.CharField', [], {'default': 'None', 'max_length': '250', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'state': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'title': ('telemeta.models.core.CharField', [], {'max_length': '250'}), + 'travail': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'year_published': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}) + }, + 'telemeta.mediaitem': { + 'Meta': {'object_name': 'MediaItem', 'db_table': "'media_items'"}, + 'alt_title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'0'", 'blank': 'True'}), + 'author': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'code': ('telemeta.models.core.CharField', [], {'default': "''", 'unique': 'True', 'max_length': '250', 'blank': 'True'}), + 'collection': ('telemeta.models.core.ForeignKey', [], {'related_name': "'items'", 'to': "orm['telemeta.MediaCollection']"}), + 'collector': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'collector_from_collection': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'collector_selection': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'comment': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'context_comment': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'contributor': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'copied_from_item': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'copies'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.MediaItem']"}), + 'creator_reference': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'cultural_area': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'depositor': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'digitalist': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'digitization_date': ('telemeta.models.core.DateField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'ethnic_group': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'items'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.EthnicGroup']"}), + 'external_references': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'file': ('telemeta.models.core.FileField', [], {'default': "''", 'max_length': '1024', 'db_column': "'filename'", 'blank': 'True'}), + 'generic_style': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'items'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.GenericStyle']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'language': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'language_iso': ('telemeta.models.core.ForeignKey', [], {'related_name': "'items'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['telemeta.Language']", 'blank': 'True', 'null': 'True'}), + 'location': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'to': "orm['telemeta.Location']", 'null': 'True', 'blank': 'True'}), + 'location_comment': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'mimetype': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'moda_execut': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'old_code': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'organization': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'to': "orm['telemeta.Organization']", 'null': 'True', 'blank': 'True'}), + 'public_access': ('telemeta.models.core.CharField', [], {'default': "'metadata'", 'max_length': '16', 'blank': 'True'}), + 'publishing_date': ('telemeta.models.core.DateField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'recorded_from_date': ('telemeta.models.core.DateField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'recorded_to_date': ('telemeta.models.core.DateField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'recordist': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'rights': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'to': "orm['telemeta.Rights']", 'null': 'True', 'blank': 'True'}), + 'scientist': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'summary': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'topic': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'to': "orm['telemeta.Topic']", 'null': 'True', 'blank': 'True'}), + 'track': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'vernacular_style': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'items'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.VernacularStyle']"}) + }, + 'telemeta.metadataauthor': { + 'Meta': {'ordering': "['value']", 'object_name': 'MetadataAuthor', 'db_table': "'metadata_authors'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.metadatawriter': { + 'Meta': {'ordering': "['value']", 'object_name': 'MetadataWriter', 'db_table': "'metadata_writers'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.organization': { + 'Meta': {'ordering': "['value']", 'object_name': 'Organization', 'db_table': "'organization'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.physicalformat': { + 'Meta': {'ordering': "['value']", 'object_name': 'PhysicalFormat', 'db_table': "'physical_formats'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.publisher': { + 'Meta': {'ordering': "['value']", 'object_name': 'Publisher', 'db_table': "'publishers'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.publishercollection': { + 'Meta': {'ordering': "['value']", 'object_name': 'PublisherCollection', 'db_table': "'publisher_collections'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'publisher': ('telemeta.models.core.ForeignKey', [], {'related_name': "'publisher_collections'", 'to': "orm['telemeta.Publisher']"}), + 'value': ('telemeta.models.core.CharField', [], {'max_length': '250'}) + }, + 'telemeta.publishingstatus': { + 'Meta': {'ordering': "['value']", 'object_name': 'PublishingStatus', 'db_table': "'publishing_status'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.recordingcontext': { + 'Meta': {'ordering': "['value']", 'object_name': 'RecordingContext', 'db_table': "'recording_contexts'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.rights': { + 'Meta': {'ordering': "['value']", 'object_name': 'Rights', 'db_table': "'rights'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.topic': { + 'Meta': {'ordering': "['value']", 'object_name': 'Topic', 'db_table': "'topic'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.vernacularstyle': { + 'Meta': {'ordering': "['value']", 'object_name': 'VernacularStyle', 'db_table': "'vernacular_styles'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + } + } + + complete_apps = ['teleforma'] \ No newline at end of file diff --git a/teleforma/models/core.py b/teleforma/models/core.py index 01a3bf54..8ce0dce6 100755 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -82,6 +82,8 @@ STATUS_CHOICES = ( WEIGHT_CHOICES = get_nint_choices(6) +GENDER_CHOICES = (('Mr', _('Mr.')), ('Mrs', _('Mrs.'))) + class MetaCore: app_label = app_label diff --git a/teleforma/models/pro.py b/teleforma/models/pro.py index b421a645..99443723 100755 --- a/teleforma/models/pro.py +++ b/teleforma/models/pro.py @@ -206,7 +206,9 @@ class Auditor(models.Model): verbose_name=_('conferences'), blank=True, null=True) + gender = models.CharField(_('gender'), choices=GENDER_CHOICES, max_length=8, blank=True) platform_only = models.BooleanField(_('platform only')) + status = models.IntegerField(_('status'), choices=STATUS_CHOICES, default=2) company = models.CharField(_('Company'), max_length=255, blank=True) address = models.TextField(_('Address'), blank=True) postal_code = models.CharField(_('Postal code'), max_length=255, blank=True) diff --git a/teleforma/templates/postman/seminar_validated.txt b/teleforma/templates/postman/seminar_validated.txt deleted file mode 100644 index 438f54b2..00000000 --- a/teleforma/templates/postman/seminar_validated.txt +++ /dev/null @@ -1,6 +0,0 @@ -{% load i18n %}{% load telemeta_utils %}{% load teleforma_tags %} -{% trans 'Congratulations!' %} - -{% trans 'You can continue to the next step of your seminar following this link' %}: - -http://{{ site.name }}{{ seminar_url }} diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html index fb23c2ff..17997c8d 100644 --- a/teleforma/templates/telemeta/base.html +++ b/teleforma/templates/telemeta/base.html @@ -20,7 +20,7 @@ -{%block head_title %}{% description %} - TeleForma{% endblock %} +{%block head_title %}{% description %}{% endblock %} {% block stylesheets %} diff --git a/teleforma/views/core.py b/teleforma/views/core.py index 1485eb9a..6cb1a965 100644 --- a/teleforma/views/core.py +++ b/teleforma/views/core.py @@ -145,7 +145,7 @@ def get_course_access(obj, courses): access = True return access -def get_seminar_access(doc, user_seminars): +def get_seminar_doc_access(doc, user_seminars): access = False doc_seminars = [doc.seminar_docs_1.all(), doc.seminar_docs_2.all(), doc.seminar_docs_correct.all()] for seminars in doc_seminars: @@ -154,6 +154,14 @@ def get_seminar_access(doc, user_seminars): access = True return access +def get_seminar_media_access(media, user_seminars): + access = False + seminars = media.seminar.all() + for seminar in seminars: + if seminar in user_seminars: + access = True + return access + def get_host(request): host = request.META['HTTP_HOST'] if ':' in host: @@ -332,7 +340,7 @@ class DocumentView(DetailView): else: context['room'] = get_room(name=document.title, content_type=content_type, id=document.id) - access = get_course_access(document, all_courses) or get_seminar_access(document, seminars) + access = get_course_access(document, all_courses) or get_seminar_doc_access(document, seminars) if not access: context['access_error'] = access_error context['message'] = contact_message @@ -347,7 +355,7 @@ class DocumentView(DetailView): document = Document.objects.get(id=pk) courses = get_courses(request.user) seminars = all_seminars(request)['all_seminars'] - if get_course_access(document, courses) or get_seminar_access(document, seminars): + if get_course_access(document, courses) or get_seminar_doc_access(document, seminars): document.readers.add(request.user) fsock = open(document.file.path, 'r') mimetype = mimetypes.guess_type(document.file.path)[0] @@ -363,7 +371,7 @@ class DocumentView(DetailView): courses = get_courses(request.user) seminars = all_seminars(request)['all_seminars'] document = Document.objects.get(id=pk) - if get_course_access(document, courses) or get_seminar_access(document, seminars): + if get_course_access(document, courses) or get_seminar_doc_access(document, seminars): document.readers.add(request.user) fsock = open(document.file.path, 'r') mimetype = mimetypes.guess_type(document.file.path)[0] diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index 388650dc..558f30a8 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -198,8 +198,14 @@ class SeminarMediaView(MediaView): context['seminar_progress'] = seminar_progress(user, seminar) return context + def get_object(self, queryset=None): + return Media.objects.get(id=self.pk) + @method_decorator(login_required) def dispatch(self, *args, **kwargs): + self.pk = kwargs.get('pk') + media = self.get_object() + if not get_seminar_media_access() return super(SeminarMediaView, self).dispatch(*args, **kwargs) @@ -247,7 +253,7 @@ class AnswersView(ListView): site = Site.objects.get_current() seminar_url = reverse('teleforma-seminar-detail', kwargs={'pk':seminar.id}) ctx_dict = {'site': site, 'seminar_url': seminar_url,} - text = render_to_string('postman/seminar_validated.txt', ctx_dict) + text = render_to_string('teleforma/messages/seminar_validated.txt', ctx_dict) mess = Message(sender=sender, recipient=user, subject=_('Your answer has been validated'), body=text) @@ -344,7 +350,7 @@ def evaluation_form_detail(request, pk, template='teleforma/evaluation_form.html else: entry = form_for_form.save() form_valid.send(sender=request, form=form_for_form, entry=entry) - messages.info(request, _("You have successfully sumitted your evaluation")) + messages.info(request, _("You have successfully submitted your evaluation")) return redirect('teleforma-seminar-detail', seminar.id) context['seminar'] = seminar -- 2.39.5