fix: Fixed task type and unessesary whitespace

michaelkoelle · Jan 21, 2021 · 1c404cb · 1c404cb
1 parent 34d5301
commit 1c404cb
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/app/utils/Formatter.ts b/app/utils/Formatter.ts
@@ -126,21 +126,19 @@ export function serializeCorrection(
     : [];
   const serializedTasks =
     tasks && ratings
-      ? serializeTasks(tasks, ratings, correction.submission.sheet.type)
+      ? serializeTasks(tasks, ratings, correction.submission.sheet.valueType)
       : '';
   const serializedAnnotation =
     correction.annotation && correction.annotation.text.trim().length > 0
       ? `\n${wordWrap(correction.annotation.text, 60)}\n`
       : '';
-  const serializedConditionalComment = correction.submission.sheet.tasks
-    ? `\n${
-        getConditionalCommentForValue(
-          getRatingValueForTasks(tasks, ratings) /
-            correction.submission.sheet.maxValue,
-          conditionalComments
-        ).text
-      }\n`
-    : '';
+  const conditionalComment = getConditionalCommentForValue(
+    getRatingValueForTasks(tasks, ratings) /
+      correction.submission.sheet.maxValue,
+    conditionalComments
+  ).text;
+  const serializedConditionalComment =
+    conditionalComment.length > 0 ? `\n${conditionalComment}\n` : '';
 
   return serializedTasks + serializedAnnotation + serializedConditionalComment;
 }