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

removed link that doesnt work for supervisors

Browse Source
This commit is contained in:
Fredrik Friis 2012-04-06 15:10:03 +09:00
parent d24aaf6c89
commit d9750a59b8
2 changed files with 32 additions and 31 deletions
src/main/java/se/su/dsv/scipro/peer/panels
LatestReviewPanel.htmlLatestReviewPanel.java

32
src/main/java/se/su/dsv/scipro/peer/panels/LatestReviewPanel.html

@ -2,20 +2,24 @@
<html xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<body>
<wicket:panel>
<div>
<table>
<tbody wicket:id="listView">
<tr>
<td wicket:id="reviewer"></td>
</tr>
<tr>
<td><a href="#" wicket:id="reviewLink">Review date: <span wicket:id="reviewDate"></span></a></td>
</tr>
</tbody>
</table>
<i><span wicket:id="noReviewersFoundMessage"></span></i>
</div>
<div>
<table>
<tbody wicket:id="listView">
<tr>
<td wicket:id="reviewer"></td>
</tr>
<tr>
<td>
<!--<a href="#" wicket:id="reviewLink">-->
Review date: <span wicket:id="reviewDate"></span>
<!--</a>-->
</td>
</tr>
</tbody>
</table>
<i><span wicket:id="noReviewersFoundMessage"></span></i>
</div>
</wicket:panel>
</body>
</html>

31
src/main/java/se/su/dsv/scipro/peer/panels/LatestReviewPanel.java

@ -1,24 +1,20 @@
package se.su.dsv.scipro.peer.panels;
import java.util.List;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.spring.injection.annot.SpringBean;
import se.su.dsv.scipro.peer.data.dao.interfaces.PeerReviewDao;
import se.su.dsv.scipro.peer.data.dataobjects.PeerReview;
import se.su.dsv.scipro.peer.pages.ProjectPeerReviewPage;
import se.su.dsv.scipro.util.DateFormatter;
import java.util.List;
public class LatestReviewPanel extends Panel {
private static final long serialVersionUID = 1L;
@ -58,17 +54,18 @@ public class LatestReviewPanel extends Panel {
Label dateLabel = new DateFormatter(DateFormatter.FORMAT.EXTENDED).createFormattedDateLabel("reviewDate", pr.getLastModified());
if(publicLinks) {
PageParameters pp = new PageParameters();
pp.put(PeerReview.PP_PEER_REVIEW_ID, pr.getId());
BookmarkablePageLink<Void> link = new BookmarkablePageLink<Void>("reviewLink", ProjectPeerReviewPage.class, pp);
link.add(dateLabel);
item.add(link);
} else {
LinkToSpanContainer ltsc = new LinkToSpanContainer("reviewLink");
ltsc.add(dateLabel);
item.add(ltsc);
}
// if(publicLinks) {
// PageParameters pp = new PageParameters();
// pp.put(PeerReview.PP_PEER_REVIEW_ID, pr.getId());
// BookmarkablePageLink<Void> link = new BookmarkablePageLink<Void>("reviewLink", ProjectPeerReviewPage.class, pp);
// link.add(dateLabel);
// item.add(link);
// } else {
// LinkToSpanContainer ltsc = new LinkToSpanContainer("reviewLink");
// ltsc.add(dateLabel);
// item.add(ltsc);
// }
item.add(dateLabel);
add(item);
}
};