diff --git a/common/urls.py b/common/urls.py index ccedb42..15eea32 100644 --- a/common/urls.py +++ b/common/urls.py @@ -62,8 +62,7 @@ urlpatterns = [ path('student_eds//examination/expert/', views.PrintExpertEDSCompensationForm.as_view(), name='print-expert-letter-eds'), - path('student/export_qualif//', views.export.export_qualification, - name='export-qualif'), + path('student/export_qualif/', views.export.export_qualification, name='export-qualif'), path('imputations/export/', views.export.imputations_export, name='imputations_export'), path('export_sap/', views.export.export_sap, name='export_sap'), diff --git a/stages/tests.py b/stages/tests.py index 2ff4060..0986a57 100644 --- a/stages/tests.py +++ b/stages/tests.py @@ -107,8 +107,8 @@ class StagesTests(TestCase): response = self.client.get(reverse('general-export')) self.assertEqual(response.status_code, 200) - def test_export_qualif_ede(self): - response = self.client.get(reverse('export-qualif', args=['ede'])) + def test_export_qualif(self): + response = self.client.get(reverse('export-qualif')) self.assertEqual(response.status_code, 200) def test_export_sap(self): diff --git a/stages/views/export.py b/stages/views/export.py index 9359a83..07cfc80 100644 --- a/stages/views/export.py +++ b/stages/views/export.py @@ -11,8 +11,8 @@ from openpyxl.styles import Font from openpyxl.utils import get_column_letter from ..models import ( - Availability, CorpContact, Corporation, Course, Section, Student, Teacher, - Training, + Availability, CorpContact, Corporation, Course, Klass, Section, Student, + Teacher, Training, ) from ..utils import school_year_start @@ -427,7 +427,7 @@ def ortra_export(request): return export.get_http_response('ortra_export') -def export_qualification(request, section='ede'): +def export_qualification(request): headers = [ 'Classe', 'Etudiant-e', 'Référent pratique', 'Titre TD', 'Résumé TD', 'Ens. référent', @@ -437,16 +437,18 @@ def export_qualification(request, section='ede'): 'Date', 'Salle', 'Note', ] - export_name = 'Export_qualif_%s' % section.upper() + export_name = f'Export_qualif{date.today().strftime("%Y_%m_%d")}' export = OpenXMLExport(export_name) export.write_line(headers, bold=True) # Data empty_values = [''] * 7 - for student in Student.objects.filter(klass__name__startswith='3%s' % section.upper(), archived=False - ).select_related('klass', 'referent', 'training_referent', 'mentor', - ).prefetch_related('examination_set' - ).order_by('klass__name', 'last_name'): + es_classes = Klass.objects.filter(section__name__in=['EDS', 'EDE', 'MSP'], name__startswith='3') + students = Student.objects.filter( + klass__in=es_classes, archived=False + ).select_related('klass', 'referent', 'training_referent', 'mentor', + ).prefetch_related('examination_set').order_by('klass__name', 'last_name') + for student in students: stud_values = [ student.klass.name, student.full_name, diff --git a/templates/admin/index.html b/templates/admin/index.html index c2471f9..09c3983 100644 --- a/templates/admin/index.html +++ b/templates/admin/index.html @@ -100,8 +100,7 @@ document.addEventListener("DOMContentLoaded", function(event) {
  • Exportation générale des élèves
  • -
  • Exportation qualif. EDE
  • -
  • Exportation qualif. EDS
  • +
  • Exportation qualif. ES