Sat, 22 Aug 2020 18:17:06 +0200
first part of navigation redesign
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1 | /* |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
3 | * |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
4 | * Copyright 2018 Mike Becker. All rights reserved. |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
5 | * |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
8 | * |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
11 | * |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
15 | * |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
27 | * |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
28 | */ |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
29 | package de.uapcore.lightpit.modules; |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
30 | |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
31 | |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
32 | import de.uapcore.lightpit.*; |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
33 | import de.uapcore.lightpit.dao.DataAccessObjects; |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
34 | import de.uapcore.lightpit.entities.*; |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
35 | import de.uapcore.lightpit.viewmodel.*; |
59 | 36 | import org.slf4j.Logger; |
37 | import org.slf4j.LoggerFactory; | |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
38 | |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
39 | import javax.servlet.annotation.WebServlet; |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
40 | import javax.servlet.http.HttpServletRequest; |
59 | 41 | import javax.servlet.http.HttpServletResponse; |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
42 | import javax.servlet.http.HttpSession; |
59 | 43 | import java.io.IOException; |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
44 | import java.sql.Date; |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
45 | import java.sql.SQLException; |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
46 | import java.util.ArrayList; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
47 | import java.util.List; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
48 | import java.util.NoSuchElementException; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
49 | import java.util.Objects; |
83
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
50 | import java.util.stream.Collectors; |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
51 | import java.util.stream.Stream; |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
52 | |
52 | 53 | import static de.uapcore.lightpit.Functions.fqn; |
54 | ||
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
55 | @WebServlet( |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
56 | name = "ProjectsModule", |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
57 | urlPatterns = "/projects/*" |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
58 | ) |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
59 | public final class ProjectsModule extends AbstractLightPITServlet { |
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
60 | |
59 | 61 | private static final Logger LOG = LoggerFactory.getLogger(ProjectsModule.class); |
62 | ||
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
63 | public static final String SESSION_ATTR_SELECTED_PROJECT = fqn(ProjectsModule.class, "selected_project"); |
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
64 | public static final String SESSION_ATTR_SELECTED_ISSUE = fqn(ProjectsModule.class, "selected_issue"); |
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
65 | public static final String SESSION_ATTR_SELECTED_VERSION = fqn(ProjectsModule.class, "selected_version"); |
52 | 66 | |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
67 | // TODO: try to get rid of this shit |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
68 | private class SessionSelection { |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
69 | final HttpSession session; |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
70 | final HttpServletRequest req; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
71 | final DataAccessObjects dao; |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
72 | Project project; |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
73 | Version version; |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
74 | Issue issue; |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
75 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
76 | SessionSelection(HttpServletRequest req, DataAccessObjects dao) { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
77 | this.req = req; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
78 | this.dao = dao; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
79 | session = req.getSession(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
80 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
81 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
82 | void newProject() { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
83 | project = null; |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
84 | version = null; |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
85 | issue = null; |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
86 | updateAttributes(); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
87 | project = new Project(-1); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
88 | updateAttributes(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
89 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
90 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
91 | void newVersion() throws SQLException { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
92 | project = (Project) session.getAttribute(SESSION_ATTR_SELECTED_PROJECT); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
93 | syncProject(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
94 | version = null; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
95 | issue = null; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
96 | updateAttributes(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
97 | version = new Version(-1); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
98 | version.setProject(project); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
99 | updateAttributes(); |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
100 | } |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
101 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
102 | void newIssue() throws SQLException { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
103 | project = (Project) session.getAttribute(SESSION_ATTR_SELECTED_PROJECT); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
104 | syncProject(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
105 | version = null; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
106 | issue = null; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
107 | updateAttributes(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
108 | issue = new Issue(-1); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
109 | issue.setProject(project); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
110 | updateAttributes(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
111 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
112 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
113 | void selectVersion(Version selectedVersion) throws SQLException { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
114 | issue = null; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
115 | version = selectedVersion; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
116 | if (!version.getProject().equals(project)) { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
117 | project = dao.getProjectDao().find(version.getProject().getId()); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
118 | } |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
119 | // our object contains more details |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
120 | version.setProject(project); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
121 | updateAttributes(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
122 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
123 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
124 | void selectIssue(Issue selectedIssue) throws SQLException { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
125 | issue = selectedIssue; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
126 | if (!issue.getProject().equals(project)) { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
127 | project = dao.getProjectDao().find(issue.getProject().getId()); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
128 | } |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
129 | // our object contains more details |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
130 | issue.setProject(project); |
88
1438e5a22c55
simplifies version overviews by removing "scheduled issues"
Mike Becker <universe@uap-core.de>
parents:
86
diff
changeset
|
131 | if (!issue.getResolvedVersions().contains(version) |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
132 | && !issue.getAffectedVersions().contains(version)) { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
133 | version = null; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
134 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
135 | updateAttributes(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
136 | } |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
137 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
138 | void syncProject() throws SQLException { |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
139 | final var projectSelection = getParameter(req, Integer.class, "pid"); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
140 | if (projectSelection.isPresent()) { |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
141 | final var selectedProject = dao.getProjectDao().find(projectSelection.get()); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
142 | if (!Objects.equals(selectedProject, project)) { |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
143 | // reset version and issue if project changed |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
144 | version = null; |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
145 | issue = null; |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
146 | } |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
147 | project = selectedProject; |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
148 | } else { |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
149 | project = project == null ? null : dao.getProjectDao().find(project.getId()); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
150 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
151 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
152 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
153 | void syncVersion() throws SQLException { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
154 | final var versionSelection = getParameter(req, Integer.class, "vid"); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
155 | if (versionSelection.isPresent()) { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
156 | if (versionSelection.get() < 0) { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
157 | version = null; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
158 | } else { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
159 | final var selectedVersion = dao.getVersionDao().find(versionSelection.get()); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
160 | if (!Objects.equals(selectedVersion, version)) { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
161 | issue = null; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
162 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
163 | selectVersion(selectedVersion); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
164 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
165 | } else { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
166 | version = version == null ? null : dao.getVersionDao().find(version.getId()); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
167 | } |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
168 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
169 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
170 | void syncIssue() throws SQLException { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
171 | final var issueSelection = getParameter(req, Integer.class, "issue"); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
172 | if (issueSelection.isPresent()) { |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
173 | if (issueSelection.get() < 0) { |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
174 | issue = null; |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
175 | } else { |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
176 | final var selectedIssue = dao.getIssueDao().find(issueSelection.get()); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
177 | dao.getIssueDao().joinVersionInformation(selectedIssue); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
178 | selectIssue(selectedIssue); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
179 | } |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
180 | } else { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
181 | issue = issue == null ? null : dao.getIssueDao().find(issue.getId()); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
182 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
183 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
184 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
185 | void sync() throws SQLException { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
186 | project = (Project) session.getAttribute(SESSION_ATTR_SELECTED_PROJECT); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
187 | version = (Version) session.getAttribute(SESSION_ATTR_SELECTED_VERSION); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
188 | issue = (Issue) session.getAttribute(SESSION_ATTR_SELECTED_ISSUE); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
189 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
190 | syncProject(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
191 | syncVersion(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
192 | syncIssue(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
193 | |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
194 | updateAttributes(); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
195 | } |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
196 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
197 | private void updateAttributes() { |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
198 | session.setAttribute(SESSION_ATTR_SELECTED_PROJECT, project); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
199 | session.setAttribute(SESSION_ATTR_SELECTED_VERSION, version); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
200 | session.setAttribute(SESSION_ATTR_SELECTED_ISSUE, issue); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
201 | } |
71 | 202 | } |
203 | ||
78
bb4c52bf3439
bloat removal 2/3 - moduleInfo
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
204 | @Override |
bb4c52bf3439
bloat removal 2/3 - moduleInfo
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
205 | protected String getResourceBundleName() { |
bb4c52bf3439
bloat removal 2/3 - moduleInfo
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
206 | return "localization.projects"; |
bb4c52bf3439
bloat removal 2/3 - moduleInfo
Mike Becker <universe@uap-core.de>
parents:
76
diff
changeset
|
207 | } |
71 | 208 | |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
209 | private String queryParams(Project p, Version v, Issue i) { |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
210 | return String.format("pid=%d&vid=%d&issue=%d", |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
211 | p == null ? -1 : p.getId(), |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
212 | v == null ? -1 : v.getId(), |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
213 | i == null ? -1 : i.getId() |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
214 | ); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
215 | } |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
216 | |
71 | 217 | /** |
96
b7b685f31e39
breadcrumb menu is now a sidebar navigation menu
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
218 | * Creates the navigation menu. |
71 | 219 | * |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
220 | * @param projects the list of projects |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
221 | * @param selection the currently selected objects |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
222 | * @param projInfo info about the currently selected project or null |
96
b7b685f31e39
breadcrumb menu is now a sidebar navigation menu
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
223 | * @return a dynamic navigation menu trying to display as many levels as possible |
71 | 224 | */ |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
225 | private List<MenuEntry> getNavMenu(List<Project> projects, SessionSelection selection, ProjectInfo projInfo) { |
96
b7b685f31e39
breadcrumb menu is now a sidebar navigation menu
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
226 | final var navigation = new ArrayList<MenuEntry>(); |
71 | 227 | |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
228 | for (Project proj : projects) { |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
229 | final var projEntry = new MenuEntry( |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
230 | proj.getName(), |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
231 | "projects/view?pid=" + proj.getId() |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
232 | ); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
233 | navigation.add(projEntry); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
234 | if (proj.equals(selection.project)) { |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
235 | projEntry.setActive(true); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
236 | |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
237 | // **************** |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
238 | // Versions Section |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
239 | // **************** |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
240 | { |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
241 | final var entry = new MenuEntry(1, |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
242 | new ResourceKey("localization.projects", "menu.versions"), |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
243 | "projects/view?" + queryParams(proj, null, null) |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
244 | ); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
245 | navigation.add(entry); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
246 | } |
71 | 247 | |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
248 | final var level2 = new ArrayList<MenuEntry>(); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
249 | { |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
250 | final var entry = new MenuEntry( |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
251 | new ResourceKey("localization.projects", "filter.all"), |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
252 | "projects/view?" + queryParams(proj, null, null) |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
253 | ); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
254 | if (selection.version == null) entry.setActive(true); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
255 | level2.add(entry); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
256 | } |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
257 | |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
258 | for (Version version : projInfo.getVersions()) { |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
259 | final var entry = new MenuEntry( |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
260 | version.getName(), |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
261 | "projects/versions/view?" + queryParams(proj, version, null) |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
262 | ); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
263 | if (version.equals(selection.version)) entry.setActive(true); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
264 | level2.add(entry); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
265 | } |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
266 | |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
267 | level2.forEach(e -> e.setLevel(2)); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
268 | navigation.addAll(level2); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
269 | } |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
270 | } |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
271 | |
96
b7b685f31e39
breadcrumb menu is now a sidebar navigation menu
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
272 | return navigation; |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
273 | } |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
274 | |
61
3e287f361c7a
moves project index to separate sub path
Mike Becker <universe@uap-core.de>
parents:
59
diff
changeset
|
275 | @RequestMapping(method = HttpMethod.GET) |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
276 | public ResponseType index(HttpServletRequest req, DataAccessObjects dao) throws SQLException { |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
277 | final var sessionSelection = new SessionSelection(req, dao); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
278 | sessionSelection.sync(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
279 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
280 | final var projectDao = dao.getProjectDao(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
281 | final var versionDao = dao.getVersionDao(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
282 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
283 | final var projectList = projectDao.list(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
284 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
285 | final var viewModel = new ProjectIndexView(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
286 | for (var project : projectList) { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
287 | final var info = new ProjectInfo(project); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
288 | info.setVersions(versionDao.list(project)); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
289 | info.setIssueSummary(projectDao.getIssueSummary(project)); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
290 | viewModel.getProjects().add(info); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
291 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
292 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
293 | setViewModel(req, viewModel); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
294 | setContentPage(req, "projects"); |
52 | 295 | setStylesheet(req, "projects"); |
296 | ||
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
297 | setNavigationMenu(req, getNavMenu(projectList, sessionSelection, currentProjectInfo(dao, sessionSelection.project))); |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
298 | |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
299 | return ResponseType.HTML; |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
300 | } |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
301 | |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
302 | private ProjectInfo currentProjectInfo(DataAccessObjects dao, Project project) throws SQLException { |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
303 | if (project == null) return null; |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
304 | final var projectDao = dao.getProjectDao(); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
305 | final var versionDao = dao.getVersionDao(); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
306 | |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
307 | final var info = new ProjectInfo(project); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
308 | info.setVersions(versionDao.list(project)); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
309 | info.setIssueSummary(projectDao.getIssueSummary(project)); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
310 | return info; |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
311 | } |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
312 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
313 | private ProjectEditView configureEditForm(HttpServletRequest req, DataAccessObjects dao, SessionSelection selection) throws SQLException { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
314 | final var viewModel = new ProjectEditView(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
315 | viewModel.setProject(selection.project); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
316 | viewModel.setUsers(dao.getUserDao().list()); |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
317 | setNavigationMenu(req, getNavMenu(dao.getProjectDao().list(), selection, currentProjectInfo(dao, selection.project))); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
318 | setViewModel(req, viewModel); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
319 | setContentPage(req, "project-form"); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
320 | return viewModel; |
71 | 321 | } |
322 | ||
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
323 | @RequestMapping(requestPath = "edit", method = HttpMethod.GET) |
51
dd0a45ae25d7
adds the possibility to add users / developers
Mike Becker <universe@uap-core.de>
parents:
47
diff
changeset
|
324 | public ResponseType edit(HttpServletRequest req, DataAccessObjects dao) throws SQLException { |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
325 | final var selection = new SessionSelection(req, dao); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
326 | if (getParameter(req, Integer.class, "pid").isEmpty()) { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
327 | selection.newProject(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
328 | } else { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
329 | selection.sync(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
330 | } |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
331 | |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
332 | configureEditForm(req, dao, selection); |
45
cc7f082c5ef3
simplifies menu generation, adds submenus and removes VersionsModule (versions will be part of the ProjectsModule)
Mike Becker <universe@uap-core.de>
parents:
43
diff
changeset
|
333 | |
cc7f082c5ef3
simplifies menu generation, adds submenus and removes VersionsModule (versions will be part of the ProjectsModule)
Mike Becker <universe@uap-core.de>
parents:
43
diff
changeset
|
334 | return ResponseType.HTML; |
cc7f082c5ef3
simplifies menu generation, adds submenus and removes VersionsModule (versions will be part of the ProjectsModule)
Mike Becker <universe@uap-core.de>
parents:
43
diff
changeset
|
335 | } |
cc7f082c5ef3
simplifies menu generation, adds submenus and removes VersionsModule (versions will be part of the ProjectsModule)
Mike Becker <universe@uap-core.de>
parents:
43
diff
changeset
|
336 | |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
337 | @RequestMapping(requestPath = "commit", method = HttpMethod.POST) |
68
ded1b5639bd3
adds request attribute users in commit() error path
Mike Becker <universe@uap-core.de>
parents:
67
diff
changeset
|
338 | public ResponseType commit(HttpServletRequest req, DataAccessObjects dao) throws SQLException { |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
339 | |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
340 | Project project = new Project(-1); |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
341 | try { |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
342 | project = new Project(getParameter(req, Integer.class, "id").orElseThrow()); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
343 | project.setName(getParameter(req, String.class, "name").orElseThrow()); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
344 | getParameter(req, String.class, "description").ifPresent(project::setDescription); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
345 | getParameter(req, String.class, "repoUrl").ifPresent(project::setRepoUrl); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
346 | getParameter(req, Integer.class, "owner").map( |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
347 | ownerId -> ownerId >= 0 ? new User(ownerId) : null |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
348 | ).ifPresent(project::setOwner); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
349 | |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
350 | dao.getProjectDao().saveOrUpdate(project); |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
351 | |
70
821c4950b619
removes the sub menu and removes the home module
Mike Becker <universe@uap-core.de>
parents:
68
diff
changeset
|
352 | setRedirectLocation(req, "./projects/"); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
353 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
59 | 354 | LOG.debug("Successfully updated project {}", project.getName()); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
355 | } catch (NoSuchElementException | IllegalArgumentException | SQLException ex) { |
59 | 356 | LOG.warn("Form validation failure: {}", ex.getMessage()); |
357 | LOG.debug("Details:", ex); | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
358 | final var selection = new SessionSelection(req, dao); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
359 | selection.project = project; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
360 | final var vm = configureEditForm(req, dao, selection); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
361 | vm.setErrorText(ex.getMessage()); // TODO: error text |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
362 | } |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
363 | |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
364 | return ResponseType.HTML; |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
365 | } |
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
366 | |
70
821c4950b619
removes the sub menu and removes the home module
Mike Becker <universe@uap-core.de>
parents:
68
diff
changeset
|
367 | @RequestMapping(requestPath = "view", method = HttpMethod.GET) |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
368 | public ResponseType view(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, IOException { |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
369 | final var selection = new SessionSelection(req, dao); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
370 | selection.sync(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
371 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
372 | if (selection.project == null) { |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
373 | resp.sendError(HttpServletResponse.SC_NOT_FOUND, "No project selected."); |
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
374 | return ResponseType.NONE; |
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
375 | } |
47
57cfb94ab99f
projects can now be added and updated
Mike Becker <universe@uap-core.de>
parents:
45
diff
changeset
|
376 | |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
377 | final var projectDao = dao.getProjectDao(); |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
378 | final var versionDao = dao.getVersionDao(); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
379 | final var issueDao = dao.getIssueDao(); |
70
821c4950b619
removes the sub menu and removes the home module
Mike Becker <universe@uap-core.de>
parents:
68
diff
changeset
|
380 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
381 | final var viewModel = new ProjectView(selection.project); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
382 | final var issues = issueDao.list(selection.project); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
383 | for (var issue : issues) issueDao.joinVersionInformation(issue); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
384 | viewModel.setIssues(issues); |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
385 | // TODO: fix duplicated selection of versions (projectInfo also contains these infos) |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
386 | viewModel.setVersions(versionDao.list(selection.project)); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
387 | viewModel.updateVersionInfo(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
388 | setViewModel(req, viewModel); |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
389 | |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
390 | setNavigationMenu(req, getNavMenu(projectDao.list(), selection, currentProjectInfo(dao, selection.project))); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
391 | setContentPage(req, "project-details"); |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
392 | setStylesheet(req, "projects"); |
59 | 393 | |
394 | return ResponseType.HTML; | |
395 | } | |
396 | ||
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
397 | @RequestMapping(requestPath = "versions/view", method = HttpMethod.GET) |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
398 | public ResponseType viewVersion(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, IOException { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
399 | final var selection = new SessionSelection(req, dao); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
400 | selection.sync(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
401 | if (selection.version == null) { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
402 | resp.sendError(HttpServletResponse.SC_NOT_FOUND); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
403 | return ResponseType.NONE; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
404 | } |
71 | 405 | |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
406 | final var projectDao = dao.getProjectDao(); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
407 | final var issueDao = dao.getIssueDao(); |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
408 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
409 | final var viewModel = new VersionView(selection.version); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
410 | final var issues = issueDao.list(selection.version); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
411 | for (var issue : issues) issueDao.joinVersionInformation(issue); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
412 | viewModel.setIssues(issues); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
413 | setViewModel(req, viewModel); |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
414 | |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
415 | setNavigationMenu(req, getNavMenu(projectDao.list(), selection, currentProjectInfo(dao, selection.project))); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
416 | setContentPage(req, "version"); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
417 | setStylesheet(req, "projects"); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
418 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
419 | return ResponseType.HTML; |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
420 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
421 | |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
422 | private VersionEditView configureEditVersionForm(HttpServletRequest req, DataAccessObjects dao, SessionSelection selection) throws SQLException { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
423 | final var viewModel = new VersionEditView(selection.version); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
424 | if (selection.version.getProject() == null) { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
425 | viewModel.setProjects(dao.getProjectDao().list()); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
426 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
427 | setViewModel(req, viewModel); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
428 | setContentPage(req, "version-form"); |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
429 | setNavigationMenu(req, getNavMenu(dao.getProjectDao().list(), selection, currentProjectInfo(dao, selection.project))); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
430 | return viewModel; |
71 | 431 | } |
432 | ||
59 | 433 | @RequestMapping(requestPath = "versions/edit", method = HttpMethod.GET) |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
434 | public ResponseType editVersion(HttpServletRequest req, DataAccessObjects dao) throws SQLException { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
435 | final var selection = new SessionSelection(req, dao); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
436 | if (getParameter(req, Integer.class, "vid").isEmpty()) { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
437 | selection.newVersion(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
438 | } else { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
439 | selection.sync(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
440 | } |
59 | 441 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
442 | configureEditVersionForm(req, dao, selection); |
59 | 443 | |
444 | return ResponseType.HTML; | |
445 | } | |
446 | ||
447 | @RequestMapping(requestPath = "versions/commit", method = HttpMethod.POST) | |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
448 | public ResponseType commitVersion(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException { |
59 | 449 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
450 | var version = new Version(-1); |
59 | 451 | try { |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
452 | version = new Version(getParameter(req, Integer.class, "id").orElseThrow()); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
453 | version.setProject(new Project(getParameter(req, Integer.class, "pid").orElseThrow())); |
59 | 454 | version.setName(getParameter(req, String.class, "name").orElseThrow()); |
455 | getParameter(req, Integer.class, "ordinal").ifPresent(version::setOrdinal); | |
456 | version.setStatus(VersionStatus.valueOf(getParameter(req, String.class, "status").orElseThrow())); | |
457 | dao.getVersionDao().saveOrUpdate(version); | |
458 | ||
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
459 | // specifying the pid parameter will purposely reset the session selected version! |
96
b7b685f31e39
breadcrumb menu is now a sidebar navigation menu
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
460 | setRedirectLocation(req, "./projects/view?pid=" + version.getProject().getId()); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
461 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
462 | } catch (NoSuchElementException | IllegalArgumentException | SQLException ex) { |
59 | 463 | LOG.warn("Form validation failure: {}", ex.getMessage()); |
464 | LOG.debug("Details:", ex); | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
465 | final var selection = new SessionSelection(req, dao); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
466 | selection.selectVersion(version); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
467 | final var viewModel = configureEditVersionForm(req, dao, selection); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
468 | // TODO: set Error Text |
59 | 469 | } |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
470 | |
43
9abf0bf44c7b
renames some crappy constants
Mike Becker <universe@uap-core.de>
parents:
42
diff
changeset
|
471 | return ResponseType.HTML; |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
472 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
473 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
474 | private IssueEditView configureEditIssueForm(HttpServletRequest req, DataAccessObjects dao, SessionSelection selection) throws SQLException { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
475 | final var viewModel = new IssueEditView(selection.issue); |
83
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
476 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
477 | if (selection.issue.getProject() == null) { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
478 | viewModel.setProjects(dao.getProjectDao().list()); |
83
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
479 | } else { |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
480 | viewModel.setVersions(dao.getVersionDao().list(selection.issue.getProject())); |
83
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
481 | } |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
482 | viewModel.setUsers(dao.getUserDao().list()); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
483 | setViewModel(req, viewModel); |
71 | 484 | |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
485 | setContentPage(req, "issue-form"); |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
486 | setNavigationMenu(req, getNavMenu(dao.getProjectDao().list(), selection, currentProjectInfo(dao, selection.project))); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
487 | return viewModel; |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
488 | } |
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
489 | |
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
490 | @RequestMapping(requestPath = "issues/", method = HttpMethod.GET) |
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
491 | public ResponseType issues(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, IOException { |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
492 | final var selection = new SessionSelection(req, dao); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
493 | selection.sync(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
494 | if (selection.project == null) { |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
495 | resp.sendError(HttpServletResponse.SC_NOT_FOUND, "No project selected."); |
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
496 | return ResponseType.NONE; |
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
497 | } |
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
498 | |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
499 | final var projectDao = dao.getProjectDao(); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
500 | final var issueDao = dao.getIssueDao(); |
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
501 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
502 | final var viewModel = new IssuesView(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
503 | viewModel.setProject(selection.project); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
504 | if (selection.version == null) { |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
505 | viewModel.setIssues(issueDao.list(selection.project)); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
506 | } else { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
507 | viewModel.setVersion(selection.version); |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
508 | viewModel.setIssues(issueDao.list(selection.version)); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
509 | } |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
510 | setViewModel(req, viewModel); |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
511 | |
97
602f75801644
first part of navigation redesign
Mike Becker <universe@uap-core.de>
parents:
96
diff
changeset
|
512 | setNavigationMenu(req, getNavMenu(projectDao.list(), selection, currentProjectInfo(dao, selection.project))); |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
513 | setContentPage(req, "issues"); |
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
514 | setStylesheet(req, "projects"); |
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
515 | |
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
516 | return ResponseType.HTML; |
71 | 517 | } |
518 | ||
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
519 | @RequestMapping(requestPath = "issues/edit", method = HttpMethod.GET) |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
520 | public ResponseType editIssue(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException { |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
521 | final var selection = new SessionSelection(req, dao); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
522 | if (getParameter(req, Integer.class, "issue").isEmpty()) { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
523 | selection.newIssue(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
524 | } else { |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
525 | selection.sync(); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
526 | } |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
527 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
528 | configureEditIssueForm(req, dao, selection); |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
529 | |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
530 | return ResponseType.HTML; |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
531 | } |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
532 | |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
533 | @RequestMapping(requestPath = "issues/commit", method = HttpMethod.POST) |
80
27a25f32048e
adds project overview page
Mike Becker <universe@uap-core.de>
parents:
79
diff
changeset
|
534 | public ResponseType commitIssue(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException { |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
535 | |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
536 | Issue issue = new Issue(-1); |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
537 | try { |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
538 | issue = new Issue(getParameter(req, Integer.class, "id").orElseThrow()); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
539 | issue.setProject(new Project(getParameter(req, Integer.class, "pid").orElseThrow())); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
540 | getParameter(req, String.class, "category").map(IssueCategory::valueOf).ifPresent(issue::setCategory); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
541 | getParameter(req, String.class, "status").map(IssueStatus::valueOf).ifPresent(issue::setStatus); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
542 | issue.setSubject(getParameter(req, String.class, "subject").orElseThrow()); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
543 | getParameter(req, Integer.class, "assignee").map( |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
544 | userid -> userid >= 0 ? new User(userid) : null |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
545 | ).ifPresent(issue::setAssignee); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
546 | getParameter(req, String.class, "description").ifPresent(issue::setDescription); |
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
547 | getParameter(req, Date.class, "eta").ifPresent(issue::setEta); |
83
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
548 | |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
549 | getParameter(req, Integer[].class, "affected") |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
550 | .map(Stream::of) |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
551 | .map(stream -> |
96
b7b685f31e39
breadcrumb menu is now a sidebar navigation menu
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
552 | stream.map(Version::new).collect(Collectors.toList()) |
83
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
553 | ).ifPresent(issue::setAffectedVersions); |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
554 | getParameter(req, Integer[].class, "resolved") |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
555 | .map(Stream::of) |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
556 | .map(stream -> |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
557 | stream.map(Version::new).collect(Collectors.toList()) |
83
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
558 | ).ifPresent(issue::setResolvedVersions); |
24a3596b8f98
adds version selection in issue editor
Mike Becker <universe@uap-core.de>
parents:
81
diff
changeset
|
559 | |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
560 | dao.getIssueDao().saveOrUpdate(issue); |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
561 | |
96
b7b685f31e39
breadcrumb menu is now a sidebar navigation menu
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
562 | // specifying the issue parameter keeps the edited issue as menu item |
b7b685f31e39
breadcrumb menu is now a sidebar navigation menu
Mike Becker <universe@uap-core.de>
parents:
88
diff
changeset
|
563 | setRedirectLocation(req, "./projects/issues/?issue=" + issue.getId()); |
74
91d1fc2a3a14
removes that dynamic_fragment bullshit
Mike Becker <universe@uap-core.de>
parents:
71
diff
changeset
|
564 | setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
75
33b6843fdf8a
adds the ability to create and edit issues
Mike Becker <universe@uap-core.de>
parents:
74
diff
changeset
|
565 | } catch (NoSuchElementException | IllegalArgumentException | SQLException ex) { |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
566 | // TODO: set request attribute with error text |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
567 | LOG.warn("Form validation failure: {}", ex.getMessage()); |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
568 | LOG.debug("Details:", ex); |
86
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
569 | final var selection = new SessionSelection(req, dao); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
570 | selection.selectIssue(issue); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
571 | final var viewModel = configureEditIssueForm(req, dao, selection); |
0a658e53177c
improves issue overview and adds progress information
Mike Becker <universe@uap-core.de>
parents:
83
diff
changeset
|
572 | // TODO: set Error Text |
64
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
573 | } |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
574 | |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
575 | return ResponseType.HTML; |
0f1746c6abfb
adds backend methods for issues (TODO: implement commitIssue())
Mike Becker <universe@uap-core.de>
parents:
61
diff
changeset
|
576 | } |
41
4f1c026a8aab
adds files for ProjectsModule
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
577 | } |