Changeset 14473 for main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py

Timestamp:

27 Jan 2017, 15:53:33 (8 years ago)

Author:

Henrik Bettermann

Message:

Define and use format_float utility method.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py (modified) (3 diffs)

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

@@ -256 +256 @@
     data = []
     style = getSampleStyleSheet()
+    format_float = getUtility(IKofaUtils).format_float
     for level in levels_data:
         level_obj = level['level']
@@ -282 +283 @@
             element[2]*cm for element in tableheader], style=CONTENT_STYLE)
         data.append(table)
-        sgpa = '%s: %.2f' % (trans('Sessional GPA (rectified)', lang), level['sgpa'])
+        sgpa = format_float(level['sgpa'], 2)
+        sgpa = '%s: %s' % (trans('Sessional GPA (rectified)', lang), sgpa)
+        #sgpa = '%s: %.2f' % (trans('Sessional GPA (rectified)', lang), level['sgpa'])
         data.append(Paragraph(sgpa, style["Normal"]))
     return data
@@ -928 +931 @@
         f_label = trans(_('Cumulative GPA:'), portal_language)
         f_label = Paragraph(f_label, ENTRY1_STYLE)
-        f_text = formatted_text('%.3f (%s)' % (
-            transcript_data[1], self.getClassFromCGPA(
-                transcript_data[1], student)[1]))
+        format_float = getUtility(IKofaUtils).format_float
+        cgpa = format_float(transcript_data[1], 3)
+        f_text = formatted_text('%s (%s)' % (
+            cgpa, self.getClassFromCGPA(transcript_data[1], student)[1]))
         f_text = Paragraph(f_text, ENTRY1_STYLE)
         contextdata.append([f_label,f_text])