comparison ape.js @ 940:475aeb3075da

Don't allow to submit before all songs are played (slightly hacky patch)

 // preTest - In preTest state
 // testRun-ID - In test running, test Id number at the end 'testRun-2'
 // testRunPost-ID - Post test of test ID
 // testRunPre-ID - Pre-test of test ID
 // postTest - End of test, final submission!
+
+
+// Create empty array to log whether different samples have been played
+var hasBeenPlayed = []; // HERE?
 
 
 // Once this is loaded and parsed, begin execution
 loadInterface(projectXML);
 

 			audioEngineContext.selectedTrack(id);
             // Currently playing track red, rest green
             document.getElementById('track-slider-'+index).style.backgroundColor = "#FF0000";
             for (var i = 0; i<$(currentTrackOrder).length; i++)
             {
-                if (i!=index)
+                if (i!=index) // Make all other sliders green
                 {
                     document.getElementById('track-slider-'+i).style.backgroundColor = "rgb(100,200,100)";
                 }
                               
             }
             audioEngineContext.play();
+            hasBeenPlayed[index] = true; // mark as played
 		};
 		
 		canvas.appendChild(trackSliderObj);
+        
+        // Add corresponding element to array to check whether sound has been played
+        hasBeenPlayed.push(false);
 	});
 	
 	// Append any commentQuestion boxes
 	var commentQuestions = $(textXML).find('CommentQuestion');
 	$(commentQuestions).each(function(index,element) {

 	}
 }
 
 function buttonSubmitClick() // TODO: Only when all songs have been played!
 {
-	if (audioEngineContext.status == 1) {
-		var playback = document.getElementById('playback-button');
-		playback.click();
-	// This function is called when the submit button is clicked. Will check for any further tests to perform, or any post-test options
-	} else
-	{
-		if (audioEngineContext.timer.testStarted == false)
-		{
-			alert('You have not started the test! Please press start to begin the test!');
-			return;
-		}
-	}
-	if (currentState.substr(0,7) == 'testRun')
-	{
-		audioEngineContext.timer.stopTest();
-		advanceState();
-	}
+    if (hasBeenPlayed.indexOf(false)==-1)
+        {
+        if (audioEngineContext.status == 1) {
+            var playback = document.getElementById('playback-button');
+            playback.click();
+        // This function is called when the submit button is clicked. Will check for any further tests to perform, or any post-test options
+        } else
+        {
+            if (audioEngineContext.timer.testStarted == false)
+            {
+                alert('You have not started the test! Please press start to begin the test!');
+                return;
+            }
+        }
+        if (currentState.substr(0,7) == 'testRun')
+        {
+            hasBeenPlayed = []; // clear array to prepare for next test
+            audioEngineContext.timer.stopTest();
+            advanceState();
+        }
+    } else // if a fragment has not been played yet
+    {
+        alert('You have not played fragment ' + hasBeenPlayed.indexOf(false) + ' yet. Please listen, rate and comment all samples before submitting.');
+        return;
+    }
 }
 
 function convSliderPosToRate(id)
 {
 	var w = document.getElementById('slider').style.width;