DMC/scipro
7
0
Fork 0
Code Issues42 Pull Requests4 Actions Projects1 Releases Wiki Activity

changed menu hierarchy according to new match3 mockups

Browse Source
This commit is contained in:
Emil Siverhall 2012-07-09 14:08:52 +02:00
parent 567600307f
commit ebb7a2ab9c
10 changed files with 103 additions and 5 deletions

9
src/main/java/se/su/dsv/scipro/components/menuhighlighting/MenuHighlightSupervisorProjectIdea.java Normal file

@ -0,0 +1,9 @@
package se.su.dsv.scipro.components.menuhighlighting;
/**
* Used to highlight hierarchy for My Projects in Supervisor view.
*
*/
public interface MenuHighlightSupervisorProjectIdea extends MenuHighlight {
}

11
src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorProjectIdeaPage.html Normal file

@ -0,0 +1,11 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<body>
<wicket:extend>
<div class="span-24 last append-bottom">
<div wicket:id="projectIdeaSub"></div>
</div>
<wicket:child/>
</wicket:extend>
</body>
</html>

20
src/main/java/se/su/dsv/scipro/supervisor/pages/AbstractSupervisorProjectIdeaPage.java Normal file

@ -0,0 +1,20 @@
package se.su.dsv.scipro.supervisor.pages;
import org.apache.wicket.PageParameters;
import se.su.dsv.scipro.supervisor.panels.SupervisorProjectIdeaTabMenuPanel;
/**
*
* @author Martin Peters - mpeters@dsv.su.se
*
*/
public abstract class AbstractSupervisorProjectIdeaPage extends AbstractSupervisorPage {
public AbstractSupervisorProjectIdeaPage(PageParameters pp) {
super(pp);
add(new SupervisorProjectIdeaTabMenuPanel("projectIdeaSub", this.getClass()));
}
}

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

@ -12,6 +12,8 @@ import org.apache.wicket.spring.injection.annot.SpringBean;
import org.odlabs.wiquery.ui.dialog.Dialog;
import org.springframework.data.domain.PageRequest;
import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightSupervisorProjectIdea;
import se.su.dsv.scipro.data.dataobjects.ScheduleTemplate;
import se.su.dsv.scipro.datatables.ClickableTitleColumn;
import se.su.dsv.scipro.datatables.GenericDataPanel;
@ -28,7 +30,7 @@ import se.su.dsv.scipro.supervisor.panels.WatsonInfoPanel;
import java.util.Iterator;
@Authorization(authorizedRoles = {Roles.EMPLOYEE})
public class SupervisorInterestPage extends AbstractSupervisorPage {
public class SupervisorInterestPage extends AbstractSupervisorProjectIdeaPage implements MenuHighlightSupervisorProjectIdea {
@SpringBean
private ProjectIdeaService projectIdeaService;

0
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaPage.html → src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMyProjectIdeasPage.html

4
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaPage.java → src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorMyProjectIdeasPage.java

@ -7,12 +7,12 @@ import org.apache.wicket.markup.html.panel.FeedbackPanel;
import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.supervisor.panels.SupervisorMatchedThesisPanel;
public class SupervisorProjectIdeaPage extends AbstractSupervisorPage {
public class SupervisorMyProjectIdeasPage extends AbstractSupervisorProjectIdeaPage {
public static final String MAIN_MENU_LABEL = "Supervisor";
private static final long serialVersionUID = -6146389373527384427L;
public SupervisorProjectIdeaPage(PageParameters pp) {
public SupervisorMyProjectIdeasPage(PageParameters pp) {
super(pp);
Component feedBackPanel = new FeedbackPanel("feedBackPanel");
feedBackPanel.setOutputMarkupId(true);

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

@ -0,0 +1,8 @@
<!DOCTYPE html>
<html
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<body>
<wicket:extend>
</wicket:extend>
</body>
</html>

11
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectIdeaStartPage.java Normal file

@ -0,0 +1,11 @@
package se.su.dsv.scipro.supervisor.pages;
import org.apache.wicket.PageParameters;
public class SupervisorProjectIdeaStartPage extends AbstractSupervisorProjectIdeaPage {
public SupervisorProjectIdeaStartPage(PageParameters pp) {
super(pp);
}
}

36
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorProjectIdeaTabMenuPanel.java Normal file

@ -0,0 +1,36 @@
package se.su.dsv.scipro.supervisor.panels;
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.Page;
import se.su.dsv.scipro.components.AbstractMenuPanel;
import se.su.dsv.scipro.supervisor.pages.AbstractSupervisorProjectIdeaPage;
import se.su.dsv.scipro.supervisor.pages.SupervisorInterestPage;
import se.su.dsv.scipro.supervisor.pages.SupervisorMyProjectIdeasPage;
import se.su.dsv.scipro.supervisor.pages.SupervisorProjectIdeaStartPage;
public class SupervisorProjectIdeaTabMenuPanel extends AbstractMenuPanel{
private static final long serialVersionUID = 1L;
public SupervisorProjectIdeaTabMenuPanel(String id, Class<? extends Page> containerClass) {
super(id, AbstractSupervisorProjectIdeaPage.class, containerClass);
}
@Override
protected List<MenuItem> getItemList() {
List<MenuItem> items = new ArrayList<MenuItem>();
items.add(new MenuItem("Supervisor project ideas", SupervisorProjectIdeaStartPage.class));
items.add(new MenuItem("Unmatched student project ideas", SupervisorInterestPage.class));
items.add(new MenuItem("My matched student project ideas", SupervisorMyProjectIdeasPage.class));
return items;
}
@Override
protected MenuType getMenuType() {
return MenuType.TAB_MULTIPLE_ROWS;
}
}

5
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorTabMenuPanel.java

@ -4,6 +4,7 @@ import org.apache.wicket.Page;
import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.components.AbstractMenuPanel;
import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightSupervisorMyProjects;
import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightSupervisorProjectIdea;
import se.su.dsv.scipro.peer.pages.SupervisorPeerListPage;
import se.su.dsv.scipro.peer.pages.SupervisorPeerPortalPage;
import se.su.dsv.scipro.security.auth.roles.Roles;
@ -30,8 +31,8 @@ public class SupervisorTabMenuPanel extends AbstractMenuPanel {
List<MenuItem> items = new ArrayList<MenuItem>();
items.add(new MenuItem("My projects", SupervisorStartPage.class, MenuHighlightSupervisorMyProjects.class));
items.add(new MenuItem("My matched project ideas", SupervisorProjectIdeaPage.class));
items.add(new MenuItem("Unmatched project ideas", SupervisorInterestPage.class));
items.add(new MenuItem("Project ideas", SupervisorProjectIdeaStartPage.class, MenuHighlightSupervisorProjectIdea.class));
//items.add(new MenuItem("Unmatched project ideas", SupervisorInterestPage.class));
items.add(new MenuItem("Activity plan templates", SupervisorScheduleTemplatesPage.class));
items.add(new MenuItem("Peer portal", SupervisorPeerListPage.class));
items.add(new MenuItem("Final seminars", SupervisorProjectsFinalSeminarPage.class));