Changeset 9521 for main/waeup.kofa/trunk/src/waeup

Timestamp:

4 Nov 2012, 08:04:15 (12 years ago)

Author:

Henrik Bettermann

Message:

Rename is_fresh method. Actually we need to filter students who have not yet paid school fee.

Location:

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

Files:

• browser.py (modified) (1 diff)
• student.py (modified) (2 diffs)
• tests/test_browser.py (modified) (2 diffs)
• utils.py (modified) (1 diff)
• viewlets.py (modified) (1 diff)

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

@@ -1400 +1400 @@
 
     def update(self):
-        if self.context.student.is_fresh:
-            self.flash(_("You can't pay for a session below your entry session."))
+        if self.context.student.before_payment:
+            self.flash(_("No previous payment to be made."))
             self.redirect(self.url(self.context))
         super(PreviousPaymentAddFormPage, self).update()

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

@@ -37 +37 @@
     IObjectHistory, IUserAccount, IFileStoreNameChooser, IFileStoreHandler,
     IKofaUtils, registration_states_vocab, IExtFileStore,
-    CLEARANCE)
+    CLEARANCE, PAID, REGISTERED, VALIDATED, RETURNING)
 from waeup.kofa.students.accommodation import StudentAccommodation
 from waeup.kofa.students.export import EXPORTER_NAMES
@@ -193 +193 @@
 
     @property
-    def is_fresh(self):
+    def before_payment(self):
         entry_session = getattr(
             self.get('studycourse', None), 'entry_session', None)
-        if self.current_session == entry_session:
+        non_fresh_states = (PAID, REGISTERED, VALIDATED, RETURNING, )
+        if self.current_session == entry_session and \
+            self.state not in non_fresh_states:
             return True
         return False

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

@@ -2199 +2199 @@
         self.assertFalse(self.student['payments'][value].p_current)
 
-        # Button and form are not available for fresh students
+        # Button and form are not available for students who are in
+        # states up to cleared
         self.student['studycourse'].entry_session = 2004
+        IWorkflowState(self.student).setState('cleared')
         self.browser.open(self.payments_path)
         self.assertFalse(
@@ -2206 +2208 @@
         self.browser.open(self.payments_path + '/addpp')
         self.assertTrue(
-            "You can't pay for a session below your entry session" in
-            self.browser.contents)
+            "No previous payment to be made" in self.browser.contents)
         return
 

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

@@ -335 +335 @@
         if academic_session == None:
             return _(u'Session configuration object is not available.'), None
+        # Determine fee.
         if category == 'schoolfee':
             try:

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

@@ -611 +611 @@
     def target_url(self):
         student = self.view.context.student
-        if student.is_fresh:
+        if student.before_payment:
             return ''
         return self.view.url(self.view.context, self.target)