Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -r509e81cd8bc4486fab7de352c4e8cfafd38efe48 -rddd6d9e928bdcfbd5dbb76e89351a9a7ec16ee8b --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision ddd6d9e928bdcfbd5dbb76e89351a9a7ec16ee8b) @@ -794,7 +794,7 @@ - Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r5ac2673214d4a3e9d831e1c468e235015b8bd0b2 -rddd6d9e928bdcfbd5dbb76e89351a9a7ec16ee8b --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 5ac2673214d4a3e9d831e1c468e235015b8bd0b2) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision ddd6d9e928bdcfbd5dbb76e89351a9a7ec16ee8b) @@ -154,6 +154,7 @@ implements IAssessmentService, ICommonAssessmentService, ToolContentManager, ToolSessionManager, ToolRestManager, IQbToolService { private static Logger log = Logger.getLogger(AssessmentServiceImpl.class.getName()); + private static Logger logAutosave = Logger.getLogger(AssessmentServiceImpl.class.getName() + "_autosave"); private AssessmentDAO assessmentDao; @@ -855,6 +856,21 @@ questionResult.getAnswerFloat(), questionDto.getAnswerFloat()) || !Objects.equals( questionResult.getAnswer(), questionDto.getAnswer()); + // this is for logging every autosave as requested by Imperial + // it produces a lot of logs, so it goes to a separate file + StringBuilder autosaveLogBuilder = null; + if (logAutosave.isTraceEnabled()) { + autosaveLogBuilder = new StringBuilder("For learner ").append(assessmentResult.getUser().getUid()) + .append(" \"").append(assessmentResult.getUser().getLoginName()).append("\" for question ") + .append(questionDto.getUid()).append(" for question result ").append(questionResult.getUid()) + .append(" answer was \"").append(questionResult.getAnswer()).append("\" and it is now \"") + .append(questionDto.getAnswer()).append("\", answerBoolean was \"") + .append(questionResult.getAnswerBoolean()).append("\" and it is now \"") + .append(questionDto.getAnswerBoolean()).append("\", answerFloat was \"") + .append(questionResult.getAnswerFloat()).append("\" and it is now \"") + .append(questionDto.getAnswerFloat()).append("\""); + } + // store question answer values questionResult.setAnswerBoolean(questionDto.getAnswerBoolean()); questionResult.setAnswerFloat(questionDto.getAnswerFloat()); @@ -882,6 +898,12 @@ isAnswerModified |= !Objects.equals(optionAnswer.getAnswerBoolean(), optionDto.getAnswerBoolean()); } + if (logAutosave.isTraceEnabled()) { + autosaveLogBuilder.append(", for option ").append(optionDto.getUid()).append(" option result ") + .append(optionAnswer.getUid()).append(" was \"").append(optionAnswer.getAnswerBoolean()) + .append("\" and it is now \"").append(optionDto.getAnswerBoolean()).append("\""); + } + // store option answer values optionAnswer.setAnswerBoolean(optionDto.getAnswerBoolean()); if (questionDto.getType() == QbQuestion.TYPE_ORDERING) { @@ -893,6 +915,10 @@ } } + if (logAutosave.isTraceEnabled()) { + logAutosave.trace(autosaveLogBuilder); + } + // store confidence levels entered by the learner if (assessment.isEnableConfidenceLevels()) { isAnswerModified |= !Objects.equals(questionResult.getConfidenceLevel(), questionDto.getConfidenceLevel()); Index: lams_tool_assessment/web/pages/learning/parts/allquestions.jsp =================================================================== diff -u -rd890ade9e99ac938f597b2e86123952efc14eced -rddd6d9e928bdcfbd5dbb76e89351a9a7ec16ee8b --- lams_tool_assessment/web/pages/learning/parts/allquestions.jsp (.../allquestions.jsp) (revision d890ade9e99ac938f597b2e86123952efc14eced) +++ lams_tool_assessment/web/pages/learning/parts/allquestions.jsp (.../allquestions.jsp) (revision ddd6d9e928bdcfbd5dbb76e89351a9a7ec16ee8b) @@ -1,156 +1,157 @@ <%@ include file="/common/taglibs.jsp"%> - <%-- Prepare same content for each question Etherpad. Each group participant's first and last name --%> - - -  :
-
-
-
-
+ <%-- Prepare same content for each question Etherpad. Each group participant's first and last name --%> + + +  :
+
+
+
+
- - - - -
-
-
+ + + + +
+
+
- ${questionIndex + sessionMap.questionNumberingOffset}. - - + ${questionIndex + sessionMap.questionNumberingOffset}. + + - ${question.title} - + ${question.title} + - + - - + + - - - - + + + + " - alt=""> + title="" + alt=""> - -
-
- -
-
- ${question.question} -
- - - - - <%@ include file="multiplechoice.jsp"%> - - - - <%@ include file="matchingpairs.jsp"%> - - - - <%@ include file="vsa.jsp"%> - - - - <%@ include file="numerical.jsp"%> - - - - <%@ include file="truefalse.jsp"%> - - - - <%@ include file="essay.jsp"%> - - - - <%@ include file="ordering.jsp"%> - - - - - - <%@ include file="../results/markhedging.jsp"%> - - -
- <%@ include file="markhedging.jsp"%> -
-
-
-
-
- - - <%@ include file="confidencelevel.jsp"%> - - - <%--Display jsutification for each question --%> - +
+ ${question.question} +
+
+ + + + + <%@ include file="multiplechoice.jsp"%> + + + + <%@ include file="matchingpairs.jsp"%> + + + + <%@ include file="vsa.jsp"%> + + + + <%@ include file="numerical.jsp"%> + + + + <%@ include file="truefalse.jsp"%> + + + + <%@ include file="essay.jsp"%> + + + + <%@ include file="ordering.jsp"%> + + + + + + <%@ include file="../results/markhedging.jsp"%> + + +
+ <%@ include file="markhedging.jsp"%> +
+
+
+
+
+ + + <%@ include file="confidencelevel.jsp"%> + + + <%--Display jsutification for each question --%> + -
- + + -
- -
-
-
-
-
- - <%--Display Etherpad for each question --%> - -
-
+
+
+
+ + <%--Display Etherpad for each question --%> + +
+ - -
-
- ${questionEtherpadContent} -
-
-
-
- - + + + +
+
+ ${questionEtherpadContent} +
+
+
+ +
+ \ No newline at end of file Index: lams_tool_assessment/web/pages/learning/results/allquestions.jsp =================================================================== diff -u -rd890ade9e99ac938f597b2e86123952efc14eced -rddd6d9e928bdcfbd5dbb76e89351a9a7ec16ee8b --- lams_tool_assessment/web/pages/learning/results/allquestions.jsp (.../allquestions.jsp) (revision d890ade9e99ac938f597b2e86123952efc14eced) +++ lams_tool_assessment/web/pages/learning/results/allquestions.jsp (.../allquestions.jsp) (revision ddd6d9e928bdcfbd5dbb76e89351a9a7ec16ee8b) @@ -10,301 +10,302 @@ - - + + - + - + - - -
-
- - -
- -
- <%-- Allow disclosing correct answers only for multiple choice questions --%> - -
- disabled="disabled"> > - -
-
-
disabled="disabled"> -  > - -
-
-
+ - -
- - -   - - +
+
- -
-   - -
-
-
- -
- + +
+ +
+ <%-- Allow disclosing correct answers only for multiple choice questions --%> + +
+ disabled="disabled"> > + +
+
+
disabled="disabled"> +  > + +
+
+
- + +
+ + +   + + + + +
+   + +
+
+
+
+
+
+ + - - + + - + - - + + " - alt=""> + title="" + alt=""> - + -
- - ${questionIndex + sessionMap.questionNumberingOffset}. - +
+ + ${questionIndex + sessionMap.questionNumberingOffset}. + - - ${question.title} - -
-
+ + ${question.title} + +
+
-
-
- ${question.question} -
- - - - - <%@ include file="multiplechoice.jsp"%> - - - - <%@ include file="matchingpairs.jsp"%> - - - - <%@ include file="vsa.jsp"%> - - - - <%@ include file="numerical.jsp"%> - - - - <%@ include file="truefalse.jsp"%> - - - - <%@ include file="essay.jsp"%> - - - - <%@ include file="ordering.jsp"%> - - - - <%@ include file="markhedging.jsp"%> - - +
+
+ ${question.question} +
+
- - <%@ include file="markandpenaltyarea.jsp"%> - + + + + <%@ include file="multiplechoice.jsp"%> + + + + <%@ include file="matchingpairs.jsp"%> + + + + <%@ include file="vsa.jsp"%> + + + + <%@ include file="numerical.jsp"%> + + + + <%@ include file="truefalse.jsp"%> + + + + <%@ include file="essay.jsp"%> + + + + <%@ include file="ordering.jsp"%> + + + + <%@ include file="markhedging.jsp"%> + + - - - <%@ include file="confidencelevel.jsp"%> - - - <%@ include file="historyresponses.jsp"%> - + + <%@ include file="markandpenaltyarea.jsp"%> + - - - - <%-- Display a table with other groups' justifications --%> -
- -
+ + + <%@ include file="confidencelevel.jsp"%> + -
-
-
- -
-
- -
-
- - - + <%@ include file="historyresponses.jsp"%> + - <%-- Get the needed piece of information from a complicated questionSummaries structure --%> - - - + + + + <%-- Display a table with other groups' justifications --%> +
+ +
- -
-
- -   - - - - - - - <%-- Sessions are named after groups --%> - - - -
- -
- -
-
-
-
-
-
- - - <%-- Display only own justification --%> -
- -
-

- -

-
-
-
+
+
+
+ +
+
+ +
+
- -
-
-
-
+ + + + <%-- Get the needed piece of information from a complicated questionSummaries structure --%> + + + + + +
+
+ +   + + + + + + + <%-- Sessions are named after groups --%> + + + +
+ +
+ +
+
+
+
+
+ + + + <%-- Display only own justification --%> +
+ +
+

+ +

+
+ +
+ + +
+
+
+
\ No newline at end of file