Mon, 04 Jan 2021 12:45:46 +0100
Automated merge
| 47 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 1 | <%-- | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 2 | DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 3 | |
| 109 | 4 | Copyright 2020 Mike Becker. All rights reserved. | 
| 47 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 5 | |
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 6 | Redistribution and use in source and binary forms, with or without | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 7 | modification, are permitted provided that the following conditions are met: | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 8 | |
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 9 | 1. Redistributions of source code must retain the above copyright | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 10 | notice, this list of conditions and the following disclaimer. | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 11 | |
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 12 | 2. Redistributions in binary form must reproduce the above copyright | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 13 | notice, this list of conditions and the following disclaimer in the | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 14 | documentation and/or other materials provided with the distribution. | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 15 | |
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 16 | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 17 | AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 18 | IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 19 | DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 20 | FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 21 | DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 22 | SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 23 | CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 24 | OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 25 | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 26 | --%> | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 27 | <%@page pageEncoding="UTF-8" %> | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 28 | <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 29 | <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 30 | |
| 109 | 31 | <jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.VersionsView" scope="request" /> | 
| 47 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 32 | |
| 99 | 33 | <c:set var="project" scope="page" value="${viewmodel.projectInfo.project}"/> | 
| 115 
c27638a50c92
proper file extensions for JSP fragments
 Mike Becker <universe@uap-core.de> parents: 
114diff
changeset | 34 | <%@include file="../jspf/project-header.jspf"%> | 
| 81 | 35 | |
| 47 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 36 | <div id="tool-area"> | 
| 148 
87364e7ec333
fixes broken links in create buttons
 Mike Becker <universe@uap-core.de> parents: 
134diff
changeset | 37 | <a href="./projects/${project.node}/create-version" class="button"><fmt:message key="button.version.create"/></a> | 
| 
87364e7ec333
fixes broken links in create buttons
 Mike Becker <universe@uap-core.de> parents: 
134diff
changeset | 38 | <a href="./projects/${project.node}/create-issue" class="button"><fmt:message key="button.issue.create"/></a> | 
| 47 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 39 | </div> | 
| 
57cfb94ab99f
projects can now be added and updated
 Mike Becker <universe@uap-core.de> parents: diff
changeset | 40 | |
| 86 
0a658e53177c
improves issue overview and adds progress information
 Mike Becker <universe@uap-core.de> parents: 
82diff
changeset | 41 | <h2><fmt:message key="progress" /></h2> | 
| 
0a658e53177c
improves issue overview and adds progress information
 Mike Becker <universe@uap-core.de> parents: 
82diff
changeset | 42 | |
| 99 | 43 | <c:set var="summary" value="${viewmodel.projectInfo.issueSummary}" /> | 
| 115 
c27638a50c92
proper file extensions for JSP fragments
 Mike Becker <universe@uap-core.de> parents: 
114diff
changeset | 44 | <%@include file="../jspf/issue-summary.jspf"%> | 
| 86 
0a658e53177c
improves issue overview and adds progress information
 Mike Becker <universe@uap-core.de> parents: 
82diff
changeset | 45 | |
| 109 | 46 | <table id="version-list" class="datatable medskip fullwidth"> | 
| 47 | <colgroup> | |
| 48 | <col> | |
| 110 
9d0be0b1580f
adds indicators for version status
 Mike Becker <universe@uap-core.de> parents: 
109diff
changeset | 49 | <col width="28%"> | 
| 
9d0be0b1580f
adds indicators for version status
 Mike Becker <universe@uap-core.de> parents: 
109diff
changeset | 50 | <col width="12%"> | 
| 
9d0be0b1580f
adds indicators for version status
 Mike Becker <universe@uap-core.de> parents: 
109diff
changeset | 51 | <col width="12%"> | 
| 
9d0be0b1580f
adds indicators for version status
 Mike Becker <universe@uap-core.de> parents: 
109diff
changeset | 52 | <col width="12%"> | 
| 
9d0be0b1580f
adds indicators for version status
 Mike Becker <universe@uap-core.de> parents: 
109diff
changeset | 53 | <col width="12%"> | 
| 
9d0be0b1580f
adds indicators for version status
 Mike Becker <universe@uap-core.de> parents: 
109diff
changeset | 54 | <col width="12%"> | 
| 
9d0be0b1580f
adds indicators for version status
 Mike Becker <universe@uap-core.de> parents: 
109diff
changeset | 55 | <col width="12%"> | 
| 109 | 56 | </colgroup> | 
| 57 | <thead> | |
| 58 | <tr> | |
| 112 
a9221ecacd05
fixes colspan of empty th in versions overview
 Mike Becker <universe@uap-core.de> parents: 
