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

-:b7b685f31e39
+:602f75801644
 public static final String SESSION_ATTR_SELECTED_PROJECT = fqn(ProjectsModule.class, "selected_project");
 public static final String SESSION_ATTR_SELECTED_ISSUE = fqn(ProjectsModule.class, "selected_issue");
 public static final String SESSION_ATTR_SELECTED_VERSION = fqn(ProjectsModule.class, "selected_version");
+// TODO: try to get rid of this shit
 private class SessionSelection {
 final HttpSession session;
 final HttpServletRequest req;
 final DataAccessObjects dao;
 Project project;
 }
 void syncIssue() throws SQLException {
 final var issueSelection = getParameter(req, Integer.class, "issue");
 if (issueSelection.isPresent()) {
-final var selectedIssue = dao.getIssueDao().find(issueSelection.get());
+if (issueSelection.get() < 0) {
-dao.getIssueDao().joinVersionInformation(selectedIssue);
+issue = null;
-selectIssue(selectedIssue);
+} else {
+final var selectedIssue = dao.getIssueDao().find(issueSelection.get());
+dao.getIssueDao().joinVersionInformation(selectedIssue);
+selectIssue(selectedIssue);
+}
 } else {
 issue = issue == null ? null : dao.getIssueDao().find(issue.getId());
 }
 }
 @Override
 protected String getResourceBundleName() {
 return "localization.projects";
 }
+private String queryParams(Project p, Version v, Issue i) {
-private static final int NAV_LEVEL_ROOT = 0;
+return String.format("pid=%d&vid=%d&issue=%d",
-private static final int NAV_LEVEL_PROJECT = 1;
+p == null ? -1 : p.getId(),
-private static final int NAV_LEVEL_VERSION = 2;
+v == null ? -1 : v.getId(),
-private static final int NAV_LEVEL_ISSUE_LIST = 3;
+i == null ? -1 : i.getId()
-private static final int NAV_LEVEL_ISSUE = 4;
+);
+}
 /**
 * Creates the navigation menu.
 *
-* @param level     the current active level (0: root, 1: project, 2: version, 3: issue list, 4: issue)
+* @param projects  the list of projects
 * @param selection the currently selected objects
+* @param projInfo  info about the currently selected project or null
 * @return a dynamic navigation menu trying to display as many levels as possible
 */
