Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rae5273508e98e92fc4652bd46f1595dfb099b16e -rd63145eef59bf85fed93f8aa94940cc5318fe44a
--- lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ae5273508e98e92fc4652bd46f1595dfb099b16e)
+++ lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d63145eef59bf85fed93f8aa94940cc5318fe44a)
@@ -212,3 +212,7 @@
 label.last.name = Last name
 label.all.learners = All
 label.group = Group
+label.rating.rubrics.view = Learner rubrics view
+label.rating.rubrics.view.learner = by learner
+label.rating.rubrics.view.row = by rubrics row
+
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20230303.sql
===================================================================
diff -u
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20230303.sql	(revision 0)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20230303.sql	(revision d63145eef59bf85fed93f8aa94940cc5318fe44a)
@@ -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-5369 Add alternative rubrics learner view
+ALTER TABLE tl_laprev11_peerreview ADD COLUMN rubrics_view TINYINT UNSIGNED NOT NULL DEFAULT 1;
+
+-- 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 -r66bda55b4291ff10c230b0ab5227dab5fa058a8a -rd63145eef59bf85fed93f8aa94940cc5318fe44a
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java	(.../Peerreview.java)	(revision 66bda55b4291ff10c230b0ab5227dab5fa058a8a)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java	(.../Peerreview.java)	(revision d63145eef59bf85fed93f8aa94940cc5318fe44a)
@@ -43,8 +43,6 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.log4j.Logger;
-import org.hibernate.annotations.Cache;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CascadeType;
 import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria;
@@ -62,6 +60,9 @@
 
     private static final Logger log = Logger.getLogger(Peerreview.class);
 
+    public static final int RUBRICS_VIEW_LEARNER = 1;
+    public static final int RUBRICS_VIEW_ROW = 2;
+
     @Id
     @Column
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -130,6 +131,9 @@
     @Column
     private int tolerance;
 
+    @Column(name = "rubrics_view")
+    private int rubricsView;
+
     // **********************************************************
     // Function method for Peerreview
     // **********************************************************
@@ -456,4 +460,12 @@
     public void setTolerance(int tolerance) {
 	this.tolerance = tolerance;
     }
+
+    public int getRubricsView() {
+	return rubricsView;
+    }
+
+    public void setRubricsView(int rubricsView) {
+	this.rubricsView = rubricsView;
+    }
 }
\ No newline at end of file
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/form/PeerreviewForm.java
===================================================================
diff -u -r4a6c446731f09a496394db2f52e60431d8160d53 -rd63145eef59bf85fed93f8aa94940cc5318fe44a
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/form/PeerreviewForm.java	(.../PeerreviewForm.java)	(revision 4a6c446731f09a496394db2f52e60431d8160d53)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/form/PeerreviewForm.java	(.../PeerreviewForm.java)	(revision d63145eef59bf85fed93f8aa94940cc5318fe44a)
@@ -34,9 +34,7 @@
  *
  * User: Andrey Balan
  */
-public class PeerreviewForm  {
-    private static final long serialVersionUID = 3599879328307492312L;
-
+public class PeerreviewForm {
     private static Logger logger = Logger.getLogger(PeerreviewForm.class.getName());
 
     // Forum fields
@@ -49,6 +47,7 @@
     public PeerreviewForm() {
 	peerreview = new Peerreview();
 	peerreview.setTitle("Peer Review");
+	peerreview.setRubricsView(Peerreview.RUBRICS_VIEW_LEARNER);
 	currentTab = 1;
     }
 
Index: lams_tool_preview/web/pages/authoring/advance.jsp
===================================================================
diff -u -rf1d0722ace2f721a8a423f094d2101c433c15a0a -rd63145eef59bf85fed93f8aa94940cc5318fe44a
--- lams_tool_preview/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision f1d0722ace2f721a8a423f094d2101c433c15a0a)
+++ lams_tool_preview/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision d63145eef59bf85fed93f8aa94940cc5318fe44a)
@@ -3,9 +3,8 @@
 <!-- Advance Tab Content -->
 
 <lams:SimplePanel titleKey="label.review.options">
-
 	<div class="form-group">
-	<label for="maximumRatesPerUser"><fmt:message key="label.max.number.marks.each.user" /></label>
+		<label for="maximumRatesPerUser"><fmt:message key="label.max.number.marks.each.user" /></label>
 		<form:select path="peerreview.maximumRatesPerUser" cssClass="form-control form-control-inline">
 			<form:option value="0">
 				<fmt:message key="label.no.maximum" />
@@ -47,6 +46,18 @@
 		<form:input type="number" min="0" max="50" path="peerreview.tolerance" id="tolerance" cssClass="form-control form-control-inline loffset5" />
 		</label>
 	</div>
+	
+	<div class="form-group">
+		<label for="rubricsView"><fmt:message key="label.rating.rubrics.view" /></label>
+		<form:select path="peerreview.rubricsView" cssClass="form-control form-control-inline">
+			<form:option value="1">
+				<fmt:message key="label.rating.rubrics.view.learner" />
+			</form:option>
+			<form:option value="2">
+				<fmt:message key="label.rating.rubrics.view.row" />
+			</form:option>
+		</form:select>
+	</div>
 </lams:SimplePanel>
 
 <lams:OutcomeAuthor toolContentId="${peerreviewForm.peerreview.contentId}" />
Index: lams_tool_preview/web/pages/learning/learning.jsp
===================================================================
diff -u -rae5273508e98e92fc4652bd46f1595dfb099b16e -rd63145eef59bf85fed93f8aa94940cc5318fe44a
--- lams_tool_preview/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision ae5273508e98e92fc4652bd46f1595dfb099b16e)
+++ lams_tool_preview/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision d63145eef59bf85fed93f8aa94940cc5318fe44a)
@@ -120,7 +120,14 @@
 			<%@ include file="hedging.jsp" %>
 		</c:when>
 		<c:when test="${criteriaRatings.ratingCriteria.ratingStyle == isRubrics}">
-			<%@ include file="rubrics.jsp" %>
+			<c:choose>
+				<c:when test="${peerreview.rubricsView eq 2}">
+					<%@ include file="rubricsPivot.jsp" %>
+				</c:when>
+				<c:otherwise>
+					<%@ include file="rubrics.jsp" %>
+				</c:otherwise>
+			</c:choose>
 		</c:when>
 		</c:choose>		
 		</div>