Fix indentation handling for DAG based Parsons problems

Author: ascholerChemeketa

runestone/parsons/js/dagGrader.js

@@ -92,6 +92,24 @@ export default class DAGGrader extends LineBasedGrader {
     return indices;
   }
 
+  checkCorrectIndentation(solutionLines, answerLines) {
+      this.indentLeft = [];
+      this.indentRight = [];
+      let loopLimit = Math.min(solutionLines.length, answerLines.length);
+      for (let i = 0; i < loopLimit; i++) {
+          let solutionIndex = answerLines[i].tag;
+          if (answerLines[i].viewIndent() < solutionLines[solutionIndex].indent) {
+              this.indentRight.push(answerLines[i]);
+          } else if (answerLines[i].viewIndent() > solutionLines[solutionIndex].indent) {
+              this.indentLeft.push(answerLines[i]);
+          }
+      }
+      this.incorrectIndents =
+          this.indentLeft.length + this.indentRight.length;
+
+      return this.incorrectIndents == 0;
+  }
+
   checkCorrectOrdering(solutionLines, answerLines) {
     if (!isDirectedAcyclicGraph(graphToNX(solutionLines))) {
       throw "Dependency between blocks does not form a Directed Acyclic Graph; Problem unsolvable.";

runestone/parsons/js/lineGrader.js

@@ -75,20 +75,10 @@ export default class LineBasedGrader {
         let isCorrectOrder = this.checkCorrectOrdering(solutionLines, answerLines)
 
         // Determine whether blocks are indented correctly
-        this.indentLeft = [];
-        this.indentRight = [];
-        let loopLimit = Math.min(solutionLines.length, answerLines.length);
-        for (i = 0; i < loopLimit; i++) {
-            if (answerLines[i].viewIndent() < solutionLines[i].indent) {
-                this.indentRight.push(answerLines[i]);
-            } else if (answerLines[i].viewIndent() > solutionLines[i].indent) {
-                this.indentLeft.push(answerLines[i]);
-            }
-        }
-        this.incorrectIndents =
-            this.indentLeft.length + this.indentRight.length;
+        let isCorrectIndents = this.checkCorrectIndentation(solutionLines, answerLines);
+
         if (
-            this.incorrectIndents == 0 &&
+            isCorrectIndents &&
             isCorrectOrder &&
             this.correctLength
         ) {
@@ -105,6 +95,23 @@ export default class LineBasedGrader {
         return state;
     }
 
+    checkCorrectIndentation(solutionLines, answerLines) {
+        this.indentLeft = [];
+        this.indentRight = [];
+        let loopLimit = Math.min(solutionLines.length, answerLines.length);
+        for (let i = 0; i < loopLimit; i++) {
+            if (answerLines[i].viewIndent() < answerLines[i].indent) {
+                this.indentRight.push(answerLines[i]);
+            } else if (answerLines[i].viewIndent() > solutionLines[i].indent) {
+                this.indentLeft.push(answerLines[i]);
+            }
+        }
+        this.incorrectIndents =
+            this.indentLeft.length + this.indentRight.length;
+
+        return this.incorrectIndents == 0;
+    }
+
     checkCorrectOrdering(solutionLines, answerLines) {
         let isCorrectOrder = true;
         this.correctLines = 0;