Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r24478a39eada2311fce1b1f9dd86f4fe7150b4f6 -r4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a
--- lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 24478a39eada2311fce1b1f9dd86f4fe7150b4f6)
+++ lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a)
@@ -220,4 +220,6 @@
 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
+label.rating.rubrics.require.ratings = Students must assign evaluation to all rubrics and peers
+label.rating.rubrics.require.ratings.tooltip = If selected, the student is required to assign an evaluation to all peers. No blank evaluations allowed.
 message.rating.rubrics.selection.missing = You have not rated one or more peers. Are you sure you want to continue?
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20230412.sql
===================================================================
diff -u
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20230412.sql	(revision 0)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dbupdates/patch20230412.sql	(revision 4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a)
@@ -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 "students must rate all peers in rubrics" option
+ALTER TABLE tl_laprev11_peerreview ADD COLUMN rubrics_require_ratings 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 -re8c858ae097ae8b7861ec6e70e490daec543e34e -r4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java	(.../Peerreview.java)	(revision e8c858ae097ae8b7861ec6e70e490daec543e34e)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java	(.../Peerreview.java)	(revision 4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a)
@@ -137,6 +137,9 @@
     @Column(name = "rubrics_in_between_columns")
     private boolean rubricsInBetweenColumns;
 
+    @Column(name = "rubrics_require_ratings")
+    private boolean rubricsRequireRatings;
+
     // **********************************************************
     // Function method for Peerreview
     // **********************************************************
@@ -479,4 +482,12 @@
     public void setRubricsInBetweenColumns(boolean rubricsInBetweenColumns) {
 	this.rubricsInBetweenColumns = rubricsInBetweenColumns;
     }
+
+    public boolean isRubricsRequireRatings() {
+	return rubricsRequireRatings;
+    }
+
+    public void setRubricsRequireRatings(boolean rubricsRequireRatings) {
+	this.rubricsRequireRatings = rubricsRequireRatings;
+    }
 }
\ No newline at end of file
Index: lams_tool_preview/web/pages/authoring/advance.jsp
===================================================================
diff -u -re8c858ae097ae8b7861ec6e70e490daec543e34e -r4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a
--- lams_tool_preview/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision e8c858ae097ae8b7861ec6e70e490daec543e34e)
+++ lams_tool_preview/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a)
@@ -60,9 +60,19 @@
 	</div>
 	
 	<div class="checkbox">
-	<label for="rubrics-in-between-columns"><form:checkbox path="peerreview.rubricsInBetweenColumns" id="rubrics-in-between-columns"/>
-	<fmt:message key="label.rating.rubrics.in.between.enable" />
-	</label>
+		<label for="rubrics-in-between-columns">
+			<form:checkbox path="peerreview.rubricsInBetweenColumns" id="rubrics-in-between-columns"/>
+			<fmt:message key="label.rating.rubrics.in.between.enable" />
+		</label>
+	</div>	
+	
+	<div class="checkbox">
+		<label for="rubrics-require-ratings">
+			<form:checkbox path="peerreview.rubricsRequireRatings" id="rubrics-require-ratings"/>
+			<fmt:message key="label.rating.rubrics.require.ratings" />
+		</label>
+		<i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right"
+			title="<fmt:message key="label.rating.rubrics.require.ratings.tooltip" />"></i>
 	</div>
 </lams:SimplePanel>
 
Index: lams_tool_preview/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r1a6408137fed60838b5744155f0884381c37d2c0 -r4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a
--- lams_tool_preview/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 1a6408137fed60838b5744155f0884381c37d2c0)
+++ lams_tool_preview/web/pages/authoring/authoring.jsp	(.../authoring.jsp)	(revision 4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a)
@@ -8,8 +8,10 @@
 
 	<%@ include file="/common/tabbedheader.jsp"%>
 	<link href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" >
-	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 	<script>
+	    // avoid name clash between bootstrap and jQuery UI
+	    $.fn.bootstrapTooltip = $.fn.tooltip.noConflict();
+    
         function init(){
             var tag = document.getElementById("currentTab");
 	    	if(tag.value != "") {
@@ -26,7 +28,12 @@
 	    	// end optional tab controller stuff
 	    	selectTab(tabId);
         }
+
+        $(document).ready(function() {
+        	$('[data-toggle="tooltip"]').bootstrapTooltip();
+        });
     </script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 </lams:head>
 <body class="stripes" onLoad="init()">
 <form:form action="update.do" method="post" modelAttribute="peerreviewForm">
Index: lams_tool_preview/web/pages/learning/learning.jsp
===================================================================
diff -u -rd63145eef59bf85fed93f8aa94940cc5318fe44a -r4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a
--- lams_tool_preview/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision d63145eef59bf85fed93f8aa94940cc5318fe44a)
+++ lams_tool_preview/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a)
@@ -149,14 +149,14 @@
 		
 		<div class="pull-right" id="buttonNextPrevDiv">		
 		<c:if test="${stepNumber > 1}">
-			<span id="prevButton" class="btn btn-default" onclick="javascript:${method}(false);"><fmt:message key="label.previous"/></span>
+			<button type="button" id="prevButton" class="btn btn-default" onclick="javascript:${method}(false);"><fmt:message key="label.previous"/></button>
 		</c:if>
 		<c:choose>
 			<c:when test="${stepNumber == numCriteria}">
-				<span id="finishButton" class="btn btn-primary" onclick="javascript:${method}(true);">${finishButtonLabel}</span>
+				<button type="button" id="finishButton" class="btn btn-primary" onclick="javascript:${method}(true);">${finishButtonLabel}</button>
 			</c:when>
 			<c:otherwise>
-				<span id="finishButton" class="btn btn-default" onclick="javascript:${method}(true);"><fmt:message key="label.next"/></span>
+				<button type="button" id="finishButton" class="btn btn-default" onclick="javascript:${method}(true);"><fmt:message key="label.next"/></button>
 			</c:otherwise>
 		</c:choose>
 		</div>
Index: lams_tool_preview/web/pages/learning/rubrics.jsp
===================================================================
diff -u -re1230c06f7df6b1098900441ad8aa7ab7fa286f4 -r4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a
--- lams_tool_preview/web/pages/learning/rubrics.jsp	(.../rubrics.jsp)	(revision e1230c06f7df6b1098900441ad8aa7ab7fa286f4)
+++ lams_tool_preview/web/pages/learning/rubrics.jsp	(.../rubrics.jsp)	(revision 4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a)
@@ -36,14 +36,18 @@
 </style>
 
 <script>
-
+	var rubricsRequireRatings = ${peerreview.rubricsRequireRatings};
+	
+	$(document).ready(function(){
+		if (rubricsRequireRatings){
+			$('#finishButton').prop('disabled', isRatingMissing());
+		}
+	});
+	
 	function submitEntry(next) {
-		if (next) {
-			let criterionTables = $('.rubrics-table'),
-				ratingMissing = $('tbody td.bg-success', criterionTables).length !== $('tbody tr', criterionTables).length - criterionTables.length;
-			if (ratingMissing && !confirm('<fmt:message key="message.rating.rubrics.selection.missing" />')){
-				return;
-			}
+		if (next && !rubricsRequireRatings && isRatingMissing() 
+				&& !confirm('<fmt:message key="message.rating.rubrics.selection.missing" />')){
+			return;
 		}
 		// answer saved when clicked so don't use next button to submit
 		nextprev(next);
@@ -65,7 +69,10 @@
     				return;
     			}
     			$(cell).addClass('bg-success').siblings('td').removeClass('bg-success');
-	  			
+    			
+        		if (rubricsRequireRatings) {
+					$('#finishButton').prop('disabled', isRatingMissing());
+            	}
     		},
 			onError : function(){
     			alert('<fmt:message key="label.rating.rubrics.error.rate" />');
@@ -76,6 +83,12 @@
 	function expandAllRubricsUserPanels(){
 		$('.collapse').collapse('show');
 	}
+
+	function isRatingMissing() {
+		let criterionTables = $('.rubrics-table');
+		return $('tbody td.bg-success', criterionTables).length !== $('tbody tr', criterionTables).length
+			- criterionTables.length;
+	}
 </script>
 <button class="btn btn-default expand-all-button" onClick="javascript:expandAllRubricsUserPanels()">
 	<fmt:message key="label.rating.rubrics.expand.all" />
Index: lams_tool_preview/web/pages/learning/rubricsPivot.jsp
===================================================================
diff -u -re1230c06f7df6b1098900441ad8aa7ab7fa286f4 -r4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a
--- lams_tool_preview/web/pages/learning/rubricsPivot.jsp	(.../rubricsPivot.jsp)	(revision e1230c06f7df6b1098900441ad8aa7ab7fa286f4)
+++ lams_tool_preview/web/pages/learning/rubricsPivot.jsp	(.../rubricsPivot.jsp)	(revision 4a6c8a497b55005dcd5b6158ebc2051fc5e3b40a)
@@ -29,18 +29,19 @@
 </style>
 
 <script>
-
+	var rubricsRequireRatings = ${peerreview.rubricsRequireRatings};
+	
 	$(document).ready(function(){
 		$('#rubrics-row-panels').closest('.container').addClass('container-fluid').removeClass('container');
+		if (rubricsRequireRatings){
+			$('#finishButton').prop('disabled', isRatingMissing());
+		}
 	});
 
 	function submitEntry(next) {
-		if (next) {
-			let criterionTables = $('.rubrics-table'),
-				ratingMissing = $('tbody td.bg-success', criterionTables).length !== $('thead th', criterionTables).length - criterionTables.length;
-			if (ratingMissing && !confirm('<fmt:message key="message.rating.rubrics.selection.missing" />')){
-				return;
-			}
+		if (next && !rubricsRequireRatings && isRatingMissing() 
+				&& !confirm('<fmt:message key="message.rating.rubrics.selection.missing" />')){
+			return;
 		}
 		// answer saved when clicked so don't use next button to submit
 		nextprev(next);
@@ -67,6 +68,10 @@
         			$(this).children('td').eq(columnIndex).removeClass('bg-success');
         		});
         		$(cell).addClass('bg-success');
+
+        		if (rubricsRequireRatings) {
+					$('#finishButton').prop('disabled', isRatingMissing());
+            	}
     		},
 			onError : function(){
     			alert('<fmt:message key="label.rating.rubrics.error.rate" />');
@@ -77,6 +82,12 @@
 	function expandAllRubricsPanels(){
 		$('.collapse').collapse('show');
 	}
+
+	function isRatingMissing() {
+		let criterionTables = $('.rubrics-table');
+		return $('tbody td.bg-success', criterionTables).length !== $('thead th', criterionTables).length 
+			- criterionTables.length;
+	}
 </script>
 <button class="btn btn-default expand-all-button" onClick="javascript:expandAllRubricsPanels()">
 	<fmt:message key="label.rating.rubrics.expand.all" />