DMC/scipro
7
0
Fork 0
Code Issues30 Pull Requests3 Actions Projects1 Releases Wiki Activity

gui improvements on my requests and reviews

Browse Source
This commit is contained in:
Fredrik Friis 2012-04-16 14:58:54 +09:00
parent 6d8af8a179
commit 7792af8737
2 changed files with 7 additions and 13 deletions
src/main/java/se/su/dsv/scipro/peer/panels
StudentPeerReviewInfoPanel.htmlStudentPeerReviewInfoPanel.java

4
src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerReviewInfoPanel.html

@ -9,7 +9,7 @@
<!-- Review --> <!-- Review -->
<i wicket:id="noReviewsMsg"></i> <i wicket:id="noReviewsMsg"></i>
<div wicket:id="myReviewsList" class="append-bottom rounded-box"> <div wicket:id="myReviewsList" class="append-bottom rounded-box">
<span class="box-title rounded" wicket:id="projectTitle"></span> <div class="box-title rounded"><a wicket:id="openReviewLink"><span wicket:id="projectTitle"></span></a></div>
<div class="append-bottom"> <div class="append-bottom">
<strong>Uploaded: </strong> <strong>Uploaded: </strong>
@ -24,7 +24,7 @@
<span wicket:id="commentLabel">Bla bla bla bla bla..</span> <span wicket:id="commentLabel">Bla bla bla bla bla..</span>
</div> </div>
<div class="right append-05 "> <div class="right append-05 ">
<input type="button" wicket:id="openReviewLink" value="Open"></input> <!--<input type="button" wicket:id="openReviewLink" value="Open"></input>-->
</div> </div>
</div> </div>
<!-- End review --> <!-- End review -->

16
src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerReviewInfoPanel.java

@ -1,9 +1,5 @@
package se.su.dsv.scipro.peer.panels; package se.su.dsv.scipro.peer.panels;
import java.util.List;
import javax.persistence.EnumType;
import org.apache.wicket.Page; import org.apache.wicket.Page;
import org.apache.wicket.PageParameters; import org.apache.wicket.PageParameters;
import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.AjaxRequestTarget;
@ -16,19 +12,17 @@ import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.spring.injection.annot.SpringBean; import org.apache.wicket.spring.injection.annot.SpringBean;
import se.su.dsv.scipro.SciProSession;
import se.su.dsv.scipro.data.dataobjects.Project; import se.su.dsv.scipro.data.dataobjects.Project;
import se.su.dsv.scipro.data.dataobjects.Student; import se.su.dsv.scipro.data.dataobjects.Student;
import se.su.dsv.scipro.peer.data.dao.interfaces.PeerRequestDao; import se.su.dsv.scipro.peer.data.dao.interfaces.PeerRequestDao;
import se.su.dsv.scipro.peer.data.dao.interfaces.PeerReviewDao; import se.su.dsv.scipro.peer.data.dao.interfaces.PeerReviewDao;
import se.su.dsv.scipro.peer.data.dataobjects.PeerRequest; import se.su.dsv.scipro.peer.data.dataobjects.PeerRequest;
import se.su.dsv.scipro.peer.data.dataobjects.PeerReview; import se.su.dsv.scipro.peer.data.dataobjects.PeerReview;
import se.su.dsv.scipro.peer.enums.RequestStatus;
import se.su.dsv.scipro.security.auth.Authorization; import se.su.dsv.scipro.security.auth.Authorization;
import se.su.dsv.scipro.security.auth.roles.Roles; import se.su.dsv.scipro.security.auth.roles.Roles;
import se.su.dsv.scipro.util.DateFormatter; import se.su.dsv.scipro.util.DateFormatter;
import se.su.dsv.scipro.util.JavascriptEventConfirmation;
import java.util.List;
@Authorization(authorizedRoles={Roles.STUDENT}) //Temp for deployment @Authorization(authorizedRoles={Roles.STUDENT}) //Temp for deployment
public abstract class StudentPeerReviewInfoPanel extends Panel { public abstract class StudentPeerReviewInfoPanel extends Panel {
@ -89,7 +83,7 @@ public abstract class StudentPeerReviewInfoPanel extends Panel {
else else
reviewStatus = "Review in progress"; reviewStatus = "Review in progress";
item.add(new Label("projectTitle", projectTitle));
item.add(new DateFormatter(DateFormatter.FORMAT.EXTENDED).createFormattedDateLabel("requestDate", request.getDateCreated())); item.add(new DateFormatter(DateFormatter.FORMAT.EXTENDED).createFormattedDateLabel("requestDate", request.getDateCreated()));
item.add(new Label("authorLabel", authors)); item.add(new Label("authorLabel", authors));
item.add(new Label("statusLabel", reviewStatus)); item.add(new Label("statusLabel", reviewStatus));
@ -107,8 +101,8 @@ public abstract class StudentPeerReviewInfoPanel extends Panel {
setResponsePage(getPeerReviewPageClass(), pp); setResponsePage(getPeerReviewPageClass(), pp);
} }
}; };
openReviewLink.add(new Label("projectTitle", projectTitle));
item.add(openReviewLink); item.add(openReviewLink);
add(item); add(item);