110diff
changeset | 59 | <th colspan="2"></th> | 
| 109 | 60 | <th colspan="3" class="hcenter"> | 
| 61 | <fmt:message key="issues.resolved"/> | |
| 62 | </th> | |
| 63 | <th colspan="3" class="hcenter"> | |
| 64 | <fmt:message key="issues.reported"/> | |
| 65 | </th> | |
| 66 | </tr> | |
| 67 | <tr> | |
| 68 | <th></th> | |
| 69 | <th><fmt:message key="version.name"/></th> | |
| 70 | <th class="hcenter"><fmt:message key="issues.open" /></th> | |
| 71 | <th class="hcenter"><fmt:message key="issues.active" /></th> | |
| 72 | <th class="hcenter"><fmt:message key="issues.done" /></th> | |
| 73 | <th class="hcenter"><fmt:message key="issues.open" /></th> | |
| 74 | <th class="hcenter"><fmt:message key="issues.active" /></th> | |
| 75 | <th class="hcenter"><fmt:message key="issues.done" /></th> | |
| 76 | </tr> | |
| 77 | </thead> | |
| 78 | <tbody> | |
| 134 
f47e82cd6077
completes feature: project components
 Mike Becker <universe@uap-core.de> parents: 
131diff
changeset | 79 | <c:forEach var="versionInfo" items="${viewmodel.versionInfos}" > | 
| 109 | 80 | <tr> | 
| 134 
f47e82cd6077
completes feature: project components
 Mike Becker <universe@uap-core.de> parents: 
131diff
changeset | 81 | <td rowspan="2" style="width: 2em;"><a href="./projects/${project.node}/versions/${versionInfo.version.node}/edit">✎</a></td> | 
| 114 
dbd5c60c29e6
resolves #20 : add progress bars to versions table
 Mike Becker <universe@uap-core.de> parents: 
112diff
changeset | 82 | <td rowspan="2"> | 
| 134 
f47e82cd6077
completes feature: project components
 Mike Becker <universe@uap-core.de> parents: 
131diff
changeset | 83 | <a href="./projects/${project.node}/all-components/${versionInfo.version.node}/issues/"> | 
| 109 | 84 | <c:out value="${versionInfo.version.name}"/> | 
| 85 | </a> | |
| 110 
9d0be0b1580f
adds indicators for version status
 Mike Becker <universe@uap-core.de> parents: 
109diff
changeset | 86 | <div class="version-tag version-${versionInfo.version.status}"> | 
| 171 
d8c5434af89d
fixes #119 - missing translation of version status labels
 Mike Becker <universe@uap-core.de> parents: 
148diff
changeset | 87 | <fmt:message key="version.status.${versionInfo.version.status}"/> | 
| 110 
9d0be0b1580f
adds indicators for version status
 Mike Becker <universe@uap-core.de> parents: 
109diff
changeset | 88 | </div> | 
| 109 | 89 | </td> | 
| 90 | <td class="hright">${versionInfo.resolvedTotal.open}</td> | |
| 91 | <td class="hright">${versionInfo.resolvedTotal.active}</td> | |
| 92 | <td class="hright">${versionInfo.resolvedTotal.done}</td> | |
| 93 | <td class="hright">${versionInfo.reportedTotal.open}</td> | |
| 94 | <td class="hright">${versionInfo.reportedTotal.active}</td> | |
| 95 | <td class="hright">${versionInfo.reportedTotal.done}</td> | |
| 96 | </tr> | |
| 114 
dbd5c60c29e6
resolves #20 : add progress bars to versions table
 Mike Becker <universe@uap-core.de> parents: 
112diff
changeset | 97 | <tr> | 
| 
dbd5c60c29e6
resolves #20 : add progress bars to versions table
 Mike Becker <universe@uap-core.de> parents: 
112diff
changeset | 98 | <td colspan="3"> | 
| 
dbd5c60c29e6
resolves #20 : add progress bars to versions table
 Mike Becker <universe@uap-core.de> parents: 
112diff
changeset | 99 | <c:set var="summary" value="${versionInfo.resolvedTotal}"/> | 
| 
dbd5c60c29e6
resolves #20 : add progress bars to versions table
 Mike Becker <universe@uap-core.de> parents: 
112diff
changeset | 100 | <%@include file="../jspf/issue-progress.jspf" %> | 
| 
dbd5c60c29e6
resolves #20 : add progress bars to versions table
 Mike Becker <universe@uap-core.de> parents: 
112diff
changeset | 101 | </td> | 
| 
dbd5c60c29e6
resolves #20 : add progress bars to versions table
 Mike Becker <universe@uap-core.de> parents: 
112diff
changeset | 102 | <td colspan="3"> | 
| 
dbd5c60c29e6
resolves #20 : add progress bars to versions table
 Mike Becker <universe@uap-core.de> parents: 
112diff
changeset | 103 | <c:set var="summary" value="${versionInfo.reportedTotal}"/> | 
| 
dbd5c60c29e6
resolves #20 : add progress bars to versions table
 Mike Becker <universe@uap-core.de> parents: 
112diff
changeset | 104 | <%@include file="../jspf/issue-progress.jspf" %> | 
| 
dbd5c60c29e6
resolves #20 : add progress bars to versions table
 Mike Becker <universe@uap-core.de> parents: 
112diff
changeset | 105 | </td> | 
| 
dbd5c60c29e6
resolves #20 : add progress bars to versions table
 Mike Becker <universe@uap-core.de> parents: 
112diff
changeset | 106 | </tr> | 
| 109 | 107 | </c:forEach> | 
| 108 | </tbody> | |
| 109 | </table> |