From 4efb05684b767026344ac6f2edb5118eba79e87c Mon Sep 17 00:00:00 2001
From: BoYanZh <32470225+BoYanZh@users.noreply.github.com>
Date: Sun, 4 Oct 2020 23:19:11 +0800
Subject: update: rubric detail

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

(limited to 'worker/CanvasWorker.py')

diff --git a/worker/CanvasWorker.py b/worker/CanvasWorker.py
index 99ad61c..e5457a2 100644
--- a/worker/CanvasWorker.py
+++ b/worker/CanvasWorker.py
@@ -37,11 +37,16 @@ class CanvasWorker():
             for _ in range(scoreInfo.get(key, 0)):
                 score += value[0]
                 comment.append(f"{value[1]}, {value[0]}")
-        comment.extend(
-            scoreInfo.get("indvComment", []) +
-            scoreInfo.get("groupComment", []) +
-            scoreInfo.get("jojComment", []))
-        if not comment: comment = ['good job']
+        if not comment:
+            comment = ['good job']
+        else:
+            comment.insert(0, "Genral Info:")
+            comment.append("")
+            comment.append("Detail:")
+            comment.extend(
+                scoreInfo.get("indvComment", []) +
+                scoreInfo.get("groupComment", []) +
+                scoreInfo.get("jojComment", []))
         return {
             'submission': {
                 'posted_grade': score
@@ -62,12 +67,12 @@ class CanvasWorker():
             name = currentUser.name.strip()
             if name not in self.names: continue
             data = self.generateHomeworkData(self.scores[name])
-            self.logger.debug(data.__repr__())
-            # submission.edit(**data)
+            self.logger.debug(f"{name} {data.__repr__()}")
+            submission.edit(**data)
 
     def exportScores(self, fileName):
         json.dump(self.scores,
                   open(fileName, "w"),
                   ensure_ascii=False,
                   indent=4)
-        self.logger.debug("score dump to score.json succeed")
\ No newline at end of file
+        self.logger.debug(f"score dump to {fileName} succeed")
\ No newline at end of file
-- 
cgit v1.2.3