Mercurial > hg > LightPIT / file diff

--- a/src/main/webapp/WEB-INF/jsp/project-details.jsp	Sat Aug 22 18:34:36 2020 +0200
+++ b/src/main/webapp/WEB-INF/jsp/project-details.jsp	Sun Aug 23 15:10:49 2020 +0200
@@ -28,9 +28,9 @@
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 
-<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.ProjectView" scope="request" />
+<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.ProjectDetailsView" scope="request" />
 
-<c:set var="project" scope="page" value="${viewmodel.project}"/>
+<c:set var="project" scope="page" value="${viewmodel.projectInfo.project}"/>
 <%@include file="../jspf/project-header.jsp"%>
 
 <div id="tool-area">
@@ -40,27 +40,34 @@
 
 <h2><fmt:message key="progress" /></h2>
 
-<c:set var="summary" value="${viewmodel.issuesTotal}" />
+<c:set var="summary" value="${viewmodel.projectInfo.issueSummary}" />
 <%@include file="../jspf/issue-summary.jsp"%>
 
 <h2><fmt:message key="issue.without-version" /></h2>
 
-<c:set var="issues" value="${viewmodel.issuesWithoutVersion}"/>
-<c:set var="summary" value="${viewmodel.issuesWithoutVersionTotal}" />
+<c:set var="issues" value="${viewmodel.projectDetails.issuesWithoutVersion}"/>
+<c:set var="summary" value="${viewmodel.projectDetails.issuesWithoutVersionTotal}" />
 <%@include file="../jspf/issue-summary.jsp"%>
 <%@include file="../jspf/issue-list.jsp"%>
 
-<c:forEach var="versionInfo" items="${viewmodel.versionInfos}">
+<c:forEach var="versionInfo" items="${viewmodel.projectDetails.versionInfos}">
     <h2>
         <fmt:message key="version.label" /> <c:out value="${versionInfo.version.name}" /> - <fmt:message key="version.status.${versionInfo.version.status}"/>
-        (<a href="./projects/versions/view?vid=${versionInfo.version.id}"><fmt:message key="version.open" /></a>)
     </h2>
 
     <h3><fmt:message key="issues.resolved"/> </h3>
     <c:set var="summary" value="${versionInfo.resolvedTotal}"/>
-    <c:set var="issues" value="${versionInfo.resolved}"/>
     <%@include file="../jspf/issue-summary.jsp"%>
+    <c:set var="issues" value="${versionInfo.resolved}"/>
     <c:if test="${not empty issues}">
-    <%@include file="../jspf/issue-list.jsp"%>
+        <%@include file="../jspf/issue-list.jsp"%>
+    </c:if>
+
+    <h3><fmt:message key="issues.reported"/> </h3>
+    <c:set var="summary" value="${versionInfo.reportedTotal}"/>
+    <%@include file="../jspf/issue-summary.jsp"%>
+    <c:set var="issues" value="${versionInfo.reported}"/>
+    <c:if test="${not empty issues}">
+        <%@include file="../jspf/issue-list.jsp"%>
     </c:if>
 </c:forEach>
\ No newline at end of file