Mercurial > hg > LightPIT / file diff

--- a/src/main/webapp/WEB-INF/jsp/project-details.jsp	Sat Oct 17 15:21:56 2020 +0200
+++ b/src/main/webapp/WEB-INF/jsp/project-details.jsp	Sat Oct 17 19:56:50 2020 +0200
@@ -24,21 +24,26 @@
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --%>
-<%@page pageEncoding="UTF-8" %>
+<%@page pageEncoding="UTF-8" import="de.uapcore.lightpit.viewmodel.ProjectView" %>
 <%@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.ProjectDetailsView" scope="request" />
 
 <c:set var="project" scope="page" value="${viewmodel.projectInfo.project}"/>
+<c:set var="component" scope="page" value="${viewmodel.componentFilter}"/>
 <%@include file="../jspf/project-header.jspf"%>
 
 <div id="tool-area">
-    <c:if test="${not empty viewmodel.versionFilter}">
-        <a href="./projects/${project.id}/versions/${viewmodel.versionFilter.id}/edit" class="button"><fmt:message key="button.version.edit"/></a>
+    <a href="./projects/${project.node}/create-issue" class="button"><fmt:message key="button.issue.create"/></a>
+    <c:if test="${viewmodel.versionFilter.id gt 0}">
+        <a href="./projects/${project.node}/versions/${viewmodel.versionFilter.node}/edit" class="button"><fmt:message key="button.version.edit"/></a>
     </c:if>
-    <a href="./projects/${project.id}/create-version" class="button"><fmt:message key="button.version.create"/></a>
-    <a href="./projects/${project.id}/create-issue" class="button"><fmt:message key="button.issue.create"/></a>
+    <a href="./projects/${project.node}/create-version" class="button"><fmt:message key="button.version.create"/></a>
+    <c:if test="${viewmodel.componentFilter.id gt 0}">
+        <a href="./projects/${project.node}/components/${viewmodel.componentFilter.node}/edit" class="button"><fmt:message key="button.component.edit"/></a>
+    </c:if>
+    <a href="./projects/${project.node}/create-component" class="button"><fmt:message key="button.component.create"/></a>
 </div>
 
 <h2><fmt:message key="progress" /></h2>
@@ -46,36 +51,43 @@
 <c:set var="summary" value="${viewmodel.projectInfo.issueSummary}" />
 <%@include file="../jspf/issue-summary.jspf"%>
 
-<c:if test="${not empty viewmodel.versionFilter}">
-    <c:set var="versionInfo" value="${viewmodel.projectDetails.versionInfo}"/>
-    <h2>
-        <fmt:message key="version.name" /> <c:out value="${versionInfo.version.name}" /> - <fmt:message key="version.status.${versionInfo.version.status}"/>
-    </h2>
-
-    <h3><fmt:message key="issues.resolved"/> </h3>
-    <c:set var="summary" value="${versionInfo.resolvedTotal}"/>
-    <%@include file="../jspf/issue-summary.jspf"%>
-    <c:set var="issues" value="${versionInfo.resolved}"/>
-    <c:if test="${not empty issues}">
-        <%@include file="../jspf/issue-list.jspf"%>
-    </c:if>
+<c:choose>
+    <c:when test="${viewmodel.versionFilter eq ProjectView.NO_VERSION or viewmodel.versionFilter eq ProjectView.ALL_VERSIONS}">
+        <h2>
+            <c:if test="${viewmodel.versionFilter eq ProjectView.NO_VERSION}">
+                <fmt:message key="issue.without-version" />
+            </c:if>
+            <c:if test="${viewmodel.versionFilter ne ProjectView.NO_VERSION}">
+                <fmt:message key="issues" />
+            </c:if>
+        </h2>
+        <c:set var="summary" value="${viewmodel.projectDetails.issueSummary}"/>
+        <c:set var="issues" value="${viewmodel.projectDetails.issues}"/>
+        <%@include file="../jspf/issue-summary.jspf"%>
+        <c:if test="${not empty issues}">
+            <%@include file="../jspf/issue-list.jspf"%>
+        </c:if>
+    </c:when>
+    <c:otherwise>
+        <c:set var="versionInfo" value="${viewmodel.projectDetails.versionInfo}"/>
+        <h2>
+            <fmt:message key="version.name" /> <c:out value="${versionInfo.version.name}" /> - <fmt:message key="version.status.${versionInfo.version.status}"/>
+        </h2>
 
-    <c:set var="issues" value="${versionInfo.reported}"/>
-    <c:if test="${not empty issues}">
-        <h3><fmt:message key="issues.reported"/> </h3>
-        <c:set var="summary" value="${versionInfo.reportedTotal}"/>
+        <h3><fmt:message key="issues.resolved"/> </h3>
+        <c:set var="summary" value="${versionInfo.resolvedTotal}"/>
         <%@include file="../jspf/issue-summary.jspf"%>
-        <%@include file="../jspf/issue-list.jspf"%>
-    </c:if>
-</c:if>
-<c:if test="${empty viewmodel.versionFilter}">
-    <h2>
-        <fmt:message key="issue.without-version" />
-    </h2>
-    <c:set var="summary" value="${viewmodel.projectDetails.issueSummary}"/>
-    <c:set var="issues" value="${viewmodel.projectDetails.issues}"/>
-    <%@include file="../jspf/issue-summary.jspf"%>
-    <c:if test="${not empty issues}">
-        <%@include file="../jspf/issue-list.jspf"%>
-    </c:if>
-</c:if>
+        <c:set var="issues" value="${versionInfo.resolved}"/>
+        <c:if test="${not empty issues}">
+            <%@include file="../jspf/issue-list.jspf"%>
+        </c:if>
+
+        <c:set var="issues" value="${versionInfo.reported}"/>
+        <c:if test="${not empty issues}">
+            <h3><fmt:message key="issues.reported"/> </h3>
+            <c:set var="summary" value="${versionInfo.reportedTotal}"/>
+            <%@include file="../jspf/issue-summary.jspf"%>
+            <%@include file="../jspf/issue-list.jspf"%>
+        </c:if>
+    </c:otherwise>
+</c:choose>
\ No newline at end of file