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

notificationsPanel

Browse Source 
Change-Id: Ib713fef22d523a26db1ac352e26d1ff19aea5c32
This commit is contained in:
joha-asc 2011-07-18 17:09:50 +02:00
parent 58176d349f
commit 5b512e0f9d
1 changed files with 2 additions and 20 deletions

22
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorProjectDetailsPage.java

@ -1,16 +1,10 @@
package se.su.dsv.scipro.supervisor.pages;
import java.util.HashSet;
import java.util.Set;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.panel.EmptyPanel;
import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.conference.panels.ConferencePanel;
import se.su.dsv.scipro.data.dataobjects.ProjectFollower;
import se.su.dsv.scipro.data.dataobjects.Student;
import se.su.dsv.scipro.data.dataobjects.User;
import se.su.dsv.scipro.events.panels.SupervisorFeedbackTasksPanel;
import se.su.dsv.scipro.schedule.panels.ProjectProgressPanel;
import se.su.dsv.scipro.security.auth.Authorization;
@ -33,20 +27,8 @@ public class SupervisorProjectDetailsPage extends AbstractSupervisorProjectDetai
add(new ProjectProgressPanel("projectProgress", projectModel.getObject()));
if (projectModel.getObject() != null) {
Set<User> users = new HashSet<User>();
for (Student s : projectModel.getObject().getProjectParticipants()) {
// Prodkod
// if(!s.getUser().equals(SciProSession.get().getUser()))
// userList.add(s.getUser());
// Testkod
users.add(s.getUser());
}
for (ProjectFollower pf : projectModel.getObject().getProjectFollowers()) {
users.add(pf.getFollower().getUser());
}
users.add(projectModel.getObject().getHeadSupervisor().getUser());
add(new ConferencePanel("projectWallPanel", projectModel.getObject(), users,
projectModel.getObject().getTitle()));
pp.put("pid", projectModel.getObject().getId());
add(new ConferencePanel("projectWallPanel", pp));
} else {
add(new EmptyPanel("projectWallPanel"));
}