From bb79444f49d356a7d843df4d1f5b0a2e40e11824 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Wed, 20 Aug 2025 09:37:15 +0200 Subject: [PATCH] =?UTF-8?q?R=C3=A9organisation=20OTP=20pour=20EDE/EDS/MSP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/settings.py | 4 ++++ stages/pdf.py | 13 +++++-------- stages/views/export.py | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/common/settings.py b/common/settings.py index f6532e1..0231e89 100644 --- a/common/settings.py +++ b/common/settings.py @@ -154,4 +154,8 @@ DATE_LIEU_EXAMEN_EDE = "mercredi 7 mars 2018, à 13h30, salle A405" DATE_LIEU_EXAMEN_EDS = "mercredi 7 mars 2018, à 13h30, salle A405" RESP_FILIERE_EDS = ("Brahim Ali Hemma", 'M') +OTP_EDE = "CPNE01.08.01.07.05.01" +OTP_EDS = "CPNE01.08.01.07.07.01" +OTP_MSP = "CPNE01.08.01.07.09.01" + from .local_settings import * diff --git a/stages/pdf.py b/stages/pdf.py index 5524fce..eb1f8a0 100644 --- a/stages/pdf.py +++ b/stages/pdf.py @@ -282,9 +282,6 @@ class CompensationForm: MENTOR_MANDAT = 'MENTOR' EXPERT_ACCOUNT = '30 490 002' MENTOR_ACCOUNT = "30 490 002" - OTP_EDE_S_PS = "CPNE01.08.01.07.02.01" - OTP_EDE_S_SS = "CPNE01.08.01.07.01.01" - OTP_EDS = "CPNE01.08.01.07.03.02" def add_private_data(self, person): self.story.append(Spacer(0, 0.5 * cm)) @@ -362,12 +359,12 @@ class CompensationForm: elif mandat == self.MENTOR_MANDAT: account = self.MENTOR_ACCOUNT - if 'EDE-S-PS' in student.klass.name: - otp = self.OTP_EDE_S_PS - elif 'EDE-S-SS' in student.klass.name: - otp = self.OTP_EDE_S_SS + if 'EDE' in student.klass.name: + otp = settings.OTP_EDE + elif 'MSP' in student.klass.name: + otp = settings.OTP_MSP elif 'EDS-S' in student.klass.name: - otp = self.OTP_EDS + otp = settings.OTP_EDS self.story.append(Spacer(0, 0.5 * cm)) data = [ diff --git a/stages/views/export.py b/stages/views/export.py index 4d41fd6..17fea0b 100644 --- a/stages/views/export.py +++ b/stages/views/export.py @@ -243,9 +243,9 @@ def export_sap(request): 'ASAFE': 'CIFO01.03.02.03.01.02 - ASA EE', 'ASEFE': 'CIFO01.03.02.04.01.02 - CFC ASE EE', 'ASSCFE': 'CIFO01.03.02.04.02.02 - CFC ASSC EE', - 'EDEpe': 'CPNE01.08.01.07.01.01 - EDE-S-SS', - 'EDEps': 'CPNE01.08.01.07.02.01 - EDE-S-PS', - 'EDS': 'CPNE01.08.01.07.03.02 - EDS EE', + 'EDEpe': f'{settings.OTP_EDE} - EDE-S-SS', + 'EDEps': f'{settings.OTP_EDE} - EDE-S-PS', + 'EDS': f'{settings.OTP_EDS} - EDS EE', 'CAS_FPP': 'CIFO01.03.02.01.03 - Mandats divers (CAS FPP)', 'MPTS' : 'CIFO01.04.03.06.02.01 - MPTS ASE', 'MPS': 'CIFO01.04.03.06.03.01 - MPS Santé',