From 4fbacd3d93ae6a066ef2f5350485dea5a60ad84a Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Thu, 13 Feb 2020 09:25:39 +0100 Subject: [PATCH] Separate EDE/EDS qualif exports --- common/urls.py | 5 +++-- stages/tests.py | 2 +- stages/views/export.py | 9 +++++---- templates/admin/index.html | 3 ++- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/common/urls.py b/common/urls.py index 834b19f..b82e3b6 100644 --- a/common/urls.py +++ b/common/urls.py @@ -49,8 +49,6 @@ urlpatterns = [ name='print-expert-compens-ede'), path('student_ede//examination/mentor/', views.PrintMentorEDECompensationForm.as_view(), name='print-mentor-compens-ede'), - path('student_ede/export_qualif_ede/', views.export.export_qualification_ede, - name='export-qualif-ede'), # Qualification EDS path('student_eds//send_convocation/', views.StudentConvocationEDSView.as_view(), @@ -58,6 +56,9 @@ urlpatterns = [ path('student_eds//examination/expert/', views.PrintExpertEDSCompensationForm.as_view(), name='print-expert-compens-eds'), + 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'), path('print/update_form/', views.PrintUpdateForm.as_view(), name='print_update_form'), diff --git a/stages/tests.py b/stages/tests.py index e51c194..1e71087 100644 --- a/stages/tests.py +++ b/stages/tests.py @@ -108,7 +108,7 @@ class StagesTests(TestCase): self.assertEqual(response.status_code, 200) def test_export_qualif_ede(self): - response = self.client.get(reverse('export-qualif-ede')) + response = self.client.get(reverse('export-qualif', args=['ede'])) self.assertEqual(response.status_code, 200) def test_export_sap(self): diff --git a/stages/views/export.py b/stages/views/export.py index 3591a11..cb16724 100644 --- a/stages/views/export.py +++ b/stages/views/export.py @@ -415,7 +415,7 @@ def ortra_export(request): return export.get_http_response('ortra_export') -def export_qualification_ede(request): +def export_qualification(request, section='ede'): headers = [ 'Classe', 'Etudiant-e', 'Référent pratique', 'Résumé TD', 'Ens. référent', 'dernier RDV', @@ -427,11 +427,12 @@ def export_qualification_ede(request): 'Date', 'Salle', 'Note', ] - export = OpenXMLExport('Expor_Qualif_EDE') + export_name = 'Export_qualif_%s' % section.upper() + export = OpenXMLExport(export_name) export.write_line(headers, bold=True) # Data - for student in Student.objects.filter(klass__name__startswith='3EDE', archived=False + for student in Student.objects.filter(klass__name__startswith='3%s' % section.upper(), archived=False ).select_related('klass', 'referent', 'training_referent', 'mentor', 'expert', 'internal_expert', ).order_by('klass__name', 'last_name'): values = [ @@ -455,7 +456,7 @@ def export_qualification_ede(request): ] export.write_line(values) - return export.get_http_response('Export_qualif_EDE') + return export.get_http_response(export_name) def institutions_export(request): diff --git a/templates/admin/index.html b/templates/admin/index.html index 3211f85..098cad5 100644 --- a/templates/admin/index.html +++ b/templates/admin/index.html @@ -100,7 +100,8 @@ document.addEventListener("DOMContentLoaded", function(event) {
  • Imprimer les formulaires de MAJ
  • Imprimer les rôles de classes
  • Exportation générale des élèves
  • -
  • Exportation qualif. EDE
  • +
  • Exportation qualif. EDE
  • +
  • Exportation qualif. EDS
  • Exportation pour ORTRA