errorMap = new LinkedMultiValueMap<>();
errorMap.add("GLOBAL", messageService.getMessage("label.questions.file.missing"));
request.setAttribute("errorMap", errorMap);
@@ -89,9 +94,16 @@
Collections.addAll(limitType, limitTypeParam.split(","));
}
- Question[] questions = packageName.endsWith(".xml")
- ? QuestionParser.parseQTIFile(uploadedFileStream, null, limitType)
- : QuestionParser.parseQTIPackage(uploadedFileStream, limitType);
+ Question[] questions;
+ if (fileName.endsWith(".xml")) {
+ questions = QuestionParser.parseQTIFile(uploadedFileStream, null, limitType);
+
+ } else if (fileName.endsWith(".docx")) {
+ questions = QuestionWordParser.parseWordFile(uploadedFileStream, fileName);
+
+ } else {
+ questions = QuestionParser.parseQTIPackage(uploadedFileStream, limitType);
+ }
request.setAttribute("questions", questions);
return "questions/questionChoice";
Index: lams_central/web/qb/collection.jsp
===================================================================
diff -u -r21555f88fd0c63a4a9eb3ae288a2e1d48452aa4b -re376b240aecf9b255b8b26fe22c3d33c70f67ddb
--- lams_central/web/qb/collection.jsp (.../collection.jsp) (revision 21555f88fd0c63a4a9eb3ae288a2e1d48452aa4b)
+++ lams_central/web/qb/collection.jsp (.../collection.jsp) (revision e376b240aecf9b255b8b26fe22c3d33c70f67ddb)
@@ -367,6 +367,11 @@
});
}
+ function importWordQuestions(){
+ window.open('questions/questionFile.jsp?importType=word',
+ 'QuestionFile','width=500,height=240,scrollbars=yes');
+ }
+
function importQTI(){
window.open('questions/questionFile.jsp',
'QuestionFile','width=500,height=240,scrollbars=yes');
@@ -486,6 +491,16 @@
+
+