claudep/epcstages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed is_examination_valid to missing_examination_data

Browse source
This commit is contained in:
Claude Paroz 2018-04-24 09:22:43 +02:00
parent f019ba4021
commit 9341f906bd
3 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
stages/views.py
View file

@ -671,17 +671,15 @@ class StudentConvocationExaminationView(EmailConfirmationView):
def dispatch(self, request, *args, **kwargs):
self.student = Student.objects.get(pk=self.kwargs['pk'])
error = ''
if not self.student.is_examination_valid:
error = "Toutes les informations ne sont pas disponibles pour la convocation!"
elif not self.student.expert.email:
error = "L’expert externe n’a pas de courriel valide !"
elif not self.student.internal_expert.email:
error = "L’expert interne n'a pas de courriel valide !"
elif self.student.date_soutenance_mailed is not None:
error = "Une convocation a déjà été envoyée !"
if error:
messages.error(request, error)
errors = self.student.missing_examination_data()
if self.student.expert and not self.student.expert.email:
errors.append("L’expert externe n’a pas de courriel valide !")
if self.student.internal_expert and not self.student.internal_expert.email:
errors.append("L’expert interne n'a pas de courriel valide !")
if self.student.date_soutenance_mailed is not None:
errors.append("Une convocation a déjà été envoyée !")
if errors:
messages.error(request, "\n".join(errors))
return redirect(reverse("admin:stages_student_change", args=(self.student.pk,)))
return super().dispatch(request, *args, **kwargs)
@ -919,8 +917,12 @@ def print_expert_ede_compensation_form(request, pk):
travail de diplôme
"""
student = Student.objects.get(pk=pk)
if not student.is_examination_valid:
messages.error(request, "Toutes les informations ne sont pas disponibles pour la lettre à l’expert!")
missing = student.missing_examination_data()
if missing:
messages.error(request, "\n".join(
["Toutes les informations ne sont pas disponibles pour la lettre à l’expert!"]
+ missing
))
return redirect(reverse("admin:stages_student_change", args=(student.pk,)))
pdf = ExpertEdeLetterPdf(student)
pdf.produce()