DMC/scipro
7
0
Fork 0
Code Issues40 Pull Requests8 Actions Projects1 Releases Wiki Activity

added conference and notificaitpn

Browse Source 
Change-Id: I5e53efb62b3062fddd4e599f72d8ab8437903f4f
This commit is contained in:
joha-asc 2011-07-15 13:01:26 +02:00
parent 7aa01ddca1
commit 0614f51425
3 changed files with 30 additions and 6 deletions

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

@ -1,12 +1,15 @@
package se.su.dsv.scipro.supervisor.pages;
import java.util.ArrayList;
import java.util.List;
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;
@ -28,10 +31,25 @@ public class SupervisorProjectDetailsPage extends AbstractSupervisorProjectDetai
add(new SupervisorFeedbackTasksPanel("feedbackTasks", SciProSession.get().getUser(),
projectModel.getObject()));
add(new ProjectProgressPanel("projectProgress", projectModel.getObject()));
List<User> userList = new ArrayList<User>();
userList.add(projectModel
.getObject().getHeadSupervisor().getUser());
add(new ConferencePanel("projectWallPanel", projectModel.getObject(), userList, projectModel.getObject().getTitle()));
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()));
} else {
add(new EmptyPanel("projectWallPanel"));
}
}
}

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

@ -5,6 +5,10 @@
<div class="span-22 last">
<div wicket:id="projectsOverviewPanel"></div>
</div>
<div class="span-22 last">
<h5 class="peer-title">Notifications</h5>
<div wicket:id="notificationsPanel"></div>
</div>
<div class="span-22 last" wicket:id="temporaryHideContainer">
<!-- Left column -->
<div class="span-10 colborder">

2
src/main/java/se/su/dsv/scipro/supervisor/pages/SupervisorStartPage.java

@ -7,6 +7,7 @@ import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.data.dataobjects.User;
import se.su.dsv.scipro.events.panels.SupervisorFeedbackTasksPanel;
import se.su.dsv.scipro.events.panels.SupervisorGroupEventsPanel;
import se.su.dsv.scipro.project.panels.NotificationsPanel;
import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.supervisor.panels.SupervisorProjectsOverviewPanel;
@ -21,6 +22,7 @@ public class SupervisorStartPage extends AbstractSupervisorPage {
add(temporaryHideContainer);
final User user = SciProSession.get().getUser();
add(new SupervisorProjectsOverviewPanel("projectsOverviewPanel"));
add(new NotificationsPanel("notificationsPanel"));
temporaryHideContainer.add(new SupervisorGroupEventsPanel("groupEvents", user));
temporaryHideContainer.add(new SupervisorFeedbackTasksPanel("feedbackTasks", user));
}