Changeset 9190 for main/waeup.fceokene/trunk/src/waeup

Timestamp:

16 Sep 2012, 04:30:12 (12 years ago)

Author:

Henrik Bettermann

Message:

Students book accommodation without AC. Bed is randomly selected.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene/students

Files:

• browser.py (modified) (2 diffs)
• browser_templates/bookbed.pt (added)
• tests/test_browser.py (modified) (1 diff)
• utils.py (modified) (2 diffs)

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

@@ -22 +22 @@
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.widgets.datewidget import FriendlyDatetimeDisplayWidget
-from waeup.kofa.students.browser import StartClearancePage
+from waeup.kofa.students.browser import StartClearancePage, BedTicketAddPage
 from kofacustom.nigeria.students.browser import (
     NigeriaOnlinePaymentDisplayFormPage,
     NigeriaOnlinePaymentAddFormPage,
     NigeriaExportPDFPaymentSlipPage,
-    NigeriaStudentClearanceEditFormPage)
+    NigeriaStudentClearanceEditFormPage,
+    )
 
 from waeup.fceokene.students.interfaces import ICustomStudentOnlinePayment
@@ -85 +86 @@
     def dataNotComplete(self):
         return False
+
+class BedTicketAddPage(BedTicketAddPage):
+    """ Page to add an online payment ticket
+    """
+    grok.template('bookbed')
+    buttonname = _('Create bed ticket')
+    notice = ''
+    with_ac = False

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

@@ -269 +269 @@
         self.assertMatches('...Clearance process has been started...',
                            self.browser.contents)
+
+    def test_student_accommodation(self):
+        # 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.assertMatches('...Hall 1, Block A, Room 101, Bed A...',
+                           self.browser.contents)
+        return

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

@@ -17 +17 @@
 ##
 import grok
+import random
 from time import time
 from zope.component import createObject
@@ -29 +30 @@
 
     """
+
+    def selectBed(self, available_beds):
+        """Randomly select a bed from a list of available beds.
+
+        """
+        return random.choice(available_beds)
 
     def getReturningData(self, student):