From: Guillaume Pellerin Date: Tue, 4 Jul 2017 22:44:30 +0000 (+0200) Subject: Allow auto exam ending thanks to Period date property X-Git-Tag: 1.1~13 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a01be4031225802c956c07eca45325bf7f3cddeb;p=teleforma.git Allow auto exam ending thanks to Period date property --- diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py index f863d0f4..8abb8dda 100644 --- a/teleforma/exam/views.py +++ b/teleforma/exam/views.py @@ -344,8 +344,9 @@ 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['period'] = Period.objects.get(id=self.kwargs['period_id']) + period = Period.objects.get(id=self.kwargs['period_id']) + context['period'] = period + context['upload'] = datetime.datetime.now() <= period.date_exam_end context['create_fields'] = ['course', 'session', 'type', 'score' ] course_pk_list = [c['course'].id for c in get_courses(self.request.user)] context['form'].fields['course'].queryset = Course.objects.filter(pk__in=course_pk_list) diff --git a/teleforma/models/core.py b/teleforma/models/core.py index d78e8803..81cd02b7 100644 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -135,6 +135,7 @@ class Period(Model): message_platform = models.TextField(_('message pour internaute'), blank=True) message_local = models.TextField(_('message pour presentielle'), blank=True) is_open = models.BooleanField(_('is open'), default=True) + date_exam_end = models.DateTimeField(_("date de fin d'examens"), null=True, blank=True) def __unicode__(self): return self.name