From 092d3635e8049476c470e965ebb8663c6c46a504 Mon Sep 17 00:00:00 2001
From: Emil Siverhall <emil-siv@dsv.su.se>
Date: Tue, 8 May 2012 13:51:12 +0200
Subject: [PATCH] added new peer sub page in supervisor - project details and
used the old SupervisorPeerStatsDetailsPanel with some modifications to
display peer info for each project
---
.../peer/pages/SupervisorPeerDetailsPage.html | 11 +++++++
.../peer/pages/SupervisorPeerDetailsPage.java | 29 +++++++++++++++++++
.../scipro/peer/panels/PeerReviewPanel.java | 5 ++--
.../SupervisorPeerStatsDetailsPanel.html | 11 ++++---
.../SupervisorPeerStatsDetailsPanel.java | 7 -----
.../panels/SupervisorSubTabMenuPanel.java | 3 ++
6 files changed, 51 insertions(+), 15 deletions(-)
create mode 100644 src/main/java/se/su/dsv/scipro/peer/pages/SupervisorPeerDetailsPage.html
create mode 100644 src/main/java/se/su/dsv/scipro/peer/pages/SupervisorPeerDetailsPage.java
diff --git a/src/main/java/se/su/dsv/scipro/peer/pages/SupervisorPeerDetailsPage.html b/src/main/java/se/su/dsv/scipro/peer/pages/SupervisorPeerDetailsPage.html
new file mode 100644
index 0000000000..e1e792bcdf
--- /dev/null
+++ b/src/main/java/se/su/dsv/scipro/peer/pages/SupervisorPeerDetailsPage.html
@@ -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="peer"></div>
+</div>
+ </wicket:extend>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/java/se/su/dsv/scipro/peer/pages/SupervisorPeerDetailsPage.java b/src/main/java/se/su/dsv/scipro/peer/pages/SupervisorPeerDetailsPage.java
new file mode 100644
index 0000000000..71262fb6a1
--- /dev/null
+++ b/src/main/java/se/su/dsv/scipro/peer/pages/SupervisorPeerDetailsPage.java
@@ -0,0 +1,29 @@
+package se.su.dsv.scipro.peer.pages;
+
+
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.markup.html.basic.Label;
+
+import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightSupervisorMyProjects;
+import se.su.dsv.scipro.peer.panels.SupervisorPeerStatsDetailsPanel;
+import se.su.dsv.scipro.supervisor.pages.AbstractSupervisorProjectDetailsPage;
+
+
+public class SupervisorPeerDetailsPage extends AbstractSupervisorProjectDetailsPage implements MenuHighlightSupervisorMyProjects {
+
+
+ public SupervisorPeerDetailsPage(PageParameters pp) {
+ super(pp);
+ if(projectModel.getObject() == null)
+ add(new Label("peer","No project selected"));
+ else
+ add(new SupervisorPeerStatsDetailsPanel("peer", projectModel.getObject()));
+
+ //add(new SupervisorPeerStatsPanel("peerStatsPanel", loggedInUser));
+
+
+
+ }
+
+
+}
diff --git a/src/main/java/se/su/dsv/scipro/peer/panels/PeerReviewPanel.java b/src/main/java/se/su/dsv/scipro/peer/panels/PeerReviewPanel.java
index de6cc06711..3a5ec3d444 100644
--- a/src/main/java/se/su/dsv/scipro/peer/panels/PeerReviewPanel.java
+++ b/src/main/java/se/su/dsv/scipro/peer/panels/PeerReviewPanel.java
@@ -14,6 +14,7 @@ import se.su.dsv.scipro.commentthread.panels.CommentThreadPanel;
import se.su.dsv.scipro.data.dao.interfaces.ProjectDao;
import se.su.dsv.scipro.peer.data.dataobjects.PeerReview;
import se.su.dsv.scipro.peer.pages.ProjectPeerStatsPage;
+import se.su.dsv.scipro.peer.pages.SupervisorPeerPortalPage;
import se.su.dsv.scipro.peer.pages.SupervisorPeerStatsPage;
public class PeerReviewPanel extends Panel {
@@ -30,8 +31,8 @@ public class PeerReviewPanel extends Panel {
BookmarkablePageLink<Void> backToMyRR;
if (isSupervisorView){
- backToMyRR = new BookmarkablePageLink<Void>("backToMy", SupervisorPeerStatsPage.class);
- backToMyRR.add(new Label("backLinkLabel", "Go back to My projects"));
+ backToMyRR = new BookmarkablePageLink<Void>("backToMy", SupervisorPeerPortalPage.class);
+ backToMyRR.add(new Label("backLinkLabel", "Go back to Supervisor peer portal"));
}
else {
backToMyRR = new BookmarkablePageLink<Void>("backToMy", ProjectPeerStatsPage.class);
diff --git a/src/main/java/se/su/dsv/scipro/peer/panels/SupervisorPeerStatsDetailsPanel.html b/src/main/java/se/su/dsv/scipro/peer/panels/SupervisorPeerStatsDetailsPanel.html
index b0b2bf1465..6ea4784e83 100644
--- a/src/main/java/se/su/dsv/scipro/peer/panels/SupervisorPeerStatsDetailsPanel.html
+++ b/src/main/java/se/su/dsv/scipro/peer/panels/SupervisorPeerStatsDetailsPanel.html
@@ -5,10 +5,9 @@
>
<body>
<wicket:panel>
-<div class="rounded-box">
-<span class="box-title" wicket:id="titleLabel"></span>
-<div class="prepend-top">
-<b>Reviews by authors in this project</b>
+<div>
+<div class="span-10">
+<h5 class="peer-title">Reviews by authors in this project</h5>
<div class="append-bottom" wicket:id="authorList">
<b><span wicket:id="authorName"></span>:</b><br />
Completed:
@@ -29,8 +28,8 @@ In progress:
Aborted: <span wicket:id="abortedReviews"></span>
</div>
</div>
-<div class="prepend-top">
-<b>Requests by authors in this project:</b><br />
+<div class="span-10">
+<h5 class="peer-title">Requests by authors in this project:</h5>
Completed:
<div wicket:id="completedReceivedList">
<a href="#" wicket:id="completedReviewLink">
diff --git a/src/main/java/se/su/dsv/scipro/peer/panels/SupervisorPeerStatsDetailsPanel.java b/src/main/java/se/su/dsv/scipro/peer/panels/SupervisorPeerStatsDetailsPanel.java
index b81d0a3912..cc4526252d 100644
--- a/src/main/java/se/su/dsv/scipro/peer/panels/SupervisorPeerStatsDetailsPanel.java
+++ b/src/main/java/se/su/dsv/scipro/peer/panels/SupervisorPeerStatsDetailsPanel.java
@@ -31,16 +31,9 @@ public class SupervisorPeerStatsDetailsPanel extends Panel {
public SupervisorPeerStatsDetailsPanel(final String id, final Project project) {
super(id);
- addTitle(project);
addAuthorReviewStats(project);
addAuthorRequestStats(project);
}
-
- private void addTitle(final Project project) {
- String titleString = project.getTitle();
- titleString += " ("+project.getProjectClass().getName()+")";
- add(new Label("titleLabel", titleString));
- }
private void addAuthorReviewStats(final Project project) {
final ListView<Student> authorList = new ListView<Student>("authorList", new ArrayList<Student>(project.getProjectParticipants())) {
diff --git a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java
index f5ac18a639..d177664134 100644
--- a/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java
+++ b/src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java
@@ -9,7 +9,9 @@ import org.apache.wicket.PageParameters;
import se.su.dsv.scipro.activityplan.pages.SupervisorActivityPlanPage;
import se.su.dsv.scipro.components.AbstractMenuPanel;
import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightSupervisorChecklist;
+import se.su.dsv.scipro.components.menuhighlighting.MenuHighlightSupervisorPeer;
import se.su.dsv.scipro.conference.pages.SupervisorConferencePage;
+import se.su.dsv.scipro.peer.pages.SupervisorPeerDetailsPage;
import se.su.dsv.scipro.supervisor.pages.AbstractSupervisorProjectDetailsPage;
import se.su.dsv.scipro.supervisor.pages.SupervisorChecklistPage;
import se.su.dsv.scipro.supervisor.pages.SupervisorFilePage;
@@ -39,6 +41,7 @@ public class SupervisorSubTabMenuPanel extends AbstractMenuPanel{
items.add(new MenuItem("Files", SupervisorFilePage.class,projectParams));
items.add(new MenuItem("Conference", SupervisorConferencePage.class, projectParams));
items.add(new MenuItem("Checklist", SupervisorChecklistPage.class, MenuHighlightSupervisorChecklist.class,projectParams));
+ items.add(new MenuItem("Peer", SupervisorPeerDetailsPage.class));
//items.add(new MenuItem("Add checklist", SupervisorAddCheckListToProjectPage.class,projectParams));
// items.add(new MenuItem("Notes", SupervisorLogPage.class)); notes is redundant, removing it for now
return items;