Index: lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml =================================================================== diff -u -rd2f1cafab9126e3848663764c082b76ccf2de0c5 -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml (.../Peerreview.hbm.xml) (revision d2f1cafab9126e3848663764c082b76ccf2de0c5) +++ lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.hbm.xml (.../Peerreview.hbm.xml) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -155,6 +155,14 @@ insert="true" column="self_review" /> + + {0}

Your results are:

{1}

This message was send automatically, please do not reply to it.

+event.sent.results.criteria.comment=

{0}:

+event.sent.results.criteria.star=

{0} (Star): {1}

+event.sent.results.criteria.hedge=

{0} (Mark Hedging): {1} out of {2}

+event.sent.results.criteria.rank=

{0} (Rank): {1} out of {2}

+event.sent.results.criteria.rankAll=

{0} (Rank All): {1}

+event.sent.results.no.results=No results +msg.results.sent={0} Email(s) Sent +button.email.results=Email Results +label.notify.user.of.results=Notify Users of Results \ No newline at end of file Index: lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rf059acd48464d2785b1ab003d64cc21747bba49d -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision f059acd48464d2785b1ab003d64cc21747bba49d) +++ lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -120,7 +120,7 @@ label.step=Step {0} of {1} label.mark=Mark label.rank=Rank -label.authoring.self.review=Allow Self Review +label.self.review=Allow Self Review label.monitoring.num.of.comments={0} Comments label.monitoring.instructions.rank.all.learners=Learners needed to rank ALL the learners. label.monitoring.instructions.rank.some.learners=Learners needed to rank {0} learners. @@ -133,4 +133,15 @@ label.monitoring.number.learners=Number of learners label.monitoring.number.learners.finished=Number of learners finished label.monitoring.view=View {0} -label.close=Close \ No newline at end of file +label.close=Close +event.sent.results.subject=LAMS: {0} results were released +event.sent.results.body=

{0}

Your results are:

{1}

This message was send automatically, please do not reply to it.

+event.sent.results.criteria.comment=

{0}:

+event.sent.results.criteria.star=

{0} (Star): {1}

+event.sent.results.criteria.hedge=

{0} (Mark Hedging): {1} out of {2}

+event.sent.results.criteria.rank=

{0} (Rank): {1} out of {2}

+event.sent.results.criteria.rankAll=

{0} (Rank All): {1}

