From 6d8af8a1796fca93cc448f41d78cf84db31a5399 Mon Sep 17 00:00:00 2001
From: Fredrik Friis <fred-fri@dsv.su.se>
Date: Mon, 16 Apr 2012 14:55:19 +0900
Subject: [PATCH] gui improvements on my requests and reviews
---
.../panels/StudentPeerRequestInfoPanel.html | 11 +++++---
.../panels/StudentPeerRequestInfoPanel.java | 26 ++++++++++---------
2 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerRequestInfoPanel.html b/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerRequestInfoPanel.html
index 2a52d56cbb..d122b5c331 100644
--- a/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerRequestInfoPanel.html
+++ b/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerRequestInfoPanel.html
@@ -9,7 +9,10 @@
<!-- Request -->
<i wicket:id="noRequestsMsg"></i>
<div wicket:id="myRequestsList" class="append-bottom rounded-box">
- <span class="box-title rounded" wicket:id="projectTitle"></span>
+ <div class="box-title">
+ <a wicket:id="openReviewLink"><span wicket:id="projectTitle"></span></a>
+
+ </div>
<div class="append-bottom">
<strong>Uploaded: </strong>
<span wicket:id="requestDate">Today</span>
@@ -22,9 +25,9 @@
<div>
<span wicket:id="commentLabel">Bla bla bla bla bla..</span>
</div>
- <div class="right append-05 ">
- <input type="button" wicket:id="openReviewLink" value="Open"></input>
- </div>
+ <!--<div class="right append-05 ">-->
+ <!--<input type="button" wicket:id="openReviewLink" value="Open"></input>-->
+ <!--</div>-->
</div>
<!-- End request -->
<div wicket:id="bottomNavigator"></div>
diff --git a/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerRequestInfoPanel.java b/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerRequestInfoPanel.java
index 6a77e11e7a..c7dc0c469d 100644
--- a/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerRequestInfoPanel.java
+++ b/src/main/java/se/su/dsv/scipro/peer/panels/StudentPeerRequestInfoPanel.java
@@ -1,9 +1,5 @@
package se.su.dsv.scipro.peer.panels;
-import java.util.List;
-
-import javax.persistence.EnumType;
-
import org.apache.wicket.Page;
import org.apache.wicket.PageParameters;
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.model.LoadableDetachableModel;
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.Student;
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.dataobjects.PeerRequest;
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.roles.Roles;
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
public abstract class StudentPeerRequestInfoPanel extends Panel {
@@ -83,7 +77,7 @@ public abstract class StudentPeerRequestInfoPanel extends Panel {
}
}
- item.add(new Label("projectTitle", projectTitle));
+
item.add(new DateFormatter(DateFormatter.FORMAT.EXTENDED).createFormattedDateLabel("requestDate", request.getDateCreated()));
item.add(new Label("authorLabel", authors));
item.add(new Label("statusLabel", request.getStatus().toString()));
@@ -103,10 +97,18 @@ public abstract class StudentPeerRequestInfoPanel extends Panel {
};
- if (pr.getId() == null)
- openReviewLink.setEnabled(false);
-
+ if (pr.getId() == null){
+ openReviewLink.setEnabled(false);
+ openReviewLink.add(new Label("projectTitle", projectTitle + " (awaiting reviewer)"));
+ }
+ else {
+ openReviewLink.add(new Label("projectTitle", projectTitle));
+ }
+
+
+
item.add(openReviewLink);
+
add(item);
}