Mercurial > hg > LightPIT / changeset

     1.1 --- a/src/main/webapp/WEB-INF/jsp/versions.jsp	Fri Oct 09 11:30:36 2020 +0200
     1.2 +++ b/src/main/webapp/WEB-INF/jsp/versions.jsp	Fri Oct 09 11:41:01 2020 +0200
     1.3 @@ -78,8 +78,8 @@
     1.4      <tbody>
     1.5          <c:forEach var="versionInfo" items="${viewmodel.versionInfo}" >
     1.6          <tr>
     1.7 -            <td style="width: 2em;"><a href="./projects/versions/edit?vid=${versionInfo.version.id}">&#x270e;</a></td>
     1.8 -            <td>
     1.9 +            <td rowspan="2" style="width: 2em;"><a href="./projects/versions/edit?vid=${versionInfo.version.id}">&#x270e;</a></td>
    1.10 +            <td rowspan="2">
    1.11                  <a href="projects/view?pid=${viewmodel.projectInfo.project.id}&vid=${versionInfo.version.id}">
    1.12                      <c:out value="${versionInfo.version.name}"/>
    1.13                  </a>
    1.14 @@ -94,6 +94,16 @@
    1.15              <td class="hright">${versionInfo.reportedTotal.active}</td>
    1.16              <td class="hright">${versionInfo.reportedTotal.done}</td>
    1.17          </tr>
    1.18 +        <tr>
    1.19 +            <td colspan="3">
    1.20 +                <c:set var="summary" value="${versionInfo.resolvedTotal}"/>
    1.21 +                <%@include file="../jspf/issue-progress.jspf" %>
    1.22 +            </td>
    1.23 +            <td colspan="3">
    1.24 +                <c:set var="summary" value="${versionInfo.reportedTotal}"/>
    1.25 +                <%@include file="../jspf/issue-progress.jspf" %>
    1.26 +            </td>
    1.27 +        </tr>
    1.28          </c:forEach>
    1.29      </tbody>
    1.30  </table>
    1.31 \ No newline at end of file

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

     3.1 --- a/src/main/webapp/WEB-INF/jspf/issue-summary.jsp	Fri Oct 09 11:30:36 2020 +0200
     3.2 +++ b/src/main/webapp/WEB-INF/jspf/issue-summary.jsp	Fri Oct 09 11:41:01 2020 +0200
     3.3 @@ -2,11 +2,7 @@
     3.4  summary: IssueSummary
     3.5  --%>
     3.6  
     3.7 -<div class="issue-progress-bar">
     3.8 -    <div class="open" style="width: ${summary.openPercent}%"></div>
     3.9 -    <div class="active" style="width: ${summary.activePercent}%"></div>
    3.10 -    <div class="done" style="width: ${summary.donePercent}%"></div>
    3.11 -</div>
    3.12 +<%@include file="issue-progress.jspf"%>
    3.13  <div class="table issue-summary">
    3.14      <div class="row">
    3.15          <div class="caption"><fmt:message key="issues.open"/>:</div>
    3.16 @@ -16,4 +12,4 @@
    3.17          <div class="caption"><fmt:message key="issues.done"/>:</div>
    3.18          <div><c:out value="${summary.done}"/></div>
    3.19      </div>
    3.20 -</div>
    3.21 +</div>
    3.22 \ No newline at end of file