# HG changeset patch
# User www-data <www-data@sucuk.dcs.qmul.ac.uk>
# Date 1461082862 -3600
# Node ID 4fe7b04dc3fa2dcbbbf40c2d722580f9e1cdd998
# Parent  2cc2eba252b459a344bc62d679159d76202d98da# Parent  2424a77a7c5680c7bf51728f3ab5e3c27131db06
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool

diff -r 2cc2eba252b4 -r 4fe7b04dc3fa interfaces/ape.js
--- a/interfaces/ape.js	Tue Apr 19 16:20:49 2016 +0100
+++ b/interfaces/ape.js	Tue Apr 19 17:21:02 2016 +0100
@@ -28,7 +28,7 @@
 	    	str = "";
 	    	if (hasBeenPlayed.length > 1) {
 		    	for (var i=0; i<hasBeenPlayed.length; i++) {
-		    		str = str + hasBeenPlayed[i];
+		    		str = str + (hasBeenPlayed[i]+1); // start from 1
 		    		if (i < hasBeenPlayed.length-2){
 		    			str += ", ";
 		    		} else if (i == hasBeenPlayed.length-2) {
@@ -37,7 +37,7 @@
 		    	}
 		    	alert('You have not played fragments ' + str + ' yet. Please listen, rate and comment all samples before submitting.');
 	       } else {
-	       		alert('You have not played fragment ' + hasBeenPlayed[0] + ' yet. Please listen, rate and comment all samples before submitting.');
+	       		alert('You have not played fragment ' + (hasBeenPlayed[0]+1) + ' yet. Please listen, rate and comment all samples before submitting.');
 	       }
 	        return false;
 	    }
@@ -68,15 +68,15 @@
 				}
 				if (interfaceTID.length == 1)
 				{
-					str += 'slider '+interfaceTID[0]+'. ';
+					str += 'slider '+(interfaceTID[0]+1)+'. '; // start from 1
 				}
 				else {
 					str += 'sliders ';
 					for (var k=0; k<interfaceTID.length-1; k++)
 					{
-						str += interfaceTID[k]+', ';
+						str += (interfaceTID[k]+1)+', '; // start from 1
 					}
-					str += interfaceTID[interfaceTID.length-1] +'. ';
+					str += (interfaceTID[interfaceTID.length-1]+1) +'. ';
 				}
 			}
 		}
@@ -105,7 +105,7 @@
 				if (strNums.length > 1) {
 					var str = "";
 			    	for (var i=0; i<strNums.length; i++) {
-			    		str = str + strNums[i];
+			    		str = str + (strNums[i]+1); // start from 1
 			    		if (i < strNums.length-2){
 			    			str += ", ";
 			    		} else if (i == strNums.length-2) {
@@ -114,7 +114,7 @@
 			    	}
 			    	alert('You have not commented on fragments ' + str + ' yet. Please listen, rate and comment all samples before submitting.');
 		       } else {
-		       		alert('You have not commented on fragment ' + strNums[0] + ' yet. Please listen, rate and comment all samples before submitting.');
+		       		alert('You have not commented on fragment ' + (strNums[0]+1) + ' yet. Please listen, rate and comment all samples before submitting.');
 		       }
 			}
 		}
diff -r 2cc2eba252b4 -r 4fe7b04dc3fa js/core.js
--- a/js/core.js	Tue Apr 19 16:20:49 2016 +0100
+++ b/js/core.js	Tue Apr 19 17:21:02 2016 +0100
@@ -2691,7 +2691,7 @@
 			if (passed == false)
 			{
 				check_pass = false;
-				console.log("Continue listening to track-"+object.interfaceDOM.getPresentedId());
+				console.log("Continue listening to track-"+object.interfaceDOM.getPresentedId()+1);
 				error_obj.push(object.interfaceDOM.getPresentedId());
 			}
 		}
@@ -2720,7 +2720,7 @@
 		{
 			if(ao.metric.wasMoved == false && ao.interfaceDOM.canMove() == true)
 			{
-				failed.push(ao.interfaceDOM.getPresentedId());
+				failed.push(ao.interfaceDOM.getPresentedId()+1);
 			}
 		}
 		if (failed.length == 0)
@@ -2751,7 +2751,7 @@
 		{
 			if(ao.metric.wasListenedTo == false)
 			{
-				failed.push(ao.interfaceDOM.getPresentedId());
+				failed.push(ao.interfaceDOM.getPresentedId()+1);
 			}
 		}
 		if (failed.length == 0)