Changeset 8472

Timestamp:

20 May 2012, 09:57:09 (13 years ago)

Author:

Henrik Bettermann

Message:

Add property is_postgrad.

Add invariant constraint to ICertificate.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/batchprocessing.txt (modified) (1 diff)
• students/browser.py (modified) (4 diffs)
• students/student.py (modified) (1 diff)
• students/studycourse.py (modified) (2 diffs)
• students/tests/test_browser.py (modified) (1 diff)
• students/utils.py (modified) (1 diff)
• university/interfaces.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/browser/batchprocessing.txt

@@ -298 +298 @@
     >>> open('certificates.csv', 'wb').write(
     ... """code,faculty_code,department_code,title,study_mode,start_level,end_level,application_category
-    ... CERT1,FAC1,DEP1,Certificate 1,ug_ft,100,300,basic
+    ... CERT1,FAC1,DEP1,Certificate 1,pg_ft,999,999,basic
     ... CERT2,FAC1,DEP1,Certificate 2,ug_ft,200,300,cest
     ... """)

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -412 +412 @@
     @property
     def form_fields(self):
-        cm = getattr(self.context,'current_mode', None)
-        if cm is not None and cm.startswith('pg'):
+        if self.context.is_postgrad:
             form_fields = grok.AutoFields(IPGStudentClearance).omit('clearance_locked')
         else:
@@ -434 +433 @@
     @property
     def form_fields(self):
-        cm = getattr(self.context,'current_mode', None)
-        if cm is not None and cm.startswith('pg'):
+        if self.context.is_postgrad:
             form_fields = grok.AutoFields(IPGStudentClearance).omit('clearance_locked')
         else:
@@ -478 +476 @@
     @property
     def form_fields(self):
-        cm = getattr(self.context,'current_mode', None)
-        if cm is not None and cm.startswith('pg'):
+        if self.context.is_postgrad:
             form_fields = grok.AutoFields(IPGStudentClearance)
         else:
@@ -1621 +1618 @@
     @property
     def form_fields(self):
-        cm = getattr(self.context,'current_mode', None)
-        if cm is not None and cm.startswith('pg'):
+        if self.context.is_postgrad:
             form_fields = grok.AutoFields(IPGStudentClearance).omit('clearance_locked')
         else:

main/waeup.kofa/trunk/src/waeup/kofa/students/student.py

@@ -133 +133 @@
         if certificate is not None:
             return certificate.study_mode
-        return
+        return None
+
+    @property
+    def is_postgrad(self):
+        is_postgrad = getattr(
+            self.get('studycourse', None), 'is_postgrad', False)
+        return is_postgrad
 
 # Set all attributes of Student required in IStudent as field

main/waeup.kofa/trunk/src/waeup/kofa/students/studycourse.py

@@ -48 +48 @@
             return True
         if self.getStudent().state == PAID \
-            and self.getStudent().current_mode.startswith('pg'):
+            and self.getStudent().is_postgrad:
             return True
         return False
@@ -105 +105 @@
         return
 
+    @property
+    def is_postgrad(self):
+        cert = getattr(self, 'certificate', None)
+        if cert is not None:
+            return cert.study_mode.startswith('pg')
+            #return cert.start_level == 999 or cert.end_level == 999
+        return False
+
 StudentStudyCourse = attrs_to_fields(StudentStudyCourse)
 

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -1837 +1837 @@
         self.assertFalse('Employer' in self.browser.contents)
         # Now we change the study mode of the certificate and a different
-        # interface is used by clearance views
+        # interface is used by clearance views.
         self.certificate.study_mode = 'pg_ft'
+        # Invariants are not being checked here?!
+        self.certificate.end_level = 100
         self.browser.open(self.clearance_path)
         self.assertTrue('Employer' in self.browser.contents)

main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py

@@ -278 +278 @@
                 details['p_session'], details[
                     'p_level'] = self.getReturningData(student)
-            elif student.current_mode.startswith('pg') and student.state == PAID:
+            elif student.is_postgrad and student.state == PAID:
                 # Returning postgraduate students also pay for the next session
                 # but their level always remains the same.

main/waeup.kofa/trunk/src/waeup/kofa/university/interfaces.py

@@ -20 +20 @@
 
 from zope import schema
-from zope.interface import Attribute
+from zope.interface import Attribute, invariant, Invalid
 from waeup.kofa.interfaces import (IKofaObject, IKofaContainer)
 from waeup.kofa.interfaces import MessageFactory as _
@@ -245 +245 @@
         """
 
+    @invariant
+    def check_pg_conditions(cert):
+        if cert.start_level == 999 and not cert.end_level == 999:
+            raise Invalid(_("Start level and end level must correspond."))
+        if cert.end_level == 999 and not cert.start_level == 999:
+            raise Invalid(_("Start level and end level must correspond."))
+        if cert.study_mode.startswith('pg') and not cert.start_level == 999:
+            raise Invalid(_(
+                "Study mode, start level and end level must correspond."))
+        if cert.start_level == 999  and not cert.study_mode.startswith('pg'):
+            raise Invalid(_(
+                "Study mode, start level and end level must correspond."))
+
+
 class ICertificateAdd(ICertificate):
     """Representation of a certificate.