Changeset 10650 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

25 Sep 2013, 06:46:53 (11 years ago)

Author:

Henrik Bettermann

Message:

Convert longtitle() into property attribute.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• export.py (modified) (1 diff)
• reports/level_report.py (modified) (2 diffs)
• reports/session_results_presentation.py (modified) (1 diff)
• utils.py (modified) (6 diffs)

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

@@ -2930 +2930 @@
 
     def label(self):
-        return 'Students in %s' % self.context.longtitle()
+        return 'Students in %s' % self.context.longtitle
 
     def _set_session_values(self):
@@ -2996 +2996 @@
 
     def label(self):
-        return 'Students studying %s' % self.context.longtitle()
+        return 'Students studying %s' % self.context.longtitle
 
     def _searchCatalog(self, session, level):
@@ -3024 +3024 @@
 
     def label(self):
-        return 'Students registered for %s' % self.context.longtitle()
+        return 'Students registered for %s' % self.context.longtitle
 
     def _searchCatalog(self, session, level):

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

@@ -476 +476 @@
             value = certificate.title
         if name == 'department' and certificate is not None:
-            value = certificate.__parent__.__parent__.longtitle()
+            value = certificate.__parent__.__parent__.longtitle
         if name == 'faculty' and certificate is not None:
-            value = certificate.__parent__.__parent__.__parent__.longtitle()
+            value = certificate.__parent__.__parent__.__parent__.longtitle
         if name == 'passport_path' and certificate is not None:
             file_id = IFileStoreNameChooser(context).chooseName(attr='passport.jpg')

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/level_report.py

@@ -152 +152 @@
         self.faccode = faccode
         self.depcode = depcode
-        self.factitle = site['faculties'][faccode].longtitle()
-        self.deptitle = site['faculties'][faccode][depcode].longtitle()
+        self.factitle = site['faculties'][faccode].longtitle
+        self.deptitle = site['faculties'][faccode][depcode].longtitle
         self.author = author
         self.creation_dt_string = self.creation_dt.astimezone(
@@ -272 +272 @@
             for dep in fac.values():
                 faccode_depcodes.append(
-                    ('%s (%s)' %(dep.longtitle(), fac.longtitle()),
+                    ('%s (%s)' %(dep.longtitle, fac.longtitle),
                      '%s_%s' %(fac.code, dep.code)))
         self.faccode_depcodes = sorted(

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/session_results_presentation.py

@@ -130 +130 @@
         self.faccode = faccode
         self.depcode = depcode
-        self.factitle = site['faculties'][faccode].longtitle()
-        self.deptitle = site['faculties'][faccode][depcode].longtitle()
+        self.factitle = site['faculties'][faccode].longtitle
+        self.deptitle = site['faculties'][faccode][depcode].longtitle
         self.author = author
         self.creation_dt_string = self.creation_dt.astimezone(

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

@@ -142 +142 @@
             f_label = Paragraph(f_label, ENTRY1_STYLE)
             f_text = formatted_text(
-                studentview.context['studycourse'].certificate.longtitle())
+                studentview.context['studycourse'].certificate.longtitle)
             f_text = Paragraph(f_text, ENTRY1_STYLE)
             data_right.append([f_label,f_text])
@@ -150 +150 @@
             f_text = formatted_text(
                 studentview.context[
-                'studycourse'].certificate.__parent__.__parent__.longtitle(),
+                'studycourse'].certificate.__parent__.__parent__.longtitle,
                 )
             f_text = Paragraph(f_text, ENTRY1_STYLE)
@@ -159 +159 @@
             f_text = formatted_text(
                 studentview.context[
-                'studycourse'].certificate.__parent__.__parent__.__parent__.longtitle(),
+                'studycourse'].certificate.__parent__.__parent__.__parent__.longtitle,
                 )
             f_text = Paragraph(f_text, ENTRY1_STYLE)
@@ -727 +727 @@
         f_label = trans(_('Course of Study:'), portal_language)
         f_label = Paragraph(f_label, ENTRY1_STYLE)
-        f_text = formatted_text(view.context.certificate.longtitle())
+        f_text = formatted_text(view.context.certificate.longtitle)
         f_text = Paragraph(f_text, ENTRY1_STYLE)
         contextdata.append([f_label,f_text])
@@ -734 +734 @@
         f_label = Paragraph(f_label, ENTRY1_STYLE)
         f_text = formatted_text(
-            view.context.certificate.__parent__.__parent__.__parent__.longtitle())
+            view.context.certificate.__parent__.__parent__.__parent__.longtitle)
         f_text = Paragraph(f_text, ENTRY1_STYLE)
         contextdata.append([f_label,f_text])
@@ -741 +741 @@
         f_label = Paragraph(f_label, ENTRY1_STYLE)
         f_text = formatted_text(
-            view.context.certificate.__parent__.__parent__.longtitle())
+            view.context.certificate.__parent__.__parent__.longtitle)
         f_text = Paragraph(f_text, ENTRY1_STYLE)
         contextdata.append([f_label,f_text])