changeset 665:88a5278b9332

Added postTest handling
author Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
date Fri, 10 Apr 2015 15:09:33 +0100
parents efeaf92d9906
children 2c25ca4d7ec6
files ape.js
diffstat 1 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ape.js	Fri Apr 10 15:04:53 2015 +0100
+++ b/ape.js	Fri Apr 10 15:09:33 2015 +0100
@@ -303,6 +303,12 @@
 		var testId = currentState.substr(11,currentState.length-10);
 		var preTest = testXMLSetups.find('PreTest')[testId];
 		this.value = preTestButtonClick(preTest,this.value);
+	} else if (currentState == 'postTest')
+	{
+		// At the end of the test, running global post test
+		var xmlTree = projectXML.find('setup');
+		var PostTest = xmlTree.find('PostTest')[0];
+		this.value = preTestButtonClick(PostTest,this.value);
 	}
 }
 
@@ -416,10 +422,12 @@
 			loadTest(testId+1);
 		} else {
 			console.log('Testing Completed!');
+			currentState = 'postTest';
 			// Check for any post tests
 			var xmlSetup = projectXML.find('setup');
-			var postTest = xmlSetup.find('PostTest');
-			console.log(postTest);
+			var postTest = xmlSetup.find('PostTest')[0];
+			showPopup();
+			preTestPopupStart(postTest);
 		}
 	}
 	console.log(currentState);