added conferencepanel with two new parameters
Change-Id: I213c599f47704f82185f0ba01fa9e09ab509a579
This commit is contained in:
parent
cac3b19cac
commit
152177d196
@ -1,16 +1,20 @@
|
||||
package se.su.dsv.scipro.project.pages;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.apache.wicket.Page;
|
||||
import org.apache.wicket.PageParameters;
|
||||
import org.apache.wicket.markup.html.WebMarkupContainer;
|
||||
import org.apache.wicket.markup.html.panel.FeedbackPanel;
|
||||
|
||||
import se.su.dsv.scipro.SciProSession;
|
||||
import se.su.dsv.scipro.conference.panels.ConferencePanel;
|
||||
import se.su.dsv.scipro.data.dataobjects.Project;
|
||||
import se.su.dsv.scipro.data.dataobjects.User;
|
||||
import se.su.dsv.scipro.opponent.panels.ProjectFinalSeminarContainerPanel;
|
||||
import se.su.dsv.scipro.peer.pages.ProjectPeerReviewPage;
|
||||
import se.su.dsv.scipro.peer.panels.StudentPeerInfoRequestsPanel;
|
||||
import se.su.dsv.scipro.project.panels.ProjectWallPanel;
|
||||
import se.su.dsv.scipro.project.panels.StateOfMindPanel;
|
||||
import se.su.dsv.scipro.schedule.panels.ProjectProgressPanel;
|
||||
import se.su.dsv.scipro.security.auth.roles.Roles;
|
||||
@ -45,7 +49,9 @@ public class ProjectStartPage extends ProjectPage {
|
||||
ProjectProgressPanel progressPanel = new ProjectProgressPanel("progress", activeProject);
|
||||
leftColumn.add(progressPanel.getHelpIcon("progressHelp"));
|
||||
leftColumn.add(progressPanel);
|
||||
leftColumn.add(new ProjectWallPanel("projectWallPanel", activeProject));
|
||||
List<User> userList = new ArrayList<User>();
|
||||
userList.add(activeProject.getHeadSupervisor().getUser());
|
||||
leftColumn.add(new ConferencePanel("projectWallPanel", activeProject, userList, activeProject.getTitle()));
|
||||
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user