Mercurial > hg > LightPIT / changeset

--- a/src/main/webapp/WEB-INF/jsp/versions.jsp	Fri Oct 09 11:30:36 2020 +0200
+++ b/src/main/webapp/WEB-INF/jsp/versions.jsp	Fri Oct 09 11:41:01 2020 +0200
@@ -78,8 +78,8 @@
     <tbody>
         <c:forEach var="versionInfo" items="${viewmodel.versionInfo}" >
         <tr>
-            <td style="width: 2em;"><a href="./projects/versions/edit?vid=${versionInfo.version.id}">&#x270e;</a></td>
-            <td>
+            <td rowspan="2" style="width: 2em;"><a href="./projects/versions/edit?vid=${versionInfo.version.id}">&#x270e;</a></td>
+            <td rowspan="2">
                 <a href="projects/view?pid=${viewmodel.projectInfo.project.id}&vid=${versionInfo.version.id}">
                     <c:out value="${versionInfo.version.name}"/>
                 </a>
@@ -94,6 +94,16 @@
             <td class="hright">${versionInfo.reportedTotal.active}</td>
             <td class="hright">${versionInfo.reportedTotal.done}</td>
         </tr>
+        <tr>
+            <td colspan="3">
+                <c:set var="summary" value="${versionInfo.resolvedTotal}"/>
+                <%@include file="../jspf/issue-progress.jspf" %>
+            </td>
+            <td colspan="3">
+                <c:set var="summary" value="${versionInfo.reportedTotal}"/>
+                <%@include file="../jspf/issue-progress.jspf" %>
+            </td>
+        </tr>
         </c:forEach>
     </tbody>
 </table>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/main/webapp/WEB-INF/jspf/issue-progress.jspf	Fri Oct 09 11:41:01 2020 +0200
@@ -0,0 +1,9 @@
+<%--
+summary: IssueSummary
+--%>
+
+<div class="issue-progress-bar">
+    <div class="open" style="width: ${summary.openPercent}%"></div>
+    <div class="active" style="width: ${summary.activePercent}%"></div>
+    <div class="done" style="width: ${summary.donePercent}%"></div>
+</div>

--- a/src/main/webapp/WEB-INF/jspf/issue-summary.jsp	Fri Oct 09 11:30:36 2020 +0200
+++ b/src/main/webapp/WEB-INF/jspf/issue-summary.jsp	Fri Oct 09 11:41:01 2020 +0200
@@ -2,11 +2,7 @@
 summary: IssueSummary
 --%>
 
-<div class="issue-progress-bar">
-    <div class="open" style="width: ${summary.openPercent}%"></div>
-    <div class="active" style="width: ${summary.activePercent}%"></div>
-    <div class="done" style="width: ${summary.donePercent}%"></div>
-</div>
+<%@include file="issue-progress.jspf"%>
 <div class="table issue-summary">
     <div class="row">
         <div class="caption"><fmt:message key="issues.open"/>:</div>
@@ -16,4 +12,4 @@
         <div class="caption"><fmt:message key="issues.done"/>:</div>
         <div><c:out value="${summary.done}"/></div>
     </div>
-</div>
+</div>
\ No newline at end of file