questions = assessment.getQuestions();
+ for (AssessmentQuestion question : questions) {
+ cell = row.createCell(cellIdx++);
+ cell.setEncoding(HSSFCell.ENCODING_UTF_16);
+ cell.setCellValue(removeHTMLTags(question.getTitle()));
+ }
+
+ cell = row.createCell(cellIdx++);
+ cell.setEncoding(HSSFCell.ENCODING_UTF_16);
+ cell.setCellValue(service.getLocalisedMessage("label.monitoring.summary.total", null));
+
+ // begin to display question and its answers
+ int questionNumber = 1;
+ for (AssessmentResult result : summary.getAssessmentResults()) {
+ cellIdx = 0;
+ row = sheet.createRow(idx++);
+
+ cell = row.createCell(cellIdx++);
+ cell.setCellValue("");
+
+ cell = row.createCell(cellIdx++);
+ cell.setCellValue(questionNumber++);
+
+ cell = row.createCell(cellIdx++);
+ cell.setEncoding(HSSFCell.ENCODING_UTF_16);
+ cell.setCellValue(removeHTMLTags(result.getUser().getLastName() + ", " + result.getUser().getFirstName()));
+
+ for (AssessmentQuestionResult questionResult : result.getQuestionResults()) {
+ cell = row.createCell(cellIdx++);
+ if (questionResult.getUid() != null) {
+ cell.setCellValue(questionResult.getMark());
+ } else {
+ cell.setCellValue("-");
+ }
+ }
+
+ cell = row.createCell(cellIdx++);
+ cell.setCellValue(result.getGrade());
+ }
+ }
+
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ wb.write(bos);
+ // construct download file response header
+ String fileName = "lams_assessment_" + contentId + ".xls";
+ String mineType = "application/vnd.ms-excel";
+ String header = "attachment; filename=\"" + fileName + "\";";
+ response.setContentType(mineType);
+ response.setHeader("Content-Disposition", header);
+
+ byte[] data = bos.toByteArray();
+ response.getOutputStream().write(data, 0, data.length);
+ response.getOutputStream().flush();
+ } catch (Exception e) {
+ MonitoringAction.log.error(e);
+ errors = new ActionMessage("error.monitoring.export.excel", e.toString()).toString();
+ }
+
+ if (errors != null) {
+ try {
+ PrintWriter out = response.getWriter();
+ out.write(errors);
+ out.flush();
+ } catch (IOException e) {
+ }
+ }
+ return null;
+ }
+
// *************************************************************************************
// Private method
// *************************************************************************************
@@ -202,5 +332,14 @@
.getServletContext());
return (IAssessmentService) wac.getBean(AssessmentConstants.ASSESSMENT_SERVICE);
}
+
+ /**
+ * Removes all the html tags from a string
+ * @param string
+ * @return
+ */
+ private String removeHTMLTags(String string) {
+ return string.replaceAll("\\<.*?>", "").replaceAll(" ", " ");
+ }
}
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java
===================================================================
diff -u -r6e6db32c93f144dc842f21601eb37745cdd7ca60 -r6a20c448cdfdc7895e72dda22c5359be1234cf47
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java (.../ExportServlet.java) (revision 6e6db32c93f144dc842f21601eb37745cdd7ca60)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java (.../ExportServlet.java) (revision 6a20c448cdfdc7895e72dda22c5359be1234cf47)
@@ -51,7 +51,6 @@
import org.lamsfoundation.lams.tool.assessment.service.IAssessmentService;
import org.lamsfoundation.lams.tool.assessment.util.AssessmentBundler;
import org.lamsfoundation.lams.tool.assessment.util.AssessmentToolContentHandler;
-import org.lamsfoundation.lams.util.WebUtil;
import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet;
import org.lamsfoundation.lams.web.util.AttributeNames;
import org.lamsfoundation.lams.web.util.SessionMap;
Index: lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
===================================================================
diff -u -r5ea7ebf8f81afa191dd6d761db613896ad530b4d -r6a20c448cdfdc7895e72dda22c5359be1234cf47
--- lams_tool_assessment/web/pages/authoring/parts/addessay.jsp (.../addessay.jsp) (revision 5ea7ebf8f81afa191dd6d761db613896ad530b4d)
+++ lams_tool_assessment/web/pages/authoring/parts/addessay.jsp (.../addessay.jsp) (revision 6a20c448cdfdc7895e72dda22c5359be1234cf47)
@@ -63,7 +63,7 @@
});
// post-submit callback
function afterRatingSubmit(responseText, statusText) {
- self.parent.refreshThickbox()
+ self.parent.refreshThickbox();
self.parent.tb_remove();
}
-->
Index: lams_tool_assessment/web/pages/learning/runoffline.jsp
===================================================================
diff -u -rc56857991e269aa7f5bd250a05b52c767a9957ad -r6a20c448cdfdc7895e72dda22c5359be1234cf47
--- lams_tool_assessment/web/pages/learning/runoffline.jsp (.../runoffline.jsp) (revision c56857991e269aa7f5bd250a05b52c767a9957ad)
+++ lams_tool_assessment/web/pages/learning/runoffline.jsp (.../runoffline.jsp) (revision 6a20c448cdfdc7895e72dda22c5359be1234cf47)
@@ -14,10 +14,6 @@
document.location.href ='';
return false;
}
- function continueReflect(){
- document.location.href='';
- }
-
-->
@@ -32,49 +28,11 @@
-
-
-
- ${sessionMap.reflectInstructions}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+