@@ -219,7 +220,15 @@
${status.index + 1}
|
-
+
+
+ ${fn:replace(option.name, newLineChar, ', ')}
+
+
+
+
+
+
|
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
===================================================================
diff -u -re8a7110708b15579af2c6b31ac52a6da427fef6d -r269c13324c6bb998631af858dc8091ad3102ef78
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision 269c13324c6bb998631af858dc8091ad3102ef78)
@@ -86,7 +86,8 @@
Set questionDtos = new TreeSet<>();
int maxOptionsInQuestion = 0;
for (AssessmentQuestion question : questionList) {
- if (QbQuestion.TYPE_MULTIPLE_CHOICE == question.getType()) {
+ if (QbQuestion.TYPE_MULTIPLE_CHOICE == question.getType()
+ || QbQuestion.TYPE_VERY_SHORT_ANSWERS == question.getType()) {
questionDtos.add(new QuestionDTO(question));
//calculate maxOptionsInQuestion
Index: lams_tool_assessment/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r67d7232f087b9f5c72ff41f7bbebe29cff81e099 -r269c13324c6bb998631af858dc8091ad3102ef78
--- lams_tool_assessment/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 67d7232f087b9f5c72ff41f7bbebe29cff81e099)
+++ lams_tool_assessment/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 269c13324c6bb998631af858dc8091ad3102ef78)
@@ -14,19 +14,19 @@
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
diff -u -re8a7110708b15579af2c6b31ac52a6da427fef6d -r269c13324c6bb998631af858dc8091ad3102ef78
--- lams_tool_assessment/web/pages/learning/learning.jsp (.../learning.jsp) (revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
+++ lams_tool_assessment/web/pages/learning/learning.jsp (.../learning.jsp) (revision 269c13324c6bb998631af858dc8091ad3102ef78)
@@ -187,15 +187,14 @@
dataType: 'json',
type: 'post',
success: function (json) {
- $('#countdown').countdown('option', 'until', json.secondsLeft+'S');
+ $('#countdown').countdown('option', 'until', json.secondsLeft+'S');
}
});
}
//autosave feature
-
var autosaveInterval = "30000"; // 30 seconds interval
window.setInterval(
function(){
@@ -212,14 +211,14 @@
$('#answers').ajaxSubmit({
url: "?sessionMapID=${sessionMapID}&date=" + new Date().getTime(),
success: function() {
- $.jGrowl(
- " ",
- { life: 2000, closeTemplate: '' }
- );
+ $.jGrowl(
+ " ",
+ { life: 2000, closeTemplate: '' }
+ );
}
});
- },
- autosaveInterval
+ },
+ autosaveInterval
);
@@ -239,9 +238,9 @@
return;
}
disableButtons();
- var myForm = $("#answers");
- myForm.attr("action", "" + pageNumber);
- myForm.submit();
+ var myForm = $("#answers");
+ myForm.attr("action", "" + pageNumber);
+ myForm.submit();
}
function submitAll(isTimelimitExpired){
@@ -252,13 +251,12 @@
}
}
disableButtons();
- var myForm = $("#answers");
- myForm.attr("action", "&isTimelimitExpired=" + isTimelimitExpired);
- myForm.submit();
+ var myForm = $("#answers");
+ myForm.attr("action", "&isTimelimitExpired=" + isTimelimitExpired);
+ myForm.submit();
}
function submitSingleMarkHedgingQuestion(singleMarkHedgingQuestionUid, questionIndex){
-
//only if time limit is not expired
if ((typeof isTimelimitExpired !== 'undefined') && isTimelimitExpired) {
return;
@@ -268,8 +266,8 @@
$('#answers').ajaxSubmit({
url: "?sessionMapID=${sessionMapID}&singleMarkHedgingQuestionUid=" + singleMarkHedgingQuestionUid +"&questionIndex="+ questionIndex +"&date=" + new Date().getTime(),
target: '#mark-hedging-question-' + singleMarkHedgingQuestionUid,
- success: function() {
- $('#question-area-' + questionIndex).removeClass('bg-warning');
+ success: function() {
+ $('#question-area-' + questionIndex).removeClass('bg-warning');
}
});
}
@@ -294,7 +292,6 @@
}
function validateAnswers() {
-
if (${!hasEditRight}) {
return true;
}
Index: lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -r269c13324c6bb998631af858dc8091ad3102ef78
--- lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp (.../assessment.jsp) (revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp (.../assessment.jsp) (revision 269c13324c6bb998631af858dc8091ad3102ef78)
@@ -9,6 +9,8 @@
+<% pageContext.setAttribute("newLineChar", "\r\n"); %>
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -23,12 +23,10 @@
-
-
+
|