diff --git a/HTML/Assets/Detectors/Lumilo/Critical_Struggle/critical_struggle.js b/HTML/Assets/Detectors/Lumilo/Critical_Struggle/critical_struggle.js index cf7214f..239119c 100644 --- a/HTML/Assets/Detectors/Lumilo/Critical_Struggle/critical_struggle.js +++ b/HTML/Assets/Detectors/Lumilo/Critical_Struggle/critical_struggle.js @@ -335,7 +335,7 @@ function secondsSince(initTime){ function checkTimeElapsed(initTime) { var timeDiff = secondsSince(initTime); var currTimeMessage = detector_output.value.split(',')[1]; - if( timeDiff > (300-seedTime) && currTimemessage!=" > 5 min"){ + if( timeDiff > (300-seedTime) && currTimeMessage!=" > 5 min"){ detector_output.history = JSON.stringify([attemptWindow, skillLevelsAttempts, initTime, onboardSkills]); detector_output.value = "1, > 5 min, " + elaborationString; detector_output.time = new Date(); @@ -343,7 +343,7 @@ function checkTimeElapsed(initTime) { postMessage(detector_output); console.log("output_data = ", detector_output); } - else if( timeDiff > (120-seedTime) && currTimemessage!=" > 2 min"){ + else if( timeDiff > (120-seedTime) && currTimeMessage!=" > 2 min"){ detector_output.history = JSON.stringify([attemptWindow, skillLevelsAttempts, initTime, onboardSkills]); detector_output.value = "1, > 2 min, " + elaborationString; detector_output.time = new Date(); @@ -351,7 +351,7 @@ function checkTimeElapsed(initTime) { postMessage(detector_output); console.log("output_data = ", detector_output); } - else if( timeDiff > (60-seedTime) && currTimemessage!=" > 1 min"){ + else if( timeDiff > (60-seedTime) && currTimeMessage!=" > 1 min"){ detector_output.history = JSON.stringify([attemptWindow, skillLevelsAttempts, initTime, onboardSkills]); detector_output.value = "1, > 1 min, " + elaborationString; detector_output.time = new Date(); @@ -359,7 +359,7 @@ function checkTimeElapsed(initTime) { postMessage(detector_output); console.log("output_data = ", detector_output); } - else if( timeDiff > (45-seedTime) && currTimemessage!=" > 45 s"){ + else if( timeDiff > (45-seedTime) && currTimeMessage!=" > 45 s"){ detector_output.history = JSON.stringify([attemptWindow, skillLevelsAttempts, initTime, onboardSkills]); detector_output.value = "1, > 45 s, " + elaborationString; detector_output.time = new Date(); @@ -368,7 +368,7 @@ function checkTimeElapsed(initTime) { console.log("output_data = ", detector_output); } else{ - if(currTimemessage!=" > " + seedTime.toString() + " s") + if(currTimeMessage!=" > " + seedTime.toString() + " s") detector_output.history = JSON.stringify([attemptWindow, skillLevelsAttempts, initTime, onboardSkills]); detector_output.value = "1, > " + seedTime.toString() + " s, " + elaborationString; detector_output.time = new Date(); diff --git a/HTML/Assets/Detectors/Lumilo/Struggle/struggle__moving_average.js b/HTML/Assets/Detectors/Lumilo/Struggle/struggle__moving_average.js index 75f03cb..2a7b6c1 100644 --- a/HTML/Assets/Detectors/Lumilo/Struggle/struggle__moving_average.js +++ b/HTML/Assets/Detectors/Lumilo/Struggle/struggle__moving_average.js @@ -40,7 +40,7 @@ function secondsSince(initTime){ function checkTimeElapsed(initTime) { var timeDiff = secondsSince(initTime); var currTimeMessage = detector_output.value.split(',')[1]; - if( timeDiff > (300-seedTime) && currTimemessage!=" > 5 min"){ + if( timeDiff > (300-seedTime) && currTimeMessage!=" > 5 min"){ detector_output.history = JSON.stringify([attemptWindow, initTime]); detector_output.value = "1, > 5 min, " + elaborationString; detector_output.time = new Date(); @@ -48,7 +48,7 @@ function checkTimeElapsed(initTime) { postMessage(detector_output); console.log("output_data = ", detector_output); } - else if( timeDiff > (120-seedTime) && currTimemessage!=" > 2 min"){ + else if( timeDiff > (120-seedTime) && currTimeMessage!=" > 2 min"){ detector_output.history = JSON.stringify([attemptWindow, initTime]); detector_output.value = "1, > 2 min, " + elaborationString; detector_output.time = new Date(); @@ -56,7 +56,7 @@ function checkTimeElapsed(initTime) { postMessage(detector_output); console.log("output_data = ", detector_output); } - else if( timeDiff > (60-seedTime) && currTimemessage!=" > 1 min"){ + else if( timeDiff > (60-seedTime) && currTimeMessage!=" > 1 min"){ detector_output.history = JSON.stringify([attemptWindow, initTime]); detector_output.value = "1, > 1 min, " + elaborationString; detector_output.time = new Date(); @@ -64,7 +64,7 @@ function checkTimeElapsed(initTime) { postMessage(detector_output); console.log("output_data = ", detector_output); } - else if( timeDiff > (45-seedTime) && currTimemessage!=" > 45 s"){ + else if( timeDiff > (45-seedTime) && currTimeMessage!=" > 45 s"){ detector_output.history = JSON.stringify([attemptWindow, initTime]); detector_output.value = "1, > 45 s, " + elaborationString; detector_output.time = new Date(); @@ -73,7 +73,7 @@ function checkTimeElapsed(initTime) { console.log("output_data = ", detector_output); } else{ - if(currTimemessage!=" > " + seedTime.toString() + " s") + if(currTimeMessage!=" > " + seedTime.toString() + " s") detector_output.history = JSON.stringify([attemptWindow, initTime]); detector_output.value = "1, > " + seedTime.toString() + " s, " + elaborationString; detector_output.time = new Date(); diff --git a/HTML/Assets/Detectors/Lumilo/System_Misuse/system_misuse.js b/HTML/Assets/Detectors/Lumilo/System_Misuse/system_misuse.js index d3e6bf4..89f99ac 100644 --- a/HTML/Assets/Detectors/Lumilo/System_Misuse/system_misuse.js +++ b/HTML/Assets/Detectors/Lumilo/System_Misuse/system_misuse.js @@ -54,7 +54,7 @@ function secondsSince(initTime){ function checkTimeElapsed(initTime) { var timeDiff = secondsSince(initTime); var currTimeMessage = detector_output.value.split(',')[1]; - if( timeDiff > (300-seedTime) && currTimemessage!=" > 5 min"){ + if( timeDiff > (300-seedTime) && currTimeMessage!=" > 5 min"){ detector_output.history = JSON.stringify([attemptWindow, initTime]); detector_output.value = "1, > 5 min, " + elaborationString; detector_output.time = new Date(); @@ -62,7 +62,7 @@ function checkTimeElapsed(initTime) { postMessage(detector_output); console.log("output_data = ", detector_output); } - else if( timeDiff > (120-seedTime) && currTimemessage!=" > 2 min"){ + else if( timeDiff > (120-seedTime) && currTimeMessage!=" > 2 min"){ detector_output.history = JSON.stringify([attemptWindow, initTime]); detector_output.value = "1, > 2 min, " + elaborationString; detector_output.time = new Date(); @@ -70,7 +70,7 @@ function checkTimeElapsed(initTime) { postMessage(detector_output); console.log("output_data = ", detector_output); } - else if( timeDiff > (60-seedTime) && currTimemessage!=" > 1 min"){ + else if( timeDiff > (60-seedTime) && currTimeMessage!=" > 1 min"){ detector_output.history = JSON.stringify([attemptWindow, initTime]); detector_output.value = "1, > 1 min, " + elaborationString; detector_output.time = new Date(); @@ -78,7 +78,7 @@ function checkTimeElapsed(initTime) { postMessage(detector_output); console.log("output_data = ", detector_output); } - else if( timeDiff > (45-seedTime) && currTimemessage!=" > 45 s"){ + else if( timeDiff > (45-seedTime) && currTimeMessage!=" > 45 s"){ detector_output.history = JSON.stringify([attemptWindow, initTime]); detector_output.value = "1, > 45 s, " + elaborationString; detector_output.time = new Date(); @@ -87,7 +87,7 @@ function checkTimeElapsed(initTime) { console.log("output_data = ", detector_output); } else{ - if(currTimemessage!=" > " + seedTime.toString() + " s") + if(currTimeMessage!=" > " + seedTime.toString() + " s") detector_output.history = JSON.stringify([attemptWindow, initTime]); detector_output.value = "1, > " + seedTime.toString() + " s, " + elaborationString; detector_output.time = new Date();