Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== diff -u -rdd4087c8c38ddcf2e97af7fc2dda25a8c948bcf0 -r3a8781497ba5a90b5dd63a364582dad5d0823d8b --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision dd4087c8c38ddcf2e97af7fc2dda25a8c948bcf0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 3a8781497ba5a90b5dd63a364582dad5d0823d8b) @@ -1049,20 +1049,10 @@ public boolean isCommentsEnabled(Long toolContentId) { return ratingService.isCommentsEnabled(toolContentId); } - - @Override - public ItemRatingDTO getRatingCriteriaDtos(Long contentId, Long itemId, Long userId) { - LinkedList itemIds = new LinkedList(); - itemIds.add(itemId); - ItemRatingDTO ratingCriteria = getRatingCriteriaDtos(contentId, itemIds, false, userId).get(0); - - return ratingCriteria; - } - @Override - public List getRatingCriteriaDtos(Long contentId, Collection itemIds, boolean isAllItemResultsRequested, Long userId) { - return ratingService.getRatingCriteriaDtos(contentId, itemIds, isAllItemResultsRequested, userId); + public List getRatingCriteriaDtos(Long contentId, Collection itemIds, boolean isCommentsByOtherUsersRequired, Long userId) { + return ratingService.getRatingCriteriaDtos(contentId, itemIds, isCommentsByOtherUsersRequired, userId); } @Override Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== diff -u -rdd4087c8c38ddcf2e97af7fc2dda25a8c948bcf0 -r3a8781497ba5a90b5dd63a364582dad5d0823d8b --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision dd4087c8c38ddcf2e97af7fc2dda25a8c948bcf0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 3a8781497ba5a90b5dd63a364582dad5d0823d8b) @@ -1006,7 +1006,9 @@ itemIds.add(response.getResponseId()); } - itemRatingDtos = qaService.getRatingCriteriaDtos(qaContentId, itemIds, false, userId); + //all comments required only for monitoring + boolean isCommentsByOtherUsersRequired = isMonitoring; + itemRatingDtos = qaService.getRatingCriteriaDtos(qaContentId, itemIds, isCommentsByOtherUsersRequired, userId); // store how many items are rated int countRatedQuestions = qaService.getCountItemsRatedByUser(qaContentId, userId.intValue()); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java =================================================================== diff -u -rdd4087c8c38ddcf2e97af7fc2dda25a8c948bcf0 -r3a8781497ba5a90b5dd63a364582dad5d0823d8b --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision dd4087c8c38ddcf2e97af7fc2dda25a8c948bcf0) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision 3a8781497ba5a90b5dd63a364582dad5d0823d8b) @@ -175,7 +175,8 @@ qaService.getLearnerContentFolder(new Long(toolSessionID), user.getQueUsrId())); } String sessionMapId = sessionMap.getSessionID(); - sessionMap.put(IS_DISABLED, qaContent.isLockWhenFinished() && user.isLearnerFinished()); + sessionMap.put(IS_DISABLED, qaContent.isLockWhenFinished() && user.isLearnerFinished() || (mode != null) + && mode.equals(ToolAccessMode.TEACHER.toString())); sessionMap.put(ATTR_GROUP_LEADER, groupLeader); boolean isUserLeader = qaService.isUserGroupLeader(user, new Long(toolSessionID)); Index: lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag =================================================================== diff -u -rdd4087c8c38ddcf2e97af7fc2dda25a8c948bcf0 -r3a8781497ba5a90b5dd63a364582dad5d0823d8b --- lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag (.../AuthoringRatingCriteria.tag) (revision dd4087c8c38ddcf2e97af7fc2dda25a8c948bcf0) +++ lams_tool_laqa/web/WEB-INF/tags/AuthoringRatingCriteria.tag (.../AuthoringRatingCriteria.tag) (revision 3a8781497ba5a90b5dd63a364582dad5d0823d8b) @@ -36,7 +36,7 @@ - ${formContentPrefix}. + @@ -72,7 +72,7 @@ - + Index: lams_tool_laqa/web/WEB-INF/tags/Rating.tag =================================================================== diff -u -rdd4087c8c38ddcf2e97af7fc2dda25a8c948bcf0 -r3a8781497ba5a90b5dd63a364582dad5d0823d8b --- lams_tool_laqa/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision dd4087c8c38ddcf2e97af7fc2dda25a8c948bcf0) +++ lams_tool_laqa/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 3a8781497ba5a90b5dd63a364582dad5d0823d8b) @@ -19,13 +19,10 @@ <%@ attribute name="disabled" required="false" rtexprvalue="true" %> <%@ attribute name="isItemAuthoredByUser" required="false" rtexprvalue="true" %> <%@ attribute name="maxRates" required="false" rtexprvalue="true" %> -<%@ attribute name="minRates" required="false" rtexprvalue="true" %> <%@ attribute name="countRatedItems" required="false" rtexprvalue="true" %> <%@ attribute name="yourRatingLabel" required="false" rtexprvalue="true" %> <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %> -<%@ attribute name="warnCommentIsBlankLabel" required="false" rtexprvalue="true" %> <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %> -<%@ attribute name="warnMinNumberWordsLabel" required="false" rtexprvalue="true" %> <%-- Default value for message key --%> @@ -37,9 +34,6 @@ - - - @@ -49,33 +43,11 @@ - - - - - - - - - <%--Rating stars area---------------------------------------%>
@@ -154,7 +126,7 @@
<%--Comments area---------------------------------------%> - +
@@ -192,9 +164,8 @@
- +
Index: lams_tool_laqa/web/learning/LearnerRep.jsp =================================================================== diff -u -rdd4087c8c38ddcf2e97af7fc2dda25a8c948bcf0 -r3a8781497ba5a90b5dd63a364582dad5d0823d8b --- lams_tool_laqa/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision dd4087c8c38ddcf2e97af7fc2dda25a8c948bcf0) +++ lams_tool_laqa/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision 3a8781497ba5a90b5dd63a364582dad5d0823d8b) @@ -26,7 +26,21 @@ - + + @@ -36,9 +50,7 @@ @@ -46,6 +49,10 @@ @@ -48,6 +51,11 @@ @@ -49,6 +52,10 @@