Changeset 9178 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

13 Sep 2012, 20:34:35 (12 years ago)

Author:

Henrik Bettermann

Message:

Change button title.

Let students view their application slip.

Fix pagetemplate.

Location:

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

Files:

• browser_templates/basepage.pt (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)
• utils.py (modified) (1 diff)
• viewlets.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/basepage.pt

@@ -18 +18 @@
           <tal:password replace="view/hasPassword" />
       </td>
-    <tr>
+    </tr>
     <tal:files content="structure provider:files" />
   </tbody>

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

@@ -1954 +1954 @@
         self.browser.getControl(name="form.identifier").value = '123'
         self.browser.getControl(name="form.email").value = 'aa@aa.ng'
-        self.browser.getControl("Get login credentials").click()
+        self.browser.getControl("Send login credentials").click()
         self.assertTrue('An email with' in self.browser.contents)
 

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

@@ -328 +328 @@
                     amount = getattr(certificate, 'school_fee_2', 0.0)
         elif category == 'clearance':
-            p_item = student['studycourse'].certificate.code
+            try:
+                p_item = student['studycourse'].certificate.code
+            except (AttributeError, TypeError):
+                return _('Study course data are incomplete.'), None
             amount = academic_session.clearance_fee
         elif category == 'bed_allocation':

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

@@ -626 +626 @@
         student_url = self.view.application_url() + (
             '/students/%s' % self.request.principal.id)
-        #app_slip = getUtility(IExtFileStore).getFileByContext(
-        #    self.context.student, 'application_slip')
+        app_slip = getUtility(IExtFileStore).getFileByContext(
+            self.context.student, 'application_slip')
         targets = []
-        #if app_slip:
-        #    targets = [{'url':student_url + '/application_slip', 'title':'Application Slip'},]
+        if app_slip:
+            targets = [{'url':student_url + '/application_slip', 'title':'Application Slip'},]
         targets += [
             {'url':student_url, 'title':'Base Data'},