From 245e98c7c910d07e9e2630973f44faef597a45c1 Mon Sep 17 00:00:00 2001 From: Yoan Le Clanche Date: Mon, 9 Jan 2023 14:19:36 +0100 Subject: [PATCH] revert nb_scripts changed --- teleforma/exam/views.py | 22 +++------------------- teleforma/models/crfpa.py | 16 ---------------- 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py index a2badb04..4fda97aa 100755 --- a/teleforma/exam/views.py +++ b/teleforma/exam/views.py @@ -53,23 +53,13 @@ class ScriptMixinView(View): context['courses'] = Course.objects.filter(pk__in=course_pk_list) context['script_service_url'] = getattr( settings, 'TELEFORMA_EXAM_SCRIPT_SERVICE_URL') - - try: - student = self.request.user.student.get() - except Student.DoesNotExist: - student = None - self.max_scripts = 1000 - if student: - self.nb_script = student.max_sessions() or settings.TELEFORMA_EXAM_MAX_SESSIONS - self.max_scripts = student.max_total_scripts() - else: - self.nb_script = self.period.nb_scripts() or settings.TELEFORMA_EXAM_MAX_SESSIONS + self.nb_script = self.period.nb_script or settings.TELEFORMA_EXAM_MAX_SESSIONS if getattr(settings, 'TELEFORMA_EXAM_SCRIPT_UPLOAD', True) and self.period.date_exam_end: upload = datetime.datetime.now() <= self.period.date_exam_end cur_scripts = Script.objects.filter(period=self.period, author=self.request.user)\ .exclude(status=0).count() - allowed_scripts = self.max_scripts * len(self.get_course_pk_list()) + allowed_scripts = self.nb_script * len(self.get_course_pk_list()) if cur_scripts >= allowed_scripts: upload = False context['upload'] = upload @@ -133,7 +123,6 @@ class ScriptView(ScriptMixinView, CourseAccessMixin, UpdateView): kwargs = super(ScriptView, self).get_form_kwargs() script = self.get_object() kwargs['period'] = script.period - kwargs['user'] = self.request.user return kwargs def get_success_url(self): @@ -318,7 +307,6 @@ class ScriptCreateView(ScriptMixinView, CreateView): def get_form_kwargs(self): kwargs = super(ScriptCreateView, self).get_form_kwargs() kwargs['period'] = self.period - kwargs['user'] = self.request.user return kwargs @@ -338,11 +326,7 @@ class QuotasView(ListView): self.courses = self.professor.courses.all() self.period = get_object_or_404( Period, id=int(self.kwargs['period_id'])) - try: - student = self.request.user.student.get() - self.nb_script = student.max_sessions() or settings.TELEFORMA_EXAM_MAX_SESSIONS - except Student.DoesNotExist: - self.nb_script = self.period.nb_scripts() or settings.TELEFORMA_EXAM_MAX_SESSIONS + self.nb_script = self.period.nb_script or settings.TELEFORMA_EXAM_MAX_SESSIONS self.session = self.request.GET.get('session') self.course = self.request.GET.get('course') self.corrector = self.request.GET.get('corrector') diff --git a/teleforma/models/crfpa.py b/teleforma/models/crfpa.py index 7cc81d95..e3e5a4f8 100755 --- a/teleforma/models/crfpa.py +++ b/teleforma/models/crfpa.py @@ -116,8 +116,6 @@ class Training(models.Model): available = models.BooleanField(_('available')) platform_only = models.BooleanField(_('e-learning platform only')) duration = models.IntegerField(u"Durée en heures", default=0) - nb_script = models.IntegerField( - _("nombre maximal de copies"), default=12) def __str__(self): @@ -403,20 +401,6 @@ class Student(models.Model): def expiration_date(self): """ closing date of student period """ return self.period.date_close_accounts - - def max_sessions(self): - """ get total number of scripts """ - max_sessions = 0 - for training in self.trainings.all(): - max_sessions = max(training.nb_script, max_sessions) - return max_sessions - - def max_total_scripts(self): - """ get total number of scripts""" - total = 0 - for training in self.trainings.all(): - total += training.nb_script - return total class Meta(MetaCore): db_table = app_label + '_' + 'student' -- 2.39.5