DMC/scipro
7
0
Fork 0
Code Issues35 Pull Requests5 Actions Projects1 Releases Wiki Activity

Merge branch 'peerRefactoring' into develop

Browse Source
This commit is contained in:
Emil Siverhall 2012-05-08 14:19:58 +02:00
commit 27dc0004f1
7 changed files with 52 additions and 16 deletions

3
src/main/java/se/su/dsv/scipro/peer/pages/AbstractSupervisorPeerPage.java

@ -24,7 +24,8 @@ public abstract class AbstractSupervisorPeerPage extends AbstractSupervisorPage
protected List<MenuItem> getItemList() {
final List<MenuItem> items = new ArrayList<MenuItem>();
items.add(new MenuItem("Browse peer requests", SupervisorPeerPortalPage.class));
items.add(new MenuItem("My projects", SupervisorPeerStatsPage.class, MenuHighlightReviewPage.class));
//Removing my projects since it's no longer needed.
//items.add(new MenuItem("My projects", SupervisorPeerStatsPage.class, MenuHighlightReviewPage.class));
items.add(new MenuItem("The purpose of peer reviews", SupervisorPeerReviewGuidePage.class));
return items;
}

11
src/main/java/se/su/dsv/scipro/peer/pages/SupervisorPeerDetailsPage.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="peer"></div>
</div>
</wicket:extend>
</body>
</html>

29
src/main/java/se/su/dsv/scipro/peer/pages/SupervisorPeerDetailsPage.java Normal file

@ -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));
}
}

5
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);

11
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">

7
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())) {

2
src/main/java/se/su/dsv/scipro/supervisor/panels/SupervisorSubTabMenuPanel.java

@ -10,6 +10,7 @@ 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.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 +40,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;