diff options
| author | Young Gyu Park <younggyu@google.com> | 2018-04-18 14:45:46 +0900 |
|---|---|---|
| committer | Keun Soo Yim <yim@google.com> | 2018-04-19 02:16:09 +0000 |
| commit | 81a026062cd56132f145862720d3472f16384ac2 (patch) | |
| tree | 940901ee9b3f185ef6d75938560a254fcf46fe19 /src/main/webapp | |
| parent | d32eb9559b034b40ea3745ee20dd23f4d9fec91d (diff) | |
| download | dashboard-81a026062cd56132f145862720d3472f16384ac2.tar.gz | |
Implementing suite test category.
Test: go/vts-web-staging/show_plan_release?plan=vts&type=suite&page=1
Bug: 78095215
Change-Id: I0f8eb37e6cba3942f5816a57869ed49e50123d92
Diffstat (limited to 'src/main/webapp')
| -rw-r--r-- | src/main/webapp/WEB-INF/datastore-indexes.xml | 1 | ||||
| -rw-r--r-- | src/main/webapp/WEB-INF/jsp/show_suite_release.jsp | 29 |
2 files changed, 27 insertions, 3 deletions
diff --git a/src/main/webapp/WEB-INF/datastore-indexes.xml b/src/main/webapp/WEB-INF/datastore-indexes.xml index 09aabb2..3d5a58f 100644 --- a/src/main/webapp/WEB-INF/datastore-indexes.xml +++ b/src/main/webapp/WEB-INF/datastore-indexes.xml @@ -108,6 +108,7 @@ </datastore-index> <datastore-index kind="TestSuiteResultEntity" ancestor="false" source="manual"> + <property name="groupType" direction="asc"/> <property name="suitePlan" direction="asc"/> <property name="__key__" direction="desc"/> </datastore-index> diff --git a/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp b/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp index 9f438b1..55039f4 100644 --- a/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp +++ b/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp @@ -27,6 +27,11 @@ <link type='text/css' href='/css/test_results.css' rel='stylesheet'> <script type='text/javascript'> $(document).ready(function() { + $("li.tab").each(function( index ) { + $(this).click(function() { + window.open($(this).children().attr("href"), '_self'); + }); + }); }); </script> <body> @@ -38,6 +43,24 @@ </div> </div> + <div class='row'> + <div class='col s12'> + + <ul class="tabs"> + <li class="tab col s6" id="otaTabLink"> + <a class="${groupType == 'OTA' ? 'active' : 'inactive'}" href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&groupType=OTA">OTA</a> + </li> + <li class="tab col s6" id="signedTabLink"> + <a class="${groupType == 'SIGNED' ? 'active' : 'inactive'}" href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&groupType=SIGNED">SIGNED</a> + </li> + <li class="tab col s6" id="totTabLink"> + <a class="${groupType == 'TOT' ? 'active' : 'inactive'}" href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&groupType=TOT">TOT</a> + </li> + </ul> + + </div> + </div> + <div class='row' id='test-suite-green-release-container'> <div class="col s12"> @@ -117,7 +140,7 @@ <c:choose> <c:when test="${testSuiteResultEntityPagination.minPageRange gt testSuiteResultEntityPagination.pageSize}"> <li class="waves-effect"> - <a href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&page=${testSuiteResultEntityPagination.minPageRange - 1}&nextPageToken=${testSuiteResultEntityPagination.previousPageCountToken}"> + <a href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&groupType=${groupType}&page=${testSuiteResultEntityPagination.minPageRange - 1}&nextPageToken=${testSuiteResultEntityPagination.previousPageCountToken}"> <i class="material-icons">chevron_left</i> </a> </li> @@ -128,7 +151,7 @@ </c:choose> <c:forEach var="pageLoop" begin="${testSuiteResultEntityPagination.minPageRange}" end="${testSuiteResultEntityPagination.maxPageRange}"> <li class="waves-effect"> - <a href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&page=${pageLoop}<c:if test="${testSuiteResultEntityPagination.currentPageCountToken ne ''}">&nextPageToken=${testSuiteResultEntityPagination.currentPageCountToken}</c:if>"> + <a href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&groupType=${groupType}&page=${pageLoop}<c:if test="${testSuiteResultEntityPagination.currentPageCountToken ne ''}">&nextPageToken=${testSuiteResultEntityPagination.currentPageCountToken}</c:if>"> <c:out value="${pageLoop}" /> </a> </li> @@ -136,7 +159,7 @@ <c:choose> <c:when test="${testSuiteResultEntityPagination.maxPages gt testSuiteResultEntityPagination.pageSize}"> <li class="waves-effect"> - <a href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&page=${testSuiteResultEntityPagination.maxPageRange + 1}&nextPageToken=${testSuiteResultEntityPagination.nextPageCountToken}"> + <a href="${requestScope['javax.servlet.forward.servlet_path']}?plan=${plan}&type=${testType}&groupType=${groupType}&page=${testSuiteResultEntityPagination.maxPageRange + 1}&nextPageToken=${testSuiteResultEntityPagination.nextPageCountToken}"> <i class="material-icons">chevron_right</i> </a> </li> |