Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java =================================================================== diff -u -r1046868d6997114f3b043778a68b371e03182faf -r64c99cc085211cff0d1ec2cb58892bf9c0cd8bc3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java (.../GeneralLearnerFlowDTO.java) (revision 1046868d6997114f3b043778a68b371e03182faf) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java (.../GeneralLearnerFlowDTO.java) (revision 64c99cc085211cff0d1ec2cb58892bf9c0cd8bc3) @@ -107,8 +107,26 @@ protected String lockWhenFinished; + protected String userUid; + protected String existMultipleUserResponses; + + protected String usernameVisible; + + /** + * @return Returns the usernameVisible. + */ + public String getUsernameVisible() { + return usernameVisible; + } + /** + * @param usernameVisible The usernameVisible to set. + */ + public void setUsernameVisible(String usernameVisible) { + this.usernameVisible = usernameVisible; + } + /** * @return Returns the currentMonitoredToolSession. */ public String getCurrentMonitoredToolSession() { @@ -583,4 +601,28 @@ public void setShowOtherAnswers(String showOtherAnswers) { this.showOtherAnswers = showOtherAnswers; } -} + /** + * @return Returns the userUid. + */ + public String getUserUid() { + return userUid; + } + /** + * @param userUid The userUid to set. + */ + public void setUserUid(String userUid) { + this.userUid = userUid; + } + /** + * @return Returns the existMultipleUserResponses. + */ + public String getExistMultipleUserResponses() { + return existMultipleUserResponses; + } + /** + * @param existMultipleUserResponses The existMultipleUserResponses to set. + */ + public void setExistMultipleUserResponses(String existMultipleUserResponses) { + this.existMultipleUserResponses = existMultipleUserResponses; + } + } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== diff -u -r1046868d6997114f3b043778a68b371e03182faf -r64c99cc085211cff0d1ec2cb58892bf9c0cd8bc3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 1046868d6997114f3b043778a68b371e03182faf) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 64c99cc085211cff0d1ec2cb58892bf9c0cd8bc3) @@ -644,6 +644,42 @@ logger.debug("lockWhenFinished: " + lockWhenFinished); generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString()); + + HttpSession ss = SessionManager.getSession(); + /* get back login user DTO */ + UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER); + logger.debug("retrieving toolUser: " + toolUser); + logger.debug("retrieving toolUser userId: " + toolUser.getUserID()); + logger.debug("retrieving toolUser username: " + toolUser.getLogin()); + + String userName=toolUser.getLogin(); + String fullName= toolUser.getFirstName() + " " + toolUser.getLastName(); + logger.debug("retrieving toolUser fullname: " + fullName); + + Long userId=new Long(toolUser.getUserID().longValue()); + logger.debug("userId: " + userId); + + QaQueUsr qaQueUsr=qaService.getQaUserBySession(userId, qaSession.getUid()); + logger.debug("qaQueUsr: " + qaQueUsr); + logger.debug("qaQueUsr uid : " + qaQueUsr.getUid()); + + generalLearnerFlowDTO.setUserUid(qaQueUsr.getUid().toString()); + + int sessionUserCount=0; + if (qaSession.getQaQueUsers() != null) + { + sessionUserCount=qaSession.getQaQueUsers().size(); + } + + if (sessionUserCount > 1) + { + logger.debug("there are multiple user responses"); + generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString()); + } + + boolean usernameVisible=qaContent.isUsernameVisible(); + generalLearnerFlowDTO.setUserNameVisible(new Boolean(usernameVisible).toString()); + request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO); logger.debug("final generalLearnerFlowDTO: " + generalLearnerFlowDTO); @@ -747,6 +783,44 @@ logger.debug("lockWhenFinished: " + lockWhenFinished); generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString()); + + HttpSession ss = SessionManager.getSession(); + /* get back login user DTO */ + UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER); + logger.debug("retrieving toolUser: " + toolUser); + logger.debug("retrieving toolUser userId: " + toolUser.getUserID()); + logger.debug("retrieving toolUser username: " + toolUser.getLogin()); + + String userName=toolUser.getLogin(); + String fullName= toolUser.getFirstName() + " " + toolUser.getLastName(); + logger.debug("retrieving toolUser fullname: " + fullName); + + Long userId=new Long(toolUser.getUserID().longValue()); + logger.debug("userId: " + userId); + + QaQueUsr qaQueUsr=qaService.getQaUserBySession(userId, qaSession.getUid()); + logger.debug("qaQueUsr: " + qaQueUsr); + logger.debug("qaQueUsr uid : " + qaQueUsr.getUid()); + + generalLearnerFlowDTO.setUserUid(qaQueUsr.getUid().toString()); + + int sessionUserCount=0; + if (qaSession.getQaQueUsers() != null) + { + sessionUserCount=qaSession.getQaQueUsers().size(); + } + + if (sessionUserCount > 1) + { + logger.debug("there are multiple user responses"); + generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString()); + } + + boolean usernameVisible=qaContent.isUsernameVisible(); + logger.debug("usernameVisible: " + usernameVisible); + generalLearnerFlowDTO.setUserNameVisible(new Boolean(usernameVisible).toString()); + + request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO); logger.debug("final generalLearnerFlowDTO: " + generalLearnerFlowDTO); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java =================================================================== diff -u -r1046868d6997114f3b043778a68b371e03182faf -r64c99cc085211cff0d1ec2cb58892bf9c0cd8bc3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision 1046868d6997114f3b043778a68b371e03182faf) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision 64c99cc085211cff0d1ec2cb58892bf9c0cd8bc3) @@ -408,6 +408,7 @@ generalLearnerFlowDTO.setRemainingQuestionCount(generalLearnerFlowDTO.getTotalQuestionCount().toString()); generalLearnerFlowDTO.setInitialScreen(new Boolean(true).toString()); + request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO); /* Is the request for a preview by the author? Preview The tool must be able to show the specified content as if it was running in a lesson. @@ -425,6 +426,22 @@ logger.debug("Author requests for a preview of the content."); } + + int sessionUserCount=0; + if (qaSession.getQaQueUsers() != null) + { + sessionUserCount=qaSession.getQaQueUsers().size(); + } + + if (sessionUserCount > 1) + { + logger.debug("there are multiple user responses"); + generalLearnerFlowDTO.setExistMultipleUserResponses(new Boolean(true).toString()); + } + + + + /* by now, we know that the mode is either teacher or learner * check if the mode is teacher and request is for Learner Progress */ @@ -447,6 +464,19 @@ generalLearnerFlowDTO, false, toolSessionID); logger.debug("presenting teacher's report"); + + + HttpSession ss = SessionManager.getSession(); + /* get back login user DTO */ + UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER); + Long userId=new Long(toolUser.getUserID().longValue()); + + QaQueUsr qaQueUsrLocal=qaService.getQaUserBySession(userId, qaSession.getUid()); + logger.debug("qaQueUsrLocal: " + qaQueUsrLocal); + logger.debug("qaQueUsrLocal uid : " + qaQueUsrLocal.getUid()); + + generalLearnerFlowDTO.setUserUid(qaQueUsrLocal.getUid().toString()); + logger.debug("fwd'ing to for learner progress" + INDIVIDUAL_LEARNER_REPORT); return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT)); @@ -533,6 +563,17 @@ mapAnswers=(Map)sessionMap.get(MAP_ALL_RESULTS_KEY); logger.debug("mapAnswers: " + mapAnswers); + HttpSession ss = SessionManager.getSession(); + /* get back login user DTO */ + UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER); + Long userId=new Long(toolUser.getUserID().longValue()); + + QaQueUsr qaQueUsrLocal=qaService.getQaUserBySession(userId, qaSession.getUid()); + logger.debug("qaQueUsrLocal: " + qaQueUsrLocal); + logger.debug("qaQueUsrLocal uid : " + qaQueUsrLocal.getUid()); + + generalLearnerFlowDTO.setUserUid(qaQueUsrLocal.getUid().toString()); + if (isLearnerFinished) { @@ -554,7 +595,8 @@ logger.debug("before fwd, GENERAL_LEARNER_FLOW_DTO: " + request.getAttribute(GENERAL_LEARNER_FLOW_DTO)); } - + + logger.debug("fwd'ing to." + INDIVIDUAL_LEARNER_REPORT); return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT)); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== diff -u -r8640cefdf8862cb87ca9847afbf05b1e388f5ff7 -r64c99cc085211cff0d1ec2cb58892bf9c0cd8bc3 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision 8640cefdf8862cb87ca9847afbf05b1e388f5ff7) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision 64c99cc085211cff0d1ec2cb58892bf9c0cd8bc3) @@ -1676,7 +1676,6 @@ boolean isUserNamesVisible, boolean isLearnerRequest, String currentSessionId, String userId, GeneralLearnerFlowDTO generalLearnerFlowDTO, boolean setEditResponse, String currentMonitoredToolSession) { - logger.debug("starting refreshSummaryData: setEditResponse + " + setEditResponse); logger.debug("currentMonitoredToolSession: " + currentMonitoredToolSession); logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO); @@ -1787,6 +1786,7 @@ logger.debug("placing LIST_MONITORED_ANSWERS_CONTAINER_DTO within generalLearnerFlowDTO"); generalLearnerFlowDTO.setListMonitoredAnswersContainerDTO(listMonitoredAnswersContainerDTO); + if (isLearnerRequest) { logger.debug("isLearnerRequest is true."); @@ -4237,5 +4237,5 @@ return reflectionsContainerDTO; } - + } \ No newline at end of file Index: lams_tool_laqa/web/learning/LearnerRep.jsp =================================================================== diff -u -r9865c6f5bb3fa8d8c39b87f73b8e59705bae27d9 -r64c99cc085211cff0d1ec2cb58892bf9c0cd8bc3 --- lams_tool_laqa/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision 9865c6f5bb3fa8d8c39b87f73b8e59705bae27d9) +++ lams_tool_laqa/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision 64c99cc085211cff0d1ec2cb58892bf9c0cd8bc3) @@ -63,10 +63,6 @@ test="${generalLearnerFlowDTO.requestLearningReportProgress != 'true'}"> -

