Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rf54c292e64bc98100d0bdaf34f361bb5e786bde4 -r2265c2e9ad0c8a27f390fcfc67769877b8c651d9
--- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f54c292e64bc98100d0bdaf34f361bb5e786bde4)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2265c2e9ad0c8a27f390fcfc67769877b8c651d9)
@@ -275,6 +275,9 @@
 label.authoring.advanced.reveal.double.click = Require double click to reveal an answer
 label.learning.reveal.double.click = Note: you need to double click on an answer to reveal its result.
 label.authoring.advanced.reveal.double.click.tooltip = When this option is enabled, leaders will require to double click on an answer in order to reveal the result. This option might be useful for summative assessments.
+label.authoring.advanced.require.all.answers = Require to reveal all correct answers before proceeding
+label.authoring.advanced.require.all.answers.tooltip = When this option is enabled, leaders will require to find all the correct answers in multiple choice questions before they can complete the activity. Otherwise they will be only presented with a warning if no all correct answers are found.
+label.learning.require.all.answers = Make sure you find all the correct answers for multiple choice questions before finishing.
 label.monitoring.change.leader = Change leader
 label.monitoring.leader.successfully.changed = Leader changed
 label.monitoring.leader.not.changed = Leader was not changed
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20230220.sql
===================================================================
diff -u
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20230220.sql	(revision 0)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20230220.sql	(revision 2265c2e9ad0c8a27f390fcfc67769877b8c651d9)
@@ -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-5361 Add option to prevent learners from advancing if they have not found all answers
+ALTER TABLE tl_lascrt11_scratchie ADD COLUMN require_all_answers TINYINT DEFAULT '1' AFTER double_click;
+
+-- 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_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
===================================================================
diff -u -r6fc452ae5cdbca9476f14a97ddc933a23fd8776a -r2265c2e9ad0c8a27f390fcfc67769877b8c651d9
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	(.../Scratchie.java)	(revision 6fc452ae5cdbca9476f14a97ddc933a23fd8776a)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	(.../Scratchie.java)	(revision 2265c2e9ad0c8a27f390fcfc67769877b8c651d9)
@@ -112,6 +112,9 @@
     @Column(name = "double_click")
     private boolean revealOnDoubleClick;
 
+    @Column(name = "require_all_answers")
+    private boolean requireAllAnswers;
+
     @Column(name = "confidence_levels_activity_uiid")
     private Integer confidenceLevelsActivityUiid;
 
@@ -212,17 +215,13 @@
     /**
      * Returns the object's creation date
      *
-     * @return date
-     *
      */
     public Date getCreated() {
 	return created;
     }
 
     /**
      * Sets the object's creation date
-     *
-     * @param created
      */
     public void setCreated(Date created) {
 	this.created = created;
@@ -409,6 +408,14 @@
 	this.revealOnDoubleClick = revealOnDoubleClick;
     }
 
+    public boolean isRequireAllAnswers() {
+	return requireAllAnswers;
+    }
+
+    public void setRequireAllAnswers(boolean requireAllAnswers) {
+	this.requireAllAnswers = requireAllAnswers;
+    }
+
     /**
      * @return which preceding activity should be queried for confidence levels
      */
Index: lams_tool_scratchie/web/pages/authoring/advance.jsp
===================================================================
diff -u -r7276ea4054a0e0a542c4845123b24ec0b5a1e195 -r2265c2e9ad0c8a27f390fcfc67769877b8c651d9
--- lams_tool_scratchie/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 7276ea4054a0e0a542c4845123b24ec0b5a1e195)
+++ lams_tool_scratchie/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 2265c2e9ad0c8a27f390fcfc67769877b8c651d9)
@@ -105,8 +105,18 @@
                     <form:checkbox path="scratchie.revealOnDoubleClick" id="reveal-on-double-click"/>
                     <fmt:message key="label.authoring.advanced.reveal.double.click" />
                 </label>
-                <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" title="" data-original-title="<fmt:message key="label.authoring.advanced.reveal.double.click.tooltip" />"></i>
+                <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" title=""
+                   data-original-title="<fmt:message key="label.authoring.advanced.reveal.double.click.tooltip" />"></i>
             </div>
+            
+            <div class="checkbox">
+                <label for="require-all-answers">
+                    <form:checkbox path="scratchie.requireAllAnswers" id="require-all-answers"/>
+                    <fmt:message key="label.authoring.advanced.require.all.answers" />
+                </label>
+                <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="bottom" title=""
+                   data-original-title="<fmt:message key="label.authoring.advanced.require.all.answers.tooltip" />"></i>
+            </div>
 
             <div class="checkbox">
                 <label for="show-scratchies-in-results">
Index: lams_tool_scratchie/web/pages/learning/learning.jsp
===================================================================
diff -u -r39898a6bc099395132ff585dae1a8848058b86bb -r2265c2e9ad0c8a27f390fcfc67769877b8c651d9
--- lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 39898a6bc099395132ff585dae1a8848058b86bb)
+++ lams_tool_scratchie/web/pages/learning/learning.jsp	(.../learning.jsp)	(revision 2265c2e9ad0c8a27f390fcfc67769877b8c651d9)
@@ -45,12 +45,10 @@
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jgrowl.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.form.js"></script>
 	<script type="text/javascript">
-		var isScratching = false;
+		var isScratching = false,
+			requireAllAnswers = <c:out value="${scratchie.requireAllAnswers}" />;
 		
 		$(document).ready(function(){
-			//initialize tooltips showing user names next to confidence levels
-			$('[data-toggle="tooltip"]').tooltip();
-
 			//handler for VSA input fields
 			$('.submit-user-answer-input').keypress(function(event){
 				var keycode = (event.keyCode ? event.keyCode : event.which);
@@ -99,10 +97,14 @@
 					scratchMcq(itemUid, optionUid);
 				});
 			</c:if>
+
+
 			
 			// hide Finish button for non-leaders until leader finishes
 			if (${hideFinishButton}) {
 				$("#finishButton").hide();
+			} else if (requireAllAnswers) {
+				checkAllCorrectMcqAnswersFound();
 			}
 
 			<%-- Connect to command websocket only if it is learner UI --%>
@@ -115,6 +117,9 @@
 					location.reload();
 				};
 			</c:if>
+
+			//initialize tooltips showing user names next to confidence levels
+			$('[data-toggle="tooltip"]').tooltip();
 		});
 
 		//scratch image (used by both scratchMcq() and scratchVsa())
@@ -166,11 +171,13 @@
 		            	$("[id^=imageLink-" + itemUid + "]").css('cursor','default');
 		            	$("[id^=image-" + itemUid + "]").not("img[src*='scratchie-correct-animation.gif']").not("img[src*='scratchie-correct.gif']").fadeTo(1300, 0.3);
 
+		            	checkAllCorrectMcqAnswersFound();
 		            } else {
 		            	var id = '-' + itemUid + '-' + optionUid;
 		            	$('#imageLink' + id).removeAttr('onclick');
 		            	$('#imageLink' + id).css('cursor','default');
 		            }
+
 	            },
 	            complete : function(){
     				// enable scratching again
@@ -280,6 +287,19 @@
 			$("table#scratches-" + itemUid).append(trElem);
 		}
 
+		function checkAllCorrectMcqAnswersFound() {
+            var numberOfAvailableScratches = $("[id^=imageLink-][onclick]").length;
+			if (numberOfAvailableScratches > 0) {
+	            $('#finishButton').prop('disabled', true).css('pointer-events', 'none')
+	            				  .parent().attr('data-title', '<fmt:message key="label.learning.require.all.answers" />')
+				  				  		   .tooltip();
+			} else {
+				$('#finishButton').prop('disabled', false)
+								  .css('pointer-events', 'auto')
+								  .parent().tooltip('destroy');
+			}
+		}
+
 		function xmlEscape(value) {
 			return value.replace(/&/g, '&amp;')
             	.replace(/</g, '&lt;')
@@ -467,10 +487,11 @@
 			var method = $("#method").val();
 			
 			var proceed = true;
-			//ask for leave confirmation only if time limit is not expired
+			// ask for leave confirmation only if time limit is not expired
 			if (!isTimelimitExpired) {
 				var numberOfAvailableScratches = $("[id^=imageLink-][onclick], [id^=type-your-answer-]:visible").length;
-				proceed = (numberOfAvailableScratches > 0) ? confirm("<fmt:message key="label.one.or.more.questions.not.completed"></fmt:message>") : true;	
+				proceed = numberOfAvailableScratches == 0 || 
+						  confirm("<fmt:message key="label.one.or.more.questions.not.completed"></fmt:message>");	
 			}
 			
 			if (proceed) {