DMC/scipro
7
0
Fork 0
Code Issues31 Pull Requests5 Actions Projects1 Releases Wiki Activity

removed duplicated feedback panels and some code cleanup

Browse Source
This commit is contained in:
Emil Siverhall 2012-08-03 10:30:40 +02:00
parent a74c27f1eb
commit 461120728d
4 changed files with 6 additions and 20 deletions

4
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorIdeaSubmissionPage.java

@ -19,15 +19,13 @@ public class SupervisorIdeaSubmissionPage extends
super(pp); super(pp);
Long ideaId = pp.getAsLong("idea"); Long ideaId = pp.getAsLong("idea");
SupervisorIdea idea; SupervisorIdea idea;
boolean readOnly = pp.getAsBoolean("readOnly");
if(ideaId!=null) if(ideaId!=null)
idea = ideaService.findOne(ideaId); idea = ideaService.findOne(ideaId);
else { else {
idea = new SupervisorIdea(); idea = new SupervisorIdea();
} }
add(new SupervisorEditIdeaPanel("editPanel", getUser(), readOnly, new Model<SupervisorIdea>(idea))); add(new SupervisorEditIdeaPanel("editPanel", getUser(), new Model<SupervisorIdea>(idea)));
} }

1
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaStartPage.html

@ -4,7 +4,6 @@
<body> <body>
<wicket:extend> <wicket:extend>
<div class="span-24 last"> <div class="span-24 last">
<div wicket:id="feedback"></div>
<div wicket:id="availabilityPanel" class="append-bottom"></div> <div wicket:id="availabilityPanel" class="append-bottom"></div>
<button wicket:id="ideaLink">Create new project idea</button> <button wicket:id="ideaLink">Create new project idea</button>
<div class="prepend-top" wicket:id="ideaPanel"></div> <div class="prepend-top" wicket:id="ideaPanel"></div>

8
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaStartPage.java

@ -3,7 +3,6 @@ package se.su.dsv.scipro.supervisor.pages;
import org.apache.wicket.PageParameters; import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import se.su.dsv.scipro.security.auth.Authorization; import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles; import se.su.dsv.scipro.security.auth.roles.Roles;
@ -13,12 +12,9 @@ import se.su.dsv.scipro.supervisor.panels.SupervisorProjectIdeaOverviewPanel;
@Authorization(authorizedRoles={Roles.SYSADMIN}) @Authorization(authorizedRoles={Roles.SYSADMIN})
public class SupervisorProjectIdeaStartPage extends AbstractSupervisorProjectIdeaPage { public class SupervisorProjectIdeaStartPage extends AbstractSupervisorProjectIdeaPage {
private FeedbackPanel feedbackPanel;
public SupervisorProjectIdeaStartPage(PageParameters pp) { public SupervisorProjectIdeaStartPage(PageParameters pp) {
super(pp); super(pp);
add(feedbackPanel = new FeedbackPanel("feedback"));
feedbackPanel.setOutputMarkupId(true);
add(new SupervisorAvailabilityPanel("availabilityPanel", getUser())); add(new SupervisorAvailabilityPanel("availabilityPanel", getUser()));
add(new SupervisorProjectIdeaOverviewPanel("ideaPanel", getUser())); add(new SupervisorProjectIdeaOverviewPanel("ideaPanel", getUser()));
addSubmissionPageLink(); addSubmissionPageLink();
@ -26,9 +22,7 @@ public class SupervisorProjectIdeaStartPage extends AbstractSupervisorProjectIde
} }
private void addSubmissionPageLink() { private void addSubmissionPageLink() {
PageParameters pp = new PageParameters(); BookmarkablePageLink<Void> ideaLink = new BookmarkablePageLink<Void>("ideaLink", SupervisorIdeaSubmissionPage.class);
pp.put("readOnly", false);
BookmarkablePageLink<Void> ideaLink = new BookmarkablePageLink<Void>("ideaLink", SupervisorIdeaSubmissionPage.class, pp);
add(ideaLink); add(ideaLink);
} }

13
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorEditIdeaPanel.java

@ -58,9 +58,9 @@ public class SupervisorEditIdeaPanel extends Panel {
@SpringBean @SpringBean
private SupervisorService supervisorService; private SupervisorService supervisorService;
public SupervisorEditIdeaPanel(String id, User currentUser, boolean readOnly,IModel<SupervisorIdea> model) { public SupervisorEditIdeaPanel(String id, User currentUser, IModel<SupervisorIdea> model) {
super(id, model); super(id, model);
add(new IdeaForm("form", model, currentUser, readOnly).setEnabled(!readOnly)); add(new IdeaForm("form", model, currentUser));
} }
private class IdeaForm extends Form<SupervisorIdea> { private class IdeaForm extends Form<SupervisorIdea> {
@ -76,7 +76,7 @@ public class SupervisorEditIdeaPanel extends Panel {
private KeywordContainer regularKwc; private KeywordContainer regularKwc;
private FeedbackPanel feedbackPanel; private FeedbackPanel feedbackPanel;
public IdeaForm(String id, final IModel<SupervisorIdea> model, final User currentUser, final boolean readOnly) { public IdeaForm(String id, final IModel<SupervisorIdea> model, final User currentUser) {
super(id, model); super(id, model);
@ -97,13 +97,8 @@ public class SupervisorEditIdeaPanel extends Panel {
descriptionField.add(StringValidator.minimumLength(10)); // Description needs to be at least 10 characters descriptionField.add(StringValidator.minimumLength(10)); // Description needs to be at least 10 characters
final Employee ideaCreator = supervisorService.findByUser(currentUser); final Employee ideaCreator = supervisorService.findByUser(currentUser);
Employee ideaSupervisor = model.getObject().getCreator();
Set<ResearchArea> areas; Set<ResearchArea> areas = ideaCreator.getActiveResearchAreas();
if(readOnly)
areas = ideaSupervisor.getActiveResearchAreas();
else
areas = ideaCreator.getActiveResearchAreas();
ListView<ResearchArea> areaList = new ListView<ResearchArea>("researchAreas", new ArrayList<ResearchArea>(areas)) { ListView<ResearchArea> areaList = new ListView<ResearchArea>("researchAreas", new ArrayList<ResearchArea>(areas)) {
private static final long serialVersionUID = 1745649109195334927L; private static final long serialVersionUID = 1745649109195334927L;