Index: lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -re1b28fc8de1d5122d10b7209e2bb1386827117f0 -rfc1e0b9d9e66313d54b4f1fad291a8e9d0054767 --- lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e1b28fc8de1d5122d10b7209e2bb1386827117f0) +++ lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision fc1e0b9d9e66313d54b4f1fad291a8e9d0054767) @@ -93,8 +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 learners modify answers -monitoring.summary.learner.reedit.confirm = Are you sure you want allows students to modify their answers again? +monitoring.summary.gallery.walk.learner.edit = Let learners modify answers +monitoring.summary.gallery.walk.learner.edit.confirm = Are you sure you want allows students to modify their answers while inside Gallery Walk? 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/dbupdates/patch20210728.sql =================================================================== diff -u --- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/dbupdates/patch20210728.sql (revision 0) +++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/dbupdates/patch20210728.sql (revision fc1e0b9d9e66313d54b4f1fad291a8e9d0054767) @@ -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-5222 Allow reedit in Whiteboard tool + +ALTER TABLE tl_lawhiteboard11_whiteboard ADD COLUMN gallery_walk_edit_enabled TINYINT NOT NULL DEFAULT 0 AFTER gallery_walk_finished; + +-- 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; Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/model/Whiteboard.java =================================================================== diff -u -rcf53a39fbd08dd3125cceba14221ac809ae6df13 -rfc1e0b9d9e66313d54b4f1fad291a8e9d0054767 --- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/model/Whiteboard.java (.../Whiteboard.java) (revision cf53a39fbd08dd3125cceba14221ac809ae6df13) +++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/model/Whiteboard.java (.../Whiteboard.java) (revision fc1e0b9d9e66313d54b4f1fad291a8e9d0054767) @@ -110,6 +110,9 @@ @Column(name = "gallery_walk_finished") private boolean galleryWalkFinished; + @Column(name = "gallery_walk_edit_enabled") + private boolean galleryWalkEditEnabled; + @Column(name = "gallery_walk_instructions") private String galleryWalkInstructions; @@ -388,6 +391,14 @@ this.galleryWalkFinished = galleryWalkFinished; } + public boolean isGalleryWalkEditEnabled() { + return galleryWalkEditEnabled; + } + + public void setGalleryWalkEditEnabled(boolean galleryWalkEditEnabled) { + this.galleryWalkEditEnabled = galleryWalkEditEnabled; + } + public String getGalleryWalkInstructions() { return galleryWalkInstructions; } Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/IWhiteboardService.java =================================================================== diff -u -ra8424bd8d5f88aa4bebe2ef1534ca678e56cfc42 -rfc1e0b9d9e66313d54b4f1fad291a8e9d0054767 --- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/IWhiteboardService.java (.../IWhiteboardService.java) (revision a8424bd8d5f88aa4bebe2ef1534ca678e56cfc42) +++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/IWhiteboardService.java (.../IWhiteboardService.java) (revision fc1e0b9d9e66313d54b4f1fad291a8e9d0054767) @@ -131,7 +131,7 @@ void finishGalleryWalk(long toolContentId) throws IOException; - void learnerReedit(long toolContentId) throws IOException; + void enableGalleryWalkLearnerEdit(long toolContentId) throws IOException; void changeLeaderForGroup(long toolSessionId, long leaderUserId); Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java =================================================================== diff -u -r9395dbdd7388571aced1bb99d1d5e3d19c89e2df -rfc1e0b9d9e66313d54b4f1fad291a8e9d0054767 --- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java (.../WhiteboardService.java) (revision 9395dbdd7388571aced1bb99d1d5e3d19c89e2df) +++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java (.../WhiteboardService.java) (revision fc1e0b9d9e66313d54b4f1fad291a8e9d0054767) @@ -326,6 +326,9 @@ } List groupList = new ArrayList<>(); + Long userSessionId = ratingUserId == null || !whiteboard.isGalleryWalkStarted() + || !whiteboard.isGalleryWalkEditEnabled() ? null + : getUserByIDAndContent(ratingUserId, contentId).getSession().getSessionId(); for (WhiteboardSession session : sessionList) { // one new group for one session. SessionDTO group = new SessionDTO(); @@ -336,7 +339,11 @@ String wid = whiteboard.getContentId() + "-" + session.getSessionId(); wid = getWhiteboardPrefixedId(wid); - if (ratingUserId != null) { + + // show read only pad if it is a learner and no reedit was enabled + if (ratingUserId != null && (userSessionId == null || !session.getSessionId().equals(userSessionId) + || (whiteboard.isUseSelectLeaderToolOuput() && (session.getGroupLeader() == null + || !session.getGroupLeader().getUserId().equals(ratingUserId))))) { wid = getWhiteboardReadOnlyWid(wid); } group.setWid(wid); @@ -508,15 +515,14 @@ } @Override - public void learnerReedit(long toolContentId) throws IOException { + public void enableGalleryWalkLearnerEdit(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 " + "Can not allow learners to reedit activity as Gallery Walk is not enabled for Whiteboard with tool content ID " + toolContentId); } - whiteboard.setGalleryWalkStarted(false); - whiteboard.setGalleryWalkFinished(false); + whiteboard.setGalleryWalkEditEnabled(true); whiteboardDao.update(whiteboard); sendGalleryWalkRefreshRequest(whiteboard); Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/MonitoringController.java =================================================================== diff -u -ra8424bd8d5f88aa4bebe2ef1534ca678e56cfc42 -rfc1e0b9d9e66313d54b4f1fad291a8e9d0054767 --- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/MonitoringController.java (.../MonitoringController.java) (revision a8424bd8d5f88aa4bebe2ef1534ca678e56cfc42) +++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/MonitoringController.java (.../MonitoringController.java) (revision fc1e0b9d9e66313d54b4f1fad291a8e9d0054767) @@ -279,11 +279,11 @@ whiteboardService.finishGalleryWalk(toolContentId); } - @RequestMapping("/learnerReedit") - private void learnerReedit(HttpServletRequest request) throws IOException { + @RequestMapping("/enableGalleryWalkLearnerEdit") + private void enableGalleryWalkLearnerEdit(HttpServletRequest request) throws IOException { Long toolContentId = WebUtil.readLongParam(request, WhiteboardConstants.ATTR_TOOL_CONTENT_ID, false); - whiteboardService.learnerReedit(toolContentId); + whiteboardService.enableGalleryWalkLearnerEdit(toolContentId); } @RequestMapping(path = "/updateTimeLimit", method = RequestMethod.POST) Index: lams_tool_whiteboard/web/pages/monitoring/summary.jsp =================================================================== diff -u -r9395dbdd7388571aced1bb99d1d5e3d19c89e2df -rfc1e0b9d9e66313d54b4f1fad291a8e9d0054767 --- lams_tool_whiteboard/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 9395dbdd7388571aced1bb99d1d5e3d19c89e2df) +++ lams_tool_whiteboard/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision fc1e0b9d9e66313d54b4f1fad291a8e9d0054767) @@ -347,7 +347,7 @@ let summaryPane = $('#whiteboard-monitoring-summary-${sessionMap.toolContentID}'); $('#gallery-walk-start', summaryPane).hide(); - $('#gallery-walk-finish, #learner-reedit', summaryPane).removeClass('hidden'); + $('#gallery-walk-finish, #gallery-walk-learner-edit', summaryPane).removeClass('hidden'); } }); } @@ -379,13 +379,13 @@ }); } - function learnerReedit(){ - if (!confirm('')) { + function enableGalleryWalkLearnerEdit(){ + if (!confirm('')) { return; } $.ajax({ - 'url' : '', + 'url' : '', 'data': { toolContentID : ${whiteboard.contentId} }, @@ -811,10 +811,10 @@ -