From 37abca2229dd9468d7c61cb1a4298c63158c6e63 Mon Sep 17 00:00:00 2001
From: hmm <hmm@hmm-PC>
Date: Thu, 4 Sep 2014 17:43:29 +0800
Subject: [PATCH] response host ip to web when recording script resolve stop
 recording button add highlight in new script and new testplan webpage

---
 .../bench4q/master/api/ScriptController.java  |  2 +-
 .../OperateScriptServerResponseModel.java     | 20 +++++++++----------
 Bench4Q-Web/src/main/webapp/createScript.jsp  |  2 +-
 Bench4Q-Web/src/main/webapp/script.jsp        |  2 +-
 .../script/RecordScript/RecordScriptServer.js | 19 ++++++------------
 .../script/RecordScript/RecordScriptUI.js     |  9 ++++++---
 .../script/RecordScript/ScriptListManage.js   |  2 --
 .../webapp/script/TestPlan/TestPlanModels.js  | 13 ++++++++++--
 Bench4Q-Web/src/main/webapp/test.jsp          |  1 +
 9 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/Bench4Q-Master/src/main/java/org/bench4q/master/api/ScriptController.java b/Bench4Q-Master/src/main/java/org/bench4q/master/api/ScriptController.java
index 871058f1..d96b4499 100644
--- a/Bench4Q-Master/src/main/java/org/bench4q/master/api/ScriptController.java
+++ b/Bench4Q-Master/src/main/java/org/bench4q/master/api/ScriptController.java
@@ -368,7 +368,7 @@ public class ScriptController extends BaseController {
 		OperateScriptServerResponseModel responseModel = new OperateScriptServerResponseModel();
 		responseModel.setSuccess(isSuccess);
 		responseModel.setFailCauseString(failCauseString);
-		responseModel.setHostName(hostName);
+		responseModel.setHostNameString(hostName);
 		responseModel.setPort(port);
 		responseModel.setFileName(fileName);
 		if (scriptModels == null || scriptModels.size() == 0) {
diff --git a/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/OperateScriptServerResponseModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/OperateScriptServerResponseModel.java
index d151d486..c740bcdf 100644
--- a/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/OperateScriptServerResponseModel.java
+++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/OperateScriptServerResponseModel.java
@@ -37,16 +37,7 @@ public class OperateScriptServerResponseModel {
 	public void setFailCauseString(String failCauseString) {
 		this.failCauseString = failCauseString;
 	}
-
-	@XmlElement
-	public String getHostNameString() {
-		return hostNameString;
-	}
-
-	public void setHostName(String hostNameString) {
-		this.hostNameString = hostNameString;
-	}
-
+	
 	@XmlElement
 	public int getPort() {
 		return port;
@@ -65,6 +56,15 @@ public class OperateScriptServerResponseModel {
 		this.fileName = fileName;
 	}
 
+	@XmlElement
+	public String getHostNameString() {
+		return hostNameString;
+	}
+
+	public void setHostNameString(String hostNameString) {
+		this.hostNameString = hostNameString;
+	}
+
 	@XmlElement
 	public List<ScriptModel> getScriptModels() {
 		return scriptModels;
diff --git a/Bench4Q-Web/src/main/webapp/createScript.jsp b/Bench4Q-Web/src/main/webapp/createScript.jsp
index 996d5298..13d69a4f 100644
--- a/Bench4Q-Web/src/main/webapp/createScript.jsp
+++ b/Bench4Q-Web/src/main/webapp/createScript.jsp
@@ -226,11 +226,11 @@ body {
 		<script src="lib/bootstrap/js/bootstrap-modal.js"></script>
 		<script src="lib/chrisma/js/jquery.cookie.js"></script>
 		<script src="lib/chrisma/js/theme.js"></script>
-		<!-- <script src="script/base.js"></script> -->
 		<script src="lib/HashMap/HashMap.js"></script>
 		<script src="lib/other/jstree.min.js"></script>
 		<script src="lib/other/jquery.msgbox.min.js"></script>
 		<script src="lib/other/jquery.noty.packaged.min.js"></script>
+		<script src="script/base.js"></script>
 		<script src="script/scriptManager/scriptModels.js"></script>
 		<script src="script/scriptManager/editorFactory.js"></script>
 		<script src="script/scriptManager/containerFactory.js"></script>
diff --git a/Bench4Q-Web/src/main/webapp/script.jsp b/Bench4Q-Web/src/main/webapp/script.jsp
index 79ce3003..8ded5155 100644
--- a/Bench4Q-Web/src/main/webapp/script.jsp
+++ b/Bench4Q-Web/src/main/webapp/script.jsp
@@ -145,7 +145,7 @@ body {
 			<div class="modal hide fade" id="myModal">
 				<div class="modal-header">
 					<button type="button" id="myModal-close" class="close"
-						data-dismiss="modal">×</button>
+						data-dismiss="modal" onclick="resetMsg()">×</button>
 					<h3>
 						<fmt:message key="settings" />
 					</h3>
diff --git a/Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptServer.js b/Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptServer.js
index 199f2f07..99f40acf 100644
--- a/Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptServer.js
+++ b/Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptServer.js
@@ -13,16 +13,16 @@ function startServer() {
 			$("#target-url2").val($("#target-url").val());
 			$('#scriptInfo2').text(
 					$.i18n.prop("setProxy")+
-						" IP:133.133.2.100"
-								+ " ,port: " + server.port
+						" IP:"+server.hostNameString
+								+ " , port: " + server.port
 								+ $.i18n.prop("recordScript"))
-			$('#stopRecording').attr('disabled', false);
+			$('#stopRecording').attr('disabled', true);
 			$('#startRecording').attr('disabled', false);
 			startServerSuccess = true;
-			stopServerSuccess = false;
 		} else {
 			$('#scriptInfo').html(
 					$.i18n.prop("startServerFail") + data.failedMessage);
+			information($.i18n.prop("startServerFail") + data.failedMessage);
 		}
 	}, "json");
 }
@@ -46,7 +46,6 @@ function startRecording() {
 				$('#stopRecording').attr('disabled', false);
 				$('#startRecording').attr('disabled', true);
 				startRecordingSuccess = true;
-				stopServerSuccess = false;
 			}
 		}, "json");
 	} else {
@@ -63,19 +62,15 @@ function stopRecording() {
 			if (!data.success) {
 				$('#scriptInfo3').text(
 						"stop record server error:" + data.failedMessage);
-
-				$('#stopRecording').attr('disabled', true);
 				$('#startRecording').attr('disabled', false);
 			}
 			else {
-
 				$('#scriptInfo3').text($.i18n.prop("stopRecord"));
-				$('#stopRecording').attr('disabled', true);
 				$('#fileName').show();
 				stopServer();
-				stopServerSuccess = true;
 				startRecordingSuccess = false;
 			}
+			$('#stopRecording').attr('disabled', true);
 		}, "json");
 	} else {
 		$('#scriptInfo3').text("record script server has not started");
@@ -91,13 +86,11 @@ function stopServer() {
 			if (!data.success) {
 				$('#scriptInfo3').text(
 						"stop record server error:" + data.failedMessage);
-				$('#stopRecording').attr('disabled', true);
-				$('#startRecording').attr('disabled', false);
 			}
 			else {
-				stopServerSuccess = true;
 				startServerSuccess = false;
 			}
+			$('#startRecording').attr('disabled', false);
 		}, "json");
 	} else {
 		$('#scriptInfo3').text("record script server has not started");
diff --git a/Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptUI.js b/Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptUI.js
index c81f3f13..9a91300d 100644
--- a/Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptUI.js
+++ b/Bench4Q-Web/src/main/webapp/script/RecordScript/RecordScriptUI.js
@@ -5,12 +5,12 @@ $('.btn-setting').click(function(e) {
 
 function dismiss(container){
 	$(container).modal('hide');
-	if(startRecordingSuccess && !stopServerSuccess){
+	if(startRecordingSuccess){
 		stopRecording();
 		$('#fileName').hide();
-	}
-	if(startServerSuccess && !stopServerSuccess)
+	}else if(startServerSuccess)
 		stopServer();
+	resetMsg();
 }
 
 $('#uploadScript')
@@ -51,4 +51,7 @@ $(document).ready(function() {
 
 function refresh() {
 	location.replace(location);
+}
+function resetMsg(){
+	$('#scriptInfo').html($.i18n.prop("startServer"));
 }
\ No newline at end of file
diff --git a/Bench4Q-Web/src/main/webapp/script/RecordScript/ScriptListManage.js b/Bench4Q-Web/src/main/webapp/script/RecordScript/ScriptListManage.js
index 6374d441..f519ad45 100644
--- a/Bench4Q-Web/src/main/webapp/script/RecordScript/ScriptListManage.js
+++ b/Bench4Q-Web/src/main/webapp/script/RecordScript/ScriptListManage.js
@@ -16,9 +16,7 @@ function loadScript(table) {
 								new Date(scripts[i].createDateTime),
 								editButton + deleteButton ]).draw().node();
 				$(tr).attr("id", scripts[i].id);
-
 			}
-
 		} else {
 			information(data.failedMessage);
 		}
diff --git a/Bench4Q-Web/src/main/webapp/script/TestPlan/TestPlanModels.js b/Bench4Q-Web/src/main/webapp/script/TestPlan/TestPlanModels.js
index 2367e240..47ff7074 100644
--- a/Bench4Q-Web/src/main/webapp/script/TestPlan/TestPlanModels.js
+++ b/Bench4Q-Web/src/main/webapp/script/TestPlan/TestPlanModels.js
@@ -6,11 +6,20 @@ function ScriptModel(ID, load, warmup, cooldown, executeRange, isFilterTimer, fi
 	this.cooldown = cooldown;
 	this.isFilterTimer = isFilterTimer;
 	this.filterTypeMatches = filterTypeMatches;
-}
+};
 
 
 function TestPlanRequestModel(scriptList, ipList, testPlanName) {
 	this.scriptList = scriptList;
 	this.ipList = ipList;
 	this.testPlanName = testPlanName;
-};
\ No newline at end of file
+};
+
+function WebScheduleModel(points){
+	this.points = points;
+}
+
+function WebPointModel(timeInSecond, load){
+	this.timeInSecond = timeInSecond;
+	this.load = load;
+}
\ No newline at end of file
diff --git a/Bench4Q-Web/src/main/webapp/test.jsp b/Bench4Q-Web/src/main/webapp/test.jsp
index d6f23a3f..3e3d94c8 100644
--- a/Bench4Q-Web/src/main/webapp/test.jsp
+++ b/Bench4Q-Web/src/main/webapp/test.jsp
@@ -225,6 +225,7 @@ body {
 		<script src="lib/chrisma/js/theme.js"></script>
 		<script src="http://code.highcharts.com/highcharts.js"></script>
 		<script src="lib/other/jquery.noty.packaged.min.js"></script>
+		<script src="script/base.js"></script>
 		<script src="script/scriptManager/uiFactory.js"></script>
 		<script src="script/Share/loadProperties.js"></script>
 		<script src="script/TestPlan/TestPlanModels.js"></script>