Changeset 9359 for main/waeup.futminna/trunk/src

Timestamp:

19 Oct 2012, 16:29:59 (12 years ago)

Author:

Henrik Bettermann

Message:

CustomStudentStudyCourse? should inherit from NigeriaStudentStudyCourse?.

File:

• main/waeup.futminna/trunk/src/waeup/futminna/students/studycourse.py (modified) (1 diff)

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

@@ -22 +22 @@
 import grok
 from zope.interface import implementedBy
-from waeup.kofa.students.studycourse import (
-    StudentStudyCourse, StudentStudyCourseFactory)
+from waeup.kofa.students.studycourse import StudentStudyCourseFactory
 from waeup.kofa.utils.helpers import attrs_to_fields
 from waeup.kofa.students.interfaces import IStudentNavigation
 from waeup.kofa.students.workflow import CLEARED, RETURNING, PAID
+from kofacustom.nigeria.students.studycourse import NigeriaStudentStudyCourse
 from waeup.futminna.students.interfaces import ICustomStudentStudyCourse
 
-class CustomStudentStudyCourse(StudentStudyCourse):
+class CustomStudentStudyCourse(NigeriaStudentStudyCourse):
     """This is a container for study levels.
     """
-
     grok.implements(ICustomStudentStudyCourse, IStudentNavigation)
     grok.provides(ICustomStudentStudyCourse)
-
-    @property
-    def next_session_allowed(self):
-        state = self.student.state
-        certificate = getattr(self, 'certificate', None)
-        if certificate == None:
-            return False
-        if state == CLEARED:
-            return True
-        cond0 = state == RETURNING
-        cond1 = self.current_verdict in (
-            'A','B','C','F','J','L','M','N','O','X','Z')
-        cond2 = self.current_level in (0, 100)
-        cond3 = certificate.study_mode.startswith('de') and \
-            self.current_level == 200
-        cond4 = certificate.study_mode.startswith('ph') and \
-            self.current_level == 300
-        if cond0 and (cond1 or cond2 or cond3 or cond4):
-            return True
-        cond5 = self.is_postgrad
-        cond6 = state == PAID
-        if  cond5 and cond6:
-            return True
-        return False
 
 CustomStudentStudyCourse = attrs_to_fields(CustomStudentStudyCourse)