summaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorYoung Gyu Park <younggyu@google.com>2018-04-17 17:47:20 +0900
committerYoung Gyu Park <younggyu@google.com>2018-04-17 17:53:00 +0900
commit0cef205aaa74773e2fd493ee711b001caf9ad8b1 (patch)
treec1e2fc23e2c7e3c70970552fe6ee8210ffe3d148 /src/main
parentd3396241a4e1ea86e3609c4157be875cb2eb8d17 (diff)
downloaddashboard-0cef205aaa74773e2fd493ee711b001caf9ad8b1.tar.gz
Bug fix on pagination
Test: go/vts-web-staging/show_plan_release?plan=vts&type=suite&page=1 Bug: 77456536 Change-Id: I68ee4a73c70e6114364f643f0aa1ae1b92a41517
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java3
-rw-r--r--src/main/java/com/android/vts/util/Pagination.java4
-rw-r--r--src/main/webapp/WEB-INF/jsp/show_suite_release.jsp58
-rw-r--r--src/main/webapp/css/test_results.css8
4 files changed, 50 insertions, 23 deletions
diff --git a/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java b/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java
index 588c789..e0d7509 100644
--- a/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java
+++ b/src/main/java/com/android/vts/servlet/ShowPlanReleaseServlet.java
@@ -290,7 +290,7 @@ public class ShowPlanReleaseServlet extends BaseServlet {
ofy().load()
.type(TestSuiteResultEntity.class)
.filter("suitePlan", testPlan)
- .limit(105);
+ .orderKey(true);
Pagination<TestSuiteResultEntity> testSuiteResultEntityPagination =
new Pagination(
@@ -306,6 +306,7 @@ public class ShowPlanReleaseServlet extends BaseServlet {
} else {
this.pageCountTokenSet.add(nextPageTokenPagination);
}
+
logger.log(Level.INFO, "pageCountTokenSet => " + pageCountTokenSet);
logger.log(Level.INFO, "list => " + testSuiteResultEntityPagination.getList());
diff --git a/src/main/java/com/android/vts/util/Pagination.java b/src/main/java/com/android/vts/util/Pagination.java
index 6223c35..ddf4d38 100644
--- a/src/main/java/com/android/vts/util/Pagination.java
+++ b/src/main/java/com/android/vts/util/Pagination.java
@@ -103,14 +103,14 @@ public class Pagination<T> implements Iterable<T> {
this.totalCount / this.pageSize + (this.totalCount % this.pageSize == 0 ? 0 : 1);
int iteratorIndex = 0;
- int startIndex = (page % pageSize == 0 ? 1 : page % pageSize - 1) * pageSize;
+ int startIndex = (page % pageSize == 0 ? 9 : page % pageSize - 1) * pageSize;
QueryResultIterator<T> resultIterator = query.iterator();
while (resultIterator.hasNext()) {
if (startIndex <= iteratorIndex && iteratorIndex < startIndex + this.pageSize)
this.list.add(resultIterator.next());
else resultIterator.next();
- if (iteratorIndex == DEFAULT_PAGE_SIZE * this.pageSize) {
+ if (iteratorIndex == DEFAULT_PAGE_WINDOW * this.pageSize) {
this.nextPageCountToken = resultIterator.getCursor().toWebSafeString();
}
iteratorIndex++;
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 e4b3837..73ab4e6 100644
--- a/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp
+++ b/src/main/webapp/WEB-INF/jsp/show_suite_release.jsp
@@ -27,7 +27,6 @@
<link type='text/css' href='/css/test_results.css' rel='stylesheet'>
<script type='text/javascript'>
$(document).ready(function() {
-
});
</script>
<body>
@@ -42,26 +41,45 @@
<div class='row' id='test-suite-green-release-container'>
<div class="col s12">
- <ul data-collapsible="expandable" class="collapsible popout test-runs">
+ <ul class="collapsible popout test-runs">
<c:forEach var="testSuiteResultEntity" items="${testSuiteResultEntityPagination.list}">
<li class="test-run-container">
- <div test="SampleShellTest" time="1522488372555217" class="collapsible-header test-run">
- <span class="test-run-metadata">
- <b><c:out value="${testSuiteResultEntity.branch}"></c:out>/<c:out value="${testSuiteResultEntity.target}"></c:out> (<c:out value="${testSuiteResultEntity.buildId}"></c:out>)</b><br>
- <b>Suite Build Number: </b><c:out value="${testSuiteResultEntity.suiteBuildNumber}"></c:out><br>
- <b>VTS Build: </b><c:out value="${testSuiteResultEntity.buildId}"></c:out><br>
- <b>Modules: </b><c:out value="${testSuiteResultEntity.modulesDone}"></c:out>/<c:out value="${testSuiteResultEntity.modulesTotal}"></c:out><br>
- <b>LOG Path: </b><c:out value="${testSuiteResultEntity.resultPath}"></c:out><br>
- <jsp:setProperty name="startDateObject" property="time" value="${testSuiteResultEntity.startTime}"/>
- <jsp:setProperty name="endDateObject" property="time" value="${testSuiteResultEntity.endTime}"/>
- <fmt:formatDate value="${startDateObject}" pattern="yyyy-MM-dd HH:mm:ss" timeZone="${timeZone}" /> - <fmt:formatDate value="${endDateObject}" pattern="yyyy-MM-dd HH:mm:ss z" timeZone="${timeZone}" />
- <c:set var="executionTime" scope="page" value="${(testSuiteResultEntity.endTime - testSuiteResultEntity.startTime) / 1000}"/>
- (<c:out value="${executionTime}"></c:out>s)
- </span>
- <span class="indicator right center green">
- <c:out value="${testSuiteResultEntity.passedTestCaseCount}"></c:out>/<c:out value="${testSuiteResultEntity.passedTestCaseCount + testSuiteResultEntity.failedTestCaseCount}"></c:out>
- </span>
- <i class="material-icons expand-arrow">expand_more</i>
+ <div class="collapsible-header test-run">
+ <div class="row" style="margin-bottom: 0px; line-height: 30px;">
+ <div class="col s9">
+ <b><c:out value="${testSuiteResultEntity.branch}"></c:out>/<c:out value="${testSuiteResultEntity.target}"></c:out> (<c:out value="${testSuiteResultEntity.buildId}"></c:out>)</b>
+ </div>
+ <div class="col s3">
+ <span class="indicator right center green">
+ <c:out value="${testSuiteResultEntity.passedTestCaseCount}"></c:out>/<c:out value="${testSuiteResultEntity.passedTestCaseCount + testSuiteResultEntity.failedTestCaseCount}"></c:out>
+ </span>
+ </div>
+ <div class="col s5">
+ <span class="suite-test-run-metadata">
+ <b>Suite Build Number: </b><c:out value="${testSuiteResultEntity.suiteBuildNumber}"></c:out><br>
+ <b>VTS Build: </b><c:out value="${testSuiteResultEntity.buildId}"></c:out><br>
+ <b>Modules: </b><c:out value="${testSuiteResultEntity.modulesDone}"></c:out>/<c:out value="${testSuiteResultEntity.modulesTotal}"></c:out><br>
+ </span>
+ </div>
+ <div class="col s7">
+ <span class="suite-test-run-metadata">
+ <b>Host: </b><c:out value="${testSuiteResultEntity.hostName}"></c:out><br>
+ <b>LOG Path: </b><c:out value="${testSuiteResultEntity.resultPath}"></c:out><br>
+ </span>
+ </div>
+ <div class="col s10">
+ <span style="font-size: 13px;">
+ <jsp:setProperty name="startDateObject" property="time" value="${testSuiteResultEntity.startTime}"/>
+ <jsp:setProperty name="endDateObject" property="time" value="${testSuiteResultEntity.endTime}"/>
+ <fmt:formatDate value="${startDateObject}" pattern="yyyy-MM-dd HH:mm:ss" timeZone="${timeZone}" /> - <fmt:formatDate value="${endDateObject}" pattern="yyyy-MM-dd HH:mm:ss z" timeZone="${timeZone}" />
+ <c:set var="executionTime" scope="page" value="${(testSuiteResultEntity.endTime - testSuiteResultEntity.startTime) / 1000}"/>
+ (<c:out value="${executionTime}"></c:out>s)
+ </span>
+ </div>
+ <div class="col s2">
+ <i class="material-icons expand-arrow">expand_more</i>
+ </div>
+ </div>
</div>
<div class="collapsible-body test-results row" style="display: none;">
<div class="col test-col grey lighten-5 s12 left-most right-most">
@@ -89,7 +107,7 @@
</div>
<div class="row">
- <div class="col s12">
+ <div class="col s12 center-align">
<ul class="pagination">
<c:choose>
<c:when test="${testSuiteResultEntityPagination.minPageRange gt testSuiteResultEntityPagination.pageSize}">
diff --git a/src/main/webapp/css/test_results.css b/src/main/webapp/css/test_results.css
index d9e54a4..fbcd49a 100644
--- a/src/main/webapp/css/test_results.css
+++ b/src/main/webapp/css/test_results.css
@@ -34,6 +34,14 @@ li.test-run-container.active {
cursor: text;
user-select: initial;
}
+.suite-test-run-metadata {
+ font-size: 13px;
+ line-height: 15px;
+ position: relative;
+ display: inline-block;
+ cursor: text;
+ user-select: initial;
+}
.test-results.row {
margin: 0;
border-radius: 0 0 10px 10px;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 22:27:01 +0000