X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/6612e6c0026cee6bbeb7845a5c5749420b409b3b..b4c1e57963e6a646c0d20c6d99dfd667a9952290:/wtem/templatetags/wtem_csv.py

diff --git a/wtem/templatetags/wtem_csv.py b/wtem/templatetags/wtem_csv.py
index 9d444e7..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,16 +13,20 @@ def csv_header(exercise_id, submissionSet):
         toret += ',' + examiners_string
     return toret
 
+
 @register.simple_tag
 def csv_row_fragment(exercise_id, submission, submissionSet):
-    toret = '%s' % submission.final_result
-    examiners = submissionSet.examiners_by_exercise[exercise_id]
+    final_mark = submission.get_final_exercise_mark(exercise_id)
+    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[examiner.id]
+        mark = marks_by_examiner.get(str(examiner.id), None)
         toret += ','
         if mark is None:
-            toret += '-'
+            toret += '"-"'
         else:
             toret += str(mark)
     return toret