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

Correction liées à la nouvelle section MSP

Browse source
This commit is contained in:
Claude Paroz 2023-11-14 18:37:15 +01:00
parent 6dbe230332
commit af2088c4b7
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
candidats/models.py
View file

@ -16,7 +16,7 @@ SECTION_CHOICES = (
('ASSC', 'Assist. en soin et santé communautaire CFC'),
('EDE', "Education de l’enfance, dipl. ES"),
('EDS', 'Education sociale, dipl. ES'),
('MSP', "Maitrise socioprofessionnelle, dipl. ES"),
('MSP', "Maîtrise socioprofessionnelle, dipl. ES"),
)
OPTION_CHOICES = (

4
candidats/views.py
View file

@ -36,7 +36,7 @@ class ConfirmationView(CandidateConfirmationView):
def get(self, request, *args, **kwargs):
candidate = Candidate.objects.get(pk=self.kwargs['pk'])
if candidate.section not in {'ASA', 'ASE', 'ASSC', 'EDE', 'EDS'}:
if candidate.section not in {'ASA', 'ASE', 'ASSC', 'EDE', 'EDS', 'MSP'}:
messages.error(request, "Ce formulaire n'est disponible que pour les candidats FE ou ES")
elif candidate.confirmation_date:
messages.error(request, 'Une confirmation a déjà été envoyée!')
@ -51,7 +51,7 @@ class ConfirmationView(CandidateConfirmationView):
candidate = Candidate.objects.get(pk=self.kwargs['pk'])
to = [candidate.email]
if candidate.section == 'EDE':
if candidate.section in {'EDE', 'MSP'}:
src_email = 'email/candidate_confirm_EDE.txt'
elif candidate.section == 'EDS':
src_email = 'email/candidate_confirm_EDS.txt'

2
common/settings.py
View file

@ -73,11 +73,11 @@ TEMPLATES = [
# Insert your TEMPLATE_CONTEXT_PROCESSORS here or use this
# list if you haven't customized them:
'django.contrib.auth.context_processors.auth',
'django.template.context_processors.debug',
'django.template.context_processors.i18n',
'django.template.context_processors.media',
'django.template.context_processors.static',
'django.template.context_processors.tz',
'django.template.context_processors.request',
'django.contrib.messages.context_processors.messages',
],
},

2
stages/views/export.py
View file

@ -443,7 +443,7 @@ def export_qualification(request):
# Data
empty_values = [''] * 7
es_classes = Klass.objects.filter(section__name__in=['EDS', 'EDE', 'MSP'], name__startswith='3')
es_classes = Klass.objects.filter(section__name__in=['EDS', 'EDE', 'MSP'], level__name='3')
students = Student.objects.filter(
klass__in=es_classes, archived=False
).select_related('klass', 'referent', 'training_referent', 'mentor',