Changeset 11012 for main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/applicants

Timestamp:

30 Jan 2014, 14:13:41 (11 years ago)

Author:

Henrik Bettermann

Message:

Merge with changes made in trunk till r10944.

Location:

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa

Files:

• . (modified) (1 prop)
• applicants/browser.py (modified) (1 diff)
• applicants/payment.py (modified) (1 diff)
• applicants/tests/test_browser.py (modified) (1 diff)

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/applicants/browser.py

@@ -547 +547 @@
             IWorkflowState(self.context).getState() == INITIALIZED:
             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 offered provisional admission 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}.' +
+                ' Change your password when you have logged in.',
+                mapping = {
+                    'a':self.context.student_id,
+                    'b':self.context.application_number,
+                    'c':session,
+                    'd':title}
+                )
+            self.flash(msg)
         return
 

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/applicants/payment.py

@@ -111 +111 @@
         return 'N/A'
 
+    @property
+    def email(self):
+        "Email of payer"
+        return self.context.__parent__.email
+
+    @property
+    def phone(self):
+        "Phone number of payer"
+        return self.context.__parent__.phone
+
+    @property
+    def current_mode(self):
+        "Current study mode of payer"
+        return 'N/A'
+
+    @property
+    def current_level(self):
+        "Current level of payer"
+        return 'N/A'
+
 # Applicant online payments must be importable. So we might need a factory.
 class ApplicantOnlinePaymentFactory(grok.GlobalUtility):

main/waeup.kofa/branches/uli-diazo-themed/src/waeup/kofa/applicants/tests/test_browser.py

@@ -566 +566 @@
         return
 
+    def test_message_for_created(self):
+        IWorkflowState(self.applicant).setState('created')
+        self.applicant.student_id = u'my id'
+        self.browser.open(self.login_path)
+        self.login()
+        self.assertTrue(
+            'You logged in.' in self.browser.contents)
+        self.assertTrue(
+            '<strong>Congratulations!</strong> You have been offered provisional'
+            ' admission 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,'
+            ' password = %s.' % self.applicant.application_number
+            in self.browser.contents)
+        return
+
     def image_url(self, filename):
         return self.edit_path.replace('edit', filename)