Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java =================================================================== diff -u -r432fd5e118d63c8dab4bce32210b55f752cf0776 -re3931b3fb440adbb62e0ab4112df71f620050066 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java (.../GradebookMonitoringController.java) (revision 432fd5e118d63c8dab4bce32210b55f752cf0776) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java (.../GradebookMonitoringController.java) (revision e3931b3fb440adbb62e0ab4112df71f620050066) @@ -132,7 +132,7 @@ } boolean isTab = WebUtil.readBooleanParam(request, "isTab", false); - return "gradebookMonitor" + (isTab ? "Content" : ""); + return "gradebookMonitor" + (isTab ? "Content5" : ""); } @RequestMapping("/courseMonitor") Index: lams_gradebook/web/gradebookMonitorContent5.jsp =================================================================== diff -u --- lams_gradebook/web/gradebookMonitorContent5.jsp (revision 0) +++ lams_gradebook/web/gradebookMonitorContent5.jsp (revision e3931b3fb440adbb62e0ab4112df71f620050066) @@ -0,0 +1,803 @@ + +<%@ include file="/common/taglibs.jsp"%> + +${not empty weights} + + + + + + +
+
+ + +
+
+ + + +
+
+
+
+
+ +
+
+ + +
+
+ + + + + + +
+
+
+ +
+
+ +
+
+
\ No newline at end of file Index: lams_monitoring/web/includes/javascript/monitorLesson5.js =================================================================== diff -u -r90a77f339c6f42a9e05ddbbd3c8ad2c8a0697c0a -re3931b3fb440adbb62e0ab4112df71f620050066 --- lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 90a77f339c6f42a9e05ddbbd3c8ad2c8a0697c0a) +++ lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision e3931b3fb440adbb62e0ab4112df71f620050066) @@ -28,7 +28,9 @@ popupHeight = 720, gateOpenIconPath = 'images/svg/gateOpen.svg', - gateOpenIconData = null; + gateOpenIconData = null, + + fileDownloadCheckTimer; $(document).ready(function(){ initCommonElements(); @@ -2575,7 +2577,42 @@ }, 50); } +function blockExportButton(areaToBlock, exportExcelUrl) { + var token = new Date().getTime(), + area = $('#' + areaToBlock).css('cursor', 'wait'), + buttons = $('.btn', area).prop('disabled', true), + form = $('
'); + + fileDownloadCheckTimer = window.setInterval(function () { + var cookieValue = $.cookie('fileDownloadToken'); + if (cookieValue == token) { + //unBlock export button + window.clearInterval(fileDownloadCheckTimer); + $.cookie('fileDownloadToken', null); //clears this cookie value + + area.css('cursor', 'auto'); + buttons.prop('disabled', false); + form.remove(); + } + }, 1000); + + //dynamically create a form and submit it + form.attr("method", "post"); + form.attr("action", exportExcelUrl); + + var hiddenField = $(''); + hiddenField.attr("type", "hidden"); + hiddenField.attr("name", "downloadTokenValue"); + hiddenField.attr("value", token); + form.append(hiddenField); + // The form needs to be a part of the document in order to be submitted + $(document.body).append(form); + form.submit(); + + return false; +} + //********** COMMON FUNCTIONS ********** Index: lams_monitoring/web/monitor5.jsp =================================================================== diff -u -r90a77f339c6f42a9e05ddbbd3c8ad2c8a0697c0a -re3931b3fb440adbb62e0ab4112df71f620050066 --- lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 90a77f339c6f42a9e05ddbbd3c8ad2c8a0697c0a) +++ lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision e3931b3fb440adbb62e0ab4112df71f620050066) @@ -35,7 +35,6 @@ -