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

Stop considering EDE/EDS level in student admin

Browse source
This commit is contained in:
Claude Paroz 2020-08-31 17:58:34 +02:00
parent 16ca90f6eb
commit d65a209766
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
stages/admin.py
View file

@ -123,7 +123,7 @@ class ExaminationInline(admin.StackedInline):
'<div class="warning">Veuillez compléter les informations '
'd’examen (date/salle/experts) pour accéder aux boutons d’impression.</div>'
)
if obj and obj.student.is_ede_3():
if obj and obj.student.is_ede():
if obj.missing_examination_data():
return missing_message
else:
@ -137,7 +137,7 @@ class ExaminationInline(admin.StackedInline):
reverse('print-compens-form', args=[obj.pk, 'ep']),
reverse('print-compens-form', args=[obj.pk, 'sout']),
)
elif obj and obj.student.is_eds_3():
elif obj and obj.student.is_eds():
if obj.missing_examination_data():
return missing_message
else:
@ -204,12 +204,12 @@ class StudentAdmin(admin.ModelAdmin):
# SupervisionBillInline is only adequate for EDE students
if not obj.klass or obj.klass.section.name != 'EDE':
inlines = [inl for inl in inlines if inl != SupervisionBillInline]
if not obj.is_ede_3() and not obj.is_eds_3():
if not obj.is_ede() and not obj.is_eds():
inlines = [inl for inl in inlines if inl != ExaminationInline]
return inlines
def get_fieldsets(self, request, obj=None):
if not obj or (not obj.is_ede_3() and not obj.is_eds_3()):
if not obj or (not obj.is_ede() and not obj.is_eds()):
# Hide group "Procédure de qualification"
fieldsets = deepcopy(self.fieldsets)
fieldsets[1][1]['classes'] = ['hidden']