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

Timestamp:

9 Dec 2011, 12:34:30 (13 years ago)

Author:

Henrik Bettermann

Message:

It seems that font attributes can't be defined in Tables if Paragraphs are being used. The latter have to be used to render the widgets properly.

Reorganise slip pages in students section.

Sort course lists by semester and course code.

File:

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

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

@@ -90 +90 @@
     """
     grok.context(IStudentsContainer)
-    title = u'Students'
+    title = 'Students'
 
 class StudentBreadcrumb(Breadcrumb):
@@ -104 +104 @@
     """
     grok.context(IStudentStudyCourse)
-    title = u'Study Course'
+    title = 'Study Course'
 
 class PaymentsBreadcrumb(Breadcrumb):
@@ -110 +110 @@
     """
     grok.context(IStudentPaymentsContainer)
-    title = u'Payments'
+    title = 'Payments'
 
 class OnlinePaymentBreadcrumb(Breadcrumb):
@@ -125 +125 @@
     """
     grok.context(IStudentAccommodation)
-    title = u'Accommodation'
+    title = 'Accommodation'
 
     #@property
@@ -536 +536 @@
     grok.require('waeup.viewStudent')
     form_fields = grok.AutoFields(IStudentClearance).omit('clearance_locked')
+    form_fields['date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
     prefix = 'form'
+    title = 'Clearance Data'
 
     @property
@@ -547 +549 @@
         students_utils = getUtility(IStudentsUtils)
         return students_utils.renderPDF(
-            self,'Clearance', 'clearance.pdf',
+            self, 'clearance.pdf',
             self.context.getStudent(), studentview)
 
@@ -819 +821 @@
     form_fields = grok.AutoFields(IStudentStudyLevel)
     prefix = 'form'
+    title = 'Level Data'
+    content_title = 'Course List'
 
     @property
@@ -828 +832 @@
             self.request)
         students_utils = getUtility(IStudentsUtils)
+        tabledata = sorted(self.context.values(),
+            key=lambda value: str(value.semester) + value.code)
         return students_utils.renderPDF(
-            self,'Course Registration', 'course_registration.pdf',
+            self, 'course_registration.pdf',
             self.context.getStudent(), studentview,
             tableheader=[('Sem.','semester', 1.5),('Code','code', 2.5),
@@ -838 +844 @@
                          ('Score', 'score', 1.5),('Auto', 'automatic', 1.5)
                          ],
-            tabledata=self.context.values())
+            tabledata=tabledata)
 
 class StudyLevelManageActionButton(ManageActionButton):
@@ -1255 +1261 @@
     form_fields['payment_date'].custom_widget = FriendlyDateDisplayWidget('le')
     prefix = 'form'
+    title = 'Payment Data'
 
     @property
@@ -1268 +1275 @@
             self.request)
         students_utils = getUtility(IStudentsUtils)
-        return students_utils.renderPDF(self,'Payment', 'payment_receipt.pdf',
+        return students_utils.renderPDF(self, 'payment_receipt.pdf',
             self.context.getStudent(), studentview)
 
@@ -1479 +1486 @@
     form_fields['booking_date'].custom_widget = FriendlyDateDisplayWidget('le')
     prefix = 'form'
+    title = 'Bed Allocation Data'
 
     @property
     def label(self):
-        return 'Bed Allocation %s' % self.context.bed_coordinates
+        return 'Bed Allocation: %s' % self.context.bed_coordinates
 
     def render(self):
@@ -1489 +1497 @@
         students_utils = getUtility(IStudentsUtils)
         return students_utils.renderPDF(
-            self,'Bed Allocation', 'bed_allocation.pdf',
+            self, 'bed_allocation.pdf',
             self.context.getStudent(), studentview)