Changeset 15972 for main

Timestamp:

31 Jan 2020, 16:16:18 (5 years ago)

Author:

Henrik Bettermann

Message:

Add AccommodationDisplayFormPage

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/students/browser.py (modified) (4 diffs)
• src/waeup/kofa/students/browser_templates/accommodationpage.pt (added)
• src/waeup/kofa/students/tests/test_browser.py (modified) (1 diff)
• src/waeup/kofa/students/viewlets.py (modified) (2 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.6.1.dev0 (unreleased)
 =======================
+
+* Add `AccommodationDisplayFormPage`.
 
 * Don't allow students to add former courses in course lists.

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

@@ -2221 +2221 @@
             omit_fields=self.omit_fields)
 
+class AccommodationDisplayFormPage(KofaDisplayFormPage):
+    """ Page to view bed tickets.
+    This manage form page is for both students and students officers.
+    """
+    grok.context(IStudentAccommodation)
+    grok.name('index')
+    grok.require('waeup.viewStudent')
+    form_fields = grok.AutoFields(IStudentAccommodation)
+    grok.template('accommodationpage')
+    pnav = 4
+    with_hostel_selection = True
+
+    @property
+    def label(self):
+        return _('${a}: Accommodation',
+            mapping = {'a':self.context.__parent__.display_fullname})
+
+    @property
+    def desired_hostel(self):
+        if self.context.desired_hostel == 'no':
+            return _('No favoured hostel')
+        if self.context.desired_hostel:
+            hostel = grok.getSite()['hostels'].get(self.context.desired_hostel)
+            if hostel is not None:
+                return hostel.hostel_name
+        return
+
+    def update(self):
+        if checkPermission('waeup.handleAccommodation', self.context):
+            self.redirect(self.url(self.context, 'manage'))
 
 class AccommodationManageFormPage(KofaEditFormPage):
@@ -2228 +2258 @@
     """
     grok.context(IStudentAccommodation)
-    grok.name('index')
+    grok.name('manage')
     grok.require('waeup.handleAccommodation')
     form_fields = grok.AutoFields(IStudentAccommodation)
@@ -2482 +2512 @@
     grok.context(IBedTicket)
     grok.name('index')
-    grok.require('waeup.handleAccommodation')
+    grok.require('waeup.viewStudent')
     form_fields = grok.AutoFields(IBedTicket).omit('bed_coordinates')
     form_fields['booking_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
@@ -2497 +2527 @@
     grok.context(IBedTicket)
     grok.name('bed_allocation_slip.pdf')
-    grok.require('waeup.handleAccommodation')
+    grok.require('waeup.viewStudent')
     form_fields = grok.AutoFields(IBedTicket).omit('bed_coordinates')
     form_fields['booking_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')

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

@@ -561 +561 @@
         self.browser.getLink("Accommodation").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
-        self.assertEqual(self.browser.url, self.acco_path)
+        # We have been redirected to the manage page
+        self.assertEqual(self.browser.url, self.acco_path + '/manage')
         self.browser.open(self.student_path)
         self.browser.getLink("History").click()

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

@@ -131 +131 @@
     grok.order(7)
     grok.name('studentmanageaccommodationlink')
-    grok.require('waeup.handleAccommodation')
+    grok.require('waeup.viewStudent')
     link = 'accommodation'
     text = _(u'Accommodation')
@@ -549 +549 @@
     grok.context(IBedTicket)
     grok.view(BedTicketDisplayFormPage)
-    grok.require('waeup.handleAccommodation')
+    grok.require('waeup.viewStudent')
     icon = 'actionicon_pdf.png'
     text = _('Download bed allocation slip')