From be29e385d39c1dce1f9516225ffb9e251895d751 Mon Sep 17 00:00:00 2001
From: BoYanZh <bomingzh@sjtu.edu.cn>
Date: Sat, 31 Oct 2020 02:20:04 +0800
Subject: update for C & multiple files uploading & code review checking

---
 worker/CanvasWorker.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'worker/CanvasWorker.py')

diff --git a/worker/CanvasWorker.py b/worker/CanvasWorker.py
index 954d1da..3ff60e3 100644
--- a/worker/CanvasWorker.py
+++ b/worker/CanvasWorker.py
@@ -13,6 +13,7 @@ class CanvasWorker():
                  indvScores,
                  groupScores,
                  jojScores,
+                 totalScores=None,
                  logger=Logger()):
         self.args = args
         self.rubric = rubric
@@ -22,13 +23,16 @@ class CanvasWorker():
         self.assignments = self.course.get_assignments()
         self.logger = logger
         self.scores = {}
-        self.names = names
-        for key in names:
-            self.scores[key] = {
-                **indvScores.get(key, {}),
-                **groupScores.get(key, {}),
-                **jojScores.get(key, {})
-            }
+        if totalScores is None:
+            self.names = names
+            for key in names:
+                self.scores[key] = {
+                    **indvScores.get(key, {}),
+                    **groupScores.get(key, {}),
+                    **jojScores.get(key, {})
+                }
+        else:
+            self.scores = totalScores
 
     def generateHomeworkData(self, scoreInfo):
         score = 0
@@ -49,7 +53,7 @@ class CanvasWorker():
                 scoreInfo.get("jojComment", []))
         return {
             'submission': {
-                'posted_grade': score
+                'posted_grade': max(score, -2.5)
             },
             'comment': {
                 'text_comment': '\n'.join(comment)
-- 
cgit v1.2.3