Index: lams_admin/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_admin/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_admin/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_central/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_central/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_central/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_gradebook/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_gradebook/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_gradebook/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_learning/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_learning/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_learning/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_monitoring/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_monitoring/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_monitoring/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_assessment/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_chat/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_chat/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_chat/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_daco/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_daco/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_daco/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_doku/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_doku/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_doku/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_forum/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_forum/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_forum/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_gmap/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_images/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_images/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_images/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_imscc/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_laqa/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_larsrc/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_leader/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_leader/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_leader/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_mindmap/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_nb/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_nb/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_nb/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_notebook/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_pixlr/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_preview/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_preview/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -216,4 +216,5 @@ label.rating.rubrics.view.learner = by learner label.rating.rubrics.view.row = by rubrics row label.rating.rubrics.in.between = in-between +label.rating.rubrics.in.between.enable = Add in-between columns in rubrics Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20230306.sql =================================================================== diff -u --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20230306.sql (revision 0) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20230306.sql (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -0,0 +1,14 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +-- Put all sql statements below here + +-- LDEV-5370 Add half point rubrics columns +ALTER TABLE tl_laprev11_peerreview ADD COLUMN rubrics_in_between_columns TINYINT UNSIGNED NOT NULL DEFAULT 0; + +-- Put all sql statements above here + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java =================================================================== diff -u -rd63145eef59bf85fed93f8aa94940cc5318fe44a -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java (.../Peerreview.java) (revision d63145eef59bf85fed93f8aa94940cc5318fe44a) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java (.../Peerreview.java) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -134,6 +134,9 @@ @Column(name = "rubrics_view") private int rubricsView; + @Column(name = "rubrics_in_between_columns") + private boolean rubricsInBetweenColumns; + // ********************************************************** // Function method for Peerreview // ********************************************************** @@ -468,4 +471,12 @@ public void setRubricsView(int rubricsView) { this.rubricsView = rubricsView; } + + public boolean isRubricsInBetweenColumns() { + return rubricsInBetweenColumns; + } + + public void setRubricsInBetweenColumns(boolean rubricsInBetweenColumns) { + this.rubricsInBetweenColumns = rubricsInBetweenColumns; + } } \ No newline at end of file Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -663,7 +663,14 @@ .collect(Collectors.mapping(rating -> { StyledRatingDTO ratingDto = new StyledRatingDTO(currentUserId.longValue()); if (rating.getRating() != null) { - ratingDto.setUserRating(rating.getRating().toString()); + if (rating.getRating() % 1 > 0) { + // for 0.5 rating columns get exact value + ratingDto.setUserRating(rating.getRating().toString()); + } else { + // for whole points round them up so we get "1" instead of "1.0" + ratingDto.setUserRating(String.valueOf(rating.getRating().intValue())); + } + } ratingDto.setItemDescription(rating.getLearner().getFullName()); ratingDto.setItemDescription2(rating.getLearner().getUserId().toString()); Index: lams_tool_preview/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_preview/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_preview/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_preview/web/pages/authoring/advance.jsp =================================================================== diff -u -rd63145eef59bf85fed93f8aa94940cc5318fe44a -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_preview/web/pages/authoring/advance.jsp (.../advance.jsp) (revision d63145eef59bf85fed93f8aa94940cc5318fe44a) +++ lams_tool_preview/web/pages/authoring/advance.jsp (.../advance.jsp) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -58,6 +58,12 @@ + +
+ +
Index: lams_tool_preview/web/pages/learning/results.jsp =================================================================== diff -u -rae5273508e98e92fc4652bd46f1595dfb099b16e -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_preview/web/pages/learning/results.jsp (.../results.jsp) (revision ae5273508e98e92fc4652bd46f1595dfb099b16e) +++ lams_tool_preview/web/pages/learning/results.jsp (.../results.jsp) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -116,7 +116,8 @@
- +
Index: lams_tool_preview/web/pages/learning/rubrics.jsp =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_preview/web/pages/learning/rubrics.jsp (.../rubrics.jsp) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_preview/web/pages/learning/rubrics.jsp (.../rubrics.jsp) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -93,7 +93,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -115,7 +115,7 @@ > - + class="bg-success" Index: lams_tool_preview/web/pages/learning/rubricsPivot.jsp =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_preview/web/pages/learning/rubricsPivot.jsp (.../rubricsPivot.jsp) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_preview/web/pages/learning/rubricsPivot.jsp (.../rubricsPivot.jsp) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -126,7 +126,7 @@
- + Index: lams_tool_preview/web/pages/monitoring/rubricspart.jsp =================================================================== diff -u -re84eb2c818ecb16060b0c08889d6ff675d344f40 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_preview/web/pages/monitoring/rubricspart.jsp (.../rubricspart.jsp) (revision e84eb2c818ecb16060b0c08889d6ff675d344f40) +++ lams_tool_preview/web/pages/monitoring/rubricspart.jsp (.../rubricspart.jsp) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -117,7 +117,8 @@
<%-- Display ratings given to this user --%> - +
Index: lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_sbmt/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_scratchie/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_scribe/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_spreadsheet/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_survey/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_survey/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_survey/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_task/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_task/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_task/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_vote/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_vote/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_vote/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_whiteboard/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_whiteboard/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_whiteboard/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_wiki/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_wiki/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_wiki/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_tool_zoom/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_tool_zoom/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_tool_zoom/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success" Index: lams_www/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -re1c0d485fc2954c260a7a70ebf35436e0e5ae637 -re8c858ae097ae8b7861ec6e70e490daec543e34e --- lams_www/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e1c0d485fc2954c260a7a70ebf35436e0e5ae637) +++ lams_www/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision e8c858ae097ae8b7861ec6e70e490daec543e34e) @@ -16,7 +16,12 @@ <%@ attribute name="criteriaRatings" required="true" rtexprvalue="true" type="org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO" %> <%@ attribute name="showJustification" required="true" %> <%@ attribute name="alwaysShowAverage" required="true" %> +<%@ attribute name="rubricsInBetweenColumns" required="false" %> + + + + <%@ attribute name="currentUserDisplay" required="true" %> @@ -258,7 +263,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -296,7 +301,7 @@ - + <%-- Check if any other learner rated this learner for this 0.5 column --%> @@ -364,7 +369,7 @@ - + <%-- Calculate again because we need the same cell background colour --%> @@ -437,7 +442,7 @@ (${columnStatus.count})  - + (${columnStatus.count + 0.5})  @@ -459,7 +464,7 @@ > - + class="bg-success"