Index: lams_tool_laqa/conf/language/ApplicationResources.properties =================================================================== diff -u -r79aa6d305d1c62b1aed8e0f8dfdedcc8e5c4bedb -rcc57114dde638ab1b37c0ac5556c1a2822e79bf3 --- lams_tool_laqa/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 79aa6d305d1c62b1aed8e0f8dfdedcc8e5c4bedb) +++ lams_tool_laqa/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision cc57114dde638ab1b37c0ac5556c1a2822e79bf3) @@ -167,6 +167,8 @@ label.content.notEditable =The content can not be edited since it is being used by learners. error.system.qa =A system exception has occured. Please contact technical support. The error to report is\:
{0}
+label.learning.reportMessage =The following are your answers: +label.allResponses =All Responses #======= End labels: Exported 160 labels for en AU ===== Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== diff -u -raf3906ba75d798954fca027bea336bb842d8b976 -rcc57114dde638ab1b37c0ac5556c1a2822e79bf3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision af3906ba75d798954fca027bea336bb842d8b976) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision cc57114dde638ab1b37c0ac5556c1a2822e79bf3) @@ -44,7 +44,9 @@ public static final String LOAD_LEARNER ="loadLearner"; public static final String LEARNING_STARTER ="learningStarter"; public static final String MONITORING_STARTER ="monitoringStarter"; - public static final String EXPORT_PORTFOLIO = "exportPortfolio"; + public static final String EXPORT_PORTFOLIO ="exportPortfolio"; + public static final String VIEW_ALL_RESULTS ="viewAllResults"; + public static final String INDIVIDUAL_LEARNER_RESULTS ="individualLearnerResults"; public static final String LOAD_MONITORING ="refreshMonitoring"; public static final String LOAD_VIEW_ONLY ="loadViewOnly"; public static final String EDIT_RESPONSE ="editResponse"; Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -rcc57114dde638ab1b37c0ac5556c1a2822e79bf3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision cc57114dde638ab1b37c0ac5556c1a2822e79bf3) @@ -631,4 +631,41 @@ } } + + public static UserDTO getToolUser() + { + /*obtain user object from the session*/ + HttpSession ss = SessionManager.getSession(); + /* get back login user DTO */ + UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER); + logger.debug("retrieving toolUser: " + toolUser); + return toolUser; + } + + + public static Long getUserId() + { + UserDTO toolUser=getToolUser(); + long userId=toolUser.getUserID().longValue(); + logger.debug("userId: " + userId); + return new Long(userId); + } + + public static String getUserName() + { + /* double check if username and login is the same */ + UserDTO toolUser=getToolUser(); + String userName=toolUser.getLogin(); + logger.debug("userName: " + userName); + return userName; + } + + public static String getUserFullName() + { + UserDTO toolUser=getToolUser(); + String fullName=toolUser.getFirstName() + " " + toolUser.getLastName(); + logger.debug("fullName: " + fullName); + return fullName; + } + } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -rcc57114dde638ab1b37c0ac5556c1a2822e79bf3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision cc57114dde638ab1b37c0ac5556c1a2822e79bf3) @@ -286,7 +286,7 @@ if ((!activeModule.equals(DEFINE_LATER)) && (setCommonContent)) { logger.debug("setting other content values..."); - qaContent.setUsernameVisible(isUsernameVisible); + //qaContent.setUsernameVisible(isUsernameVisible); qaContent.setQuestionsSequenced(isQuestionsSequenced); /**the default question listing in learner mode will be all in the same page*/ qaContent.setSynchInMonitor(isSynchInMonitor); qaContent.setOnlineInstructions(richTextOnlineInstructions); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -rcc57114dde638ab1b37c0ac5556c1a2822e79bf3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java (.../LearningUtil.java) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java (.../LearningUtil.java) (revision cc57114dde638ab1b37c0ac5556c1a2822e79bf3) @@ -37,6 +37,7 @@ import org.lamsfoundation.lams.tool.qa.QaQueUsr; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaUsrResp; +import org.lamsfoundation.lams.tool.qa.QaUtils; import org.lamsfoundation.lams.tool.qa.service.IQaService; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.web.session.SessionManager; @@ -106,14 +107,16 @@ logger.debug("createQaQueUsr - qaQueUsr: " + qaQueUsr); + logger.debug("session uid: " + qaSession.getUid()); /*note that it is possible for a user to already exist from another tool session. In this case don't add any more user record*/ - QaQueUsr qaQueUsrLocal=qaService.getQaQueUsrById(userId.longValue()); + QaQueUsr qaQueUsrLocal=qaService.getQaUserBySession(userId, qaSession.getUid()); logger.debug("qaQueUsrLocal: " + qaQueUsrLocal); if ((qaQueUsr != null) && (qaQueUsrLocal == null)) { - qaService.createQaQueUsr(qaQueUsr); - logger.debug("createUsers-qaQueUsr created in the db: " + qaQueUsr); + //qaService.createQaQueUsr(qaQueUsr); + qaQueUsr=createUser(request); + logger.debug("created qaQueUsr: " + qaQueUsr); } else { @@ -156,6 +159,31 @@ } + public static QaQueUsr createUser(HttpServletRequest request) + { + logger.debug("creating a new user in the tool db"); + IQaService qaService =QaUtils.getToolService(request); + Long queUsrId=QaUtils.getUserId(); + String username=QaUtils.getUserName(); + String fullname=QaUtils.getUserFullName(); + Long toolSessionId=(Long) request.getSession().getAttribute(TOOL_SESSION_ID); + + QaSession qaSession=qaService.retrieveQaSessionOrNullById(toolSessionId.longValue()); + logger.debug("qaSession: " + qaSession); + + QaQueUsr qaQueUsr= new QaQueUsr(queUsrId, + username, + fullname, + null, + qaSession, + new TreeSet()); + + qaService.createQaQueUsr(qaQueUsr); + logger.debug("created qaQueUsr in the db: " + qaQueUsr); + return qaQueUsr; + } + + /** * feedBackAnswersProgress(HttpServletRequest request, int currentQuestionIndex) * give user feedback on the remaining questions Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -rcc57114dde638ab1b37c0ac5556c1a2822e79bf3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision cc57114dde638ab1b37c0ac5556c1a2822e79bf3) @@ -309,7 +309,7 @@ if (qaSession != null) { List listUsers=qaService.getUserBySessionOnly(qaSession); - logger.debug("listMcUsers for session id:" + qaSession.getQaSessionId() + " = " + listUsers); + logger.debug("listQaUsers for session id:" + qaSession.getQaSessionId() + " = " + listUsers); Map sessionUsersAttempts=populateSessionUsersAttempts(request,qaSession.getQaSessionId(), listUsers, questionUid, isUserNamesVisible, isLearnerRequest, userId); listMonitoredAttemptsContainerDTO.add(sessionUsersAttempts); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== diff -u -r1234f01caf8a5043f71b94cc51e9f09d9566e84a -rcc57114dde638ab1b37c0ac5556c1a2822e79bf3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 1234f01caf8a5043f71b94cc51e9f09d9566e84a) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision cc57114dde638ab1b37c0ac5556c1a2822e79bf3) @@ -237,9 +237,66 @@ qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, currentSessionId, userID); request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(true).toString()); - logger.debug("fwd'ing to." + LEARNER_REPORT); + logger.debug("fwd'ing to." + INDIVIDUAL_LEARNER_RESULTS); + return (mapping.findForward(INDIVIDUAL_LEARNER_RESULTS)); + } + + + /** + * returns Learner Report for a session + * ActionForward viewAllResults(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException) + * + * @param mapping + * @param form + * @param request + * @param response + * @return + * @throws IOException + * @throws ServletException + */ + public ActionForward viewAllResults(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException + { + logger.debug("dispatching viewAllResults..."); + QaLearningForm qaLearningForm = (QaLearningForm) form; + + IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE); + logger.debug("qaService: " + qaService); + if (qaService == null) + { + logger.debug("will retrieve qaService"); + qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); + logger.debug("retrieving qaService from session: " + qaService); + } + + Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID); + logger.debug("toolContentId: " + toolContentId); + + QaContent qaContent=qaService.loadQa(toolContentId.longValue()); + logger.debug("existing qaContent:" + qaContent); + + Long toolSessionId=(Long)request.getSession().getAttribute(AttributeNames.PARAM_TOOL_SESSION_ID); + + Boolean isUserNamesVisibleBoolean=(Boolean)request.getSession().getAttribute(IS_USERNAME_VISIBLE); + boolean isUserNamesVisible=isUserNamesVisibleBoolean.booleanValue(); + logger.debug("isUserNamesVisible: " + isUserNamesVisible); + + QaMonitoringAction qaMonitoringAction= new QaMonitoringAction(); + qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, toolSessionId.toString(), null); + + request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(true).toString()); + request.getSession().setAttribute(REQUEST_LEARNING_REPORT_PROGRESS, new Boolean(false).toString()); + logger.debug("fwd'ing to for learner progress" + LEARNER_REPORT); return (mapping.findForward(LEARNER_REPORT)); } + /** Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningForm.java =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -rcc57114dde638ab1b37c0ac5556c1a2822e79bf3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningForm.java (.../QaLearningForm.java) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningForm.java (.../QaLearningForm.java) (revision cc57114dde638ab1b37c0ac5556c1a2822e79bf3) @@ -41,6 +41,7 @@ protected String getPreviousQuestion; protected String endLearning; + protected String viewAllResults; protected String responseId; @@ -154,4 +155,17 @@ public void setMethod(String method) { this.method = method; } + + /** + * @return Returns the viewAllResults. + */ + public String getViewAllResults() { + return viewAllResults; + } + /** + * @param viewAllResults The viewAllResults to set. + */ + public void setViewAllResults(String viewAllResults) { + this.viewAllResults = viewAllResults; + } } Index: lams_tool_laqa/web/WEB-INF/struts-config.xml =================================================================== diff -u -r79aa6d305d1c62b1aed8e0f8dfdedcc8e5c4bedb -rcc57114dde638ab1b37c0ac5556c1a2822e79bf3 --- lams_tool_laqa/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 79aa6d305d1c62b1aed8e0f8dfdedcc8e5c4bedb) +++ lams_tool_laqa/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision cc57114dde638ab1b37c0ac5556c1a2822e79bf3) @@ -280,7 +280,20 @@ path="/monitoring/LearnerRep.jsp" redirect="false" /> - + + + + + + +<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+
+ +
+   +
+ + + + + + +
+
+ + +
+ + + \ No newline at end of file Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp =================================================================== diff -u -r1234f01caf8a5043f71b94cc51e9f09d9566e84a -rcc57114dde638ab1b37c0ac5556c1a2822e79bf3 --- lams_tool_laqa/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 1234f01caf8a5043f71b94cc51e9f09d9566e84a) +++ lams_tool_laqa/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision cc57114dde638ab1b37c0ac5556c1a2822e79bf3) @@ -101,7 +101,6 @@ - Index: lams_tool_laqa/web/monitoring/UserResponses.jsp =================================================================== diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -rcc57114dde638ab1b37c0ac5556c1a2822e79bf3 --- lams_tool_laqa/web/monitoring/UserResponses.jsp (.../UserResponses.jsp) (revision 65166da92a6f0f4ff73acb92b95672e237b25742) +++ lams_tool_laqa/web/monitoring/UserResponses.jsp (.../UserResponses.jsp) (revision cc57114dde638ab1b37c0ac5556c1a2822e79bf3) @@ -35,7 +35,6 @@ - @@ -48,7 +47,6 @@ - @@ -60,7 +58,6 @@ -