X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/963ec6666865c661bb53519cce3f96b9c5fdd0a3..469775ecf6cef4426cd6a89a84889a9c007b9d01:/wtem/templatetags/wtem_csv.py

diff --git a/wtem/templatetags/wtem_csv.py b/wtem/templatetags/wtem_csv.py
index be3a905..028836c 100644
--- a/wtem/templatetags/wtem_csv.py
+++ b/wtem/templatetags/wtem_csv.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from django import template
 
 register = template.Library()
@@ -12,17 +13,20 @@ def csv_header(exercise_id, submissionSet):
         toret += ',' + examiners_string
     return toret
 
+
 @register.simple_tag
 def csv_row_fragment(exercise_id, submission, submissionSet):
     final_mark = submission.get_final_exercise_mark(exercise_id)
-    toret = str(final_mark) if isinstance(final_mark, int) else '-'
+    if final_mark is not None:
+        final_mark = ('%.2f' % final_mark).rstrip('0').rstrip('.')
+    toret = final_mark if final_mark else '-'
     examiners = submissionSet.examiners_by_exercise.get(exercise_id, [])
     marks_by_examiner = submission.get_exercise_marks_by_examiner(exercise_id)
     for examiner in examiners:
         mark = marks_by_examiner.get(str(examiner.id), None)
         toret += ','
         if mark is None:
-            toret += '-'
+            toret += '"-"'
         else:
             toret += str(mark)
     return toret