test scenario dashboard

chaminda · Feb 6, 2014 · 3d12ce6 · 3d12ce6
1 parent 0fba5ac
commit 3d12ce6
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 12 deletions.
diff --git a/.project b/.project
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>QA_PORTAL</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.dltk.core.scriptbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.php.core.JAGNature</nature>
+		<nature>org.eclipse.php.core.PHPNature</nature>
+		<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>
diff --git a/controller/TestScenarioDashboardonLoad.jag b/controller/TestScenarioDashboardonLoad.jag
@@ -2,7 +2,10 @@
     include("base64_encode.jag");
     var SERVICE_SECURE_ROOT = session.get("service_secure_root");
     var WSO2_QAP_TEST_SCENARIO_ID = parse(request.getParameter("data"));
+    //print(WSO2_QAP_TEST_SCENARIO_ID);
+
     var urlTestScenarioDetails  = SERVICE_SECURE_ROOT+"WSO2_QAP_TEST_SCENARIO_DataService/view/testscenario_with_id/"+WSO2_QAP_TEST_SCENARIO_ID;
+    //print(urlTestScenarioDetails);
 
    	var optionalHeaders = {
     "Accept": "application/json",
@@ -11,13 +14,16 @@
 
 	var dataScenarioDetails = get(urlTestScenarioDetails,"",optionalHeaders);
 	var objScenarioDetails = parse(dataScenarioDetails.data);
+	//print(objScenarioDetails);
 	var listScenarioDetails = objScenarioDetails.WSO2_QAP_TEST_SCENARIOCollection.WSO2_QAP_TEST_SCENARIO;
+	//print(listScenarioDetails);
 
 print('<input type="hidden" name="WSO2_QAP_TEST_SCENARIO_ID" value="'+WSO2_QAP_TEST_SCENARIO_ID+'">');
+print("<tr class=\"tableEvenRow\"><td>Name</td>");
+print("<td><a href="+listScenarioDetails.WSO2_QAP_TEST_SCENARIO_NAME+" target=\"_blank\">"+listScenarioDetails.WSO2_QAP_TEST_SCENARIO_NAME+"</a></td></tr>");
 print("<tr class=\"tableOddRow\"><td>Description</td>");
 print("<td>"+listScenarioDetails.WSO2_QAP_DESCRIPTION+"</td></tr>");
-//print("<tr class=\"tableEvenRow\"><td>Redmine URL</td>");
-//print("<td><a href="+listFeatureDetails.WSO2_QAP_REDMINE_URL+" target=\"_blank\">"+listFeatureDetails.WSO2_QAP_REDMINE_URL+"</a></td></tr>");
+
 
 
  %>
diff --git a/controller/featureDashboardOnload.jag b/controller/featureDashboardOnload.jag
@@ -13,6 +13,7 @@
 	var objFeatureDetails = parse(dataFeatureDetails.data);
 	var listFeatureDetails = objFeatureDetails.WSO2_QAP_FEATURECollection.WSO2_QAP_FEATURE;
 
+
 print('<input type="hidden" name="WSO2_QAP_FEATURE_ID" value="'+WSO2_QAP_FEATURE_ID+'">');
 print("<tr class=\"tableOddRow\"><td>Description</td>");
 print("<td>"+listFeatureDetails.WSO2_QAP_DESCRIPTION+"</td></tr>");

diff --git a/controller/testscenario_home_onload.jag b/controller/testscenario_home_onload.jag
@@ -41,11 +41,11 @@
 
         print('<tr vertical-align:middle>');
         print('<td style="text-align:center; !important" width="10px">');
-        print('    <input name="productId" value="'+list[i].WSO2_QAP_TEST_SCENARIO_ID+'" onclick="resetVars()" class="chkBox" type="checkbox">');
+        print('    <input name="scenarioId" value="'+list[i].WSO2_QAP_TEST_SCENARIO_ID+'" onclick="resetVars()" class="chkBox" type="checkbox">');
         print('</td>');
 
         print('<td>');
-        var link = "product_versions.jag?data="+encodeURIComponent(stringify(list[i]));
+        var link ="test_scenario_dashboard.jag?data="+encodeURIComponent(stringify(list[i].WSO2_QAP_TEST_SCENARIO_ID));
         print('<a href="'+link+'">');
         print("&emsp;&emsp;&emsp;");
         print(list[i].WSO2_QAP_TEST_SCENARIO_NAME );

diff --git a/controller/testscenario_onload.jag b/controller/testscenario_onload.jag
@@ -41,7 +41,7 @@ else if(!(list1 instanceof Array)){
     print(' </td>');
 
     print(' <td>');
-    //var link = "view_testcase.jag?data="+encodeURIComponent(stringify(object));
+    var link = "view_testcase.jag?data="+encodeURIComponent(stringify(object));
     //print('<a href="'+link+'">');
     print("&emsp;&emsp;&emsp;");
     print(list2.WSO2_QAP_TEST_SCENARIO_NAME );

diff --git a/view/test_scenario_dashboard.jag b/view/test_scenario_dashboard.jag
@@ -57,11 +57,11 @@ if(name===null){
 			</tr>
 			<tr>
 				<% 
-				require("template/product_vertical_menu.jag");
+				include("template/product_vertical_menu.jag");
 				%>
 
 				<%
-				require("template/product_menu_panel.jag");
+				include("template/product_menu_panel.jag");
 				%>
 
 				<td id="middle-content">
@@ -81,8 +81,7 @@ if(name===null){
 																		<table cellspacing="0">
 																			<tbody>
 																				<tr>
-																					<td class="breadcrumb-link"><a href="index.jag">QA
-																							Home</a>
+																					<td class="breadcrumb-link"><a href="index.jag">QA Home</a>
 																					</td>
 																					<td class="breadcrumb-link"><a
 																						href="product_home.jag">&nbsp;&gt;&nbsp;Products</a>
@@ -137,7 +136,7 @@ if(name===null){
                               document.onload=setBreadcrumDiv();
                               function setBreadcrumDiv () {
                                var breadcrumbDiv = document.getElementById('breadcrumb-div');
-                               breadcrumbDiv.innerHTML = '<table cellspacing="0"><tr><td class="breadcrumb-link"><a href="index.jag">QA Home</a></td><td class="breadcrumb-link"><a href="product_home.jag">&nbsp;&gt;&nbsp;Products</a></td><td class="breadcrumb-link">&nbsp;&gt;&nbsp;List</td><td class="breadcrumb-link">&nbsp;&gt;&nbsp;Feature dashboard</td>';
+                               breadcrumbDiv.innerHTML = '<table cellspacing="0"><tr><td class="breadcrumb-link"><a href="index.jag">QA Home</a></td><td class="breadcrumb-link"><a href="product_home.jag">&nbsp;&gt;&nbsp;Products</a></td><td class="breadcrumb-link">&nbsp;&gt;&nbsp;List</td><td class="breadcrumb-link">&nbsp;&gt;&nbsp;Test Scenario Dashboard</td>';
                             }
                             </script> <!--
                                  ~ Copyright (c) 2005-2010, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
@@ -169,7 +168,7 @@ if(name===null){
 																<table class="styledLeft" id="webappsTable" width="100%">
 																	<tbody>
 																		<%
-                                      require("../controller/TestScenarioDashboardonLoad.jag");
+                                      include("../controller/TestScenarioDashboardonLoad.jag");
                                     %>
 																	</tbody>
 																</table>

diff --git a/view/testscenario_home.jag b/view/testscenario_home.jag
@@ -238,7 +238,7 @@
                                              </thead>
                                              <tbody>
                                                 <%
-
+                                                print ("aAAAAAAAA");
                                                    include("../controller/testscenario_home_onload.jag");
 
                                                 %>
-Original file line number
+Diff line change
@@ Expand Up / @@ -238,7 +238,7 @@ @@
                                                  </thead>
                                                  <tbody>
                                                     <%
+                                                    print ("aAAAAAAAA");
                                                        include("../controller/testscenario_home_onload.jag");
                                                     %>
@@ Expand Down @@