Changeset 8046

Timestamp:

5 Apr 2012, 11:28:20 (12 years ago)

Author:

Henrik Bettermann

Message:

Define SEPARATORS_DICT in ApplicantsUtils?.

Insert headlines (separators) between groups of widgets also in pdf slips.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• pdf.py (modified) (3 diffs)
• utils.py (modified) (2 diffs)

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

@@ -60 +60 @@
 grok.context(IKofaObject) # Make IKofaObject the default context
 
-SEPARATORS = {}
-SEPARATORS['form.course1'] = _(u'Desired Courses')
-SEPARATORS['form.screening_score'] = _(u'Process Data')
-
 class ApplicantsRootPage(KofaPage):
     grok.context(IApplicantsRoot)
@@ -389 +385 @@
     label = _('Applicant')
     pnav = 3
-    separators = SEPARATORS
+
+    @property
+    def separators(self):
+        return getUtility(IApplicantsUtils).SEPARATORS_DICT
 
     def update(self):
@@ -630 +629 @@
     display_actions = [[_('Save'), _('Final Submit')],
         [_('Add online payment ticket'),_('Remove selected tickets')]]
-    separators = SEPARATORS
+
+    @property
+    def separators(self):
+        return getUtility(IApplicantsUtils).SEPARATORS_DICT
 
     def update(self):

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

@@ -21 +21 @@
 import grok
 from datetime import datetime
-from zope.component import getUtility
-from zope.i18n import translate
 from reportlab.pdfgen import canvas
 from reportlab.lib.units import cm
@@ -29 +27 @@
 from reportlab.platypus import Frame, Paragraph, Image, Table, Spacer
 from reportlab.platypus.tables import TableStyle
+from zope.i18n import translate
 from zope.component import getUtility
 from zope.formlib.form import setUpEditWidgets
 from zope.publisher.browser import TestRequest
 from waeup.kofa.widgets.datewidget import FriendlyDateDisplayWidget
-from waeup.kofa.applicants.interfaces import IApplicant
+from waeup.kofa.applicants.interfaces import IApplicant, IApplicantsUtils
 from waeup.kofa.browser import DEFAULT_PASSPORT_IMAGE_PATH
 from waeup.kofa.interfaces import IExtFileStore, IPDF, IKofaUtils
@@ -175 +174 @@
         portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
         for widget in widgets: # self.widgets:
+            separators = getUtility(IApplicantsUtils).SEPARATORS_DICT
+            if separators and separators.get(widget.name):
+                f_headline = ('<font size=12><strong>%s</strong></font>'
+                    % translate(separators[widget.name], 'waeup.kofa',
+                    target_language=portal_language))
+                f_headline = Paragraph(f_headline, style["Normal"])
+                data.append([f_headline ])
             f_label = '<font size=12>%s</font>:' % translate(
                 widget.label.strip(), 'waeup.kofa',

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

@@ -21 +21 @@
 import grok
 from waeup.kofa.applicants.interfaces import IApplicantsUtils
+from waeup.kofa.interfaces import MessageFactory as _
 
 class ApplicantsUtils(grok.GlobalUtility):
@@ -30 +31 @@
       'app': ['General Studies', 'APP'],
       }
+
+    SEPARATORS_DICT = {
+      'form.course1': _(u'Desired Study Courses'),
+      'form.screening_score': _(u'Process Data'),
+      }