Changeset 10909 for main/waeup.kofa/branches/0.2/src

Timestamp:

14 Jan 2014, 08:50:07 (11 years ago)

Author:

Henrik Bettermann

Message:

Update branch from trunk.

Location:

main/waeup.kofa/branches/0.2/src/waeup/kofa

Files:

• applicants/browser.py (modified) (2 diffs)
• applicants/tests/test_browser.py (modified) (1 diff)
• browser/templates/staffsitelayout.pt (modified) (1 diff)
• browser/templates/studentsitelayout.pt (modified) (1 diff)
• students/payments.py (modified) (1 diff)

main/waeup.kofa/branches/0.2/src/waeup/kofa/applicants/browser.py

@@ -551 +551 @@
             IWorkflowInfo(self.context).fireTransition('start')
         if usertype == 'applicant' and self.context.state == 'created':
+            session = '%s/%s' % (self.context.__parent__.year,
+                                 self.context.__parent__.year+1)
+            title = getattr(grok.getSite()['configuration'], 'name', u'Sample University')
             msg = _(
                 '\n <strong>Congratulations!</strong>' +
-                ' You have been provisionally admitted' +
-                ' and your student record has been created for you.' +
-                ' Logout again and proceed to the login page of the portal.' +
+                ' You have been provisionally admitted into the' +
+                ' ${c} Academic Session of ${d}.'
+                ' Your student record has been created for you.' +
+                ' Please, logout again and proceed to the' +
+                ' login page of the portal.'
                 ' Then enter your new student credentials:' +
                 ' user name= ${a}, password = ${b}.' +
@@ -561 +566 @@
                 mapping = {
                     'a':self.context.student_id,
-                    'b':self.context.application_number}
+                    'b':self.context.application_number,
+                    'c':session,
+                    'd':title}
                 )
             self.flash(msg)

main/waeup.kofa/branches/0.2/src/waeup/kofa/applicants/tests/test_browser.py

@@ -575 +575 @@
         self.assertTrue(
             '<strong>Congratulations!</strong> You have been provisionally'
-            ' admitted and your student record has been created for you.'
-            in self.browser.contents)
+            ' admitted into the %s/%s Academic Session of'
+            ' Sample University. Your student record has been created for you.'
+            % (session_1, session_1 + 1) in self.browser.contents)
         self.assertTrue(
             'Then enter your new student credentials: user name= my id,'

main/waeup.kofa/branches/0.2/src/waeup/kofa/browser/templates/staffsitelayout.pt

@@ -126 +126 @@
           </div>
           <div i18n:translate="">
-            Copyright &copy; WAeUP Group 2008-2013
+            Copyright &copy; WAeUP Group 2008-2014
           </div>
         </div>

main/waeup.kofa/branches/0.2/src/waeup/kofa/browser/templates/studentsitelayout.pt

@@ -111 +111 @@
           </div>
           <div i18n:translate="">
-            Copyright &copy; WAeUP Group 2008-2013
+            Copyright &copy; WAeUP Group 2008-2014
           </div>
         </div>

main/waeup.kofa/branches/0.2/src/waeup/kofa/students/payments.py

@@ -171 +171 @@
         return self.context.student.depcode
 
+    @property
+    def email(self):
+        "Email of payer"
+        return self.context.student.email
+
+    @property
+    def phone(self):
+        "Phone number of payer"
+        return self.context.student.phone
+
+    @property
+    def current_mode(self):
+        "Current study mode of payer"
+        return self.context.student.current_mode
+
+    @property
+    def current_level(self):
+        "Current level of payer"
+        return self.context.student.current_level
+
 # Student online payments must be importable. So we might need a factory.
 class StudentOnlinePaymentFactory(grok.GlobalUtility):