minor bug fixes for current problem history and minor tweak to critic…

…al struggle
d19fe8 · Jul 13, 2017 · 9ae9040 · 9ae9040
1 parent 5edcfd6
commit 9ae9040
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/HTML/Assets/Detectors/Lumilo/Critical_Struggle/critical_struggle.js b/HTML/Assets/Detectors/Lumilo/Critical_Struggle/critical_struggle.js
@@ -6,7 +6,7 @@ var variableName = "critical_struggle"
 //initializations (do not touch)
 var detector_output = {name: variableName,
 						category: "Dashboard", 
-						value: "0, none",
+						value: "0, > 0 s",
 						history: "",
 						skill_names: "",
 						step_id: "",

diff --git a/HTML/Assets/Detectors/Lumilo/current_problem_history.js b/HTML/Assets/Detectors/Lumilo/current_problem_history.js
@@ -108,7 +108,7 @@ function receive_transaction( e ){
 				}
 				else{
 					if(stepCounter[currStep] != 1){
-						currLeft = currLeft + "*";
+						currLeft = "[*] " + currLeft;
 					}
 				}
 			}
@@ -119,7 +119,7 @@ function receive_transaction( e ){
 				}
 				else{
 					if(stepCounter[currStep] != 1){
-						currRight = currRight + "*";
+						currRight = currRight + " [*]";
 					}
 				}
 			}
@@ -130,10 +130,7 @@ function receive_transaction( e ){
 						//this currently relies on the existing problem naming convention(!)
 						//would be ideal to change this to something more robust... specifically:
 						//would be nice if we could access varables from tutor state (variable table...)
-						prevEq = e.data.context.problem_name.replace(" ", " + ").replace("eq", " = ").replace("+", " + ").replace("=", " = ");
-						if("par" in prevEq){
-							prevEq = reinsertParentheses(prevEq);
-						} 
+						prevEq = e.data.context.problem_name.replace(" ", " + ").replace("eq", " = ").replace("+", " + ").replace("=", " = ").replace("par", "(");
 						runningSolutionMinusCurrentLine = prevEq;
 						//"-x 6eq15"
 					}