Index: lams_admin/web/WEB-INF/tags/Rating.tag =================================================================== diff -u -r26dd5894db796186d42b4bdfb259218eefea68d6 -r959f663f5d378d09ce193c52e9900ea865956f79 --- lams_admin/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 26dd5894db796186d42b4bdfb259218eefea68d6) +++ lams_admin/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 959f663f5d378d09ce193c52e9900ea865956f79) @@ -1,14 +1,14 @@ -<% - /** - * Rating.tag - * Author: Andrey Balan - * Description: Shows rating stars widget - */ - %> +<% + /** + * Rating.tag + * Author: Andrey Balan + * Description: Shows rating stars widget + */ +%> <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-function" prefix="fn" %> @@ -82,92 +82,92 @@ <%--Rating stars area---------------------------------------%>
-
+
- - - - - - - - - - - - - - - - - - - - - - ${criteriaDto.ratingCriteria.title} - - - - - - - - - - - - -
-
- - - -
- - - - - - ${criteriaDto.numberOfVotes} - - -
- - - -
style="visibility: hidden;" - > - - + + + + + + + + + + + + + + + + + + + + + + ${criteriaDto.ratingCriteria.title} + + + + + + + + + + + + +
+
+ + + +
+ + + + + + ${criteriaDto.numberOfVotes} + + +
+ + + +
style="visibility: hidden;" + > + + - - + + - - - ${criteriaDto.numberOfVotes} - - -
- - - - - + + + ${criteriaDto.numberOfVotes} + + +
-
+ + + + +
+
<%--Comments area---------------------------------------%> -
+
@@ -176,41 +176,42 @@
- +
- + -
- +
+ - + : - +
- +
-
+
- -
+ +
- -
+ +
\ No newline at end of file Index: lams_central/web/WEB-INF/tags/Rating.tag =================================================================== diff -u -r26dd5894db796186d42b4bdfb259218eefea68d6 -r959f663f5d378d09ce193c52e9900ea865956f79 --- lams_central/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 26dd5894db796186d42b4bdfb259218eefea68d6) +++ lams_central/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 959f663f5d378d09ce193c52e9900ea865956f79) @@ -1,14 +1,14 @@ -<% - /** - * Rating.tag - * Author: Andrey Balan - * Description: Shows rating stars widget - */ - %> +<% + /** + * Rating.tag + * Author: Andrey Balan + * Description: Shows rating stars widget + */ +%> <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-function" prefix="fn" %> @@ -82,92 +82,92 @@ <%--Rating stars area---------------------------------------%>
-
+
- - - - - - - - - - - - - - - - - - - - - - ${criteriaDto.ratingCriteria.title} - - - - - - - - - - - - -
-
- - - -
- - - - - - ${criteriaDto.numberOfVotes} - - -
- - - -
style="visibility: hidden;" - > - - + + + + + + + + + + + + + + + + + + + + + + ${criteriaDto.ratingCriteria.title} + + + + + + + + + + + + +
+
+ + + +
+ + + + + + ${criteriaDto.numberOfVotes} + + +
+ + + +
style="visibility: hidden;" + > + + - - + + - - - ${criteriaDto.numberOfVotes} - - -
- - - - - + + + ${criteriaDto.numberOfVotes} + + +
-
+ + + + +
+
<%--Comments area---------------------------------------%> -
+
@@ -176,41 +176,42 @@
- +
- + -
- +
+ - + : - +
- +
-
+
- -
+ +
- -
+ +
\ No newline at end of file Index: lams_gradebook/web/WEB-INF/tags/Rating.tag =================================================================== diff -u -r26dd5894db796186d42b4bdfb259218eefea68d6 -r959f663f5d378d09ce193c52e9900ea865956f79 --- lams_gradebook/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 26dd5894db796186d42b4bdfb259218eefea68d6) +++ lams_gradebook/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 959f663f5d378d09ce193c52e9900ea865956f79) @@ -1,14 +1,14 @@ -<% - /** - * Rating.tag - * Author: Andrey Balan - * Description: Shows rating stars widget - */ - %> +<% + /** + * Rating.tag + * Author: Andrey Balan + * Description: Shows rating stars widget + */ +%> <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-function" prefix="fn" %> @@ -82,92 +82,92 @@ <%--Rating stars area---------------------------------------%>
-
+
- - - - - - - - - - - - - - - - - - - - - - ${criteriaDto.ratingCriteria.title} - - - - - - - - - - - - -
-
- - - -
- - - - - - ${criteriaDto.numberOfVotes} - - -
- - - -
style="visibility: hidden;" - > - - + + + + + + + + + + + + + + + + + + + + + + ${criteriaDto.ratingCriteria.title} + + + + + + + + + + + + +
+
+ + + +
+ + + + + + ${criteriaDto.numberOfVotes} + + +
+ + + +
style="visibility: hidden;" + > + + - - + + - - - ${criteriaDto.numberOfVotes} - - -
- - - - - + + + ${criteriaDto.numberOfVotes} + + +
-
+ + + + +
+
<%--Comments area---------------------------------------%> -
+
@@ -176,41 +176,42 @@
- +
- + -
- +
+ - + : - +
- +
-
+
- -
+ +
- -
+ +
\ No newline at end of file Index: lams_learning/web/WEB-INF/tags/Rating.tag =================================================================== diff -u -r26dd5894db796186d42b4bdfb259218eefea68d6 -r959f663f5d378d09ce193c52e9900ea865956f79 --- lams_learning/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 26dd5894db796186d42b4bdfb259218eefea68d6) +++ lams_learning/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 959f663f5d378d09ce193c52e9900ea865956f79) @@ -1,14 +1,14 @@ -<% - /** - * Rating.tag - * Author: Andrey Balan - * Description: Shows rating stars widget - */ - %> +<% + /** + * Rating.tag + * Author: Andrey Balan + * Description: Shows rating stars widget + */ +%> <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-function" prefix="fn" %> @@ -82,92 +82,92 @@ <%--Rating stars area---------------------------------------%>
-
+
- - - - - - - - - - - - - - - - - - - - - - ${criteriaDto.ratingCriteria.title} - - - - - - - - - - - - -
-
- - - -
- - - - - - ${criteriaDto.numberOfVotes} - - -
- - - -
style="visibility: hidden;" - > - - + + + + + + + + + + + + + + + + + + + + + + ${criteriaDto.ratingCriteria.title} + + + + + + + + + + + + +
+
+ + + +
+ + + + + + ${criteriaDto.numberOfVotes} + + +
+ + + +
style="visibility: hidden;" + > + + - - + + - - - ${criteriaDto.numberOfVotes} - - -
- - - - - + + + ${criteriaDto.numberOfVotes} + + +
-
+ + + + +
+
<%--Comments area---------------------------------------%> -
+
@@ -176,41 +176,42 @@
- +
- + -
- +
+ - + : - +
- +
-
+
- -
+ +
- -
+ +
\ No newline at end of file Index: lams_monitoring/web/WEB-INF/tags/Rating.tag =================================================================== diff -u -r26dd5894db796186d42b4bdfb259218eefea68d6 -r959f663f5d378d09ce193c52e9900ea865956f79 --- lams_monitoring/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 26dd5894db796186d42b4bdfb259218eefea68d6) +++ lams_monitoring/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 959f663f5d378d09ce193c52e9900ea865956f79) @@ -1,14 +1,14 @@ -<% - /** - * Rating.tag - * Author: Andrey Balan - * Description: Shows rating stars widget - */ - %> +<% + /** + * Rating.tag + * Author: Andrey Balan + * Description: Shows rating stars widget + */ +%> <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-function" prefix="fn" %> @@ -82,92 +82,92 @@ <%--Rating stars area---------------------------------------%>
-
+
- - - - - - - - - - - - - - - - - - - - - - ${criteriaDto.ratingCriteria.title} - - - - - - - - - - - - -
-
- - - -
- - - - - - ${criteriaDto.numberOfVotes} - - -
- - - -
style="visibility: hidden;" - > - - + + + + + + + + + + + + + + + + + + + + + + ${criteriaDto.ratingCriteria.title} + + + + + + + + + + + + +
+
+ + + +
+ + + + + + ${criteriaDto.numberOfVotes} + + +
+ + + +
style="visibility: hidden;" + > + + - - + + - - - ${criteriaDto.numberOfVotes} - - -
- - - - - + + + ${criteriaDto.numberOfVotes} + + +
-
+ + + + +
+
<%--Comments area---------------------------------------%> -
+
@@ -176,41 +176,42 @@
- +
- + -
- +
+ - + : - +
- +
-
+
- -
+ +
- -
+ +
\ No newline at end of file Index: lams_tool_assessment/web/WEB-INF/tags/Rating.tag =================================================================== diff -u -r26dd5894db796186d42b4bdfb259218eefea68d6 -r959f663f5d378d09ce193c52e9900ea865956f79 --- lams_tool_assessment/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 26dd5894db796186d42b4bdfb259218eefea68d6) +++ lams_tool_assessment/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 959f663f5d378d09ce193c52e9900ea865956f79) @@ -1,14 +1,14 @@ -<% - /** - * Rating.tag - * Author: Andrey Balan - * Description: Shows rating stars widget - */ - %> +<% + /** + * Rating.tag + * Author: Andrey Balan + * Description: Shows rating stars widget + */ +%> <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-function" prefix="fn" %> @@ -82,92 +82,92 @@ <%--Rating stars area---------------------------------------%>
-
+
- - - - - - - - - - - - - - - - - - - - - - ${criteriaDto.ratingCriteria.title} - - - - - - - - - - - - -
-
- - - -
- - - - - - ${criteriaDto.numberOfVotes} - - -
- - - -
style="visibility: hidden;" - > - - + + + + + + + + + + + + + + + + + + + + + + ${criteriaDto.ratingCriteria.title} + + + + + + + + + + + + +
+
+ + + +
+ + + + + + ${criteriaDto.numberOfVotes} + + +
+ + + +
style="visibility: hidden;" + > + + - - + + - - - ${criteriaDto.numberOfVotes} - - -
- - - - - + + + ${criteriaDto.numberOfVotes} + + +
-
+ + + + +
+
<%--Comments area---------------------------------------%> -
+
@@ -176,41 +176,42 @@
- +
- + -
- +
+ - + : - +
- +
-
+
- -
+ +
- -
+ +
\ No newline at end of file Index: lams_tool_chat/web/WEB-INF/tags/Rating.tag =================================================================== diff -u -r26dd5894db796186d42b4bdfb259218eefea68d6 -r959f663f5d378d09ce193c52e9900ea865956f79 --- lams_tool_chat/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 26dd5894db796186d42b4bdfb259218eefea68d6) +++ lams_tool_chat/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 959f663f5d378d09ce193c52e9900ea865956f79) @@ -1,14 +1,14 @@ -<% - /** - * Rating.tag - * Author: Andrey Balan - * Description: Shows rating stars widget - */ - %> +<% + /** + * Rating.tag + * Author: Andrey Balan + * Description: Shows rating stars widget + */ +%> <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-function" prefix="fn" %> @@ -82,92 +82,92 @@ <%--Rating stars area---------------------------------------%>
-
+
- - - - - - - - - - - - - - - - - - - - - - ${criteriaDto.ratingCriteria.title} - - - - - - - - - - - - -
-
- - - -
- - - - - - ${criteriaDto.numberOfVotes} - - -
- - - -
style="visibility: hidden;" - > - - + + + + + + + + + + + + + + + + + + + + + + ${criteriaDto.ratingCriteria.title} + + + + + + + + + + + + +
+
+ + + +
+ + + + + + ${criteriaDto.numberOfVotes} + + +
+ + + +
style="visibility: hidden;" + > + + - - + + - - - ${criteriaDto.numberOfVotes} - - -
- - - - - + + + ${criteriaDto.numberOfVotes} + + +
-
+ + + + +
+
<%--Comments area---------------------------------------%> -
+
@@ -176,41 +176,42 @@
- +
- + -
- +
+ - + : - +
- +
-
+
- -
+ +
- -
+ +
\ No newline at end of file Index: lams_tool_daco/web/WEB-INF/tags/Rating.tag =================================================================== diff -u -r26dd5894db796186d42b4bdfb259218eefea68d6 -r959f663f5d378d09ce193c52e9900ea865956f79 --- lams_tool_daco/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 26dd5894db796186d42b4bdfb259218eefea68d6) +++ lams_tool_daco/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 959f663f5d378d09ce193c52e9900ea865956f79) @@ -1,14 +1,14 @@ -<% - /** - * Rating.tag - * Author: Andrey Balan - * Description: Shows rating stars widget - */ - %> +<% + /** + * Rating.tag + * Author: Andrey Balan + * Description: Shows rating stars widget + */ +%> <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-function" prefix="fn" %> @@ -82,92 +82,92 @@ <%--Rating stars area---------------------------------------%>
-
+
- - - - - - - - - - - - - - - - - - - - - - ${criteriaDto.ratingCriteria.title} - - - - - - - - - - - - -
-
- - - -
- - - - - - ${criteriaDto.numberOfVotes} - - -
- - - -
style="visibility: hidden;" - > - - + + + + + + + + + + + + + + + + + + + + + + ${criteriaDto.ratingCriteria.title} + + + + + + + + + + + + +
+
+ + + +
+ + + + + + ${criteriaDto.numberOfVotes} + + +
+ + + +
style="visibility: hidden;" + > + + - - + + - - - ${criteriaDto.numberOfVotes} - - -
- - - - - + + + ${criteriaDto.numberOfVotes} + + +
-
+ + + + +
+
<%--Comments area---------------------------------------%> -
+
@@ -176,41 +176,42 @@
- +
- + -
- +
+ - + : - +
- +
-
+
- -
+ +
- -
+ +
\ No newline at end of file Index: lams_tool_doku/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rb6a6c5a9da3698a073a0e48c1f00a267edddcc6c -r959f663f5d378d09ce193c52e9900ea865956f79 --- lams_tool_doku/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b6a6c5a9da3698a073a0e48c1f00a267edddcc6c) +++ lams_tool_doku/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 959f663f5d378d09ce193c52e9900ea865956f79) @@ -143,4 +143,6 @@ label.sorry.the.deadline.has.passed = Sorry, the deadline to participate in this activity has passed. Please contact your teacher for further details. monitor.summary.notification = Notification monitor.summary.date.restriction.set = Date availability has been set -monitor.summary.date.restriction.removed = Date availability has been removed \ No newline at end of file +monitor.summary.date.restriction.removed = Date availability has been removed +label.comment.textarea.tip = Type your comment here then click on the green tick. +warning.comment.blank = Comment text is missing. \ No newline at end of file Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java =================================================================== diff -u -rca5a2db0956e5e04be5cbf1354c234f47c7c6353 -r959f663f5d378d09ce193c52e9900ea865956f79 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java (.../DokumaranService.java) (revision ca5a2db0956e5e04be5cbf1354c234f47c7c6353) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java (.../DokumaranService.java) (revision 959f663f5d378d09ce193c52e9900ea865956f79) @@ -23,21 +23,9 @@ package org.lamsfoundation.lams.tool.dokumaran.service; -import java.io.IOException; -import java.security.InvalidParameterException; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; -import java.util.function.Function; -import java.util.stream.Collectors; - -import javax.servlet.http.HttpServletResponse; - +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; +import net.gjerull.etherpad.client.EPLiteClient; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; @@ -62,13 +50,7 @@ import org.lamsfoundation.lams.rating.service.IRatingService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.ToolCompletionStatus; -import org.lamsfoundation.lams.tool.ToolContentManager; -import org.lamsfoundation.lams.tool.ToolOutput; -import org.lamsfoundation.lams.tool.ToolOutputDefinition; -import org.lamsfoundation.lams.tool.ToolSession; -import org.lamsfoundation.lams.tool.ToolSessionExportOutputData; -import org.lamsfoundation.lams.tool.ToolSessionManager; +import org.lamsfoundation.lams.tool.*; import org.lamsfoundation.lams.tool.dokumaran.DokumaranConstants; import org.lamsfoundation.lams.tool.dokumaran.dao.DokumaranDAO; import org.lamsfoundation.lams.tool.dokumaran.dao.DokumaranSessionDAO; @@ -88,11 +70,14 @@ import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.security.InvalidParameterException; +import java.time.LocalDateTime; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; -import net.gjerull.etherpad.client.EPLiteClient; - /** * @author Dapeng.Ni */ @@ -283,8 +268,9 @@ public void changeLeaderForGroup(long toolSessionId, long leaderUserId) { DokumaranSession session = getDokumaranSessionBySessionId(toolSessionId); if (DokumaranConstants.COMPLETED == session.getStatus()) { - throw new InvalidParameterException("Attempting to assing a new leader with user ID " + leaderUserId - + " to a finished session wtih ID " + toolSessionId); + throw new InvalidParameterException( + "Attempting to assing a new leader with user ID " + leaderUserId + " to a finished session wtih ID " + + toolSessionId); } DokumaranUser existingLeader = session.getGroupLeader(); @@ -463,7 +449,7 @@ Set itemIds = sessionList.stream() .collect(Collectors.mapping(DokumaranSession::getSessionId, Collectors.toSet())); - List itemRatingDtos = ratingService.getRatingCriteriaDtos(contentId, null, itemIds, false, + List itemRatingDtos = ratingService.getRatingCriteriaDtos(contentId, null, itemIds, true, ratingUserId); // Mapping of Item ID -> DTO itemRatingDtoMap = itemRatingDtos.stream() @@ -482,8 +468,8 @@ group.setReadOnlyPadId(session.getEtherpadReadOnlyId()); //mark all session that has had problems with pad initializations so that they could be fixed in monitoring by a teacher - if (StringUtils.isEmpty(session.getEtherpadReadOnlyId()) - || StringUtils.isEmpty(session.getEtherpadGroupId())) { + if (StringUtils.isEmpty(session.getEtherpadReadOnlyId()) || StringUtils.isEmpty( + session.getEtherpadGroupId())) { group.setSessionFaulty(true); } @@ -513,7 +499,8 @@ if (entry != null) { ReflectDTO ref = new ReflectDTO(user); ref.setReflect(entry.getEntry()); - Date postedDate = (entry.getLastModified() != null) ? entry.getLastModified() + Date postedDate = (entry.getLastModified() != null) + ? entry.getLastModified() : entry.getCreateDate(); ref.setDate(postedDate); reflections.add(ref); @@ -555,8 +542,8 @@ @Override public Grouping getGrouping(long toolContentId) { - ToolActivity toolActivity = (ToolActivity) userManagementService - .findByProperty(ToolActivity.class, "toolContentId", toolContentId).get(0); + ToolActivity toolActivity = (ToolActivity) userManagementService.findByProperty(ToolActivity.class, + "toolContentId", toolContentId).get(0); return toolActivity.getApplyGrouping() ? toolActivity.getGrouping() : null; } @@ -584,11 +571,12 @@ } if (criteria.isEmpty()) { - ToolActivityRatingCriteria criterion = (ToolActivityRatingCriteria) RatingCriteria - .getRatingCriteriaInstance(RatingCriteria.TOOL_ACTIVITY_CRITERIA_TYPE); + ToolActivityRatingCriteria criterion = (ToolActivityRatingCriteria) RatingCriteria.getRatingCriteriaInstance( + RatingCriteria.TOOL_ACTIVITY_CRITERIA_TYPE); criterion.setTitle(messageService.getMessage("label.pad.rating.title")); criterion.setOrderId(1); criterion.setRatingStyle(RatingCriteria.RATING_STYLE_STAR); + criterion.setCommentsEnabled(true); criterion.setToolContentId(toolContentId); dokumaranDao.insert(criterion); @@ -851,14 +839,14 @@ @SuppressWarnings("unchecked") public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException { if (DokumaranService.log.isDebugEnabled()) { - DokumaranService.log - .debug("Removing Dokumaran content for user ID " + userId + " and toolContentId " + toolContentId); + DokumaranService.log.debug( + "Removing Dokumaran content for user ID " + userId + " and toolContentId " + toolContentId); } Dokumaran dokumaran = dokumaranDao.getByContentId(toolContentId); if (dokumaran == null) { - DokumaranService.log - .warn("Did not find activity with toolContentId: " + toolContentId + " to remove learner content"); + DokumaranService.log.warn( + "Did not find activity with toolContentId: " + toolContentId + " to remove learner content"); return; } @@ -955,7 +943,8 @@ return new ToolCompletionStatus(ToolCompletionStatus.ACTIVITY_NOT_ATTEMPTED, null, null); } - return new ToolCompletionStatus(learner.isSessionFinished() ? ToolCompletionStatus.ACTIVITY_COMPLETED + return new ToolCompletionStatus(learner.isSessionFinished() + ? ToolCompletionStatus.ACTIVITY_COMPLETED : ToolCompletionStatus.ACTIVITY_ATTEMPTED, null, null); } @@ -1037,10 +1026,12 @@ session.setStatus(DokumaranConstants.COMPLETED); dokumaranSessionDao.saveObject(session); } else { - DokumaranService.log.error("Fail to leave tool Session.Could not find shared dokumaran " - + "session by given session id: " + toolSessionId); - throw new DataMissingException("Fail to leave tool Session." - + "Could not find shared dokumaran session by given session id: " + toolSessionId); + DokumaranService.log.error( + "Fail to leave tool Session.Could not find shared dokumaran " + "session by given session id: " + + toolSessionId); + throw new DataMissingException( + "Fail to leave tool Session." + "Could not find shared dokumaran session by given session id: " + + toolSessionId); } return toolService.completeToolSession(toolSessionId, learnerId); } @@ -1218,4 +1209,4 @@ saveOrUpdate(dokumaran); } -} +} \ No newline at end of file Index: lams_tool_doku/web/WEB-INF/tags/Rating.tag =================================================================== diff -u -r26dd5894db796186d42b4bdfb259218eefea68d6 -r959f663f5d378d09ce193c52e9900ea865956f79 --- lams_tool_doku/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 26dd5894db796186d42b4bdfb259218eefea68d6) +++ lams_tool_doku/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 959f663f5d378d09ce193c52e9900ea865956f79) @@ -1,14 +1,14 @@ -<% - /** - * Rating.tag - * Author: Andrey Balan - * Description: Shows rating stars widget - */ - %> +<% + /** + * Rating.tag + * Author: Andrey Balan + * Description: Shows rating stars widget + */ +%> <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-function" prefix="fn" %> @@ -82,92 +82,92 @@ <%--Rating stars area---------------------------------------%>
-
+
- - - - - - - - - - - - - - - - - - - - - - ${criteriaDto.ratingCriteria.title} - - - - - - - - - - - - -
-
- - - -
- - - - - - ${criteriaDto.numberOfVotes} - - -
- - - -
style="visibility: hidden;" - > - - + + + + + + + + + + + + + + + + + + + + + + ${criteriaDto.ratingCriteria.title} + + + + + + + + + + + + +
+
+ + + +
+ + + + + + ${criteriaDto.numberOfVotes} + + +
+ + + +
style="visibility: hidden;" + > + + - - + + - - - ${criteriaDto.numberOfVotes} - - -
- - - - - + + + ${criteriaDto.numberOfVotes} + + +
-
+ + + + +
+
<%--Comments area---------------------------------------%> -
+
@@ -176,41 +176,42 @@
- +
- + -
- +
+ - + : - +
- +
-
+
- -
+ +
- -
+ +
\ No newline at end of file Index: lams_tool_doku/web/pages/learning/galleryWalk.jsp =================================================================== diff -u -rb6a6c5a9da3698a073a0e48c1f00a267edddcc6c -r959f663f5d378d09ce193c52e9900ea865956f79 --- lams_tool_doku/web/pages/learning/galleryWalk.jsp (.../galleryWalk.jsp) (revision b6a6c5a9da3698a073a0e48c1f00a267edddcc6c) +++ lams_tool_doku/web/pages/learning/galleryWalk.jsp (.../galleryWalk.jsp) (revision 959f663f5d378d09ce193c52e9900ea865956f79) @@ -39,18 +39,26 @@ #gallery-walk-preview-info { margin-bottom: 20px; } + + .comment-textarea { + margin-bottom: 15px; + }