Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionDTO.java =================================================================== diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -r218884f2db7184187d2c65f87284984991321ccd --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionDTO.java (.../TblAssessmentQuestionDTO.java) (revision 9c3a64b840753192b333afb73c8fe7bdb54be638) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionDTO.java (.../TblAssessmentQuestionDTO.java) (revision 218884f2db7184187d2c65f87284984991321ccd) @@ -6,16 +6,17 @@ * TBL modification of Assessment tool's QuestionSummary. */ public class TblAssessmentQuestionDTO { - private List sessionQuestionResults; + private String title; private String questionTypeLabel; private String correctAnswer; - - public List getSessionQuestionResults() { - return sessionQuestionResults; + private List sessionQuestionResults; + + public String getTitle() { + return title; } - public void setSessionQuestionResults(List sessionQuestionResults) { - this.sessionQuestionResults = sessionQuestionResults; + public void setTitle(String title) { + this.title = title; } public String getQuestionTypeLabel() { @@ -33,4 +34,12 @@ public void setCorrectAnswer(String correctAnswer) { this.correctAnswer = correctAnswer; } + + public List getSessionQuestionResults() { + return sessionQuestionResults; + } + + public void setSessionQuestionResults(List sessionQuestionResults) { + this.sessionQuestionResults = sessionQuestionResults; + } } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java =================================================================== diff -u -r269c13324c6bb998631af858dc8091ad3102ef78 -r218884f2db7184187d2c65f87284984991321ccd --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision 269c13324c6bb998631af858dc8091ad3102ef78) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java (.../TblMonitoringController.java) (revision 218884f2db7184187d2c65f87284984991321ccd) @@ -196,6 +196,7 @@ QuestionDTO questionDto = questionSummary.getQuestionDto(); TblAssessmentQuestionDTO tblQuestionDto = new TblAssessmentQuestionDTO(); + tblQuestionDto.setTitle(questionDto.getTitle()); tblQuestionDto.setQuestionTypeLabel(AssessmentServiceImpl.getQuestionTypeLabel(questionDto.getType())); tblQuestionDto.setCorrectAnswer(getAssessmentCorrectAnswer(questionDto)); Index: lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp =================================================================== diff -u -r00e3c6b7660be7f304a284698c23aa899862fb98 -r218884f2db7184187d2c65f87284984991321ccd --- lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp (.../assessmentStudentChoices.jsp) (revision 00e3c6b7660be7f304a284698c23aa899862fb98) +++ lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp (.../assessmentStudentChoices.jsp) (revision 218884f2db7184187d2c65f87284984991321ccd) @@ -1,4 +1,5 @@ <%@ include file="/common/taglibs.jsp"%> +<% pageContext.setAttribute("newLineChar", "\r\n"); %>