- -

- @@ -92,22 +88,69 @@ - -

- - - -

-

- - -

-
+ + + +

+ - + +

+

+ + +

+
+
+ + + +

+ +

+ + + + + +
+ + + + + + + + +

+ + + + - + + +

+

+ +


+

+
+
+
+
+
+
+
@@ -191,22 +234,71 @@ - -

- - - -

-

- -

-
+ + + +

+ - + +

+

+ + +

+
+
+ + + +

+ +

+ + + + + +
+ + + + + + + + +

+ + + + - + + +

+

+ +


+

+
+
+
+
+
+
+
+

Index: lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp =================================================================== diff -u -r9865c6f5bb3fa8d8c39b87f73b8e59705bae27d9 -r64c99cc085211cff0d1ec2cb58892bf9c0cd8bc3 --- lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp (.../RevisitedLearnerRep.jsp) (revision 9865c6f5bb3fa8d8c39b87f73b8e59705bae27d9) +++ lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp (.../RevisitedLearnerRep.jsp) (revision 64c99cc085211cff0d1ec2cb58892bf9c0cd8bc3) @@ -92,23 +92,71 @@ - -

- - - -

-

- - -

-
+ + + +

+ - + +

+

+ + +

+
+
+ + + +

+ +

+ + + + + +
+ + + + + + + + +

+ + + + - + + +

+

+ +


+

+
+
+
+
+
+
+
+

@@ -192,21 +240,69 @@ - -

- - - -

-

- -

-
+ + + +

+ - + +

+

+ + +

+
+
+ + + +

+ +

+ + + + + +
+ + + + + + + + +

+ + + + - + + +

+

+ +


+

+
+
+
+
+
+
+