-private List<MenuEntry> getNavMenu(int level, SessionSelection selection) {
+private List<MenuEntry> getNavMenu(List<Project> projects, SessionSelection selection, ProjectInfo projInfo) {
-MenuEntry entry;
 final var navigation = new ArrayList<MenuEntry>();
-entry = new MenuEntry(new ResourceKey("localization.lightpit", "menu.projects"),
-"projects/");
+for (Project proj : projects) {
-navigation.add(entry);
+final var projEntry = new MenuEntry(
-if (level == NAV_LEVEL_ROOT) entry.setActive(true);
+proj.getName(),
+"projects/view?pid=" + proj.getId()
-if (selection.project != null) {
+);
-if (selection.project.getId() < 0) {
+navigation.add(projEntry);
-entry = new MenuEntry(new ResourceKey("localization.projects", "button.create"),
+if (proj.equals(selection.project)) {
-"projects/edit");
+projEntry.setActive(true);
-} else {
-entry = new MenuEntry(selection.project.getName(),
+// ****************
-"projects/view?pid=" + selection.project.getId());
+// Versions Section
-}
+// ****************
-if (level == NAV_LEVEL_PROJECT) entry.setActive(true);
+{
-navigation.add(entry);
+final var entry = new MenuEntry(1,
-}
+new ResourceKey("localization.projects", "menu.versions"),
+"projects/view?" + queryParams(proj, null, null)
-if (selection.version != null) {
+);
-if (selection.version.getId() < 0) {
+navigation.add(entry);
-entry = new MenuEntry(new ResourceKey("localization.projects", "button.version.create"),
+}
-"projects/versions/edit");
-} else {
+final var level2 = new ArrayList<MenuEntry>();
-entry = new MenuEntry(selection.version.getName(),
+{
-"projects/versions/view?vid=" + selection.version.getId());
+final var entry = new MenuEntry(
-}
+new ResourceKey("localization.projects", "filter.all"),
-if (level == NAV_LEVEL_VERSION) entry.setActive(true);
+"projects/view?" + queryParams(proj, null, null)
-navigation.add(entry);
+);
-}
+if (selection.version == null) entry.setActive(true);
+level2.add(entry);
-if (selection.project != null) {
+}
-String path = "projects/issues/?pid=" + selection.project.getId();
-if (selection.version != null) {
+for (Version version : projInfo.getVersions()) {
-path += "&vid=" + selection.version.getId();
+final var entry = new MenuEntry(
-}
+version.getName(),
-entry = new MenuEntry(new ResourceKey("localization.projects", "menu.issues"),
+"projects/versions/view?" + queryParams(proj, version, null)
-path);
+);
-if (level == NAV_LEVEL_ISSUE_LIST) entry.setActive(true);
+if (version.equals(selection.version)) entry.setActive(true);
-navigation.add(entry);
+level2.add(entry);
 }
-if (selection.issue != null) {
+level2.forEach(e -> e.setLevel(2));
-if (selection.issue.getId() < 0) {
+navigation.addAll(level2);
-entry = new MenuEntry(new ResourceKey("localization.projects", "button.issue.create"),
+}
-"projects/issues/edit");
-} else {
-entry = new MenuEntry("#" + selection.issue.getId(),
-// TODO: maybe change link to a view rather than directly opening the editor
-"projects/issues/edit?issue=" + selection.issue.getId());
-}
-if (level == NAV_LEVEL_ISSUE) entry.setActive(true);
-navigation.add(entry);
 }
 return navigation;
 }
 setViewModel(req, viewModel);
 setContentPage(req, "projects");
 setStylesheet(req, "projects");
-setNavItems(req, getNavMenu(NAV_LEVEL_ROOT, sessionSelection));
+setNavigationMenu(req, getNavMenu(projectList, sessionSelection, currentProjectInfo(dao, sessionSelection.project)));
 return ResponseType.HTML;
+}
+private ProjectInfo currentProjectInfo(DataAccessObjects dao, Project project) throws SQLException {
+if (project == null) return null;
+final var projectDao = dao.getProjectDao();
+final var versionDao = dao.getVersionDao();
+final var info = new ProjectInfo(project);
+info.setVersions(versionDao.list(project));
+info.setIssueSummary(projectDao.getIssueSummary(project));
+return info;
 }
 private ProjectEditView configureEditForm(HttpServletRequest req, DataAccessObjects dao, SessionSelection selection) throws SQLException {
 final var viewModel = new ProjectEditView();
 viewModel.setProject(selection.project);
 viewModel.setUsers(dao.getUserDao().list());
+setNavigationMenu(req, getNavMenu(dao.getProjectDao().list(), selection, currentProjectInfo(dao, selection.project)));
 setViewModel(req, viewModel);
 setContentPage(req, "project-form");
-setNavItems(req, getNavMenu(NAV_LEVEL_PROJECT, selection));
 return viewModel;
 }
 @RequestMapping(requestPath = "edit", method = HttpMethod.GET)
 public ResponseType edit(HttpServletRequest req, DataAccessObjects dao) throws SQLException {
 if (selection.project == null) {
 resp.sendError(HttpServletResponse.SC_NOT_FOUND, "No project selected.");
 return ResponseType.NONE;
 }
+final var projectDao = dao.getProjectDao();
 final var versionDao = dao.getVersionDao();
 final var issueDao = dao.getIssueDao();
 final var viewModel = new ProjectView(selection.project);
 final var issues = issueDao.list(selection.project);
 for (var issue : issues) issueDao.joinVersionInformation(issue);
 viewModel.setIssues(issues);
+// TODO: fix duplicated selection of versions (projectInfo also contains these infos)
 viewModel.setVersions(versionDao.list(selection.project));
 viewModel.updateVersionInfo();
 setViewModel(req, viewModel);
-setNavItems(req, getNavMenu(NAV_LEVEL_PROJECT, selection));
+setNavigationMenu(req, getNavMenu(projectDao.list(), selection, currentProjectInfo(dao, selection.project)));
 setContentPage(req, "project-details");
 setStylesheet(req, "projects");
 return ResponseType.HTML;
 }
 if (selection.version == null) {
 resp.sendError(HttpServletResponse.SC_NOT_FOUND);
 return ResponseType.NONE;
 }
+final var projectDao = dao.getProjectDao();
 final var issueDao = dao.getIssueDao();
 final var viewModel = new VersionView(selection.version);
 final var issues = issueDao.list(selection.version);
 for (var issue : issues) issueDao.joinVersionInformation(issue);
 viewModel.setIssues(issues);
 setViewModel(req, viewModel);
-setNavItems(req, getNavMenu(NAV_LEVEL_VERSION, selection));
+setNavigationMenu(req, getNavMenu(projectDao.list(), selection, currentProjectInfo(dao, selection.project)));
 setContentPage(req, "version");
 setStylesheet(req, "projects");
 return ResponseType.HTML;
 }
 if (selection.version.getProject() == null) {
 viewModel.setProjects(dao.getProjectDao().list());
 }
 setViewModel(req, viewModel);
 setContentPage(req, "version-form");
-setNavItems(req, getNavMenu(NAV_LEVEL_VERSION, selection));
+setNavigationMenu(req, getNavMenu(dao.getProjectDao().list(), selection, currentProjectInfo(dao, selection.project)));
 return viewModel;
 }
 @RequestMapping(requestPath = "versions/edit", method = HttpMethod.GET)
 public ResponseType editVersion(HttpServletRequest req, DataAccessObjects dao) throws SQLException {
 }
 viewModel.setUsers(dao.getUserDao().list());
 setViewModel(req, viewModel);
 setContentPage(req, "issue-form");
-setNavItems(req, getNavMenu(NAV_LEVEL_ISSUE, selection));
+setNavigationMenu(req, getNavMenu(dao.getProjectDao().list(), selection, currentProjectInfo(dao, selection.project)));
 return viewModel;
 }
 @RequestMapping(requestPath = "issues/", method = HttpMethod.GET)
 public ResponseType issues(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws SQLException, IOException {
 if (selection.project == null) {
 resp.sendError(HttpServletResponse.SC_NOT_FOUND, "No project selected.");
 return ResponseType.NONE;
 }
+final var projectDao = dao.getProjectDao();
+final var issueDao = dao.getIssueDao();
 final var viewModel = new IssuesView();
 viewModel.setProject(selection.project);
 if (selection.version == null) {
-viewModel.setIssues(dao.getIssueDao().list(selection.project));
+viewModel.setIssues(issueDao.list(selection.project));
 } else {
 viewModel.setVersion(selection.version);
-viewModel.setIssues(dao.getIssueDao().list(selection.version));
+viewModel.setIssues(issueDao.list(selection.version));
 }
 setViewModel(req, viewModel);
-setNavItems(req, getNavMenu(NAV_LEVEL_ISSUE_LIST, selection));
+setNavigationMenu(req, getNavMenu(projectDao.list(), selection, currentProjectInfo(dao, selection.project)));
 setContentPage(req, "issues");
 setStylesheet(req, "projects");
 return ResponseType.HTML;
 }

Mercurial > hg > LightPIT / file comparison

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

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