Add oral filters

diff --git a/teleforma/admin.py b/teleforma/admin.py
index 6aa9d5d3d02aaaa6a423ef6fefe0c7833e2f1641..e8a33f7669f67bf8435c1da94f2c356443a909d9 100644 (file)
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@ -73,7 +73,8 @@ class StudentAdmin(admin.ModelAdmin):
     inlines = [PaymentInline, OptionalFeeInline, DiscountInline]
     search_fields = ['user__first_name', 'user__last_name', 'user__username']
     list_filter = ['user__is_active', 'is_subscribed', 'platform_only', PeriodListFilter,
-                    'trainings', 'iej', 'procedure', 'written_speciality']
+                    'trainings', 'iej', 'procedure', 'written_speciality', 'oral_speciality',
+                    'oral_1', 'oral_2']
     list_display = ['student_name', 'get_trainings', 'platform_only',
                     'total_payments', 'total_fees', 'balance']
     actions = ['export_xls', 'write_message', 'add_to_group']

diff --git a/teleforma/exam/models.py b/teleforma/exam/models.py
index b9524cc012d05e6ccf4f3ea578f5f36a7c2d6256..59a0bae71237e5704e77182cd3e65d96ed7fb767 100644 (file)
--- a/teleforma/exam/models.py
+++ b/teleforma/exam/models.py
@@ -79,8 +79,6 @@ REJECT_REASON = (('unreadable', _('unreadable')),
 cache_path = settings.MEDIA_ROOT + 'cache/'
 script_path = settings.MEDIA_ROOT + 'scripts/'
 
-SCRIPT_MAX_SIZE = 26214400
-
 
 def sha1sum_file(filename):
     '''
@@ -404,7 +402,7 @@ class Script(BaseResource):
             self.auto_reject('wrong format')
             return
 
-        if os.stat(self.file.path).st_size > SCRIPT_MAX_SIZE:
+        if os.stat(self.file.path).st_size > settings.TELEFORMA_EXAM_SCRIPT_MAX_SIZE:
             self.auto_reject('file too large')
             return
 

diff --git a/teleforma/exam/templates/exam/script_form.html b/teleforma/exam/templates/exam/script_form.html
index ba4a419f8a4edb1e5afbb604048158ad6e27ef97..48cc5133ee3dcd854b0e8e578debddd6b2c904ab 100644 (file)
--- a/teleforma/exam/templates/exam/script_form.html
+++ b/teleforma/exam/templates/exam/script_form.html
@@ -48,7 +48,7 @@
 <br />
 
 <div>Ce formulaire vous permet de soumettre une copie <b>non corrigée</b> à la correction en ligne.</div>
-<div>Merci de fournir <b>un seul fichier par épreuve</b>, en <b>noir/gris et blanc</b>, au format <b>PDF uniquement</b> et de <b>taille inférieure à 25 Mo</b>.</div>
+<div>Merci de fournir <b>un seul fichier par épreuve</b>, en <b>noir/gris et blanc</b>, au format <b>PDF uniquement</b> et de <b>taille inférieure à 20 Mo</b>.</div>
 <br/>
 <div>La taille du fichier scanné peut être réduite en utilisant un mode sans couleur (par exemple "nuances de gris"), en diminuant la résolution de votre scanner (150 points par pouces ou DPI peuvent suffire) ou en utilisant le service en ligne <a href="http://smallpdf.com/compress-pdf">smallpdf.com/compress-pdf</a>.</div>
 <br/>

diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py
index 3d90b46b2f8b7d28056b6e4ff579eea6f93b1a4d..e02430b3c2890e1b73f69c852aef31179c899d65 100644 (file)
--- a/teleforma/exam/views.py
+++ b/teleforma/exam/views.py
@@ -175,7 +175,7 @@ class ScriptCreateView(CreateView):
 
     def get_context_data(self, **kwargs):
         context = super(ScriptCreateView, self).get_context_data(**kwargs)
-        context['upload'] = getattr(settings, 'TELEFORMA_EXAM_SCRIPT_UPLOAD', True)
+        context['upload'] = (getattr(settings, 'TELEFORMA_EXAM_SCRiIPT_UPLOAD', True) or self.request.user.is_superuser)
         context['period'] = Period.objects.get(id=self.kwargs['period_id'])
         context['create_fields'] = ['course', 'session', 'type', 'file' ]
         course_pk_list = [c['course'].id for c in get_courses(self.request.user)]
@@ -343,7 +343,7 @@ class ScoreCreateView(ScriptCreateView):
 
     def get_context_data(self, **kwargs):
         context = super(ScriptCreateView, self).get_context_data(**kwargs)
-        context['upload'] = getattr(settings, 'TELEFORMA_EXAM_SCRIPT_UPLOAD', True)
+        context['upload'] = getattr(settings, 'TELEFORMA_EXAM_SCRIPT_UPLOAD', True) 
         context['period'] = Period.objects.get(id=self.kwargs['period_id'])
         context['create_fields'] = ['course', 'session', 'type', 'score' ]
         course_pk_list = [c['course'].id for c in get_courses(self.request.user)]

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index 51f0bf0d0e818a048c397e103a20dedf2b9df104..f20fa4ea05a22046df4bee4720842dff382c77d5 100644 (file)
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -56,6 +56,7 @@ from django.core.paginator import InvalidPage, EmptyPage
 from django.template.defaultfilters import slugify
 from sorl.thumbnail import default as sorl_default
 from django.core.urlresolvers import reverse, reverse_lazy
+from django.conf import settings
 
 app_label = 'teleforma'
 
@@ -66,7 +67,8 @@ def get_n_choices(n):
 def get_nint_choices(n):
     return [(x, y) for x in range(1, n) for y in range(1, n) if x == y]
 
-session_choices = get_n_choices(8)
+session_choices = get_n_choices(settings.TELEFORMA_EXAM_MAX_SESSIONS+1)
+
 server_choices = [('icecast', 'icecast'), ('stream-m', 'stream-m')]
 streaming_choices = [('mp3', 'mp3'), ('ogg', 'ogg'), ('webm', 'webm'), ('mp4', 'mp4')]
 mimetypes.add_type('video/webm','.webm')