@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@
@@ -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 @@