Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -re2ca7d11ecae551170950326b7fd1af5373c84b3 -r3a63a14c76ca48df23e9e057918f249bdc79a53e --- lams_tool_preview/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e2ca7d11ecae551170950326b7fd1af5373c84b3) +++ lams_tool_preview/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 3a63a14c76ca48df23e9e057918f249bdc79a53e) @@ -1,19 +1,12 @@ appName = peerreview -#language code: en -#locale code: AU - - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 02 10:51:09 CST 2015 - -#=================== labels for PeerReview =================# - activity.title =Peer Review activity.description =Individual peer review. activity.helptext =Individual peer review. tool.display.name =Peer Review Tool tool.description =Tool for individual peer review. appName =Peer Review errorPage.title =Error page -errorPage.heading =Some error occurs when handling your request +errorPage.heading =Some error(s) occurred when handling your request label.authoring.heading =Peer Review Authoring label.author.title =Peer Review label.authoring.heading.basic =Basic @@ -55,7 +48,7 @@ label.continue =Continue message.no.reflection.available =No notebook available message.alertContentEdit =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information. -message.warnLockOnFinish =Note: After you click on "Next Activity\u201d, if you come back to this Peer Review, you won\u2019t be able to rate new users. +message.warnLockOnFinish =Note: After you click on "Next Activity", if you come back to this Peer Review, you will not be able to rate new users. message.activityLocked =The instructor has set this activity not to allow you to view or rate any more users after you have finished it. label.export.reflection =Notebook Entries label.on =On @@ -65,11 +58,10 @@ monitor.summary.td.notebookInstructions =Notebook instructions label.submit =Finish label.monitoring.heading =Peer Review Monitoring - label.average.rating =Average rating {0}/{1} votes label.redo =Redo ratings -label.rating.criterias =Rating criterias -label.add.criteria =Add Criteria +label.rating.criterias =Rating criteria +label.add.criteria =Add Criterion label.your.rating =Your rating is {0}
Avg rating {1} out of {2} votes label.rate.limits.reminder =Rating limitation: Minimum {0} and Maximum {1}. label.rate.limits.topic.reminder =You have rated {0} users already. @@ -96,9 +88,9 @@ label.comment.minimum.number.words =Minimum number of words in a comment{0} label.no.users =There are no users available for rating. Press Refresh to check for new users. label.no.ratings.left =No ratings left -label.cant.rate =This user can't be rated as it attracted the maximum number of rates already. +label.cant.rate =This user cannot be rated as it attracted the maximum number of rates already. label.refresh=Refresh warning.comment.blank=Comment text is missing. -creating.users.message =Please wait while the learners' details are set up ready for you to review their responses. +creating.users.message =Please wait while the learners\' details are set up ready for you to review their responses. error.max.ratings.per.user=Unable to save the review - the maximum number of ratings may have been reached. The page will now be refreshed. -#======= End labels: Exported 168 labels for en AU ===== +export.tool.export.not.supported=This tool does not support export portfolio. Index: lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -re2ca7d11ecae551170950326b7fd1af5373c84b3 -r3a63a14c76ca48df23e9e057918f249bdc79a53e --- lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision e2ca7d11ecae551170950326b7fd1af5373c84b3) +++ lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 3a63a14c76ca48df23e9e057918f249bdc79a53e) @@ -1,19 +1,12 @@ appName = peerreview -#language code: en -#locale code: AU - - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Tue Jun 02 10:51:09 CST 2015 - -#=================== labels for PeerReview =================# - activity.title =Peer Review activity.description =Individual peer review. activity.helptext =Individual peer review. tool.display.name =Peer Review Tool tool.description =Tool for individual peer review. appName =Peer Review errorPage.title =Error page -errorPage.heading =Some error occurs when handling your request +errorPage.heading =Some error(s) occurred when handling your request label.authoring.heading =Peer Review Authoring label.author.title =Peer Review label.authoring.heading.basic =Basic @@ -55,7 +48,7 @@ label.continue =Continue message.no.reflection.available =No notebook available message.alertContentEdit =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information. -message.warnLockOnFinish =Note: After you click on "Next Activity\u201d, if you come back to this Peer Review, you won\u2019t be able to rate new users. +message.warnLockOnFinish =Note: After you click on "Next Activity", if you come back to this Peer Review, you will not be able to rate new users. message.activityLocked =The instructor has set this activity not to allow you to view or rate any more users after you have finished it. label.export.reflection =Notebook Entries label.on =On @@ -65,11 +58,10 @@ monitor.summary.td.notebookInstructions =Notebook instructions label.submit =Finish label.monitoring.heading =Peer Review Monitoring - label.average.rating =Average rating {0}/{1} votes label.redo =Redo ratings -label.rating.criterias =Rating criterias -label.add.criteria =Add Criteria +label.rating.criterias =Rating criteria +label.add.criteria =Add Criterion label.your.rating =Your rating is {0}
Avg rating {1} out of {2} votes label.rate.limits.reminder =Rating limitation: Minimum {0} and Maximum {1}. label.rate.limits.topic.reminder =You have rated {0} users already. @@ -83,7 +75,7 @@ label.minimum.number.words =Minimum number of words in a comment {0} warning.minimum.number.words =There is a minimum required number of words in a comment is {0}. You have entered {1} word(s). label.comment.textarea.tip =Type your comment here then click on the green tick. -label.max.number.marks.each.user =Max number of reviews per user. +label.max.number.marks.each.user =Max number of reviews per user label.move.up =Move Up label.move.down =Move Down label.allow.comments =Allow learners to comment on other learners @@ -96,9 +88,9 @@ label.comment.minimum.number.words =Minimum number of words in a comment{0} label.no.users =There are no users available for rating. Press Refresh to check for new users. label.no.ratings.left =No ratings left -label.cant.rate =This user can't be rated as it attracted the maximum number of rates already. +label.cant.rate =This user cannot be rated as it attracted the maximum number of rates already. label.refresh=Refresh warning.comment.blank=Comment text is missing. -creating.users.message =Please wait while the learners' details are set up ready for you to review their responses. +creating.users.message =Please wait while the learners\' details are set up ready for you to review their responses. error.max.ratings.per.user=Unable to save the review - the maximum number of ratings may have been reached. The page will now be refreshed. -#======= End labels: Exported 168 labels for en AU ===== +export.tool.export.not.supported=This tool does not support export portfolio. Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/servlet/ExportServlet.java =================================================================== diff -u -r0e69531f65529363399c5472a6c42bae1aa88408 -r3a63a14c76ca48df23e9e057918f249bdc79a53e --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/servlet/ExportServlet.java (.../ExportServlet.java) (revision 0e69531f65529363399c5472a6c42bae1aa88408) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/servlet/ExportServlet.java (.../ExportServlet.java) (revision 3a63a14c76ca48df23e9e057918f249bdc79a53e) @@ -26,182 +26,47 @@ package org.lamsfoundation.lams.tool.peerreview.web.servlet; import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; import javax.servlet.ServletException; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.tool.ToolAccessMode; -import org.lamsfoundation.lams.tool.peerreview.PeerreviewConstants; -import org.lamsfoundation.lams.tool.peerreview.dto.ReflectDTO; -import org.lamsfoundation.lams.tool.peerreview.model.Peerreview; -import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewUser; -import org.lamsfoundation.lams.tool.peerreview.service.IPeerreviewService; import org.lamsfoundation.lams.tool.peerreview.service.PeerreviewApplicationException; -import org.lamsfoundation.lams.tool.peerreview.service.PeerreviewServiceProxy; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet; -import org.lamsfoundation.lams.web.util.AttributeNames; -import org.lamsfoundation.lams.web.util.SessionMap; /** - * Export portfolio servlet to export all peerreview into offline HTML package. - * - * @author Steve.Ni - * - * @version $Revision$ + * Export Portfolio not supported. */ public class ExportServlet extends AbstractExportPortfolioServlet { private static final long serialVersionUID = -4529093489007108143L; - private static Logger logger = Logger.getLogger(ExportServlet.class); - private final String FILENAME = "peer_review_main.html"; - private IPeerreviewService service; - @Override public void init() throws ServletException { - service = PeerreviewServiceProxy.getPeerreviewService(getServletContext()); super.init(); } public String doExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) { - // initial sessionMap - SessionMap sessionMap = new SessionMap(); - request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); + String basePath =WebUtil.getBaseServerURL() + + request.getContextPath(); + writeResponseToFile(basePath + "/pages/export/exportportfolio.jsp", directoryName, FILENAME, cookies); - try { - if (StringUtils.equals(mode, ToolAccessMode.LEARNER.toString())) { - sessionMap.put(AttributeNames.ATTR_MODE, ToolAccessMode.LEARNER); - learner(request, response, directoryName, cookies, sessionMap); - } else if (StringUtils.equals(mode, ToolAccessMode.TEACHER.toString())) { - sessionMap.put(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER); - teacher(request, response, directoryName, cookies, sessionMap); - } - } catch (PeerreviewApplicationException e) { - logger.error("Cannot perform export for peerreview tool."); - } - - String basePath = WebUtil.getBaseServerURL() + request.getContextPath(); - writeResponseToFile(basePath + "/pages/export/exportportfolio.jsp?sessionMapID=" + sessionMap.getSessionID(), - directoryName, FILENAME, cookies); - return FILENAME; } public void learner(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies, HashMap sessionMap) throws PeerreviewApplicationException { - if (userID == null || toolSessionID == null) { - String error = "Tool session Id or user Id is null. Unable to continue"; - logger.error(error); - throw new PeerreviewApplicationException(error); - } - - PeerreviewUser learner = service.getUserByIDAndSession(userID, toolSessionID); - - if (learner == null) { - String error = "The user with user id " + userID + " does not exist."; - logger.error(error); - throw new PeerreviewApplicationException(error); - } - - Peerreview content = service.getPeerreviewBySessionId(toolSessionID); - - if (content == null) { - String error = "The content for this activity has not been defined yet."; - logger.error(error); - throw new PeerreviewApplicationException(error); - } - -// List group = service.exportBySessionId(toolSessionID, true); -// saveFileToLocal(group, directoryName); -// -// List> groupList = new ArrayList>(); -// if (group.size() > 0) -// groupList.add(group); - - // Add flag to indicate whether to render user notebook entries - sessionMap.put(PeerreviewConstants.ATTR_REFLECTION_ON, content.isReflectOnActivity()); - - // Create reflectList if reflection is enabled. - if (content.isReflectOnActivity()) { - List reflectList = new LinkedList(); - - // Create reflectList, need to follow same structure used in teacher - // see service.getReflectList(); - reflectList.add(getReflectionEntry(learner)); - - // Add reflectList to sessionMap - sessionMap.put(PeerreviewConstants.ATTR_REFLECT_LIST, reflectList); - } - - sessionMap.put(PeerreviewConstants.ATTR_TITLE, content.getTitle()); - sessionMap.put(PeerreviewConstants.ATTR_INSTRUCTIONS, content.getInstructions()); -// sessionMap.put(PeerreviewConstants.ATTR_SUMMARY_LIST, groupList); } public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies, HashMap sessionMap) throws PeerreviewApplicationException { - // check if toolContentId exists in db or not - if (toolContentID == null) { - String error = "Tool Content Id is missing. Unable to continue"; - logger.error(error); - throw new PeerreviewApplicationException(error); - } - - Peerreview content = service.getPeerreviewByContentId(toolContentID); - - if (content == null) { - String error = "Data is missing from the database. Unable to Continue"; - logger.error(error); - throw new PeerreviewApplicationException(error); - } -// List> groupList = service.exportByContentId(toolContentID); -// if (groupList != null) { -// for (List list : groupList) { -// saveFileToLocal(list, directoryName); -// } -// } - - // Add flag to indicate whether to render user notebook entries - sessionMap.put(PeerreviewConstants.ATTR_REFLECTION_ON, content.isReflectOnActivity()); - - // Create reflectList if reflection is enabled. - if (content.isReflectOnActivity()) { - List reflectList = service.getReflectList(content.getContentId()); - // Add reflectList to sessionMap - sessionMap.put(PeerreviewConstants.ATTR_REFLECT_LIST, reflectList); - } - - // put it into HTTPSession - sessionMap.put(PeerreviewConstants.ATTR_TITLE, content.getTitle()); - sessionMap.put(PeerreviewConstants.ATTR_INSTRUCTIONS, content.getInstructions()); -// sessionMap.put(PeerreviewConstants.ATTR_SUMMARY_LIST, groupList); } - private ReflectDTO getReflectionEntry(PeerreviewUser peerreviewUser) { - ReflectDTO reflectDTO = new ReflectDTO(peerreviewUser); - NotebookEntry notebookEntry = service.getEntry(peerreviewUser.getSession().getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, PeerreviewConstants.TOOL_SIGNATURE, peerreviewUser.getUserId() - .intValue()); - - // check notebookEntry is not null - if (notebookEntry != null) { - reflectDTO.setReflect(notebookEntry.getEntry()); - logger.debug("Could not find notebookEntry for PeerreviewUser: " + peerreviewUser.getUid()); - } - return reflectDTO; - } } Index: lams_tool_preview/web/pages/export/exportportfolio.jsp =================================================================== diff -u -r0e69531f65529363399c5472a6c42bae1aa88408 -r3a63a14c76ca48df23e9e057918f249bdc79a53e --- lams_tool_preview/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 0e69531f65529363399c5472a6c42bae1aa88408) +++ lams_tool_preview/web/pages/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 3a63a14c76ca48df23e9e057918f249bdc79a53e) @@ -1,195 +1,27 @@ + + <%@ include file="/common/taglibs.jsp"%> - - - - - - - - - - <fmt:message key="export.title" /> - - - - - - + + + + - + - - +
+ +

+ +

-
+
+ -

- -

- -
- + + - - -

- - - - - - - ${group[0].sessionName} - - -

+ + - - - - - - - - - - - - - - - - <%-- Bold styling is to indicate an item created by the author --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
-
- -
-
- - - - - - - - - - - - - - - - - - - -
    - -
  1. - -
  2. -
    -
-
- -   - -
-
- - - - - - -
- -
- - <%-- Display reflection entries --%> - -

- -

- -

- -

-

- -

-
-
- -
- - - - - - - Index: lams_tool_preview/web/pages/monitoring/summary.jsp =================================================================== diff -u -re2ca7d11ecae551170950326b7fd1af5373c84b3 -r3a63a14c76ca48df23e9e057918f249bdc79a53e --- lams_tool_preview/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision e2ca7d11ecae551170950326b7fd1af5373c84b3) +++ lams_tool_preview/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 3a63a14c76ca48df23e9e057918f249bdc79a53e) @@ -173,8 +173,6 @@
- -