✨ Update grading for hparsons

Author: zihan21206

runestone/hparsons/js/BlockFeedback.js

@@ -30,9 +30,25 @@ export default class BlockFeedback extends HParsonsFeedback {
     // Called when check button clicked (block-based Feedback)
     async runButtonHandler() {
         this.checkCurrentAnswer();
+        this.logCurrentAnswer();
         this.renderFeedback();
     }
 
+    async logCurrentAnswer() {
+        let act = {
+            scheme: "block",
+            correct: this.grader.graderState == 'correct' ? "T" : "F",
+            answer: this.hparsons.hparsonsInput.getParsonsTextArray(),
+            percent: this.grader.percent
+        }
+        let logData = {
+            event: "hparsonsAnswer",
+            div_id: this.hparsons.divid, 
+            act: act
+        }
+        await this.hparsons.logBookEvent(logData);
+    }
+
     // Used for block-based feedback
     checkCurrentAnswer() {
         if (!this.solved) {

runestone/hparsons/js/SQLFeedback.js

@@ -272,34 +272,20 @@ export default class SQLFeedback extends HParsonsFeedback {
     }
 
     // copied from activecode-sql
-    async logCurrentAnswer(sid) {
-        // commenting these out for now
-        // Not sure if we need to log run event in horizontal parsons
-        // let data = {
-        //     div_id: this.hparsons.divid,
-        //     code: this.hparsons.hparsonsInput.getParsonsTextArray(),
-        //     language: "sql",
-        //     // errinfo: this.results[this.results.length - 1].status,
-        //     to_save: this.hparsons.saveCode,
-        //     prefix: this.hparsons.pretext,
-        //     suffix: this.hparsons.suffix,
-        // }; // Log the run event
-        // if (typeof sid !== "undefined") {
-        //     data.sid = sid;
-        // }
-        // await this.hparsons.logRunEvent(data);
-
+    async logCurrentAnswer() {
         if (this.unit_results) {
-            let unitData = {
-                event: "unittest",
+            let act = {
+                scheme: "execution",
+                correct: (this.failed === 0 && this.percent != null) ? "T" : "F",
+                answer: this.hparsons.hparsonsInput.getParsonsTextArray(),
+                percent: this.percent // percent is null if there is execution error
+            }
+            let logData = {
+                event: "hparsonsAnswer",
                 div_id: this.hparsons.divid,
-                course: eBookConfig.course,
-                act: this.unit_results,
-            };
-            if (typeof sid !== "undefined") {
-                unitData.sid = sid;
+                act: act
             }
-            await this.hparsons.logBookEvent(unitData);
+            await this.hparsons.logBookEvent(logData);
         }
     }
 
@@ -332,6 +318,7 @@ export default class SQLFeedback extends HParsonsFeedback {
             result += "\n";
         }
         let pct = (100 * this.passed) / (this.passed + this.failed);
+        this.percent = pct;
         pct = pct.toLocaleString(undefined, { maximumFractionDigits: 2 });
         result += `You passed ${this.passed} out of ${this.passed + this.failed
             } tests for ${pct}%`;

runestone/hparsons/js/hparsons-sql.js

@@ -75,7 +75,6 @@ export default class SQLHParsons extends RunestoneBase {
 
     // copied from activecode, already modified to add parsons
     createEditor() {
-        console.log('test create editor hparsons')
         this.outerDiv = document.createElement("div");
         $(this.origElem).replaceWith(this.outerDiv);
         let parsonsHTML = `<horizontal-parsons id='${this.divid}-hparsons'`;