From 7dc641edff82f620040f63ecaa5f8a4dc4f66984 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Mon, 21 Aug 2017 16:41:19 +0200 Subject: [PATCH] Stage attributions should be restricted to MP* sections --- stages/models.py | 3 ++- stages/tests.py | 8 ++++---- stages/views.py | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/stages/models.py b/stages/models.py index 511e297..195d7b2 100644 --- a/stages/models.py +++ b/stages/models.py @@ -285,7 +285,8 @@ class Domain(models.Model): class Period(models.Model): """ Périodes de stages """ title = models.CharField(max_length=150, verbose_name='Titre') - section = models.ForeignKey(Section, verbose_name='Filière', on_delete=models.PROTECT) + section = models.ForeignKey(Section, verbose_name='Filière', on_delete=models.PROTECT, + limit_choices_to={'name__startswith': 'MP'}) level = models.ForeignKey(Level, verbose_name='Niveau', on_delete=models.PROTECT) start_date = models.DateField(verbose_name='Date de début') end_date = models.DateField(verbose_name='Date de fin') diff --git a/stages/tests.py b/stages/tests.py index 4f7293e..12d6505 100644 --- a/stages/tests.py +++ b/stages/tests.py @@ -18,9 +18,9 @@ class StagesTest(TestCase): @classmethod def setUpTestData(cls): Section.objects.bulk_create([ - Section(name='ASE'), Section(name='ASSC'), Section(name='EDE'), Section(name='EDS') + Section(name='MP_ASE'), Section(name='MP_ASSC'), Section(name='EDE'), Section(name='EDS') ]) - sect_ase = Section.objects.get(name='ASE') + sect_ase = Section.objects.get(name='MP_ASE') lev1 = Level.objects.create(name='1') lev2 = Level.objects.create(name='2') klass1 = Klass.objects.create(name="1ASE3", section=sect_ase, level=lev1) @@ -95,7 +95,7 @@ class StagesTest(TestCase): response = self.client.get(reverse('attribution')) # Section select self.assertContains(response, - '' % Section.objects.get(name='ASE').pk) + '' % Section.objects.get(name='MP_ASE').pk) # Referent select self.assertContains(response, '' % Teacher.objects.get(abrev="JCA").pk) @@ -144,7 +144,7 @@ class StagesTest(TestCase): class PeriodTest(TestCase): def setUp(self): - self.section = Section.objects.create(name="ASE") + self.section = Section.objects.create(name="MP_ASE") self.level1 = Level.objects.create(name='1') self.level2 = Level.objects.create(name='2') diff --git a/stages/views.py b/stages/views.py index 1197359..cbc94da 100644 --- a/stages/views.py +++ b/stages/views.py @@ -162,7 +162,7 @@ class AttributionView(TemplateView): context.update({ #'period_form': PeriodForm(), - 'sections': Section.objects.all(), + 'sections': Section.objects.filter(name__startswith='MP'), 'referents': referents, }) return context