diff options
| author | Young Gyu Park <younggyu@google.com> | 2018-03-29 14:25:25 +0900 |
|---|---|---|
| committer | Young Gyu Park <younggyu@google.com> | 2018-03-29 14:25:25 +0900 |
| commit | 6e361f8dcfdbce11436445bb5cc0b86e290d4e75 (patch) | |
| tree | 8569690c40e505958deb1402acae0e483de8d256 /src/main/webapp | |
| parent | c9542478819193e4d511e52cfac5c0a53e4711fd (diff) | |
| download | dashboard-6e361f8dcfdbce11436445bb5cc0b86e290d4e75.tar.gz | |
Creating Green Build Page for suite test data
Test: Tested with browser on local dev server
Bug: 76448184
Change-Id: Ib4a5a53b8fb0c75bea258832287e466cf53a6830
Diffstat (limited to 'src/main/webapp')
| -rw-r--r-- | src/main/webapp/WEB-INF/jsp/show_green_suite_release.jsp | 80 |
1 files changed, 53 insertions, 27 deletions
diff --git a/src/main/webapp/WEB-INF/jsp/show_green_suite_release.jsp b/src/main/webapp/WEB-INF/jsp/show_green_suite_release.jsp index b1214cb..c883ee2 100644 --- a/src/main/webapp/WEB-INF/jsp/show_green_suite_release.jsp +++ b/src/main/webapp/WEB-INF/jsp/show_green_suite_release.jsp @@ -40,33 +40,59 @@ </div> </div> - <div class='row' id='test-suite-green-release-container'> - <div class="col s12"> - <table class="bordered highlight"> - <thead> - <tr> - <th>Branch</th> - <th>Target</th> - <th>Build ID</th> - <th>Suite Plan</th> - <th>System Fingerprint</th> - <th>Vendor Fingerprint</th> - </tr> - </thead> - <tbody> - <c:forEach var="testSuiteResultEntity" items="${testSuiteResultEntityList}"> - <tr> - <td><c:out value="${testSuiteResultEntity.branch}"></c:out></td> - <td><c:out value="${testSuiteResultEntity.target}"></c:out></td> - <td><c:out value="${testSuiteResultEntity.buildId}"></c:out></td> - <td><c:out value="${testSuiteResultEntity.suitePlan}"></c:out></td> - <td><c:out value="${testSuiteResultEntity.buildSystemFingerprint}"></c:out></td> - <td><c:out value="${testSuiteResultEntity.buildVendorFingerprint}"></c:out></td> - </tr> - </c:forEach> - </tbody> - </table> - </div> + <div class='row' id='test-plan-green-release-container'> + <table class="bordered highlight"> + <thead> + <tr> + <th>Branch</th> + <th>Last Finished Build</th> + <th>Last Green Build</th> + </tr> + </thead> + + <tbody> + <c:forEach var="branchList" items="${greenBuildInfo}"> + <tr> + <td> <c:out value="${branchList.key}"></c:out> </td> + <td> + <c:forEach varStatus="deviceLoop" var="deviceBuildInfo" items="${branchList.value}"> + <p> + <c:out value="${deviceBuildInfo.deviceBuildTarget}"></c:out> : + <c:choose> + <c:when test="${deviceBuildInfo.candidateBuildId eq 'No Test Results'}"> + <c:out value="${deviceBuildInfo.candidateBuildId}"></c:out> + </c:when> + <c:otherwise> + <c:out value="${deviceBuildInfo.candidateBuildId}"></c:out> + </c:otherwise> + </c:choose> + </p> + <c:if test="${!deviceLoop.last}"> + <hr/> + </c:if> + </c:forEach> + </td> + <td> + <c:forEach varStatus="deviceLoop" var="deviceBuildInfo" items="${branchList.value}"> + <p> + <c:choose> + <c:when test="${deviceBuildInfo.greenBuildId eq 'N/A'}"> + <c:out value="${deviceBuildInfo.greenBuildId}"></c:out> + </c:when> + <c:otherwise> + <c:out value="${deviceBuildInfo.greenBuildId}"></c:out> + </c:otherwise> + </c:choose> + </p> + <c:if test="${!deviceLoop.last}"> + <hr/> + </c:if> + </c:forEach> + </td> + </tr> + </c:forEach> + </tbody> + </table> </div> </div> |