@pie-element/multiple-choice 13.4.0 → 13.4.2-beta.2

package/module/controller.js

@@ -2722,10 +2722,6 @@ const getShuffledChoices = (choices, session, updateSession, choiceKey) =>
  * - true - that means that the order of the choices will be ordinal (as is created in the configure item)
  * - false - that means the getShuffledChoices above will be called and that in turn means that we either
  * return the shuffled values on the session (if any exists) or we shuffle the choices
- *
- * Note: the role (student/instructor) is intentionally not considered here — instructor mode
- * will respect the same `lockChoiceOrder` value as students, instead of forcing the order to be locked.
- *
  * @param model - model to check if we should lock order
  * @param session - session to check if we should lock order
  * @param env - env to check if we should lock order
@@ -2742,6 +2738,21 @@ const lockChoices = (model, session, env) => {
     return true;
   }
 
+  const role = get(env, 'role', 'student');
+
+  if (role === 'instructor') {
+    // TODO: .. in the future the instructor can toggle between ordinal and shuffled here, so keeping this code until then
+    /*const alreadyShuffled = hasShuffledValues(session);
+
+    if (alreadyShuffled) {
+      return false;
+    }
+
+    return true;*/
+    return true;
+  }
+
+  // here it's a student, so don't lock and it will shuffle if needs be
   return false;
 };
 
@@ -2985,14 +2996,12 @@ const validate = (model = {}, config = {}) => {
   });
 
   let hasCorrectResponse = false;
-  let correctCount = 0;
 
   reversedChoices.forEach((choice, index) => {
     const { correct, value, label, rationale } = choice;
 
     if (correct) {
       hasCorrectResponse = true;
-      correctCount++;
     }
 
     if (!getContent(label)) {
@@ -3020,12 +3029,6 @@ const validate = (model = {}, config = {}) => {
 
   if (!hasCorrectResponse) {
     errors.correctResponse = 'No correct response defined.';
-  } else {
-    const { maxSelections, choiceMode } = model;
-
-    if (choiceMode !== 'radio' && maxSelections != null && correctCount > maxSelections) {
-      errors.correctResponse = `The number of correct answers (${correctCount}) exceeds max selections (${maxSelections}). Students won't be able to select all correct answers.`;
-    }
   }
 
   if (!isEmpty(choicesErrors)) {