Index: lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r66073df9d060c655481967312c70b03b1c858e42 -ra8424bd8d5f88aa4bebe2ef1534ca678e56cfc42 --- lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 66073df9d060c655481967312c70b03b1c858e42) +++ lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision a8424bd8d5f88aa4bebe2ef1534ca678e56cfc42) @@ -93,6 +93,8 @@ monitoring.summary.gallery.walk.start.confirm = Are you sure you want to finish collaboration phase and start Gallery Walk? monitoring.summary.gallery.walk.finish = Finish Gallery Walk monitoring.summary.gallery.walk.finish.confirm = Are you sure you want to finish Gallery Walk? +monitoring.summary.learner.reedit = Let learner modify answers +monitoring.summary.learner.reedit.confirm = Are you sure you want allows students to modify their answers again? label.gallery.walk = Gallery Walk label.gallery.walk.wait.finish = The Gallery Walk activity has not been set as completed by the teacher. If you have completed, please contact the teacher for assistance. label.rating = Rating Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/IWhiteboardService.java =================================================================== diff -u -r5739216c21c85ff9b4b11cba522b5ffd2875d55c -ra8424bd8d5f88aa4bebe2ef1534ca678e56cfc42 --- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/IWhiteboardService.java (.../IWhiteboardService.java) (revision 5739216c21c85ff9b4b11cba522b5ffd2875d55c) +++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/IWhiteboardService.java (.../IWhiteboardService.java) (revision a8424bd8d5f88aa4bebe2ef1534ca678e56cfc42) @@ -131,6 +131,8 @@ void finishGalleryWalk(long toolContentId) throws IOException; + void learnerReedit(long toolContentId) throws IOException; + void changeLeaderForGroup(long toolSessionId, long leaderUserId); Grouping getGrouping(long toolContentId); Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java =================================================================== diff -u -r5739216c21c85ff9b4b11cba522b5ffd2875d55c -ra8424bd8d5f88aa4bebe2ef1534ca678e56cfc42 --- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java (.../WhiteboardService.java) (revision 5739216c21c85ff9b4b11cba522b5ffd2875d55c) +++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java (.../WhiteboardService.java) (revision a8424bd8d5f88aa4bebe2ef1534ca678e56cfc42) @@ -507,6 +507,20 @@ sendGalleryWalkRefreshRequest(whiteboard); } + @Override + public void learnerReedit(long toolContentId) throws IOException { + Whiteboard whiteboard = getWhiteboardByContentId(toolContentId); + if (!whiteboard.isGalleryWalkEnabled()) { + throw new IllegalArgumentException( + "Can not allow learners to reedit activity as Gallery Walk is not enabled for Wwith tool content ID " + + toolContentId); + } + whiteboard.setGalleryWalkStarted(false); + whiteboardDao.update(whiteboard); + + sendGalleryWalkRefreshRequest(whiteboard); + } + private void sendGalleryWalkRefreshRequest(Whiteboard whiteboard) { ObjectNode jsonCommand = JsonNodeFactory.instance.objectNode(); jsonCommand.put("hookTrigger", "whiteboard-refresh-" + whiteboard.getContentId()); Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/MonitoringController.java =================================================================== diff -u -r5739216c21c85ff9b4b11cba522b5ffd2875d55c -ra8424bd8d5f88aa4bebe2ef1534ca678e56cfc42 --- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 5739216c21c85ff9b4b11cba522b5ffd2875d55c) +++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/MonitoringController.java (.../MonitoringController.java) (revision a8424bd8d5f88aa4bebe2ef1534ca678e56cfc42) @@ -279,6 +279,13 @@ whiteboardService.finishGalleryWalk(toolContentId); } + @RequestMapping("/learnerReedit") + private void learnerReedit(HttpServletRequest request) throws IOException { + Long toolContentId = WebUtil.readLongParam(request, WhiteboardConstants.ATTR_TOOL_CONTENT_ID, false); + + whiteboardService.learnerReedit(toolContentId); + } + @RequestMapping(path = "/updateTimeLimit", method = RequestMethod.POST) @ResponseStatus(HttpStatus.OK) public void updateTimeLimit(@RequestParam(name = AttributeNames.PARAM_TOOL_CONTENT_ID) long toolContentId, Index: lams_tool_whiteboard/web/pages/monitoring/summary.jsp =================================================================== diff -u -r5739216c21c85ff9b4b11cba522b5ffd2875d55c -ra8424bd8d5f88aa4bebe2ef1534ca678e56cfc42 --- lams_tool_whiteboard/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 5739216c21c85ff9b4b11cba522b5ffd2875d55c) +++ lams_tool_whiteboard/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision a8424bd8d5f88aa4bebe2ef1534ca678e56cfc42) @@ -344,10 +344,10 @@ toolContentID : ${whiteboard.contentId} }, 'success' : function(){ - $('#whiteboard-monitoring-summary-${sessionMap.toolContentID} #gallery-walk-start, ' + - '#whiteboard-monitoring-summary-${sessionMap.toolContentID} #countdown, ' + - '#whiteboard-monitoring-summary-${sessionMap.toolContentID} #add-one-minute, #start-activity').hide(); - $('#whiteboard-monitoring-summary-${sessionMap.toolContentID} #gallery-walk-finish').removeClass('hidden'); + let summaryPane = $('#whiteboard-monitoring-summary-${sessionMap.toolContentID}'); + + $('#gallery-walk-start', summaryPane).hide(); + $('#gallery-walk-finish, #learner-reedit', summaryPane).removeClass('hidden'); } }); } @@ -379,7 +379,30 @@ }); } - + function learnerReedit(){ + if (!confirm('')) { + return; + } + + $.ajax({ + 'url' : '', + 'data': { + toolContentID : ${whiteboard.contentId} + }, + 'success' : function(){ + + + // reload current tab with Doku summary + loadTab(null, null, false); + + + location.reload(); + + + } + }); + } + function showChangeLeaderModal(toolSessionId) { $('#whiteboard-monitoring-summary-${sessionMap.toolContentID} #change-leader-modals').empty() .load('',{ @@ -788,6 +811,12 @@ + +