1.1 --- a/src/main/webapp/WEB-INF/jsp/project-details.jsp Sat Aug 22 18:34:36 2020 +0200
1.2 +++ b/src/main/webapp/WEB-INF/jsp/project-details.jsp Sun Aug 23 15:10:49 2020 +0200
1.3 @@ -28,9 +28,9 @@
1.4 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
1.5 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
1.6
1.7 -<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.ProjectView" scope="request" />
1.8 +<jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.ProjectDetailsView" scope="request" />
1.9
1.10 -<c:set var="project" scope="page" value="${viewmodel.project}"/>
1.11 +<c:set var="project" scope="page" value="${viewmodel.projectInfo.project}"/>
1.12 <%@include file="../jspf/project-header.jsp"%>
1.13
1.14 <div id="tool-area">
1.15 @@ -40,27 +40,34 @@
1.16
1.17 <h2><fmt:message key="progress" /></h2>
1.18
1.19 -<c:set var="summary" value="${viewmodel.issuesTotal}" />
1.20 +<c:set var="summary" value="${viewmodel.projectInfo.issueSummary}" />
1.21 <%@include file="../jspf/issue-summary.jsp"%>
1.22
1.23 <h2><fmt:message key="issue.without-version" /></h2>
1.24
1.25 -<c:set var="issues" value="${viewmodel.issuesWithoutVersion}"/>
1.26 -<c:set var="summary" value="${viewmodel.issuesWithoutVersionTotal}" />
1.27 +<c:set var="issues" value="${viewmodel.projectDetails.issuesWithoutVersion}"/>
1.28 +<c:set var="summary" value="${viewmodel.projectDetails.issuesWithoutVersionTotal}" />
1.29 <%@include file="../jspf/issue-summary.jsp"%>
1.30 <%@include file="../jspf/issue-list.jsp"%>
1.31
1.32 -<c:forEach var="versionInfo" items="${viewmodel.versionInfos}">
1.33 +<c:forEach var="versionInfo" items="${viewmodel.projectDetails.versionInfos}">
1.34 <h2>
1.35 <fmt:message key="version.label" /> <c:out value="${versionInfo.version.name}" /> - <fmt:message key="version.status.${versionInfo.version.status}"/>
1.36 - (<a href="./projects/versions/view?vid=${versionInfo.version.id}"><fmt:message key="version.open" /></a>)
1.37 </h2>
1.38
1.39 <h3><fmt:message key="issues.resolved"/> </h3>
1.40 <c:set var="summary" value="${versionInfo.resolvedTotal}"/>
1.41 + <%@include file="../jspf/issue-summary.jsp"%>
1.42 <c:set var="issues" value="${versionInfo.resolved}"/>
1.43 + <c:if test="${not empty issues}">
1.44 + <%@include file="../jspf/issue-list.jsp"%>
1.45 + </c:if>
1.46 +
1.47 + <h3><fmt:message key="issues.reported"/> </h3>
1.48 + <c:set var="summary" value="${versionInfo.reportedTotal}"/>
1.49 <%@include file="../jspf/issue-summary.jsp"%>
1.50 + <c:set var="issues" value="${versionInfo.reported}"/>
1.51 <c:if test="${not empty issues}">
1.52 - <%@include file="../jspf/issue-list.jsp"%>
1.53 + <%@include file="../jspf/issue-list.jsp"%>
1.54 </c:if>
1.55 </c:forEach>
1.56 \ No newline at end of file
