LightPIT: comparison src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java

-:6657dad897ea
+:2e0669e814ff
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.sql.Date;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.NoSuchElementException;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 private static final String PARAMETER_SELECTED_VERSION = "vid";
 @Override
 protected String getResourceBundleName() {
 return "localization.projects";
-}
-private String queryParams(Project p, Version v) {
-return String.format("pid=%d&vid=%d",
-p == null ? -1 : p.getId(),
-v == null ? -1 : v.getId()
-);
-}
-/**
-* Creates the navigation menu.
-*
-* @param req the servlet request
-* @param viewModel the current view model
-*/
-private void setNavigationMenu(HttpServletRequest req, ProjectView viewModel) {
-final Project selectedProject = Optional.ofNullable(viewModel.getProjectInfo()).map(ProjectInfo::getProject).orElse(null);
-final var navigation = new ArrayList<MenuEntry>();
-for (ProjectInfo plistInfo : viewModel.getProjectList()) {
-final var proj = plistInfo.getProject();
-final var projEntry = new MenuEntry(
-proj.getName(),
-"projects/view?" + queryParams(proj, null)
-);
-navigation.add(projEntry);
-if (proj.equals(selectedProject)) {
-final var projInfo = viewModel.getProjectInfo();
-projEntry.setActive(true);
-// ****************
-// Versions Section
-// ****************
-{
-final var entry = new MenuEntry(1,
-new ResourceKey(getResourceBundleName(), "menu.versions"),
-"projects/view?" + queryParams(proj, null)
-);
-navigation.add(entry);
-}
-final var level2 = new ArrayList<MenuEntry>();
-{
-final var entry = new MenuEntry(
-new ResourceKey(getResourceBundleName(), "filter.none"),
-"projects/view?" + queryParams(proj, null)
-);
-if (viewModel.getVersionFilter() == null) entry.setActive(true);
-level2.add(entry);
-}
-for (Version version : projInfo.getVersions()) {
-final var entry = new MenuEntry(
-version.getName(),
-"projects/view?" + queryParams(proj, version)
-);
-if (version.equals(viewModel.getVersionFilter())) entry.setActive(true);
-level2.add(entry);
-}
-level2.forEach(e -> e.setLevel(2));
-navigation.addAll(level2);
-}
-}
-setNavigationMenu(req, navigation);
 }
 private int syncParamWithSession(HttpServletRequest req, String param, String attr) {
 final var session = req.getSession();
 final var idParam = getParameter(req, Integer.class, param);
 private ResponseType forwardView(HttpServletRequest req, ProjectView viewModel, String name) {
 setViewModel(req, viewModel);
 setContentPage(req, name);
 setStylesheet(req, "projects");
-setNavigationMenu(req, viewModel);
+setNavigationMenu(req, "project-navmenu");
 return ResponseType.HTML;
 }
 @RequestMapping(method = HttpMethod.GET)
 public ResponseType index(HttpServletRequest req, DataAccessObjects dao) throws SQLException {
 ownerId -> ownerId >= 0 ? new User(ownerId) : null
 ).ifPresent(project::setOwner);
 dao.getProjectDao().saveOrUpdate(project);
-setRedirectLocation(req, "./projects/view?pid="+project.getId());
+setRedirectLocation(req, "./projects/versions?pid="+project.getId());
 setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL);
 LOG.debug("Successfully updated project {}", project.getName());
 return ResponseType.HTML;
 } catch (NoSuchElementException | IllegalArgumentException | SQLException ex) {
 detailView.updateDetails(issues, version);
 return forwardView(req, viewModel, "project-details");
 }
+@RequestMapping(requestPath = "versions", method = HttpMethod.GET)
+public ResponseType versions(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException, SQLException {
+final var viewModel = new VersionsView();
+populate(viewModel, req, dao);
+viewModel.setVersionFilter(null);
+final var projectInfo = viewModel.getProjectInfo();
+if (projectInfo == null) {
+resp.sendError(HttpServletResponse.SC_NOT_FOUND, "No project selected.");
+return ResponseType.NONE;
+}
+final var issueDao = dao.getIssueDao();
+final var issues = issueDao.list(projectInfo.getProject());
+for (var issue : issues) issueDao.joinVersionInformation(issue);
+viewModel.update(projectInfo.getVersions(), issues);
+return forwardView(req, viewModel, "versions");
+}
 @RequestMapping(requestPath = "versions/edit", method = HttpMethod.GET)
 public ResponseType editVersion(HttpServletRequest req, DataAccessObjects dao) throws SQLException {
 final var viewModel = new VersionEditView();
 populate(viewModel, req, dao);
 getParameter(req, Integer.class, "ordinal").ifPresent(version::setOrdinal);
 version.setStatus(VersionStatus.valueOf(getParameter(req, String.class, "status").orElseThrow()));
 dao.getVersionDao().saveOrUpdate(version);
 // specifying the pid parameter will purposely reset the session selected version!
-setRedirectLocation(req, "./projects/view?pid=" + version.getProject().getId());
+setRedirectLocation(req, "./projects/versions?pid=" + version.getProject().getId());
 setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL);
 } catch (NoSuchElementException | IllegalArgumentException | SQLException ex) {
 LOG.warn("Form validation failure: {}", ex.getMessage());
 LOG.debug("Details:", ex);
 final var viewModel = new VersionEditView();

Mercurial > hg > LightPIT / file comparison

comparison: src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java

src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java