Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r129ea5b185183a7213e3dedaff8724c146b7fc9e -ra0430f6a63b52c4ea0cdfc1c9d5c4aba0b4d5e68
--- lams_tool_preview/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 129ea5b185183a7213e3dedaff8724c146b7fc9e)
+++ lams_tool_preview/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision a0430f6a63b52c4ea0cdfc1c9d5c4aba0b4d5e68)
@@ -159,4 +159,5 @@
error.unable.save.comments=Unable to save comments
label.show.ratings.left.by.user =After completion, show feedback left for other students
label.ratings.by.others =Ratings left for you
-label.rating.rank=Rank
\ No newline at end of file
+label.rating.rank=Rank
+label.file.downloaded=Spreadsheet downloaded
\ No newline at end of file
Index: lams_tool_preview/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r06710873eb945b5dd10ad0bc6697d68f54d1fb6e -ra0430f6a63b52c4ea0cdfc1c9d5c4aba0b4d5e68
--- lams_tool_preview/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 06710873eb945b5dd10ad0bc6697d68f54d1fb6e)
+++ lams_tool_preview/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision a0430f6a63b52c4ea0cdfc1c9d5c4aba0b4d5e68)
@@ -36,6 +36,7 @@
var url = "";
$("#messageArea").html("");
$("#messageArea_Busy").show();
+ $(".btn-disable-on-submit").prop("disabled", true);
$("#messageArea").load(
url,
{
@@ -46,44 +47,27 @@
},
function() {
$("#messageArea_Busy").hide();
+ $(".btn-disable-on-submit").prop("disabled", false);
}
);
return false;
}
-
- //Detecting the file download dialog in the browser:
- //http://geekswithblogs.net/GruffCode/archive/2010/10/28/detecting-the-file-download-dialog-in-the-browser.aspx
- var fileDownloadCheckTimer;
-
- function exportResults() {
- $("#messageArea").html("");
- $("#messageArea_Busy").show();
-
- var token = new Date().getTime(); //use the current timestamp as the token value
-
- fileDownloadCheckTimer = window.setInterval(function () {
- var cookieValue = $.cookie('fileDownloadToken');
- if (cookieValue == token) {
- //unBlock export button
- window.clearInterval(fileDownloadCheckTimer);
- $.cookie('fileDownloadToken', null); //clears this cookie value
- $("#messageArea").html('File downloaded');
- $("#messageArea_Busy").hide();
- }
- }, 1000);
-
- var exportExcelUrl = "exportTeamReport.do?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&toolContentID=${sessionMap.toolContentID}";
- document.location.href = exportExcelUrl + "&downloadTokenValue=" + token;
- return false;
- }
+
+
+
@@ -99,8 +83,8 @@
-
-
+
+
@@ -136,8 +120,8 @@
criteria.do?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&criteriaId=${criteria.ratingCriteriaId}
-
-
+
@@ -147,11 +131,11 @@
reflections.do?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&toolContentID=${sessionMap.toolContentID}
-
+
loffset5
-
+
@@ -169,19 +153,19 @@