p05617423
/
bench4q
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix the bug the problem of dialog that cannot close.

This commit is contained in:
rkasdf 2013-08-29 15:21:48 +08:00
parent 18334f3064
commit 9bf2cd7894
9 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bench4q-web/src/main/java/org/bench4q/web/controller/RegisterActionController.java
View File

@ -15,8 +15,7 @@ import org.bench4q.web.model.UserModel;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.SessionAttributes;
@Controller
public class RegisterActionController extends BaseActionController {

11
bench4q-web/src/main/java/org/bench4q/web/controller/ScriptActionController.java
View File

@ -14,12 +14,7 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import org.bench4q.master.api.model.OperateScriptServerResponseModel;
import org.bench4q.master.communication.HttpRequester;
import org.bench4q.master.communication.HttpRequester.HttpResponse;
@ -145,7 +140,7 @@ public class ScriptActionController extends BaseActionController {
return objecttoString(scripts);
}
@RequestMapping("queryScriptBydate.do")
/*@RequestMapping("queryScriptBydate.do")
public void queryScriptBydate(@ModelAttribute("accessToken")String accessToken, HttpServletRequest request){
System.out.println("enter queryscript");
String urlString = masterIP + "RecordScript/queryScriptsByDate";
@ -159,7 +154,7 @@ public class ScriptActionController extends BaseActionController {
+ accessToken);
params.put("startDate","createDate");
params.put("endDate", "createDate");
}
}*/
public String objecttoString(List<Script> scripts){
Iterator<Script> it = scripts.iterator();

13
bench4q-web/src/main/java/org/bench4q/web/controller/TestPlanActionController.java
View File

@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.SessionAttributes;
@Controller
@SessionAttributes({"accessToken","tesplanID"})
@SessionAttributes({"accessToken","testplanID"})
public class TestPlanActionController extends BaseActionController {
private TestPlanResultModel result;
@ -103,11 +103,12 @@ public class TestPlanActionController extends BaseActionController {
TestPlanResultModel runTestPlanResultModel = extractRunTestPlanResultModel(httpResponse.getContent());
this.setTestPlanId(runTestPlanResultModel.getTestPlanId());
model.addAttribute("testplanID", runTestPlanResultModel.getTestPlanId().toString());
return "form";
System.out.println("finshirun");
return "result";
}
@RequestMapping("getRunningInfo.do")
public void getRunningIofo(HttpServletRequest request, @ModelAttribute("accessToken") String accessToken, @ModelAttribute("testplanID") String testplanID)
public @ResponseBody String getRunningIofo(HttpServletRequest request, @ModelAttribute("accessToken") String accessToken, @ModelAttribute("testplanID") String testplanID)
throws IOException, JAXBException {
System.out.println("enter getrunninginfo");
Map<String, String> params = new HashMap<String, String>();
@ -118,8 +119,9 @@ public class TestPlanActionController extends BaseActionController {
HttpRequester httpRequester = new HttpRequester();
String urlString = masterIP+"testPlan/getRunningInfo";
HttpResponse httpResponse = httpRequester.sendGet(urlString, params, properties);
System.out.println(httpResponse.getContent());
this.setResult(extractRunTestPlanResultModel(httpResponse.getContent()));
TestPlanResultModel testPlanResultModel = extractRunTestPlanResultModel(httpResponse.getContent());
List<RunningScriptModel> list = testPlanResultModel.getRunningScriptModels();
return Integer.toString(list.size());
}
@RequestMapping("getAgentBriefStatus.do")
@ -148,7 +150,6 @@ public class TestPlanActionController extends BaseActionController {
}
@RequestMapping("get")
private AgentBriefModel _getBriefOfAgent(UUID testPlanId, UUID agentRunIdUuid,

1
bench4q-web/src/main/webapp/bench4qjs/test.js
View File

@ -131,7 +131,6 @@ function submitform(){
savetablerow.setAttribute("warmup",$("#warmup").val());
savetablerow.setAttribute("cooldown",$("#cooldown").val());
savetablerow.setAttribute("executeRange",$("#executeRange").val());
//$("#scripttab > tbody > tr").each(function(index, element) {
// alert($(this).attr("cooldown"))
// });

2
bench4q-web/src/main/webapp/result.jsp
View File

@ -177,7 +177,7 @@
</div>
</div>
<div class="box-content">
<div id></div>
<div id="highcontainer" style="width:800px; height:300px"></div>
</div>
</div>

4
bench4q-web/src/main/webapp/test.jsp
View File

@ -273,7 +273,7 @@
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" onClick="submitform()">Submit</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" onClick="submitform()">Submit</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" >Cancel</button>
</div>
</div>
@ -304,7 +304,7 @@
</table>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" onClick="submitselectedscript()">Choose</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" onClick="submitselectedscript()">Choose</button>
<button type="button" class="btn btn-primary" data-dismiss="modal" >Cancel</button>
</div>
</div>

BIN
bench4q-web/target/classes/org/bench4q/web/controller/RegisterActionController.class
View File

Binary file not shown.

BIN
bench4q-web/target/classes/org/bench4q/web/controller/TestPlanActionController.class
View File

Binary file not shown.

2
bench4q-web/target/m2e-wtp/web-resources/META-INF/maven/bench4q-web/bench4q-web/pom.properties
View File

@ -1,5 +1,5 @@
#Generated by Maven Integration for Eclipse
#Thu Aug 29 10:38:43 CST 2013
#Thu Aug 29 15:20:26 CST 2013
version=0.0.1-SNAPSHOT
groupId=bench4q-web
m2e.projectName=bench4q-web