From 96d6f5f406e215be5ec6583762a15053d20f8500 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Tue, 27 Sep 2016 13:06:13 +0200
Subject: [PATCH] Add oral filters

---
 teleforma/admin.py                             | 3 ++-
 teleforma/exam/models.py                       | 4 +---
 teleforma/exam/templates/exam/script_form.html | 2 +-
 teleforma/exam/views.py                        | 4 ++--
 teleforma/models/core.py                       | 4 +++-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/teleforma/admin.py b/teleforma/admin.py
index 6aa9d5d3..e8a33f76 100644
--- 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 b9524cc0..59a0bae7 100644
--- 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 ba4a419f..48cc5133 100644
--- 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 3d90b46b..e02430b3 100644
--- 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 51f0bf0d..f20fa4ea 100644
--- 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')
-- 
2.39.5