Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java =================================================================== diff -u -r019e11f9b8c2198557291f6b4a2244328f22f263 -r1d705f95c7d374192c678e101772e93f0442dae9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java (.../McGeneralLearnerFlowDTO.java) (revision 019e11f9b8c2198557291f6b4a2244328f22f263) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McGeneralLearnerFlowDTO.java (.../McGeneralLearnerFlowDTO.java) (revision 1d705f95c7d374192c678e101772e93f0442dae9) @@ -69,6 +69,8 @@ protected String lowestMark; protected String averageMark; + + protected String reportViewOnly; protected String learnerProgress; @@ -337,6 +339,7 @@ .append("activityTitle: ", activityTitle) .append("questionListingMode: ", questionListingMode) .append("learnerProgress: ", learnerProgress) + .append("reportViewOnly: ", reportViewOnly) .toString(); } @@ -462,4 +465,17 @@ public void setMapQuestionsContent(Map mapQuestionsContent) { this.mapQuestionsContent = mapQuestionsContent; } + + /** + * @return Returns the reportViewOnly. + */ + public String getReportViewOnly() { + return reportViewOnly; + } + /** + * @param reportViewOnly The reportViewOnly to set. + */ + public void setReportViewOnly(String reportViewOnly) { + this.reportViewOnly = reportViewOnly; + } } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredAnswersDTO.java =================================================================== diff -u -rcaa7d3d855db20f8bb1b534ce5dc75a1d28474ea -r1d705f95c7d374192c678e101772e93f0442dae9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredAnswersDTO.java (.../McMonitoredAnswersDTO.java) (revision caa7d3d855db20f8bb1b534ce5dc75a1d28474ea) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredAnswersDTO.java (.../McMonitoredAnswersDTO.java) (revision 1d705f95c7d374192c678e101772e93f0442dae9) @@ -99,12 +99,19 @@ this.questionAttempts = questionAttempts; } + public String toString() { return new ToStringBuilder(this) - .append("question", getQuestion()) + .append("questionUid: ", questionUid) + .append("question: ", question) + .append("weight: ", weight) + .append("candidateAnswers: ", candidateAnswers) + .append("questionAttempts: ", questionAttempts) + .append("candidateAnswersCorrect:", candidateAnswersCorrect) .toString(); } + public int compareTo(Object o) { McMonitoredAnswersDTO mcMonitoredAnswersDTO = (McMonitoredAnswersDTO) o; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java =================================================================== diff -u -rf5f65dc49c173cb6bef72ba8281762814c12b315 -r1d705f95c7d374192c678e101772e93f0442dae9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java (.../McSessionDAO.java) (revision f5f65dc49c173cb6bef72ba8281762814c12b315) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java (.../McSessionDAO.java) (revision 1d705f95c7d374192c678e101772e93f0442dae9) @@ -92,6 +92,7 @@ public int countSessionComplete(McContent mcContent) { + logger.debug("starting countSessionComplete: " + mcContent); HibernateTemplate templ = this.getHibernateTemplate(); List list = getSession().createQuery(COUNT_SESSION_COMPLETE) .list(); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java =================================================================== diff -u -rf5f65dc49c173cb6bef72ba8281762814c12b315 -r1d705f95c7d374192c678e101772e93f0442dae9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java (.../McUserDAO.java) (revision f5f65dc49c173cb6bef72ba8281762814c12b315) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java (.../McUserDAO.java) (revision 1d705f95c7d374192c678e101772e93f0442dae9) @@ -152,6 +152,7 @@ public int getTotalNumberOfUsers(McContent mcContent) { + logger.debug("starting getTotalNumberOfUsers: " + mcContent); String strGetUser = "from mcQueUsr in class McQueUsr"; HibernateTemplate templ = this.getHibernateTemplate(); List list = getSession().createQuery(strGetUser) @@ -167,6 +168,7 @@ if (usr.getMcSession().getMcContent().getUid().intValue() == mcContent.getUid().intValue()) { + logger.debug("increasing user count"); ++totalUserCount; } } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java =================================================================== diff -u -r4a1085fc82d8e6273b9b800fb6852bcbd2c7baea -r1d705f95c7d374192c678e101772e93f0442dae9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java (.../ExportServlet.java) (revision 4a1085fc82d8e6273b9b800fb6852bcbd2c7baea) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java (.../ExportServlet.java) (revision 1d705f95c7d374192c678e101772e93f0442dae9) @@ -54,16 +54,16 @@ */ public class ExportServlet extends AbstractExportPortfolioServlet implements McAppConstants{ - static Logger logger = Logger.getLogger(ExportServlet.class.getName()); - private static final long serialVersionUID = -5119093489007108143L; + static Logger logger = Logger.getLogger(ExportServlet.class.getName()); + private static final long serialVersionUID = -17790L; private final String FILENAME = "mcq_main.html"; public String doExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) { logger.debug("dispathcing doExport"); - request.getSession().setAttribute(IS_PORTFOLIO_EXPORT, new Boolean(true).toString()); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath(); + logger.debug("basePath:" + basePath); if (StringUtils.equals(mode,ToolAccessMode.LEARNER.toString())){ learner(request,response,directoryName,cookies); @@ -79,9 +79,8 @@ public void learner(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) { logger.debug("starting learner mode..."); - request.getSession().setAttribute(PORTFOLIO_EXPORT_MODE, "learner"); - - IMcService mcService = McServiceProxy.getMcService(getServletContext()); + + IMcService mcService = McServiceProxy.getMcService(getServletContext()); logger.debug("mcService:" + mcService); logger.debug("userID:" + userID); @@ -117,18 +116,21 @@ throw new McApplicationException(error); } + McMonitoringAction mcMonitoringAction= new McMonitoringAction(); List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionDataForExportLearner(request, content, mcService, mcSession, learner ); request.getSession().setAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO, listMonitoredAnswersContainerDTO); logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO)); + String intTotalMark=viewAnswers(request, content, learner, mcSession, mcService); logger.debug("intTotalMark: " + intTotalMark); request.getSession().setAttribute(LEARNER_MARK,intTotalMark); request.getSession().setAttribute(LEARNER_NAME,learner.getFullname() ); request.getSession().setAttribute(PASSMARK,content.getPassMark().toString()); - + + request.getSession().setAttribute(PORTFOLIO_EXPORT_MODE, "learner"); logger.debug("ending learner mode: "); } @@ -334,7 +336,6 @@ public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) { logger.debug("starting teacher mode..."); - request.getSession().setAttribute(PORTFOLIO_EXPORT_MODE, "teacher"); IMcService mcService = McServiceProxy.getMcService(getServletContext()); @@ -367,6 +368,8 @@ request.getSession().setAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO, listMonitoredMarksContainerDTO); logger.debug("LIST_MONITORED_MARKS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO)); + request.getSession().setAttribute(PASSMARK,content.getPassMark().toString()); + request.getSession().setAttribute(PORTFOLIO_EXPORT_MODE, "teacher"); logger.debug("ending teacher mode: "); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java =================================================================== diff -u -r5c7bb4ec40360f114409b7000ccc8dc3083e4dcc -r1d705f95c7d374192c678e101772e93f0442dae9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java (.../LearningUtil.java) (revision 5c7bb4ec40360f114409b7000ccc8dc3083e4dcc) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java (.../LearningUtil.java) (revision 1d705f95c7d374192c678e101772e93f0442dae9) @@ -235,9 +235,9 @@ * @param queUsrId * @return */ - public static int getHighestAttemptOrder(HttpServletRequest request, Long queUsrId) + public static int getHighestAttemptOrder(HttpServletRequest request, Long queUsrId, IMcService mcService) { - IMcService mcService =McUtils.getToolService(request); + logger.debug("mcService: " + mcService); List listMarks=mcService.getHighestAttemptOrder(queUsrId); Iterator itMarks=listMarks.iterator(); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java =================================================================== diff -u -r5c7bb4ec40360f114409b7000ccc8dc3083e4dcc -r1d705f95c7d374192c678e101772e93f0442dae9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java (.../McLearningAction.java) (revision 5c7bb4ec40360f114409b7000ccc8dc3083e4dcc) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java (.../McLearningAction.java) (revision 1d705f95c7d374192c678e101772e93f0442dae9) @@ -1219,6 +1219,10 @@ mcGeneralLearnerFlowDTO.setMapQueCorrectAttempts(mapQueCorrectAttempts); mcGeneralLearnerFlowDTO.setMapQueIncorrectAttempts(mapQueIncorrectAttempts); + String reportViewOnly=mcLearningForm.getReportViewOnly(); + logger.debug("reportViewOnly: " + reportViewOnly); + + mcGeneralLearnerFlowDTO.setReportViewOnly(reportViewOnly); request.setAttribute(MC_GENERAL_LEARNER_FLOW_DTO, mcGeneralLearnerFlowDTO); logger.debug("MC_GENERAL_LEARNER_FLOW_DTO: " + request.getAttribute(MC_GENERAL_LEARNER_FLOW_DTO)); logger.debug("end of prepareViewAnswersData."); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java =================================================================== diff -u -r23dfda22f89f127769d9d95688f025481bd836d7 -r1d705f95c7d374192c678e101772e93f0442dae9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java (.../McLearningForm.java) (revision 23dfda22f89f127769d9d95688f025481bd836d7) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java (.../McLearningForm.java) (revision 1d705f95c7d374192c678e101772e93f0442dae9) @@ -62,6 +62,7 @@ protected String passMarkApplicable; protected String learnerProgress; protected String learnerProgressUserId; + protected String reportViewOnly; protected String questionListingMode; @@ -70,6 +71,7 @@ protected String httpSessionID; public IMcService mcService; + public void resetCa(ActionMapping mapping, HttpServletRequest request) { checkedCa = new String[0]; @@ -421,4 +423,17 @@ public void setMcService(IMcService mcService) { this.mcService = mcService; } + + /** + * @return Returns the reportViewOnly. + */ + public String getReportViewOnly() { + return reportViewOnly; + } + /** + * @param reportViewOnly The reportViewOnly to set. + */ + public void setReportViewOnly(String reportViewOnly) { + this.reportViewOnly = reportViewOnly; + } } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java =================================================================== diff -u -r5c7bb4ec40360f114409b7000ccc8dc3083e4dcc -r1d705f95c7d374192c678e101772e93f0442dae9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java (.../McLearningStarterAction.java) (revision 5c7bb4ec40360f114409b7000ccc8dc3083e4dcc) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java (.../McLearningStarterAction.java) (revision 1d705f95c7d374192c678e101772e93f0442dae9) @@ -399,7 +399,7 @@ Long queUsrId=mcQueUsr.getUid(); logger.debug("queUsrId: " + queUsrId); - int highestAttemptOrder=LearningUtil.getHighestAttemptOrder(request, queUsrId); + int highestAttemptOrder=LearningUtil.getHighestAttemptOrder(request, queUsrId, mcService); logger.debug("highestAttemptOrder: " + highestAttemptOrder); if (highestAttemptOrder == 0) highestAttemptOrder=1; @@ -442,6 +442,7 @@ { McLearningAction mcLearningAction= new McLearningAction(); logger.debug("present to learner with previous attempts data"); + mcLearningForm.setReportViewOnly(new Boolean(true).toString()); return mcLearningAction.viewAnswers(mapping, mcLearningForm, request, response); } } Index: lams_tool_lamc/web/WEB-INF/struts-config.xml =================================================================== diff -u -rafa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2 -r1d705f95c7d374192c678e101772e93f0442dae9 --- lams_tool_lamc/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision afa0e6bf1c5690c4f8c49b0b767f75c000ff1fe2) +++ lams_tool_lamc/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 1d705f95c7d374192c678e101772e93f0442dae9) @@ -7,7 +7,6 @@ - @@ -350,29 +349,6 @@ /> - - - - - - - Fisheye: Tag 1d705f95c7d374192c678e101772e93f0442dae9 refers to a dead (removed) revision in file `lams_tool_lamc/web/export/ExportContent.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/web/export/exportportfolio.jsp =================================================================== diff -u -rf197ae9772cbabe32b6f7df4078d5a2d0f6915ab -r1d705f95c7d374192c678e101772e93f0442dae9 --- lams_tool_lamc/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision f197ae9772cbabe32b6f7df4078d5a2d0f6915ab) +++ lams_tool_lamc/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 1d705f95c7d374192c678e101772e93f0442dae9) @@ -55,11 +55,220 @@

- - - + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
 
: +   ( + ) +
+ + + + + + +
+ + + +   () + +
+
+ +
+ + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
: +
+ +   ( + ) +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
: +   ( + ) +
+ + + + + + +
+ + + +   () + +
+
+ + + + + + + + + + + + + + + + + + + + + + +
+ + + + + ( ) + + +
+ + + + + + +
+ +
+
+ +
+ : +
+ : +
+ + + Index: lams_tool_lamc/web/learning/ViewAnswers.jsp =================================================================== diff -u -r0dccd4a293386449bfceb24e42179f9a7ad05f04 -r1d705f95c7d374192c678e101772e93f0442dae9 --- lams_tool_lamc/web/learning/ViewAnswers.jsp (.../ViewAnswers.jsp) (revision 0dccd4a293386449bfceb24e42179f9a7ad05f04) +++ lams_tool_lamc/web/learning/ViewAnswers.jsp (.../ViewAnswers.jsp) (revision 1d705f95c7d374192c678e101772e93f0442dae9) @@ -167,41 +167,42 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - -
- - - -
- - - - - + + + + + + + + + + + + + +
+ + + +
+ + + + + + Index: lams_tool_lamc/web/monitoring/SummaryAllSessions.jsp =================================================================== diff -u -re3cad6678d4dae4c9d8636b31c53c0bb61f43fcc -r1d705f95c7d374192c678e101772e93f0442dae9 --- lams_tool_lamc/web/monitoring/SummaryAllSessions.jsp (.../SummaryAllSessions.jsp) (revision e3cad6678d4dae4c9d8636b31c53c0bb61f43fcc) +++ lams_tool_lamc/web/monitoring/SummaryAllSessions.jsp (.../SummaryAllSessions.jsp) (revision 1d705f95c7d374192c678e101772e93f0442dae9) @@ -37,7 +37,7 @@ - + :