+event.sent.results.no.results=No results +msg.results.sent={0} Email(s) Sent +button.email.results=Email Results +label.notify.user.of.results=Notify Users of Results \ No newline at end of file Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20161026.sql =================================================================== diff -u --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20161026.sql (revision 0) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20161026.sql (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -0,0 +1,15 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-3767 Peer review: two new review methods. Allow monitor to email results to users + +ALTER TABLE tl_laprev11_peerreview ADD COLUMN notify_users_of_results TINYINT(4) DEFAULT '1'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java =================================================================== diff -u -rd2f1cafab9126e3848663764c082b76ccf2de0c5 -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java (.../Peerreview.java) (revision d2f1cafab9126e3848663764c082b76ccf2de0c5) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java (.../Peerreview.java) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -82,6 +82,8 @@ private boolean selfReview; + private boolean notifyUsersOfResults; + // ********************************************************** // Function method for Peerreview // ********************************************************** @@ -392,4 +394,12 @@ public void setSelfReview(boolean selfReview) { this.selfReview = selfReview; } + + public boolean isNotifyUsersOfResults() { + return notifyUsersOfResults; + } + + public void setNotifyUsersOfResults(boolean notifyUsersOfResults) { + this.notifyUsersOfResults = notifyUsersOfResults; + } } Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml =================================================================== diff -u -r9fc998daa072351bbb64ed9d16a1c571c8136b64 -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml (.../peerreviewApplicationContext.xml) (revision 9fc998daa072351bbb64ed9d16a1c571c8136b64) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/peerreviewApplicationContext.xml (.../peerreviewApplicationContext.xml) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -65,7 +65,8 @@ - + + Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java =================================================================== diff -u -r1493a89e84185e53ff46dc7fc532850053e8cab2 -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java (.../IPeerreviewService.java) (revision 1493a89e84185e53ff46dc7fc532850053e8cab2) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java (.../IPeerreviewService.java) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -30,14 +30,12 @@ import org.apache.tomcat.util.json.JSONArray; import org.apache.tomcat.util.json.JSONException; import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rating.ToolRatingManager; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; import org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO; import org.lamsfoundation.lams.rating.model.RatingCriteria; import org.lamsfoundation.lams.tool.peerreview.dto.GroupSummary; import org.lamsfoundation.lams.tool.peerreview.dto.PeerreviewStatisticsDTO; -import org.lamsfoundation.lams.tool.peerreview.dto.ReflectDTO; import org.lamsfoundation.lams.tool.peerreview.model.Peerreview; import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewSession; import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewUser; @@ -272,4 +270,10 @@ */ List getUserNotebookEntriesForTablesorter(Long toolSessionId, int page, int size, int sorting, String searchString); - } + /** Send an email with the user's results to each user in the session */ + int emailReportToSessionUsers(Long toolContentId, Long sessionId); + + /** Send an email with the user's results to the specified user in the session */ + int emailReportToUser(Long toolContentId, Long sessionId, Long userId); + +} Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java =================================================================== diff -u -r1493a89e84185e53ff46dc7fc532850053e8cab2 -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision 1493a89e84185e53ff46dc7fc532850053e8cab2) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -23,13 +23,13 @@ package org.lamsfoundation.lams.tool.peerreview.service; +import java.security.InvalidParameterException; import java.text.NumberFormat; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -45,6 +45,8 @@ import org.apache.tomcat.util.json.JSONArray; import org.apache.tomcat.util.json.JSONException; import org.apache.tomcat.util.json.JSONObject; +import org.lamsfoundation.lams.events.AbstractDeliveryMethod; +import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; @@ -54,6 +56,7 @@ import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; import org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO; +import org.lamsfoundation.lams.rating.dto.StyledRatingDTO; import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria; import org.lamsfoundation.lams.rating.model.RatingCriteria; import org.lamsfoundation.lams.rating.service.IRatingService; @@ -72,7 +75,6 @@ import org.lamsfoundation.lams.tool.peerreview.dao.PeerreviewUserDAO; import org.lamsfoundation.lams.tool.peerreview.dto.GroupSummary; import org.lamsfoundation.lams.tool.peerreview.dto.PeerreviewStatisticsDTO; -import org.lamsfoundation.lams.tool.peerreview.dto.ReflectDTO; import org.lamsfoundation.lams.tool.peerreview.model.Peerreview; import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewSession; import org.lamsfoundation.lams.tool.peerreview.model.PeerreviewUser; @@ -115,6 +117,8 @@ private ICoreNotebookService coreNotebookService; private IRatingService ratingService; + + private IEventNotificationService eventNotificationService; private SortedSet creatingUsersForSessionIds; @@ -431,7 +435,112 @@ return rawData; } - + + @Override + public int emailReportToSessionUsers(Long toolContentId, Long sessionId) { + List users = peerreviewUserDao.getBySessionID(sessionId); + Peerreview peerreview = getPeerreviewByContentId(toolContentId); + String subject = getResultsEmailSubject(peerreview); + List criterias = getRatingCriterias(toolContentId); + int numEmailsSent = 0; + for (PeerreviewUser user : users) { + if (emailReport(toolContentId, sessionId, user, peerreview, criterias, subject) != 1) { + log.error("Unable to email to all users in session " + sessionId + ". Have processed " + numEmailsSent + + " so far."); + return -1; + } + numEmailsSent++; + } + return numEmailsSent; + } + + @Override + public int emailReportToUser(Long toolContentId, Long sessionId, Long userId) { + + PeerreviewUser user = peerreviewUserDao.getUserByUserIDAndSessionID(userId, sessionId); + Peerreview peerreview = getPeerreviewByContentId(toolContentId); + return emailReport(toolContentId, sessionId, user, peerreview, getRatingCriterias(toolContentId), + getResultsEmailSubject(peerreview)); + } + + private String getResultsEmailSubject(Peerreview peerreview) { + return getLocalisedMessage("event.sent.results.subject", new Object[] { peerreview.getTitle() }); + } + + private int emailReport(Long toolContentId, Long sessionId, PeerreviewUser user, Peerreview peerreview, List ratingCriterias, String subject) { + + int userId = user.getUserId().intValue(); + String name = StringEscapeUtils.escapeCsv(user.getFirstName()+" "+user.getLastName()); + + StringBuilder notificationMessage = new StringBuilder(); + + for (RatingCriteria criteria : ratingCriterias) { + int sorting = PeerreviewConstants.SORT_BY_AVERAGE_RESULT_DESC; + if (criteria.isRankingStyleRating()) + sorting = PeerreviewConstants.SORT_BY_AVERAGE_RESULT_ASC; + StyledCriteriaRatingDTO dto = getUsersRatingsCommentsByCriteriaIdDTO(toolContentId, sessionId, criteria, + user.getUserId(), false, sorting, null, true, false); + generateRatingEntryForEmail(notificationMessage, criteria, dto); + } + + eventNotificationService.sendMessage(null, + userId, + IEventNotificationService.DELIVERY_METHOD_MAIL, + subject, + getLocalisedMessage("event.sent.results.body", new Object[]{name, notificationMessage.toString()}), + true); + + return 1; + + } + + private void generateRatingEntryForEmail(StringBuilder notificationMessage, RatingCriteria criteria, + StyledCriteriaRatingDTO dto) { + if (dto.getRatingDtos().size() >= 1) { + if (criteria.isCommentRating()) { + StringBuilder comments = new StringBuilder(); + for (StyledRatingDTO ratingDto : dto.getRatingDtos()) { + if (ratingDto.getComment() != null) + comments.append("
  • ").append(ratingDto.getComment()).append("
  • "); + } + notificationMessage.append(getLocalisedMessage("event.sent.results.criteria.comment", new Object[] { + dto.getRatingCriteria().getTitle(), comments.toString() })); + } else { + String avgRating = dto.getRatingDtos().get(0).getAverageRating().length() > 0 ? dto.getRatingDtos() + .get(0).getAverageRating() : "0"; + StringBuilder comments = null; + if (criteria.isStarStyleRating()) { + if (criteria.isCommentsEnabled()) { + comments = new StringBuilder(); + for (StyledRatingDTO ratingDto : dto.getRatingDtos()) { + if (ratingDto.getComment() != null) + comments.append("
  • ").append(ratingDto.getComment()).append("
  • "); + } + } + notificationMessage.append(getLocalisedMessage( + "event.sent.results.criteria.star", + new Object[] { dto.getRatingCriteria().getTitle(), avgRating, + comments != null ? comments.toString() : "" })); + } else if (criteria.isRankingStyleRating()) { + if (criteria.getMaxRating() > 0) { + notificationMessage + .append(getLocalisedMessage("event.sent.results.criteria.rank", new Object[] { + dto.getRatingCriteria().getTitle(), avgRating, criteria.getMaxRating() })); + } else { + notificationMessage.append(getLocalisedMessage("event.sent.results.criteria.rankAll", + new Object[] { dto.getRatingCriteria().getTitle(), avgRating })); + } + } else { // hedge style rating + notificationMessage.append(getLocalisedMessage("event.sent.results.criteria.hedge", new Object[] { + dto.getRatingCriteria().getTitle(), avgRating, criteria.getMaxRating() })); + } + } + } else { + notificationMessage.append(dto.getRatingCriteria().getTitle()).append( + getLocalisedMessage("event.sent.results.no.results", null)); + } + notificationMessage.append("\n"); + } // ***************************************************************************** // private methods // ***************************************************************************** @@ -842,6 +951,10 @@ // ****************** REST methods ************************* + public void setEventNotificationService(IEventNotificationService eventNotificationService) { + this.eventNotificationService = eventNotificationService; + } + /** * Used by the Rest calls to create content. Mandatory fields in toolContentJSON: title, instructions, peerreview, * user fields firstName, lastName and loginName Peerreview must contain a JSONArray of JSONObject objects, which Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java =================================================================== diff -u -r1493a89e84185e53ff46dc7fc532850053e8cab2 -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 1493a89e84185e53ff46dc7fc532850053e8cab2) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -55,6 +55,7 @@ import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; +import org.springframework.util.StringUtils; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -90,6 +91,12 @@ if (param.equals("getReflections")) { return getReflections(mapping, form, request, response); } + if (param.equals("sendResultsToUser")) { + return sendResultsToUser(mapping, form, request, response); + } + if (param.equals("sendResultsToSessionUsers")) { + return sendResultsToSessionUsers(mapping, form, request, response); + } return mapping.findForward(PeerreviewConstants.ERROR); } @@ -127,6 +134,7 @@ List criterias = service.getRatingCriterias(contentId); request.setAttribute(PeerreviewConstants.ATTR_CRITERIAS, criterias); + return mapping.findForward(PeerreviewConstants.SUCCESS); } @@ -203,6 +211,7 @@ JSONArray rows = new JSONArray(); + String emailResultsText = service.getLocalisedMessage("button.email.results", null); if (criteria.isCommentRating()) { // special db lookup just for this - gets the user's & how many comments left for them List rawRows = service.getCommentsCounts(toolContentId, toolSessionId, criteria, page, size, @@ -218,8 +227,11 @@ int numComments = numCommentsNumber != null ? numCommentsNumber.intValue() : 0; if (numComments > 0) { cell.put("rating", service.getLocalisedMessage("label.monitoring.num.of.comments", new Object[] { numComments })); + cell.put("email", generateResultsButton(toolSessionId, rawRow[0], emailResultsText)); } else { cell.put("rating", ""); + cell.put("email", ""); + } JSONObject row = new JSONObject(); @@ -251,8 +263,10 @@ starString += msg; starString += ""; rawRow.put("rating", starString); + rawRow.put("email", generateResultsButton(toolSessionId, (Long) rawRow.get("itemId"), emailResultsText)); } else { rawRow.put("rating", averageRating); + rawRow.put("email", generateResultsButton(toolSessionId, (Long) rawRow.get("itemId"), emailResultsText)); } } JSONObject row = new JSONObject(); @@ -268,6 +282,17 @@ return null; } + private String generateResultsButton(Object toolSessionId, Object userId, String emailResultsText) { + return new StringBuilder("") + .append(emailResultsText) + .append("") + .toString(); + } + private ActionForward getSubgridData(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws JSONException, IOException { IPeerreviewService service = getPeerreviewService(); @@ -314,7 +339,9 @@ JSONArray userData = new JSONArray(); userData.put(i); userData.put(ratingDetails[4]); - userData.put(StringEscapeUtils.escapeHtml(comment)); + String commentText = StringEscapeUtils.escapeHtml(comment); + commentText = StringUtils.replace(commentText, "<BR>", "
    "); + userData.put(commentText); userData.put("Comments"); JSONObject userRow = new JSONObject(); @@ -392,7 +419,7 @@ sorting = PeerreviewConstants.SORT_BY_NOTEBOOK_ENTRY_ASC; } } - + String searchString = WebUtil.readStrParam(request, "itemDescription", true); // setting date format to ISO8601 for jquery.timeago @@ -451,7 +478,42 @@ return null; } - + private ActionForward sendResultsToUser(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) throws JSONException, IOException { + return sendResults(mapping, request, response, true); + } + + private ActionForward sendResultsToSessionUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) throws JSONException, IOException { + return sendResults(mapping, request, response, false); + } + + private ActionForward sendResults(ActionMapping mapping, HttpServletRequest request, + HttpServletResponse response, boolean oneUserOnly) throws JSONException, IOException { + + String sessionMapID = request.getParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID); + SessionMap sessionMap = (SessionMap) request.getSession() + .getAttribute(sessionMapID); + request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); + + Long contentId = (Long) sessionMap.get(PeerreviewConstants.ATTR_TOOL_CONTENT_ID); + Long toolSessionId = WebUtil.readLongParam(request, "toolSessionId"); + + IPeerreviewService service = getPeerreviewService(); + int numEmailsSent = 0; + + if ( oneUserOnly) { + Long userId = WebUtil.readLongParam(request, PeerreviewConstants.PARAM_USERID); + numEmailsSent = service.emailReportToUser(contentId, toolSessionId, userId); + } else { + numEmailsSent = service.emailReportToSessionUsers(contentId, toolSessionId); + } + + response.setContentType("text/html;charset=utf-8"); + response.getWriter().write(service.getLocalisedMessage("msg.results.sent", new Object[] { numEmailsSent })); + return null; + } + // ************************************************************************************* // Private method // ************************************************************************************* Index: lams_tool_preview/web/WEB-INF/struts-config.xml =================================================================== diff -u -re755d63f41781aa02a1fb97ae349019d01a58782 -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision e755d63f41781aa02a1fb97ae349019d01a58782) +++ lams_tool_preview/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -193,6 +193,15 @@ type="org.lamsfoundation.lams.tool.peerreview.web.action.MonitoringAction" parameter="getReflections" > + + + + + Index: lams_tool_preview/web/includes/css/learning.css =================================================================== diff -u -rd2f1cafab9126e3848663764c082b76ccf2de0c5 -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/web/includes/css/learning.css (.../learning.css) (revision d2f1cafab9126e3848663764c082b76ccf2de0c5) +++ lams_tool_preview/web/includes/css/learning.css (.../learning.css) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -51,8 +51,19 @@ .ui-jqgrid td { border-style: none !important; + padding: 0px 4px 4px 4px; } +.ui-jqgrid tr.jqgrow td { + padding: 8px 8px 8px 8px; + white-space: normal !important; +} + +.ui-jqgrid .ui-jqgrid-view { + font-size: 14px; + font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; +} + .divrankx { width: 300px; height: 30px; @@ -77,3 +88,6 @@ background-color: #337ab7; } +.email-button { + margin: 2px; +} Index: lams_tool_preview/web/pages/authoring/advance.jsp =================================================================== diff -u -rd2f1cafab9126e3848663764c082b76ccf2de0c5 -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/web/pages/authoring/advance.jsp (.../advance.jsp) (revision d2f1cafab9126e3848663764c082b76ccf2de0c5) +++ lams_tool_preview/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -32,10 +32,17 @@
    +
    + +
    + + Index: lams_tool_preview/web/pages/learning/star.jsp =================================================================== diff -u -rd2f1cafab9126e3848663764c082b76ccf2de0c5 -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/web/pages/learning/star.jsp (.../star.jsp) (revision d2f1cafab9126e3848663764c082b76ccf2de0c5) +++ lams_tool_preview/web/pages/learning/star.jsp (.../star.jsp) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -73,8 +73,6 @@ $("#no-users-info").show(); } - debugger; - for (i = 0; i < data.rows.length; i++){ var userData = data.rows[i]; var itemId = userData["itemId"]; @@ -178,7 +176,6 @@ } function onRatingSuccessCallback() { - debugger; var numItems = $("#count-rated-items").html(); if ( ${criteriaRatings.ratingCriteria.minimumRates} <= 0 || numItems >= ${criteriaRatings.ratingCriteria.minimumRates} ) $("#finishButton").css("visibility", "visible"); Index: lams_tool_preview/web/pages/monitoring/advanceoptions.jsp =================================================================== diff -u -r2504d197b72acb9a431160463483359209b94e9b -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/web/pages/monitoring/advanceoptions.jsp (.../advanceoptions.jsp) (revision 2504d197b72acb9a431160463483359209b94e9b) +++ lams_tool_preview/web/pages/monitoring/advanceoptions.jsp (.../advanceoptions.jsp) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -23,46 +23,46 @@ - + - - + + - ${sessionMap.imageGallery.minimumRates} + - + - + - + - - + + - ${sessionMap.imageGallery.maximumRates} + - + - + - + - + Index: lams_tool_preview/web/pages/monitoring/criteria.jsp =================================================================== diff -u -r1493a89e84185e53ff46dc7fc532850053e8cab2 -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/web/pages/monitoring/criteria.jsp (.../criteria.jsp) (revision 1493a89e84185e53ff46dc7fc532850053e8cab2) +++ lams_tool_preview/web/pages/monitoring/criteria.jsp (.../criteria.jsp) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -11,22 +11,6 @@ <%@ include file="/common/header.jsp"%> - - Index: lams_tool_preview/web/pages/monitoring/criteriapart.jsp =================================================================== diff -u -r1493a89e84185e53ff46dc7fc532850053e8cab2 -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/web/pages/monitoring/criteriapart.jsp (.../criteriapart.jsp) (revision 1493a89e84185e53ff46dc7fc532850053e8cab2) +++ lams_tool_preview/web/pages/monitoring/criteriapart.jsp (.../criteriapart.jsp) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -28,11 +28,15 @@ colNames:[ 'itemId', '', - '${heading}' ], + '${heading}' + , '' + ], colModel:[ {name:'itemId', index:'itemId', width:0, hidden: true}, {name:'itemDescription', index:'itemDescription', width:200, searchoptions: { clearSearch: false }}, {name:'rating', index:'rating', width:100, align:"center", search:false} + , {name:'email', index:'email', width:100, align:"center", search:false} + ], rowNum:10, rowList:[10,20,30,40,50,100], @@ -78,10 +82,10 @@ 'criteriaId' ], colModel:[ - {name:'id', index:'id', hidden:true}, - {name:'userName',index:'userName'}, - {name:'rating', index:'rating', width:140, align:"center"}, - {name:'criteriaId', hidden:true} + {name:'id', index:'id', width:0, hidden:true}, + {name:'userName', index:'userName', width:100 }, + {name:'rating', index:'rating', width:200, align:"center"}, + {name:'criteriaId', width:0, hidden:true} ], loadError: function(xhr,st,err) { jQuery("#"+subgridTableId).clearGridData(); @@ -115,6 +119,27 @@ }); + function sendResultsForLearner(sessionId, userId) { + var url = ""; + $("#messageArea2").html(""); + $("#messageArea2_Busy").show(); + $("#messageArea2").load( + url, + { + sessionMapID: "${sessionMapID}", + toolContentID: ${sessionMap.toolContentID}, + toolSessionId: sessionId, + userID: userId, + reqID: (new Date()).getTime() + }, + function() { + $("#messageArea2_Busy").hide(); + } + ); + return false; + } + + Index: lams_tool_preview/web/pages/monitoring/reflections.jsp =================================================================== diff -u -r1493a89e84185e53ff46dc7fc532850053e8cab2 -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/web/pages/monitoring/reflections.jsp (.../reflections.jsp) (revision 1493a89e84185e53ff46dc7fc532850053e8cab2) +++ lams_tool_preview/web/pages/monitoring/reflections.jsp (.../reflections.jsp) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -25,8 +25,6 @@ $(document).ready(function(){ - debugger; - jQuery("#group${toolSessionId}").jqGrid({ url: "?toolSessionId=${toolSessionId}&sessionMapID=${sessionMapID}", datatype: "json", Index: lams_tool_preview/web/pages/monitoring/summary.jsp =================================================================== diff -u -rf059acd48464d2785b1ab003d64cc21747bba49d -r0a6765ac7eb73c6b99c343a021877c48236241b8 --- lams_tool_preview/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision f059acd48464d2785b1ab003d64cc21747bba49d) +++ lams_tool_preview/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 0a6765ac7eb73c6b99c343a021877c48236241b8) @@ -8,22 +8,6 @@ - - @@ -59,6 +62,10 @@ + + +
    + @@ -81,7 +88,7 @@ - +

    ${criteria.title}

    @@ -96,14 +103,23 @@ ${criteria.title}
    - - reflections.do?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&toolContentID=${sessionMap.toolContentID} - -
     
    + +
    + + reflections.do?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&toolContentID=${sessionMap.toolContentID} + + + + + Send Results To Learners + +
    +
    +