1.1 --- a/src/main/webapp/WEB-INF/jsp/project-details.jsp Sat Oct 17 15:21:56 2020 +0200
1.2 +++ b/src/main/webapp/WEB-INF/jsp/project-details.jsp Sat Oct 17 19:56:50 2020 +0200
1.3 @@ -24,21 +24,26 @@
1.4 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1.5 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1.6 --%>
1.7 -<%@page pageEncoding="UTF-8" %>
1.8 +<%@page pageEncoding="UTF-8" import="de.uapcore.lightpit.viewmodel.ProjectView" %>
1.9 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
1.10 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
1.11
1.12 <jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.ProjectDetailsView" scope="request" />
1.13
1.14 <c:set var="project" scope="page" value="${viewmodel.projectInfo.project}"/>
1.15 +<c:set var="component" scope="page" value="${viewmodel.componentFilter}"/>
1.16 <%@include file="../jspf/project-header.jspf"%>
1.17
1.18 <div id="tool-area">
1.19 - <c:if test="${not empty viewmodel.versionFilter}">
1.20 - <a href="./projects/${project.id}/versions/${viewmodel.versionFilter.id}/edit" class="button"><fmt:message key="button.version.edit"/></a>
1.21 + <a href="./projects/${project.node}/create-issue" class="button"><fmt:message key="button.issue.create"/></a>
1.22 + <c:if test="${viewmodel.versionFilter.id gt 0}">
1.23 + <a href="./projects/${project.node}/versions/${viewmodel.versionFilter.node}/edit" class="button"><fmt:message key="button.version.edit"/></a>
1.24 </c:if>
1.25 - <a href="./projects/${project.id}/create-version" class="button"><fmt:message key="button.version.create"/></a>
1.26 - <a href="./projects/${project.id}/create-issue" class="button"><fmt:message key="button.issue.create"/></a>
1.27 + <a href="./projects/${project.node}/create-version" class="button"><fmt:message key="button.version.create"/></a>
1.28 + <c:if test="${viewmodel.componentFilter.id gt 0}">
1.29 + <a href="./projects/${project.node}/components/${viewmodel.componentFilter.node}/edit" class="button"><fmt:message key="button.component.edit"/></a>
1.30 + </c:if>
1.31 + <a href="./projects/${project.node}/create-component" class="button"><fmt:message key="button.component.create"/></a>
1.32 </div>
1.33
1.34 <h2><fmt:message key="progress" /></h2>
1.35 @@ -46,36 +51,43 @@
1.36 <c:set var="summary" value="${viewmodel.projectInfo.issueSummary}" />
1.37 <%@include file="../jspf/issue-summary.jspf"%>
1.38
1.39 -<c:if test="${not empty viewmodel.versionFilter}">
1.40 - <c:set var="versionInfo" value="${viewmodel.projectDetails.versionInfo}"/>
1.41 - <h2>
1.42 - <fmt:message key="version.name" /> <c:out value="${versionInfo.version.name}" /> - <fmt:message key="version.status.${versionInfo.version.status}"/>
1.43 - </h2>
1.44 +<c:choose>
1.45 + <c:when test="${viewmodel.versionFilter eq ProjectView.NO_VERSION or viewmodel.versionFilter eq ProjectView.ALL_VERSIONS}">
1.46 + <h2>
1.47 + <c:if test="${viewmodel.versionFilter eq ProjectView.NO_VERSION}">
1.48 + <fmt:message key="issue.without-version" />
1.49 + </c:if>
1.50 + <c:if test="${viewmodel.versionFilter ne ProjectView.NO_VERSION}">
1.51 + <fmt:message key="issues" />
1.52 + </c:if>
1.53 + </h2>
1.54 + <c:set var="summary" value="${viewmodel.projectDetails.issueSummary}"/>
1.55 + <c:set var="issues" value="${viewmodel.projectDetails.issues}"/>
1.56 + <%@include file="../jspf/issue-summary.jspf"%>
1.57 + <c:if test="${not empty issues}">
1.58 + <%@include file="../jspf/issue-list.jspf"%>
1.59 + </c:if>
1.60 + </c:when>
1.61 + <c:otherwise>
1.62 + <c:set var="versionInfo" value="${viewmodel.projectDetails.versionInfo}"/>
1.63 + <h2>
1.64 + <fmt:message key="version.name" /> <c:out value="${versionInfo.version.name}" /> - <fmt:message key="version.status.${versionInfo.version.status}"/>
1.65 + </h2>
1.66
1.67 - <h3><fmt:message key="issues.resolved"/> </h3>
1.68 - <c:set var="summary" value="${versionInfo.resolvedTotal}"/>
1.69 - <%@include file="../jspf/issue-summary.jspf"%>
1.70 - <c:set var="issues" value="${versionInfo.resolved}"/>
1.71 - <c:if test="${not empty issues}">
1.72 - <%@include file="../jspf/issue-list.jspf"%>
1.73 - </c:if>
1.74 + <h3><fmt:message key="issues.resolved"/> </h3>
1.75 + <c:set var="summary" value="${versionInfo.resolvedTotal}"/>
1.76 + <%@include file="../jspf/issue-summary.jspf"%>
1.77 + <c:set var="issues" value="${versionInfo.resolved}"/>
1.78 + <c:if test="${not empty issues}">
1.79 + <%@include file="../jspf/issue-list.jspf"%>
1.80 + </c:if>
1.81
1.82 - <c:set var="issues" value="${versionInfo.reported}"/>
1.83 - <c:if test="${not empty issues}">
1.84 - <h3><fmt:message key="issues.reported"/> </h3>
1.85 - <c:set var="summary" value="${versionInfo.reportedTotal}"/>
1.86 - <%@include file="../jspf/issue-summary.jspf"%>
1.87 - <%@include file="../jspf/issue-list.jspf"%>
1.88 - </c:if>
1.89 -</c:if>
1.90 -<c:if test="${empty viewmodel.versionFilter}">
1.91 - <h2>
1.92 - <fmt:message key="issue.without-version" />
1.93 - </h2>
1.94 - <c:set var="summary" value="${viewmodel.projectDetails.issueSummary}"/>
1.95 - <c:set var="issues" value="${viewmodel.projectDetails.issues}"/>
1.96 - <%@include file="../jspf/issue-summary.jspf"%>
1.97 - <c:if test="${not empty issues}">
1.98 - <%@include file="../jspf/issue-list.jspf"%>
1.99 - </c:if>
1.100 -</c:if>
1.101 + <c:set var="issues" value="${versionInfo.reported}"/>
1.102 + <c:if test="${not empty issues}">
1.103 + <h3><fmt:message key="issues.reported"/> </h3>
1.104 + <c:set var="summary" value="${versionInfo.reportedTotal}"/>
1.105 + <%@include file="../jspf/issue-summary.jspf"%>
1.106 + <%@include file="../jspf/issue-list.jspf"%>
1.107 + </c:if>
1.108 + </c:otherwise>
1.109 +</c:choose>
1.110 \ No newline at end of file
