Changeset 9141

Timestamp:

1 Sep 2012, 07:15:42 (12 years ago)

Author:

Henrik Bettermann

Message:

Adjust student base data section on slips. Display certificate code and full name.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• applicants/browser.py (modified) (1 diff)
• students/browser.py (modified) (5 diffs)
• students/utils.py (modified) (2 diffs)

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

@@ -545 +545 @@
     grok.name('base')
     form_fields = grok.AutoFields(IApplicant).select(
-        'applicant_id', 'firstname', 'lastname','email', 'course1')
+        'applicant_id','email', 'course1')
 
 class CreateStudentPage(UtilityView, grok.View):

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

@@ -316 +316 @@
         return _('unset')
 
+class StudentBasePDFFormPage(KofaDisplayFormPage):
+    """ Page to display student base data in pdf files.
+    """
+    form_fields = grok.AutoFields(IStudentBase).omit(
+        'password', 'suspended', 'phone', 'adm_code', 'sex')
+
 class ContactStudentForm(ContactAdminForm):
     grok.context(IStudent)
@@ -525 +531 @@
 
     def render(self):
-        studentview = StudentBaseDisplayFormPage(self.context.student,
+        studentview = StudentBasePDFFormPage(self.context.student,
             self.request)
         students_utils = getUtility(IStudentsUtils)
@@ -913 +919 @@
         Mand = translate(_('Mand.'), 'waeup.kofa', target_language=portal_language)
         Score = translate(_('Score'), 'waeup.kofa', target_language=portal_language)
-        studentview = StudentBaseDisplayFormPage(self.context.student,
+        studentview = StudentBasePDFFormPage(self.context.student,
             self.request)
         students_utils = getUtility(IStudentsUtils)
@@ -1304 +1310 @@
         #    self.redirect(self.url(self.context))
         #    return
-        studentview = StudentBaseDisplayFormPage(self.context.student,
+        studentview = StudentBasePDFFormPage(self.context.student,
             self.request)
         students_utils = getUtility(IStudentsUtils)
@@ -1524 +1530 @@
 
     def render(self):
-        studentview = StudentBaseDisplayFormPage(self.context.student,
+        studentview = StudentBasePDFFormPage(self.context.student,
             self.request)
         students_utils = getUtility(IStudentsUtils)

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

@@ -117 +117 @@
     #data.append([Spacer(1, 12)])
     portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
+
+    f_label = formatted_label(size=12) % _('Name')
+    f_label = Paragraph(f_label, style["Normal"])
+    f_text = formatted_text(studentview.context.display_fullname, size=12)
+    f_text = Paragraph(f_text, style["Normal"])
+    data_right.append([f_label,f_text])
+
     for widget in studentview.widgets:
-        if widget.name == 'form.adm_code':
+        if 'name' in widget.name:
             continue
         f_label = formatted_label(size=12) % translate(
@@ -127 +134 @@
         f_text = Paragraph(f_text, style["Normal"])
         data_right.append([f_label,f_text])
+
+    if hasattr(studentview.context, 'certcode'):
+        f_label = formatted_label(size=12) % _('Study Course')
+        f_label = Paragraph(f_label, style["Normal"])
+        f_text = formatted_text(studentview.context.certcode, size=12)
+        f_text = Paragraph(f_text, style["Normal"])
+        data_right.append([f_label,f_text])
+
     table_left = Table(data_left,style=SLIP_STYLE)
     table_right = Table(data_right,style=SLIP_STYLE, colWidths=[5*cm, 6*cm])