Changeset 7004 for main/waeup.sirp/trunk/src/waeup

Timestamp:

6 Nov 2011, 08:52:36 (13 years ago)

Author:

Henrik Bettermann

Message:

Prepare selection of bed for customization.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• browser.py (modified) (5 diffs)
• utils.py (modified) (3 diffs)

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

@@ -50 +50 @@
 from waeup.sirp.students.vocabularies import StudyLevelSource
 from waeup.sirp.students.utils import (
-    getPaymentDetails, getAccommodationDetails,)
+    getPaymentDetails, getAccommodationDetails, selectBed)
 from waeup.sirp.browser.resources import toggleall
 from waeup.sirp.authentication import get_principal_role_manager
@@ -1091 +1091 @@
         return getAccommodationDetails(student)
 
+    # To be sepezified in customization packages
+    def selectBed(self, student):
+        return getAccommodationDetails(student)
+
     def update(self, SUBMIT=None):
         student = self.context.getStudent()
@@ -1098 +1102 @@
             self.redirect(self.url(self.context))
             return
+        if str(student['studycourse'].entry_session) in self.context.keys():
+            self.flash('Ticket for %d already created.'
+                % student['studycourse'].entry_session)
+            self.redirect(self.url(self.context))
+            return
         self.ac_series = self.request.form.get('ac_series', None)
         self.ac_number = self.request.form.get('ac_number', None)
-
         if SUBMIT is None:
             return
@@ -1121 +1129 @@
         entries = cat.searchResults(
             owner=(student.student_id,student.student_id))
+        # Cannot happen but anyway ...
         if len(entries):
             bed = [entry for entry in entries][0]
@@ -1143 +1152 @@
         bedticket.booking_session = acc_details['booking_session']
         bedticket.bed_type = acc_details['bt']
-        bed = available_beds[0] # first bed found
+        bed = selectBed(available_beds)
         bed.bookBed(student.student_id)
-        bedticket.bed = bed # maybe wo don't need the bed object itself
+        bedticket.bed = bed # maybe wo don't need the bed object itself and can
+                            # remove that later
         hall_title = bed.__parent__.hostel_name
         coordinates = bed.getBedCoordinates()[1:]

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

@@ -21 +21 @@
     return
 
-# To be specified in customization packages.
+# To be specified in customization packages, see also view which
+# calls the function.
 # This function is for demonstration and testing only.
 def getPaymentDetails(category, student):
@@ -45 +46 @@
         d['amount'] = academic_session.fee_2
     elif category == 'bed_allocation':
-        d['p_item'] = getBedType(student)
+        d['p_item'] = getAccommodationDetails(student)['bt']
         d['amount'] = academic_session.booking_fee
     return d
 
-# To be specified in customization packages.
+# To be specified in customization packages, see also view which
+# calls the function.
 # This function is for demonstration and testing only.
 def getAccommodationDetails(student):
@@ -76 +78 @@
     d['bt'] = u'%s_%s_%s' % (special_handling,sex,bt)
     return d
+
+# To be specified in customization packages, see also view which
+# calls the function.
+# I the standard configuration we select the first bed found,
+# but can also randomize the selection if we like.
+def selectBed(available_beds):
+    return available_beds[0]