# HG changeset patch
# User Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
# Date 1449850059 0
# Node ID 8a926674000b7b23f2530372d7ac82f667c62fc4
# Parent  9ed3abe54604e84889c9187e2ae0480c5bd92422
Bug #1488 fixed. Movement checks now operate per axis and report which axis and sliders need moving.

diff -r 9ed3abe54604 -r 8a926674000b ape.js
--- a/ape.js	Fri Dec 11 15:54:59 2015 +0000
+++ b/ape.js	Fri Dec 11 16:07:39 2015 +0000
@@ -45,31 +45,40 @@
 	};
 	
 	Interface.prototype.checkAllMoved = function() {
-		var audioObjs = audioEngineContext.audioObjects;
 		var state = true;
-		var strNums = [];
-		for (var i=0; i<audioObjs.length; i++)
+		var str = 'You have not moved the following sliders. ';
+		for (var i=0; i<this.interfaceSliders.length; i++)
 		{
-			if (audioObjs[i].metric.wasMoved == false && audioObjs[i].specification.type != 'outsidereference') {
-				state = false;
-				strNums.push(i);
+			var interfaceTID = [];
+			for (var j=0; j<this.interfaceSliders[i].metrics.length; j++)
+			{
+				if (this.interfaceSliders[i].metrics[j].wasMoved == false)
+				{
+					state = false;
+					interfaceTID.push(j);
+				}
+			}
+			if (interfaceTID.length != 0)
+			{
+				str += 'On axis "'+this.interfaceSliders[i].interfaceObject.title+'" you must move ';
+				if (interfaceTID.length == 1)
+				{
+					str += 'slider +'+interfaceTID[0]+'. ';
+				}
+				else {
+					str += 'sliders ';
+					for (var k=0; k<interfaceTID.length-1; k++)
+					{
+						str += interfaceTID[k]+', ';
+					}
+					str += interfaceTID[interfaceTID.length-1] +'. ';
+				}
 			}
 		}
-		if (state == false) {
-			if (strNums.length > 1) {
-				var str = "";
-		    	for (var i=0; i<strNums.length; i++) {
-		    		str = str + strNums[i];
-		    		if (i < strNums.length-2){
-		    			str += ", ";
-		    		} else if (i == strNums.length-2) {
-		    			str += " or ";
-		    		}
-		    	}
-		    	alert('You have not moved fragments ' + str + ' yet. Please listen, rate and comment all samples before submitting.');
-	       } else {
-	       		alert('You have not moved fragment ' + strNums[0] + ' yet. Please listen, rate and comment all samples before submitting.');
-	       }
+		if (state != true)
+		{
+			alert(str);
+			console.log(str);
 		}
 		return state;
 	};
diff -r 9ed3abe54604 -r 8a926674000b core.js
--- a/core.js	Fri Dec 11 15:54:59 2015 +0000
+++ b/core.js	Fri Dec 11 16:07:39 2015 +0000
@@ -233,6 +233,7 @@
 			{
 				console.log(e);
 				popup.buttonProceed.onclick();
+				e.preventDefault();
 			}
 		});