Changeset 7150 for main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

Timestamp:

20 Nov 2011, 07:35:35 (13 years ago)

Author:

Henrik Bettermann

Message:

Turn all functions subject to customization into methods of a global utility component called StudentsUtils?. This is really an incredible improvement and eases customization a lot.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py (modified) (11 diffs)

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

@@ -45 +45 @@
     IStudentAccommodation, IStudentClearanceEdit, IStudentStudyLevel,
     ICourseTicket, ICourseTicketAdd, IStudentPaymentsContainer,
-    IStudentOnlinePayment, IBedTicket
+    IStudentOnlinePayment, IBedTicket, IStudentsUtils
     )
 from waeup.sirp.students.catalog import search
@@ -52 +52 @@
 from waeup.sirp.students.studylevel import StudentStudyLevel, CourseTicket
 from waeup.sirp.students.vocabularies import StudyLevelSource
-from waeup.sirp.students.utils import (
-    get_payment_details, get_accommodation_details, select_bed,
-    render_pdf)
 from waeup.sirp.browser.resources import toggleall
 from waeup.sirp.authentication import get_principal_role_manager
@@ -667 +664 @@
         studentview = StudentBaseDisplayFormPage(self.context.getStudent(),
             self.request)
-        return render_pdf(self,'Course Registration', 'course_registration.pdf',
+        students_utils = getUtility(IStudentsUtils)
+        return students_utils.render_pdf(
+            self,'Course Registration', 'course_registration.pdf',
             self.context.getStudent, studentview)
 
@@ -939 +938 @@
     pnav = 4
     
-    # To be sepezified in customization packages
-    def get_payment_details(self, category, student):
-        return get_payment_details(category, student)
-
     @grok.action('Create ticket')
     def createTicket(self, **data):
@@ -954 +949 @@
                 self.redirect(self.url(self.context))
                 return
-        pay_details  = self.get_payment_details(
+        students_utils = getUtility(IStudentsUtils)
+        pay_details  = students_utils.get_payment_details(
             p_category,student)
         if pay_details['error']:
@@ -1108 +1104 @@
         studentview = StudentBaseDisplayFormPage(self.context.getStudent(),
             self.request)
-        return render_pdf(self,'Payment', 'payment_receipt.pdf',
+        students_utils = getUtility(IStudentsUtils)
+        return students_utils.render_pdf(self,'Payment', 'payment_receipt.pdf',
             self.context.getStudent, studentview)
 
@@ -1217 +1214 @@
     notice = ''
 
-    # To be sepezified in customization packages
-    def get_accommodation_details(self, student):
-        return get_accommodation_details(student)
-
-    # To be sepezified in customization packages
-    def select_bed(self, available_beds):
-        return select_bed(available_beds)
-
     def update(self, SUBMIT=None):
         student = self.context.getStudent()
-        acc_details  = self.get_accommodation_details(student)
+        students_utils = getUtility(IStudentsUtils)
+        acc_details  = students_utils.get_accommodation_details(student)
         if not student.state in acc_details['allowed_states']:
             self.flash("You are in the wrong registration state.")
@@ -1264 +1254 @@
                 entry for entry in entries if entry.owner == NOT_OCCUPIED]
             if available_beds:
-                bed = self.select_bed(available_beds)
+                students_utils = getUtility(IStudentsUtils)
+                bed = students_utils.select_bed(available_beds)
                 bed.bookBed(student.student_id)
             else:
@@ -1345 +1336 @@
         studentview = StudentBaseDisplayFormPage(self.context.getStudent(),
             self.request)
-        return render_pdf(self,'Bed Allocation', 'bed_allocation.pdf',
+        students_utils = getUtility(IStudentsUtils)
+        return students_utils.render_pdf(
+            self,'Bed Allocation', 'bed_allocation.pdf',
             self.context.getStudent, studentview)
 
@@ -1364 +1357 @@
     grok.require('waeup.manageHostels')
 
-    # To be sepezified in customization packages
-    def get_accommodation_details(self, student):
-        return get_accommodation_details(student)
-
-    # To be sepezified in customization packages
-    def select_bed(self, available_beds):
-        return select_bed(available_beds)
-
     # Relocate student if student parameters have changed or the bed_type
     # of the bed has changed
     def update(self):
         student = self.context.getStudent()
-        acc_details  = self.get_accommodation_details(student)
+        students_utils = getUtility(IStudentsUtils)
+        acc_details  = students_utils.get_accommodation_details(student)
         if self.context.bed != None and \
               'reserved' in self.context.bed.bed_type:
@@ -1403 +1389 @@
                 entry for entry in entries if entry.owner == NOT_OCCUPIED]
             if available_beds:
-                new_bed = self.select_bed(available_beds)
+                students_utils = getUtility(IStudentsUtils)
+                new_bed = students_utils.select_bed(available_beds)
                 new_bed.bookBed(student.student_id)
             else: