From 885758c3d345e16d87ca92b4aa37845c0bd4962a Mon Sep 17 00:00:00 2001
From: daisyonly <1241945585@qq.com>
Date: Fri, 29 Aug 2014 10:26:19 +0800
Subject: [PATCH] add content Verification

add content Verification
---
 .../scriptManager/contentVerification.js      | 43 ++++++++++++++++---
 .../script/scriptManager/createScript.js      |  5 ++-
 .../script/scriptManager/dataCollect.js       | 35 ++++++++++++---
 .../script/scriptManager/editorFactory.js     |  6 +--
 .../script/scriptManager/scriptEditor.js      |  6 ++-
 5 files changed, 78 insertions(+), 17 deletions(-)

diff --git a/Bench4Q-Web/src/main/webapp/script/scriptManager/contentVerification.js b/Bench4Q-Web/src/main/webapp/script/scriptManager/contentVerification.js
index 35af054c..53c55df2 100644
--- a/Bench4Q-Web/src/main/webapp/script/scriptManager/contentVerification.js
+++ b/Bench4Q-Web/src/main/webapp/script/scriptManager/contentVerification.js
@@ -1,5 +1,38 @@
-$(document).ready(function(){	
-	$("#behaviorEditor").on("focusout",".editor input",function(){
-	    console.log(this);
-	})
-});
\ No newline at end of file
+$(function() {
+	$(document).ready(function(){	
+		$("#behaviorEditor").on("focusout",".editor input",function(){
+		    var input = $(this);
+		    if(input.attr("required") == "required" && input.val() == ""){
+		    	information("Please fill in the parameter");
+		    	input.focus();
+		    }	    
+		})
+	});
+});
+
+function checkPluginsInput(plugins) {
+	for (var i = 0; i < plugins.length; i++){
+		for (var j = 0; j < plugins[i].parameters.length; j++){
+			if (plugins[i].parameters[j].check =="false")
+				return false;
+		}
+	}
+	return true;
+}
+
+function checkPagesInput(pages) {
+	for (var i = 0;i < pages.length; i++){
+		console.log(pages[i].batches.length);
+		for (var j = 0; j < pages[i].batches.length; j++){
+			for (var k = 0; k < pages[i].batches[j].behaviors.length; k++){
+				for (var q = 0; q < pages[i].batches[j].behaviors[k].parameters.length; q++){
+					if (pages[i].batches[j].behaviors[k].parameters[q].check == "false"){
+						return false;
+					}					
+				}
+				
+			}
+		}
+	}
+	return true;
+}
diff --git a/Bench4Q-Web/src/main/webapp/script/scriptManager/createScript.js b/Bench4Q-Web/src/main/webapp/script/scriptManager/createScript.js
index 8a383250..7fe2890a 100644
--- a/Bench4Q-Web/src/main/webapp/script/scriptManager/createScript.js
+++ b/Bench4Q-Web/src/main/webapp/script/scriptManager/createScript.js
@@ -6,6 +6,9 @@ $(function() {
 	$("#submitScript").click(function() {
 		var plugins = usePlugin.getPlugins();
 		var pages = usePlugin.getPages();
-		submitScript(pages,plugins);
+		if(checkPluginsInput(plugins) && checkPagesInput(pages))
+			submitScript(pages,plugins);
+		else
+			information("必填的参数没有填写完整,请补充完整后提交");
 	});
 });
diff --git a/Bench4Q-Web/src/main/webapp/script/scriptManager/dataCollect.js b/Bench4Q-Web/src/main/webapp/script/scriptManager/dataCollect.js
index ab31bf59..0b87c42d 100644
--- a/Bench4Q-Web/src/main/webapp/script/scriptManager/dataCollect.js
+++ b/Bench4Q-Web/src/main/webapp/script/scriptManager/dataCollect.js
@@ -1,6 +1,11 @@
-var Parameter = function(key, value) {
+var Parameter = function(key, value, check) {
 	this.key = key;
 	this.value = value;
+	if (check == undefined)
+		this.check = "true";
+	else
+		this.check = check;
+	
 }
 var DataCollector = function() {
 };
@@ -24,19 +29,26 @@ DataCollector.prototype.fieldData = function(editor) {
 	var name = $(editor).attr("id");
 	editor = $(editor.children('.field'));
 	var value = editor.children("input").val();
+	var required = editor.children("input").attr("required");
+	var check = "true";
+	if (required == "required" && value == "")
+		check = "false"; 
 	// if (!this.validate(value)) {
 	// return false;
 	// }
-
-	return new Parameter(name, value);
+	return new Parameter(name, value, check);
 };
 DataCollector.prototype.dateData = function(editor) {
 	var name = editor.attr("id");
 	var value = editor.children("input").val();
+	var required = editor.children("input").attr("required");
+	var check = "true";
+	if (required == "required" && value == "")
+		check = "false"; 
 	// if (!this.validate(value)) {
 	// return false;
 	// }
-	return new Parameter(name, value);
+	return new Parameter(name, value, check);
 };
 DataCollector.prototype.multiFieldData = function(editor) {
 	var editorArray = editor.children(".field");
@@ -47,9 +59,13 @@ DataCollector.prototype.multiFieldData = function(editor) {
 	}
 	var name = editor.attr("id")
 	var value = "";
-
+	var check = "true";
 	for ( var i = 0; i < editorArray.length; i++) {
 		var fieldValue = $(editorArray[i]).children("input").val();
+		var tmpRequired = $(editorArray[i]).children("input").attr("required");
+		if (tmpRequired =="required" && fieldValue == ""){
+			check = "false";
+		}
 		if (fieldValue == "") {
 			continue;
 		}
@@ -60,7 +76,7 @@ DataCollector.prototype.multiFieldData = function(editor) {
 	// if (!this.validate(value)) {
 	// return false;
 	// }
-	return new Parameter(name, value);
+	return new Parameter(name, value, check);
 
 };
 
@@ -69,10 +85,15 @@ DataCollector.prototype.tableData = function(editor) {
 	var editorArray = editor.find("tbody").children("tr");
 	var name = editor.attr("id");
 	var value = "";
+	var check = "true";
 	for ( var i = 0; i < editorArray.length; i++) {
 		var tdArray = $(editorArray[i]).children("td");
 		var trValue = "";
 		for ( var j = 0; j < tdArray.length; j++) {
+			var tmpRequired = $(tdArray[j]).children("input").attr("required");
+			var tmpValue = $(tdArray[j]).children("input").val();
+			if (tmpRequired == "Required" && tmpValue == "")
+				check = "false";	
 			if ($(tdArray[j]).children("input").val() == undefined
 					|| $(tdArray[j]).children("input").val() == "") {
 				continue;
@@ -88,7 +109,7 @@ DataCollector.prototype.tableData = function(editor) {
 	// if (!this.validate(value)) {
 	// return false;
 	// }
-	return new Parameter(name, value);
+	return new Parameter(name, value, check);
 
 };
 DataCollector.prototype.selectData = function(editor) {
diff --git a/Bench4Q-Web/src/main/webapp/script/scriptManager/editorFactory.js b/Bench4Q-Web/src/main/webapp/script/scriptManager/editorFactory.js
index 8f8d361f..d7eb4784 100644
--- a/Bench4Q-Web/src/main/webapp/script/scriptManager/editorFactory.js
+++ b/Bench4Q-Web/src/main/webapp/script/scriptManager/editorFactory.js
@@ -101,7 +101,7 @@ EditorFactory.prototype.createFieldLine = function(size, name, required, value)
 	$(fieldName).html(name);
 	var field = document.createElement("input");
 	$(field).attr("type", "text");
-	if(required=="true"){
+	if(required == "true"){
 		$(field).attr("required", "required");
 	}
 //	$(field).attr("maxlength", size);
@@ -227,7 +227,7 @@ function(label, name, required, cols, id, value) {
 			$(input).attr("type", "text");
 			$(input).attr("style","width:"+"90%");
 			if(required == "true"){
-				$(field).attr("required", "required");
+				$(input).attr("required", "required");
 			}
 			if(values[i] != undefined){
 				$(input).val(values[i].split("=")[1]);
@@ -280,7 +280,7 @@ EditorFactory.prototype.createDate = function(label, name, required, size, id, v
 	var date = document.createElement("input");
 	$(date).attr("type", "date");
 	if(required == "true"){
-		$(field).attr("required", "required");
+		$(date).attr("required", "required");		
 	}
 	$(div).children(".editor").append(dateLabel);
 	$(div).children(".editor").append(date);
diff --git a/Bench4Q-Web/src/main/webapp/script/scriptManager/scriptEditor.js b/Bench4Q-Web/src/main/webapp/script/scriptManager/scriptEditor.js
index cea6bb64..feffa788 100644
--- a/Bench4Q-Web/src/main/webapp/script/scriptManager/scriptEditor.js
+++ b/Bench4Q-Web/src/main/webapp/script/scriptManager/scriptEditor.js
@@ -28,6 +28,7 @@ $(function() {
 	var scriptId = getvars()['scriptId'];
 	var usePlugin = new UsePlugin("useBehaviorList");
 	getScriptObject(scriptId,usePlugin);
+	
 	$("#scriptName").val(getvars()['name']);
 
 	$("#tabs").tabs();
@@ -36,7 +37,10 @@ $(function() {
 	$("#submitScript").click(function() {
 		var plugins = usePlugin.getPlugins();
 		var pages = usePlugin.getPages();
-		updateScript(scriptId,pages,plugins);
+		if(checkPluginsInput(plugins) && checkPagesInput(pages))
+			updateScript(scriptId,pages,plugins);
+		else
+			information("必填的参数没有填写完整,请补充完整后提交");
 
 	});
 });