Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.5.2.9 -r1.5.2.10
--- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties 23 Feb 2017 22:55:08 -0000 1.5.2.9
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties 8 Mar 2017 12:49:51 -0000 1.5.2.10
@@ -201,6 +201,6 @@
label.waiting.for.leader.submit.notebook =Time limit set by teacher is expired. Please wait until a group leader submits notebook.
label.waiting.for.leader.submit.burning.questions =Time limit set by teacher is expired. Please wait until a group leader submits burning questions.
label.authoring.advanced.shuffle.items =Shuffle questions
+label.summary.downloaded=Excel file downloaded.
-
#======= End labels: Exported 195 labels for en AU =====
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java,v
diff -u -r1.21.2.6 -r1.21.2.7
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java 16 Dec 2016 09:26:40 -0000 1.21.2.6
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java 8 Mar 2017 12:49:51 -0000 1.21.2.7
@@ -33,6 +33,7 @@
import javax.servlet.ServletException;
import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
@@ -255,6 +256,12 @@
response.setContentType("application/x-download");
response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+ // set cookie that will tell JS script that export has been finished
+ String downloadTokenValue = WebUtil.readStrParam(request, "downloadTokenValue");
+ Cookie fileDownloadTokenCookie = new Cookie("fileDownloadToken", downloadTokenValue);
+ fileDownloadTokenCookie.setPath("/");
+ response.addCookie(fileDownloadTokenCookie);
+
// Code to generate file and write file contents to response
ServletOutputStream out = response.getOutputStream();
ExcelUtil.createExcel(out, dataToExport, null, false);
Index: lams_tool_scratchie/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.6.2.2 -r1.6.2.3
--- lams_tool_scratchie/web/pages/monitoring/monitoring.jsp 1 Jun 2016 04:21:36 -0000 1.6.2.2
+++ lams_tool_scratchie/web/pages/monitoring/monitoring.jsp 8 Mar 2017 12:49:51 -0000 1.6.2.3
@@ -25,8 +25,11 @@
-
+
+
+
+
-