From 170057f5f8787c4775217bd9431d84c29952d9df Mon Sep 17 00:00:00 2001 From: Yoan Le Clanche Date: Thu, 2 Jul 2020 11:34:40 +0200 Subject: [PATCH] Exam : remove 'type' field on "add exam form" --- teleforma/exam/forms.py | 2 +- teleforma/exam/models.py | 2 +- teleforma/exam/views.py | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/teleforma/exam/forms.py b/teleforma/exam/forms.py index d6950914..1f578462 100644 --- a/teleforma/exam/forms.py +++ b/teleforma/exam/forms.py @@ -22,7 +22,7 @@ class ScriptForm(ModelForm): class Meta: model = Script - exclude = ['uuid', 'mime_type', 'sha1', 'url', + exclude = ['uuid', 'mime_type', 'sha1', 'url', 'type' 'date_submitted', 'date_rejected', 'date_marked', 'box_uuid',] #hidden_fields = ['status'] diff --git a/teleforma/exam/models.py b/teleforma/exam/models.py index fe7828ac..3c78b09f 100755 --- a/teleforma/exam/models.py +++ b/teleforma/exam/models.py @@ -252,7 +252,7 @@ class Script(BaseResource): period = models.ForeignKey(Period, related_name='scripts', verbose_name=_('period'), null=True, blank=True, on_delete=models.SET_NULL) session = models.CharField(_('session'), max_length=16, default="1") - type = models.ForeignKey(ScriptType, related_name='scripts', verbose_name=_('type'), null=True, on_delete=models.SET_NULL) + type = models.ForeignKey(ScriptType, related_name='scripts', verbose_name=_('type'), null=True, blank=True, on_delete=models.SET_NULL) author = models.ForeignKey(User, related_name="author_scripts", verbose_name=_('author'), null=True, blank=True, on_delete=models.SET_NULL) corrector = models.ForeignKey(User, related_name="corrector_scripts", verbose_name=_('corrector'), blank=True, null=True, on_delete=models.SET_NULL) file = models.FileField(_('PDF file'), upload_to='scripts/%Y/%m/%d', max_length=1024, blank=True) diff --git a/teleforma/exam/views.py b/teleforma/exam/views.py index 993247cb..99cf014c 100755 --- a/teleforma/exam/views.py +++ b/teleforma/exam/views.py @@ -246,7 +246,7 @@ class ScriptCreateView(ScriptMixinView, CreateView): def form_valid(self, form): scripts = Script.objects.filter(course=form.cleaned_data['course'], session=form.cleaned_data['session'], - type=form.cleaned_data['type'], author=self.request.user, period=self.period).exclude(status=0) + author=self.request.user, period=self.period).exclude(status=0) if scripts: messages.error(self.request, _("Error: you have already submitted a script for this session, the same course and the same type!")) return redirect('teleforma-exam-script-create', self.period.id) @@ -261,7 +261,7 @@ class ScriptCreateView(ScriptMixinView, CreateView): def get_context_data(self, **kwargs): context = super(ScriptCreateView, self).get_context_data(**kwargs) - context['create_fields'] = ['course', 'session', 'type', 'file' ] + context['create_fields'] = ['course', 'session', 'file' ] context['form'].fields['course'].queryset = context['courses'] return context @@ -515,7 +515,6 @@ def get_mass_students(request): session = request.GET.get('session') course_id = request.GET.get('course_id') q = request.GET.get('q[term]') - # import pdb;pdb.set_trace() students = Student.objects.filter(period = period).filter(Q(user__username__icontains=q) | Q(user__last_name__icontains=q) | Q(user__first_name__icontains=q)) # Exclude students who already have a script for this session -- 2.39.5