Changeset 7186 for main/waeup.sirp/trunk/src/waeup/sirp/students

Timestamp:

24 Nov 2011, 11:31:04 (13 years ago)

Author:

Henrik Bettermann

Message:

Rename functions according to the WAeUP style guide:

functions and methods with property decorator with underscore

methods with CamelCase

Location:

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

Files:

• browser.py (modified) (10 diffs)
• interfaces.py (modified) (3 diffs)
• utils.py (modified) (6 diffs)

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

@@ -737 +737 @@
             self.request)
         students_utils = getUtility(IStudentsUtils)
-        return students_utils.render_pdf(
+        return students_utils.renderPDF(
             self,'Course Registration', 'course_registration.pdf',
             self.context.getStudent, studentview)
@@ -1022 +1022 @@
                 return
         students_utils = getUtility(IStudentsUtils)
-        pay_details  = students_utils.get_payment_details(
+        pay_details  = students_utils.getPaymentDetails(
             p_category,student)
         if pay_details['error']:
@@ -1177 +1177 @@
             self.request)
         students_utils = getUtility(IStudentsUtils)
-        return students_utils.render_pdf(self,'Payment', 'payment_receipt.pdf',
+        return students_utils.renderPDF(self,'Payment', 'payment_receipt.pdf',
             self.context.getStudent, studentview)
 
@@ -1289 +1289 @@
         student = self.context.getStudent()
         students_utils = getUtility(IStudentsUtils)
-        acc_details  = students_utils.get_accommodation_details(student)
+        acc_details  = students_utils.getAccommodationDetails(student)
         if not student.state in acc_details['allowed_states']:
             self.flash("You are in the wrong registration state.")
@@ -1327 +1327 @@
             if available_beds:
                 students_utils = getUtility(IStudentsUtils)
-                bed = students_utils.select_bed(available_beds)
+                bed = students_utils.selectBed(available_beds)
                 bed.bookBed(student.student_id)
             else:
@@ -1409 +1409 @@
             self.request)
         students_utils = getUtility(IStudentsUtils)
-        return students_utils.render_pdf(
+        return students_utils.renderPDF(
             self,'Bed Allocation', 'bed_allocation.pdf',
             self.context.getStudent, studentview)
@@ -1434 +1434 @@
         student = self.context.getStudent()
         students_utils = getUtility(IStudentsUtils)
-        acc_details  = students_utils.get_accommodation_details(student)
+        acc_details  = students_utils.getAccommodationDetails(student)
         if self.context.bed != None and \
               'reserved' in self.context.bed.bed_type:
@@ -1462 +1462 @@
             if available_beds:
                 students_utils = getUtility(IStudentsUtils)
-                new_bed = students_utils.select_bed(available_beds)
+                new_bed = students_utils.selectBed(available_beds)
                 new_bed.bookBed(student.student_id)
             else:
@@ -1719 +1719 @@
 
     @grok.action('Save and request clearance')
-    def requestclearance(self, **data):
+    def requestClearance(self, **data):
         self.applyData(self.context, **data)
         self.context._p_changed = True
@@ -1964 +1964 @@
 
     @grok.action('Register course list')
-    def register_courses(self, **data):
+    def RegisterCourses(self, **data):
         state = IWorkflowState(self.context.getStudent()).getState()
         IWorkflowInfo(self.context.getStudent()).fireTransition('register_courses')

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

@@ -30 +30 @@
 
     """
-    def get_payment_details(category, student):
+    def getPaymentDetails(category, student):
         """Get the payment dates of a student for the payment category
         specified.
@@ -36 +36 @@
         """
 
-    def get_accommodation_details(student):
+    def getAccommodation_details(student):
         """Determine the accommodation dates of a student.
 
         """
 
-    def select_bed(available_beds):
+    def selectBed(available_beds):
         """Select a bed from a list of available beds.
 
@@ -48 +48 @@
         """
 
-    def render_pdf(view, subject='', filename='slip.pdf',):
+    def renderPDF(view, subject='', filename='slip.pdf',):
         """Render pdf slips for various pages.
 

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

@@ -35 +35 @@
     return
 
-def setUpWidgets(view, ignore_request=False):
+def set_up_widgets(view, ignore_request=False):
     view.adapters = {}
     view.widgets = setUpEditWidgets(
@@ -44 +44 @@
 
 def render_student_data(student, studentview):
-    setUpWidgets(studentview, ignore_request=True)
+    set_up_widgets(studentview, ignore_request=True)
     data = []
     style = getSampleStyleSheet()
@@ -63 +63 @@
     grok.implements(IStudentsUtils)
 
-    def get_payment_details(self,category, student):
+    def getPaymentDetails(self,category, student):
         d = {}
         d['p_item'] = u''
@@ -85 +85 @@
             d['amount'] = academic_session.clearance_fee
         elif category == 'bed_allocation':
-            d['p_item'] = self.get_accommodation_details(student)['bt']
+            d['p_item'] = self.getAccommodationDetails(student)['bt']
             d['amount'] = academic_session.booking_fee
         return d
 
-    def get_accommodation_details(self, student):
+    def getAccommodationDetails(self, student):
         d = {}
         d['error'] = u''
@@ -117 +117 @@
     # In the standard configuration we select the first bed found,
     # but can also randomize the selection if we like.
-    def select_bed(self, available_beds):
+    def selectBed(self, available_beds):
         return available_beds[0]
 
-    def render_pdf(self, view, subject='', filename='slip.pdf',
+    def renderPDF(self, view, subject='', filename='slip.pdf',
         student=None, studentview=None):
         # (0,0),(-1,-1) = whole table
@@ -153 +153 @@
             story.append(studenttable)
         story.append(Spacer(1, 18))
-        setUpWidgets(view)
+        set_up_widgets(view)
         data = []
         for widget in view.widgets: