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

Fix EDE pe/ps class detection

Browse source
This commit is contained in:
alazo 2018-11-16 09:17:20 +01:00 • committed by Claude Paroz
parent e384cc6fa8
commit 32398be8c3
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
stages/models.py
View file

@ -81,10 +81,10 @@ class Klass(models.Model):
return self.name
def is_Ede_pe(self):
return 'EDEpe' in self.name
return 'EDE' in self.name and 'pe' in self.name
def is_Ede_ps(self):
return 'EDEps' in self.name
return 'EDE' in self.name and 'ps' in self.name
class Teacher(models.Model):

14
stages/tests.py
View file

@ -274,6 +274,20 @@ tél. 032 886 33 00
self.assertEqual(response['Content-Type'], 'application/pdf')
self.assertGreater(len(response.content), 200)
def test_EDEpe_klass(self):
lev3 = Level.objects.create(name='3')
klass4 = Klass.objects.create(name="3EDEp_pe", section=Section.objects.get(name='EDE'), level=lev3)
self.assertTrue(klass4.is_Ede_pe())
klass5 = Klass.objects.create(name="3EDEpe", section=Section.objects.get(name='EDE'), level=lev3)
self.assertTrue(klass5.is_Ede_pe())
def test_EDEps_klass(self):
lev3 = Level.objects.create(name='3')
klass4 = Klass.objects.create(name="3EDEp_ps", section=Section.objects.get(name='EDE'), level=lev3)
self.assertTrue(klass4.is_Ede_ps())
klass5 = Klass.objects.create(name="3EDEps", section=Section.objects.get(name='EDE'), level=lev3)
self.assertTrue(klass5.is_Ede_ps())
class PeriodTest(TestCase):
def setUp(self):