Index: lams_common/src/java/org/lamsfoundation/lams/logevent/LearnerInteractionEvent.java =================================================================== diff -u -r292df3a6fb3cce2b31c9d9ee33c61bbe931e58ab -r952a9a9bb86760e4e827fb763008efb0aaaa54bc --- lams_common/src/java/org/lamsfoundation/lams/logevent/LearnerInteractionEvent.java (.../LearnerInteractionEvent.java) (revision 292df3a6fb3cce2b31c9d9ee33c61bbe931e58ab) +++ lams_common/src/java/org/lamsfoundation/lams/logevent/LearnerInteractionEvent.java (.../LearnerInteractionEvent.java) (revision 952a9a9bb86760e4e827fb763008efb0aaaa54bc) @@ -1,6 +1,7 @@ package org.lamsfoundation.lams.logevent; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import javax.persistence.Column; import javax.persistence.Entity; @@ -17,6 +18,8 @@ public static final int CHECKBOX_CHECKED = 2; public static final int CHECKBOX_UNCHECKED = 3; + public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm:ss"); + @Id @Column @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -72,6 +75,10 @@ this.occuredDateTime = occuredDateTime; } + public String getFormattedDate() { + return this.occuredDateTime.format(DATE_FORMATTER); + } + public int getUserId() { return userId; } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -rc9cd3dcc9a92e0315d1d64fa2165518cc7e72cca -r952a9a9bb86760e4e827fb763008efb0aaaa54bc --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision c9cd3dcc9a92e0315d1d64fa2165518cc7e72cca) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 952a9a9bb86760e4e827fb763008efb0aaaa54bc) @@ -2281,8 +2281,7 @@ if (interaction == null) { userResultRow.addEmptyCell(); } else { - userResultRow.addCell(interaction.getOccuredDateTime() - .format(FileUtil.EXPORT_TO_SPREADSHEET_TITLE_DATE_FORMATTER)); + userResultRow.addCell(interaction.getFormattedDate()); } } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java =================================================================== diff -u -ra8614f8bb8ccde5d2068b34659649c3c93c4e0d1 -r952a9a9bb86760e4e827fb763008efb0aaaa54bc --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision a8614f8bb8ccde5d2068b34659649c3c93c4e0d1) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java (.../MonitoringController.java) (revision 952a9a9bb86760e4e827fb763008efb0aaaa54bc) @@ -55,6 +55,8 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.learningdesign.Group; import org.lamsfoundation.lams.learningdesign.Grouping; +import org.lamsfoundation.lams.logevent.LearnerInteractionEvent; +import org.lamsfoundation.lams.logevent.service.ILearnerInteractionService; import org.lamsfoundation.lams.qb.dto.QbStatsActivityDTO; import org.lamsfoundation.lams.qb.model.QbQuestion; import org.lamsfoundation.lams.qb.service.IQbService; @@ -134,6 +136,9 @@ @Autowired private IRatingService ratingService; + @Autowired + private ILearnerInteractionService learnerInteractionService; + @RequestMapping("/summary") public String summary(HttpServletRequest request, HttpServletResponse response) { @@ -314,6 +319,10 @@ UserSummary userSummary = service.getUserSummary(contentId, userId, sessionId); request.setAttribute(AssessmentConstants.ATTR_USER_SUMMARY, userSummary); + Map learnerInteractions = learnerInteractionService + .getFirstLearnerInteractions(contentId, userId.intValue()); + request.setAttribute("learnerInteractions", learnerInteractions); + Assessment assessment = service.getAssessmentByContentId(contentId); boolean questionEtherpadEnabled = assessment.isUseSelectLeaderToolOuput() && assessment.isQuestionEtherpadEnabled() Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp =================================================================== diff -u -r47af8921ff7d63addfeff2b9624c23fa0602bf63 -r952a9a9bb86760e4e827fb763008efb0aaaa54bc --- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp (.../usersummary.jsp) (revision 47af8921ff7d63addfeff2b9624c23fa0602bf63) +++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp (.../usersummary.jsp) (revision 952a9a9bb86760e4e827fb763008efb0aaaa54bc) @@ -108,13 +108,14 @@ }); + var responseStr = ""; <%@ include file="userresponse.jsp"%> var table = jQuery("#user${question.uid}"); table.addRowData(${i.index + 1}, { id:"${i.index + 1}", questionResultUid:"${questionResult.uid}", - time:"${questionResult.finishDate}", + time:"${empty learnerInteraction ? questionResult.finishDate : learnerInteraction.formattedDate}", response:responseStr, confidence:"${questionResult.confidenceLevel}",