Index: lams_tool_doku/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r31261a5f8d336b5543df5356acc233df8219e714 -r87dce5c82fdf33a8e8335ed56f6a75b5c06a11cb
--- lams_tool_doku/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 31261a5f8d336b5543df5356acc233df8219e714)
+++ lams_tool_doku/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 87dce5c82fdf33a8e8335ed56f6a75b5c06a11cb)
@@ -103,6 +103,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_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
===================================================================
diff -u -rb0f4135473a7c21793882bd4aa679e6033d14988 -r87dce5c82fdf33a8e8335ed56f6a75b5c06a11cb
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java (.../DokumaranService.java) (revision b0f4135473a7c21793882bd4aa679e6033d14988)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java (.../DokumaranService.java) (revision 87dce5c82fdf33a8e8335ed56f6a75b5c06a11cb)
@@ -630,6 +630,20 @@
sendGalleryWalkRefreshRequest(dokumaran);
}
+ @Override
+ public void learnerReedit(long toolContentId) throws IOException {
+ Dokumaran dokumaran = getDokumaranByContentId(toolContentId);
+ if (!dokumaran.isGalleryWalkEnabled()) {
+ throw new IllegalArgumentException(
+ "Can not allow learners to reedit activity as Gallery Walk is not enabled for Dokumaran with tool content ID "
+ + toolContentId);
+ }
+ dokumaran.setGalleryWalkStarted(false);
+ dokumaranDao.saveObject(dokumaran);
+
+ sendGalleryWalkRefreshRequest(dokumaran);
+ }
+
private void sendGalleryWalkRefreshRequest(Dokumaran dokumaran) {
ObjectNode jsonCommand = JsonNodeFactory.instance.objectNode();
jsonCommand.put("hookTrigger", "doku-refresh-" + dokumaran.getContentId());
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
===================================================================
diff -u -rb0f4135473a7c21793882bd4aa679e6033d14988 -r87dce5c82fdf33a8e8335ed56f6a75b5c06a11cb
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java (.../IDokumaranService.java) (revision b0f4135473a7c21793882bd4aa679e6033d14988)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java (.../IDokumaranService.java) (revision 87dce5c82fdf33a8e8335ed56f6a75b5c06a11cb)
@@ -233,6 +233,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_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
===================================================================
diff -u -r1324c32fc07460a47b0b53b25a2b43d77fbd500c -r87dce5c82fdf33a8e8335ed56f6a75b5c06a11cb
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 1324c32fc07460a47b0b53b25a2b43d77fbd500c)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 87dce5c82fdf33a8e8335ed56f6a75b5c06a11cb)
@@ -314,6 +314,13 @@
dokumaranService.finishGalleryWalk(toolContentId);
}
+ @RequestMapping("/learnerReedit")
+ private void learnerReedit(HttpServletRequest request) throws IOException {
+ Long toolContentId = WebUtil.readLongParam(request, DokumaranConstants.ATTR_TOOL_CONTENT_ID, false);
+
+ dokumaranService.learnerReedit(toolContentId);
+ }
+
@RequestMapping("/ae")
private String tblApplicationExcercise(HttpServletRequest request, HttpServletResponse response)
throws EtherpadException {
Index: lams_tool_doku/web/pages/monitoring/summary.jsp
===================================================================
diff -u -refcf81f45cfb07cebbba85c3494fa9af1bee325f -r87dce5c82fdf33a8e8335ed56f6a75b5c06a11cb
--- lams_tool_doku/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision efcf81f45cfb07cebbba85c3494fa9af1bee325f)
+++ lams_tool_doku/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 87dce5c82fdf33a8e8335ed56f6a75b5c06a11cb)
@@ -312,10 +312,10 @@
toolContentID : ${dokumaran.contentId}
},
'success' : function(){
- $('#doku-monitoring-summary-${sessionMap.toolContentID} #gallery-walk-start, ' +
- '#doku-monitoring-summary-${sessionMap.toolContentID} #countdown, ' +
- '#doku-monitoring-summary-${sessionMap.toolContentID} #add-one-minute, #start-activity').hide();
- $('#doku-monitoring-summary-${sessionMap.toolContentID} #gallery-walk-finish').removeClass('hidden');
+ let summaryPane = $('#doku-monitoring-summary-${sessionMap.toolContentID}');
+
+ $('#gallery-walk-start', summaryPane).hide();
+ $('#gallery-walk-finish, #learner-reedit', summaryPane).removeClass('hidden');
}
});
}
@@ -347,7 +347,32 @@
});
}
+
+ function learnerReedit(){
+ if (!confirm('')) {
+ return;
+ }
+
+ $.ajax({
+ 'url' : '',
+ 'data': {
+ toolContentID : ${dokumaran.contentId}
+ },
+ 'success' : function(){
+
+
+ // reload current tab with Doku summary
+ loadTab(null, null, false);
+
+
+ location.reload();
+
+
+ }
+ });
+ }
+
function showChangeLeaderModal(toolSessionId) {
$('#doku-monitoring-summary-${sessionMap.toolContentID} #change-leader-modals').empty()
.load('',{
@@ -757,6 +782,12 @@
onClick="javascript:startGalleryWalk()">
+
+