Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java =================================================================== diff -u -r0db83894504dc7652d3670a6ce496605b961faa1 -r6d2e2aad377adefe852a1b1b998ed71f0d5ee0d0 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java (.../GeneralLearnerFlowDTO.java) (revision 0db83894504dc7652d3670a6ce496605b961faa1) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java (.../GeneralLearnerFlowDTO.java) (revision 6d2e2aad377adefe852a1b1b998ed71f0d5ee0d0) @@ -63,6 +63,8 @@ protected String currentAnswer; + protected String teacherViewOnly; + protected String notebookEntriesVisible; protected String reflection; @@ -229,6 +231,7 @@ .append("activityOffline: ", activityOffline) .append("totalQuestionCount : ", totalQuestionCount) .append("activityInstructions: ", activityInstructions) + .append("teacherViewOnly: ", teacherViewOnly) .append("activityTitle: ", activityTitle) .append("countSessionComplete: ", countSessionComplete) .append("toolSessionID: ", toolSessionID) @@ -509,4 +512,16 @@ public void setMapFeedback(Map mapFeedback) { this.mapFeedback = mapFeedback; } + /** + * @return Returns the teacherViewOnly. + */ + public String getTeacherViewOnly() { + return teacherViewOnly; + } + /** + * @param teacherViewOnly The teacherViewOnly to set. + */ + public void setTeacherViewOnly(String teacherViewOnly) { + this.teacherViewOnly = teacherViewOnly; + } } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java =================================================================== diff -u -r0db83894504dc7652d3670a6ce496605b961faa1 -r6d2e2aad377adefe852a1b1b998ed71f0d5ee0d0 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java (.../QaAction.java) (revision 0db83894504dc7652d3670a6ce496605b961faa1) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java (.../QaAction.java) (revision 6d2e2aad377adefe852a1b1b998ed71f0d5ee0d0) @@ -2032,11 +2032,13 @@ } catch (RepositoryCheckedException e) { logger.error("Unable to delete file",e); + /* ActionMessages am = new ActionMessages(); am.add( ActionMessages.GLOBAL_MESSAGE, new ActionMessage( "error.contentrepository" , attachment.getFileName())); - saveErrors( request, am ); + saveErrors( request, am ); + */ } if ( attachment.getSubmissionId() != null ) { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java =================================================================== diff -u -r0db83894504dc7652d3670a6ce496605b961faa1 -r6d2e2aad377adefe852a1b1b998ed71f0d5ee0d0 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision 0db83894504dc7652d3670a6ce496605b961faa1) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision 6d2e2aad377adefe852a1b1b998ed71f0d5ee0d0) @@ -406,11 +406,14 @@ logger.debug("using generalLearnerFlowDTO: " + generalLearnerFlowDTO); generalLearnerFlowDTO.setRequestLearningReport(new Boolean(true).toString()); generalLearnerFlowDTO.setRequestLearningReportProgress(new Boolean(true).toString()); - + generalLearnerFlowDTO.setTeacherViewOnly(new Boolean(true).toString()); + qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, true, true, toolSessionID, learnerProgressUserId, generalLearnerFlowDTO, false); - logger.debug("fwd'ing to for learner progress" + INDIVIDUAL_LEARNER_REPORT); + logger.debug("presenting teacher's report"); + logger.debug("fwd'ing to for learner progress" + INDIVIDUAL_LEARNER_REPORT); + return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT)); } /* by now, we know that the mode is learner*/ Index: lams_tool_laqa/web/learning/LearnerRep.jsp =================================================================== diff -u -r0db83894504dc7652d3670a6ce496605b961faa1 -r6d2e2aad377adefe852a1b1b998ed71f0d5ee0d0 --- lams_tool_laqa/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision 0db83894504dc7652d3670a6ce496605b961faa1) +++ lams_tool_laqa/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision 6d2e2aad377adefe852a1b1b998ed71f0d5ee0d0) @@ -141,35 +141,37 @@ - - - - - - - - -
- - - - -
- - - - - - - - - - - -
-
+ + + + + + + + + +
+ + + + +
+ + + + + + + + + + + +
+
+
@@ -252,33 +254,35 @@ - - - + +
- - - -
+ + + + - -
+ + + + +
+ + + + + -
-
- - - - - - - - - - - -
-
+ + + + + + + + + +