Changeset 13353

Timestamp:

27 Oct 2015, 08:03:37 (9 years ago)

Author:

Henrik Bettermann

Message:

Customize getBedCoordinates.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

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

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

@@ -32 +32 @@
     ExportPDFTranscriptSlip,
     ExportPDFAdmissionSlip,
+    BedTicketAddPage,
     )
 from kofacustom.nigeria.students.browser import (
@@ -317 +318 @@
             self.context.student, omit_fields=self.omit_fields,
             pre_text=pre_text, post_text='')
+
+class CustomBedTicketAddPage(BedTicketAddPage):
+    """ Page to add an online payment ticket
+    """
+    with_ac = False

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

@@ -527 +527 @@
         self.assertMatches('...<h1 class="kofa-content-label">Start clearance</h1>...',
                    self.browser.contents)
+
+    def test_student_accommodation(self):
+        del self.student['accommodation']['2004']
+        # Login
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+        # Students can book accommodation without AC ...
+        self.browser.open(self.acco_path)
+        IWorkflowInfo(self.student).fireTransition('admit')
+        self.browser.getLink("Book accommodation").click()
+        self.assertFalse('Activation Code:' in self.browser.contents)
+        self.browser.getControl("Create bed ticket").click()
+        # Bed is randomly selected but, since there is only
+        # one bed for this student, we know that
+        self.assertEqual(self.student['accommodation']['2004'].bed_coordinates,
+            'Hall 1, Block A, Room 101, Bed A (regular_male_fr)')
+        # Only the hall name is displayed
+        self.assertEqual(self.student['accommodation']['2004'].display_coordinates,
+            'Hall 1')
+        self.assertFalse('Hall 1, Block A, Room 101, Bed A'
+            in self.browser.contents)
+        self.assertTrue('<td>Hall 1</td>'
+            in self.browser.contents)
+        return

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

@@ -197 +197 @@
         return 48
 
+    def getBedCoordinates(self, bedticket):
+        """Return descriptive bed coordinates.
+        This method can be used to customize the `display_coordinates`
+        property method in order to  display a
+        customary description of the bed space.
+        """
+        bc = bedticket.bed_coordinates.split(',')
+        if len(bc) == 4:
+            return bc[0]
+        return bedticket.bed_coordinates
+
     # AAUE prefix
     STUDENT_ID_PREFIX = u'E'