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

Separate EDE/EDS qualif exports

Browse source
This commit is contained in:
Claude Paroz 2020-02-13 09:25:39 +01:00
parent 9d8bee3d59
commit 4fbacd3d93
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
common/urls.py
View file

@ -49,8 +49,6 @@ urlpatterns = [
name='print-expert-compens-ede'),
path('student_ede/<int:pk>/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/<int:pk>/send_convocation/', views.StudentConvocationEDSView.as_view(),
@ -58,6 +56,9 @@ urlpatterns = [
path('student_eds/<int:pk>/examination/expert/', views.PrintExpertEDSCompensationForm.as_view(),
name='print-expert-compens-eds'),
path('student/export_qualif/<slug:section>/', 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'),

2
stages/tests.py
View file

@ -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):

9
stages/views/export.py
View file

@ -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):

3
templates/admin/index.html
View file

@ -100,7 +100,8 @@ document.addEventListener("DOMContentLoaded", function(event) {
<li><a id="updateFormLink" href="{% url 'print_update_form' %}">Imprimer les formulaires de MAJ</a></li>
<li><a href="{% url 'print-klass-list' %}">Imprimer les rôles de classes</a></li>
<li><a href="{% url 'general-export' %}">Exportation générale des élèves</a></li>
<li><a href="{% url 'export-qualif-ede' %}">Exportation qualif. EDE</a></li>
<li><a href="{% url 'export-qualif' 'ede' %}">Exportation qualif. EDE</a></li>
<li><a href="{% url 'export-qualif' 'eds' %}">Exportation qualif. EDS</a></li>
<li><a href="{% url 'ortra-export' %}">Exportation pour ORTRA</a></li>
</ul>
</div>