@doenet/v06-to-v07 0.7.0-beta6 → 0.7.0-beta7

package/index.js

@@ -67460,10 +67460,467 @@ class MathList extends CompositeComponent {
     return { replacementChanges, nComponents };
   }
 }
+function returnScoredSectionAttributes() {
+  return {
+    aggregateScores: {
+      createComponentOfType: "boolean",
+      createStateVariable: "aggregateScoresPreliminary",
+      defaultValue: false
+    },
+    weight: {
+      createComponentOfType: "number",
+      createStateVariable: "weight",
+      defaultValue: 1,
+      public: true
+    },
+    sectionWideCheckWork: {
+      createComponentOfType: "boolean",
+      createStateVariable: "sectionWideCheckWork",
+      defaultValue: false,
+      public: true
+    },
+    showCorrectness: {
+      createComponentOfType: "boolean",
+      createStateVariable: "showCorrectnessPreliminary",
+      defaultValue: null
+    },
+    submitLabel: {
+      createComponentOfType: "text",
+      createStateVariable: "submitLabel",
+      defaultValue: "Check Work",
+      public: true,
+      forRenderer: true
+    },
+    submitLabelNoCorrectness: {
+      createComponentOfType: "text",
+      createStateVariable: "submitLabelNoCorrectness",
+      defaultValue: "Submit Response",
+      public: true,
+      forRenderer: true
+    },
+    displayDigitsForCreditAchieved: {
+      createComponentOfType: "integer",
+      createStateVariable: "displayDigitsForCreditAchieved",
+      defaultValue: 3,
+      public: true
+    }
+  };
+}
+function returnScoredSectionStateVariableDefinition() {
+  const stateVariableDefinitions = {};
+  stateVariableDefinitions.scoredDescendants = {
+    returnDependencies: () => ({
+      scoredDescendants: {
+        dependencyType: "descendant",
+        componentTypes: [
+          "_sectioningComponent",
+          "answer",
+          "setup",
+          "_blockScoredComponent",
+          "p",
+          "li",
+          "div",
+          "span"
+        ],
+        variableNames: [
+          "scoredDescendants",
+          "aggregateScores",
+          "weight"
+        ],
+        recurseToMatchedChildren: false,
+        variablesOptional: true
+      }
+    }),
+    definition({ dependencyValues }) {
+      let scoredDescendants = [];
+      for (let descendant of dependencyValues.scoredDescendants) {
+        if (descendant.componentType === "setup") {
+          continue;
+        }
+        if (descendant.stateValues.aggregateScores || descendant.stateValues.scoredDescendants === void 0) {
+          scoredDescendants.push(descendant);
+        } else {
+          scoredDescendants.push(
+            ...descendant.stateValues.scoredDescendants
+          );
+        }
+      }
+      return { setValue: { scoredDescendants } };
+    }
+  };
+  stateVariableDefinitions.answerDescendants = {
+    returnDependencies: () => ({
+      answerDescendants: {
+        dependencyType: "descendant",
+        componentTypes: ["answer", "_blockScoredComponent"],
+        variableNames: ["justSubmitted"],
+        recurseToMatchedChildren: false
+      }
+    }),
+    definition({ dependencyValues }) {
+      return {
+        setValue: {
+          answerDescendants: dependencyValues.answerDescendants
+        }
+      };
+    }
+  };
+  stateVariableDefinitions.justSubmitted = {
+    forRenderer: true,
+    returnDependencies: () => ({
+      answerDescendants: {
+        dependencyType: "stateVariable",
+        variableName: "answerDescendants"
+      }
+    }),
+    definition({ dependencyValues }) {
+      return {
+        setValue: {
+          justSubmitted: dependencyValues.answerDescendants.every(
+            (x2) => x2.stateValues.justSubmitted
+          )
+        }
+      };
+    }
+  };
+  stateVariableDefinitions.showCorrectness = {
+    forRenderer: true,
+    returnDependencies: () => ({
+      showCorrectnessPreliminary: {
+        dependencyType: "stateVariable",
+        variableName: "showCorrectnessPreliminary"
+      },
+      showCorrectnessFlag: {
+        dependencyType: "flag",
+        flagName: "showCorrectness"
+      }
+    }),
+    definition({ dependencyValues, usedDefault }) {
+      let showCorrectness;
+      if (!usedDefault.showCorrectnessPreliminary) {
+        showCorrectness = dependencyValues.showCorrectnessPreliminary;
+      } else {
+        showCorrectness = dependencyValues.showCorrectnessFlag !== false;
+      }
+      return { setValue: { showCorrectness } };
+    }
+  };
+  stateVariableDefinitions.displayDecimalsForCreditAchieved = {
+    returnDependencies: () => ({}),
+    definition: () => ({
+      setValue: { displayDecimalsForCreditAchieved: -Infinity }
+    })
+  };
+  stateVariableDefinitions.aggregateScores = {
+    public: true,
+    shadowingInstructions: {
+      createComponentOfType: "boolean"
+    },
+    returnDependencies: () => ({
+      aggregateScoresPreliminary: {
+        dependencyType: "stateVariable",
+        variableName: "aggregateScoresPreliminary"
+      },
+      sectionWideCheckWork: {
+        dependencyType: "stateVariable",
+        variableName: "sectionWideCheckWork"
+      }
+    }),
+    definition({ dependencyValues }) {
+      return {
+        setValue: {
+          aggregateScores: dependencyValues.aggregateScoresPreliminary || dependencyValues.sectionWideCheckWork
+        }
+      };
+    }
+  };
+  stateVariableDefinitions.creditAchieved = {
+    public: true,
+    shadowingInstructions: {
+      createComponentOfType: "number",
+      addAttributeComponentsShadowingStateVariables: {
+        displayDigits: {
+          stateVariableToShadow: "displayDigitsForCreditAchieved"
+        },
+        displayDecimals: {
+          stateVariableToShadow: "displayDecimalsForCreditAchieved"
+        }
+      }
+    },
+    forRenderer: true,
+    defaultValue: 0,
+    hasEssential: true,
+    additionalStateVariablesDefined: [
+      {
+        variableName: "percentCreditAchieved",
+        public: true,
+        shadowingInstructions: {
+          createComponentOfType: "number",
+          addAttributeComponentsShadowingStateVariables: {
+            displayDigits: {
+              stateVariableToShadow: "displayDigitsForCreditAchieved"
+            },
+            displayDecimals: {
+              stateVariableToShadow: "displayDecimalsForCreditAchieved"
+            }
+          }
+        },
+        defaultValue: 0,
+        hasEssential: true
+      }
+    ],
+    stateVariablesDeterminingDependencies: [
+      "aggregateScores",
+      "scoredDescendants"
+    ],
+    returnDependencies({ stateValues }) {
+      let dependencies2 = {
+        aggregateScores: {
+          dependencyType: "stateVariable",
+          variableName: "aggregateScores"
+        }
+      };
+      if (stateValues.aggregateScores) {
+        dependencies2.scoredDescendants = {
+          dependencyType: "stateVariable",
+          variableName: "scoredDescendants"
+        };
+        for (let [
+          ind,
+          descendant
+        ] of stateValues.scoredDescendants.entries()) {
+          dependencies2["creditAchieved" + ind] = {
+            dependencyType: "stateVariable",
+            componentIdx: descendant.componentIdx,
+            variableName: "creditAchieved"
+          };
+        }
+      }
+      return dependencies2;
+    },
+    definition({ dependencyValues }) {
+      if (!dependencyValues.aggregateScores) {
+        return {
+          setValue: {
+            creditAchieved: 0,
+            percentCreditAchieved: 0
+          }
+        };
+      }
+      let creditSum = 0;
+      let totalWeight = 0;
+      for (let [
+        ind,
+        component
+      ] of dependencyValues.scoredDescendants.entries()) {
+        let weight = component.stateValues.weight;
+        creditSum += dependencyValues["creditAchieved" + ind] * weight;
+        totalWeight += weight;
+      }
+      let creditAchieved;
+      if (totalWeight > 0) {
+        creditAchieved = creditSum / totalWeight;
+      } else {
+        creditAchieved = 1;
+      }
+      let percentCreditAchieved = creditAchieved * 100;
+      return { setValue: { creditAchieved, percentCreditAchieved } };
+    }
+  };
+  stateVariableDefinitions.creditAchievedIfSubmit = {
+    defaultValue: 0,
+    stateVariablesDeterminingDependencies: [
+      "aggregateScores",
+      "scoredDescendants"
+    ],
+    returnDependencies({ stateValues }) {
+      let dependencies2 = {
+        aggregateScores: {
+          dependencyType: "stateVariable",
+          variableName: "aggregateScores"
+        }
+      };
+      if (stateValues.aggregateScores) {
+        dependencies2.scoredDescendants = {
+          dependencyType: "stateVariable",
+          variableName: "scoredDescendants"
+        };
+        for (let [
+          ind,
+          descendant
+        ] of stateValues.scoredDescendants.entries()) {
+          dependencies2["creditAchievedIfSubmit" + ind] = {
+            dependencyType: "stateVariable",
+            componentIdx: descendant.componentIdx,
+            variableName: "creditAchievedIfSubmit"
+          };
+        }
+      }
+      return dependencies2;
+    },
+    definition({ dependencyValues }) {
+      if (!dependencyValues.aggregateScores) {
+        return {
+          setValue: {
+            creditAchievedIfSubmit: 0
+          }
+        };
+      }
+      let creditSum = 0;
+      let totalWeight = 0;
+      for (let [
+        ind,
+        component
+      ] of dependencyValues.scoredDescendants.entries()) {
+        let weight = component.stateValues.weight;
+        creditSum += dependencyValues["creditAchievedIfSubmit" + ind] * weight;
+        totalWeight += weight;
+      }
+      let creditAchievedIfSubmit = creditSum / totalWeight;
+      return { setValue: { creditAchievedIfSubmit } };
+    }
+  };
+  stateVariableDefinitions.createSubmitAllButton = {
+    forRenderer: true,
+    additionalStateVariablesDefined: [
+      {
+        variableName: "suppressAnswerSubmitButtons",
+        forRenderer: true
+      }
+    ],
+    returnDependencies: () => ({
+      sectionWideCheckWork: {
+        dependencyType: "stateVariable",
+        variableName: "sectionWideCheckWork"
+      },
+      sectionAncestor: {
+        dependencyType: "ancestor",
+        componentType: "_sectioningComponent",
+        variableNames: ["suppressAnswerSubmitButtons"]
+      },
+      documentAncestor: {
+        dependencyType: "ancestor",
+        componentType: "document",
+        variableNames: ["suppressAnswerSubmitButtons"]
+      },
+      pAncestor: {
+        dependencyType: "ancestor",
+        componentType: "p",
+        variableNames: ["suppressAnswerSubmitButtons"]
+      },
+      liAncestor: {
+        dependencyType: "ancestor",
+        componentType: "li",
+        variableNames: ["suppressAnswerSubmitButtons"]
+      },
+      divAncestor: {
+        dependencyType: "ancestor",
+        componentType: "div",
+        variableNames: ["suppressAnswerSubmitButtons"]
+      },
+      spanAncestor: {
+        dependencyType: "ancestor",
+        componentType: "span",
+        variableNames: ["suppressAnswerSubmitButtons"]
+      }
+    }),
+    definition({ dependencyValues }) {
+      let warnings = [];
+      let createSubmitAllButton = false;
+      let suppressAnswerSubmitButtons = false;
+      if (dependencyValues.documentAncestor.stateValues.suppressAnswerSubmitButtons || dependencyValues.sectionAncestor?.stateValues.suppressAnswerSubmitButtons || dependencyValues.pAncestor?.stateValues.suppressAnswerSubmitButtons || dependencyValues.liAncestor?.stateValues.suppressAnswerSubmitButtons || dependencyValues.divAncestor?.stateValues.suppressAnswerSubmitButtons || dependencyValues.spanAncestor?.stateValues.suppressAnswerSubmitButtons) {
+        suppressAnswerSubmitButtons = true;
+      } else if (dependencyValues.sectionWideCheckWork) {
+        createSubmitAllButton = true;
+        suppressAnswerSubmitButtons = true;
+      }
+      return {
+        setValue: {
+          createSubmitAllButton,
+          suppressAnswerSubmitButtons
+        },
+        sendWarnings: warnings
+      };
+    }
+  };
+  stateVariableDefinitions.suppressCheckWork = {
+    forRenderer: true,
+    returnDependencies: () => ({
+      autoSubmit: {
+        dependencyType: "flag",
+        flagName: "autoSubmit"
+      }
+    }),
+    definition({ dependencyValues }) {
+      return {
+        setValue: {
+          suppressCheckWork: dependencyValues.autoSubmit
+        }
+      };
+    }
+  };
+  stateVariableDefinitions.showCheckWork = {
+    forRenderer: true,
+    returnDependencies: () => ({
+      createSubmitAllButton: {
+        dependencyType: "stateVariable",
+        variableName: "createSubmitAllButton"
+      },
+      suppressCheckWork: {
+        dependencyType: "stateVariable",
+        variableName: "suppressCheckWork"
+      }
+    }),
+    definition({ dependencyValues }) {
+      return {
+        setValue: {
+          showCheckWork: dependencyValues.createSubmitAllButton && !dependencyValues.suppressCheckWork
+        }
+      };
+    }
+  };
+  return stateVariableDefinitions;
+}
+async function submitAllAnswers({
+  component,
+  actionId,
+  sourceInformation = {},
+  skipRendererUpdate = false
+}) {
+  component.coreFunctions.requestRecordEvent({
+    verb: "submitted",
+    object: {
+      componentIdx: component.componentIdx,
+      componentType: component.componentType
+    },
+    result: {
+      creditAchieved: await component.stateValues.creditAchievedIfSubmit
+    }
+  });
+  let answersToSubmit = [];
+  for (let answer of await component.stateValues.answerDescendants) {
+    if (!await answer.stateValues.justSubmitted) {
+      answersToSubmit.push(answer);
+    }
+  }
+  let numAnswers = answersToSubmit.length;
+  for (let [ind, answer] of answersToSubmit.entries()) {
+    await component.coreFunctions.performAction({
+      componentIdx: answer.componentIdx,
+      actionName: "submitAnswer",
+      args: {
+        actionId,
+        sourceInformation,
+        skipRendererUpdate: skipRendererUpdate || ind < numAnswers - 1
+      }
+    });
+  }
+}
 class Div extends BlockComponent {
   constructor(args) {
     super(args);
     Object.assign(this.actions, {
+      submitAllAnswers: this.submitAllAnswers.bind(this),
       recordVisibilityChange: this.recordVisibilityChange.bind(this)
     });
   }
@@ -67472,6 +67929,12 @@ class Div extends BlockComponent {
   static renderChildren = true;
   static canDisplayChildErrors = true;
   static includeBlankStringChildren = true;
+  static createAttributesObject() {
+    let attributes = super.createAttributesObject();
+    let scoredSectionAttributes = returnScoredSectionAttributes();
+    Object.assign(attributes, scoredSectionAttributes);
+    return attributes;
+  }
   static returnChildGroups() {
     return [
       {
@@ -67480,6 +67943,26 @@ class Div extends BlockComponent {
       }
     ];
   }
+  static returnStateVariableDefinitions() {
+    let stateVariableDefinitions = super.returnStateVariableDefinitions();
+    Object.assign(
+      stateVariableDefinitions,
+      returnScoredSectionStateVariableDefinition()
+    );
+    return stateVariableDefinitions;
+  }
+  async submitAllAnswers({
+    actionId,
+    sourceInformation = {},
+    skipRendererUpdate = false
+  }) {
+    return submitAllAnswers({
+      component: this,
+      actionId,
+      sourceInformation,
+      skipRendererUpdate
+    });
+  }
   recordVisibilityChange({ isVisible }) {
     this.coreFunctions.requestRecordEvent({
       verb: "visibilityChanged",
@@ -67492,11 +67975,23 @@ class Div extends BlockComponent {
   }
 }
 class Span extends InlineComponent {
+  constructor(args) {
+    super(args);
+    Object.assign(this.actions, {
+      submitAllAnswers: this.submitAllAnswers.bind(this)
+    });
+  }
   static componentType = "span";
   static rendererType = "containerInline";
   static renderChildren = true;
   static canDisplayChildErrors = true;
   static includeBlankStringChildren = true;
+  static createAttributesObject() {
+    let attributes = super.createAttributesObject();
+    let scoredSectionAttributes = returnScoredSectionAttributes();
+    Object.assign(attributes, scoredSectionAttributes);
+    return attributes;
+  }
   static returnChildGroups() {
     return [
       {
@@ -67505,6 +68000,26 @@ class Span extends InlineComponent {
       }
     ];
   }
+  static returnStateVariableDefinitions() {
+    let stateVariableDefinitions = super.returnStateVariableDefinitions();
+    Object.assign(
+      stateVariableDefinitions,
+      returnScoredSectionStateVariableDefinition()
+    );
+    return stateVariableDefinitions;
+  }
+  async submitAllAnswers({
+    actionId,
+    sourceInformation = {},
+    skipRendererUpdate = false
+  }) {
+    return submitAllAnswers({
+      component: this,
+      actionId,
+      sourceInformation,
+      skipRendererUpdate
+    });
+  }
 }
 const Divisions = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
@@ -80506,109 +81021,6 @@ function returnFeedbackDefinitionStateVariables() {
   };
   return stateVariableDefinitions;
 }
-function returnScoredSectionStateVariableDefinition() {
-  const stateVariableDefinitions = {};
-  stateVariableDefinitions.scoredDescendants = {
-    returnDependencies: () => ({
-      scoredDescendants: {
-        dependencyType: "descendant",
-        componentTypes: [
-          "_sectioningComponent",
-          "answer",
-          "setup",
-          "_blockScoredComponent"
-        ],
-        variableNames: [
-          "scoredDescendants",
-          "aggregateScores",
-          "weight"
-        ],
-        recurseToMatchedChildren: false,
-        variablesOptional: true
-      }
-    }),
-    definition({ dependencyValues }) {
-      let scoredDescendants = [];
-      for (let descendant of dependencyValues.scoredDescendants) {
-        if (descendant.componentType === "setup") {
-          continue;
-        }
-        if (descendant.stateValues.aggregateScores || descendant.stateValues.scoredDescendants === void 0) {
-          scoredDescendants.push(descendant);
-        } else {
-          scoredDescendants.push(
-            ...descendant.stateValues.scoredDescendants
-          );
-        }
-      }
-      return { setValue: { scoredDescendants } };
-    }
-  };
-  stateVariableDefinitions.answerDescendants = {
-    returnDependencies: () => ({
-      answerDescendants: {
-        dependencyType: "descendant",
-        componentTypes: ["answer", "_blockScoredComponent"],
-        variableNames: ["justSubmitted"],
-        recurseToMatchedChildren: false
-      }
-    }),
-    definition({ dependencyValues }) {
-      return {
-        setValue: {
-          answerDescendants: dependencyValues.answerDescendants
-        }
-      };
-    }
-  };
-  stateVariableDefinitions.justSubmitted = {
-    forRenderer: true,
-    returnDependencies: () => ({
-      answerDescendants: {
-        dependencyType: "stateVariable",
-        variableName: "answerDescendants"
-      }
-    }),
-    definition({ dependencyValues }) {
-      return {
-        setValue: {
-          justSubmitted: dependencyValues.answerDescendants.every(
-            (x2) => x2.stateValues.justSubmitted
-          )
-        }
-      };
-    }
-  };
-  stateVariableDefinitions.showCorrectness = {
-    forRenderer: true,
-    returnDependencies: () => ({
-      showCorrectnessPreliminary: {
-        dependencyType: "stateVariable",
-        variableName: "showCorrectnessPreliminary"
-      },
-      showCorrectnessFlag: {
-        dependencyType: "flag",
-        flagName: "showCorrectness"
-      }
-    }),
-    definition({ dependencyValues, usedDefault }) {
-      let showCorrectness;
-      if (!usedDefault.showCorrectnessPreliminary) {
-        showCorrectness = dependencyValues.showCorrectnessPreliminary;
-      } else {
-        showCorrectness = dependencyValues.showCorrectnessFlag !== false;
-      }
-      return { setValue: { showCorrectness } };
-    }
-  };
-  stateVariableDefinitions.displayDecimalsForCreditAchieved = {
-    returnDependencies: () => ({}),
-    definition: () => ({
-      setValue: { displayDecimalsForCreditAchieved: -Infinity }
-    })
-  };
-  return stateVariableDefinitions;
-}
 class SectioningComponent extends BlockComponent {
   constructor(args) {
     super(args);
@@ -80626,48 +81038,8 @@ class SectioningComponent extends BlockComponent {
   static createsVariants = true;
   static createAttributesObject() {
     let attributes = super.createAttributesObject();
-    attributes.aggregateScores = {
-      createComponentOfType: "boolean",
-      createStateVariable: "aggregateScoresPreliminary",
-      defaultValue: false
-    };
-    attributes.weight = {
-      createComponentOfType: "number",
-      createStateVariable: "weight",
-      defaultValue: 1,
-      public: true
-    };
-    attributes.sectionWideCheckWork = {
-      createComponentOfType: "boolean",
-      createStateVariable: "sectionWideCheckWork",
-      defaultValue: false,
-      public: true
-    };
-    attributes.showCorrectness = {
-      createComponentOfType: "boolean",
-      createStateVariable: "showCorrectnessPreliminary",
-      defaultValue: null
-    };
-    attributes.submitLabel = {
-      createComponentOfType: "text",
-      createStateVariable: "submitLabel",
-      defaultValue: "Check Work",
-      public: true,
-      forRenderer: true
-    };
-    attributes.submitLabelNoCorrectness = {
-      createComponentOfType: "text",
-      createStateVariable: "submitLabelNoCorrectness",
-      defaultValue: "Submit Response",
-      public: true,
-      forRenderer: true
-    };
-    attributes.displayDigitsForCreditAchieved = {
-      createComponentOfType: "integer",
-      createStateVariable: "displayDigitsForCreditAchieved",
-      defaultValue: 3,
-      public: true
-    };
+    let scoredSectionAttributes = returnScoredSectionAttributes();
+    Object.assign(attributes, scoredSectionAttributes);
     attributes.boxed = {
       createComponentOfType: "boolean",
       createStateVariable: "boxed",
@@ -81087,175 +81459,6 @@ class SectioningComponent extends BlockComponent {
         return { setValue: { level } };
       }
     };
-    stateVariableDefinitions.aggregateScores = {
-      public: true,
-      shadowingInstructions: {
-        createComponentOfType: "boolean"
-      },
-      returnDependencies: () => ({
-        aggregateScoresPreliminary: {
-          dependencyType: "stateVariable",
-          variableName: "aggregateScoresPreliminary"
-        },
-        sectionWideCheckWork: {
-          dependencyType: "stateVariable",
-          variableName: "sectionWideCheckWork"
-        }
-      }),
-      definition({ dependencyValues }) {
-        return {
-          setValue: {
-            aggregateScores: dependencyValues.aggregateScoresPreliminary || dependencyValues.sectionWideCheckWork
-          }
-        };
-      }
-    };
-    stateVariableDefinitions.creditAchieved = {
-      public: true,
-      shadowingInstructions: {
-        createComponentOfType: "number",
-        addAttributeComponentsShadowingStateVariables: {
-          displayDigits: {
-            stateVariableToShadow: "displayDigitsForCreditAchieved"
-          },
-          displayDecimals: {
-            stateVariableToShadow: "displayDecimalsForCreditAchieved"
-          }
-        }
-      },
-      forRenderer: true,
-      defaultValue: 0,
-      hasEssential: true,
-      additionalStateVariablesDefined: [
-        {
-          variableName: "percentCreditAchieved",
-          public: true,
-          shadowingInstructions: {
-            createComponentOfType: "number",
-            addAttributeComponentsShadowingStateVariables: {
-              displayDigits: {
-                stateVariableToShadow: "displayDigitsForCreditAchieved"
-              },
-              displayDecimals: {
-                stateVariableToShadow: "displayDecimalsForCreditAchieved"
-              }
-            }
-          },
-          defaultValue: 0,
-          hasEssential: true
-        }
-      ],
-      stateVariablesDeterminingDependencies: [
-        "aggregateScores",
-        "scoredDescendants"
-      ],
-      returnDependencies({ stateValues }) {
-        let dependencies2 = {
-          aggregateScores: {
-            dependencyType: "stateVariable",
-            variableName: "aggregateScores"
-          }
-        };
-        if (stateValues.aggregateScores) {
-          dependencies2.scoredDescendants = {
-            dependencyType: "stateVariable",
-            variableName: "scoredDescendants"
-          };
-          for (let [
-            ind,
-            descendant
-          ] of stateValues.scoredDescendants.entries()) {
-            dependencies2["creditAchieved" + ind] = {
-              dependencyType: "stateVariable",
-              componentIdx: descendant.componentIdx,
-              variableName: "creditAchieved"
-            };
-          }
-        }
-        return dependencies2;
-      },
-      definition({ dependencyValues }) {
-        if (!dependencyValues.aggregateScores) {
-          return {
-            setValue: {
-              creditAchieved: 0,
-              percentCreditAchieved: 0
-            }
-          };
-        }
-        let creditSum = 0;
-        let totalWeight = 0;
-        for (let [
-          ind,
-          component
-        ] of dependencyValues.scoredDescendants.entries()) {
-          let weight = component.stateValues.weight;
-          creditSum += dependencyValues["creditAchieved" + ind] * weight;
-          totalWeight += weight;
-        }
-        let creditAchieved;
-        if (totalWeight > 0) {
-          creditAchieved = creditSum / totalWeight;
-        } else {
-          creditAchieved = 1;
-        }
-        let percentCreditAchieved = creditAchieved * 100;
-        return { setValue: { creditAchieved, percentCreditAchieved } };
-      }
-    };
-    stateVariableDefinitions.creditAchievedIfSubmit = {
-      defaultValue: 0,
-      stateVariablesDeterminingDependencies: [
-        "aggregateScores",
-        "scoredDescendants"
-      ],
-      returnDependencies({ stateValues }) {
-        let dependencies2 = {
-          aggregateScores: {
-            dependencyType: "stateVariable",
-            variableName: "aggregateScores"
-          }
-        };
-        if (stateValues.aggregateScores) {
-          dependencies2.scoredDescendants = {
-            dependencyType: "stateVariable",
-            variableName: "scoredDescendants"
-          };
-          for (let [
-            ind,
-            descendant
-          ] of stateValues.scoredDescendants.entries()) {
-            dependencies2["creditAchievedIfSubmit" + ind] = {
-              dependencyType: "stateVariable",
-              componentIdx: descendant.componentIdx,
-              variableName: "creditAchievedIfSubmit"
-            };
-          }
-        }
-        return dependencies2;
-      },
-      definition({ dependencyValues }) {
-        if (!dependencyValues.aggregateScores) {
-          return {
-            setValue: {
-              creditAchievedIfSubmit: 0
-            }
-          };
-        }
-        let creditSum = 0;
-        let totalWeight = 0;
-        for (let [
-          ind,
-          component
-        ] of dependencyValues.scoredDescendants.entries()) {
-          let weight = component.stateValues.weight;
-          creditSum += dependencyValues["creditAchievedIfSubmit" + ind] * weight;
-          totalWeight += weight;
-        }
-        let creditAchievedIfSubmit = creditSum / totalWeight;
-        return { setValue: { creditAchievedIfSubmit } };
-      }
-    };
     stateVariableDefinitions.generatedVariantInfo = {
       shadowVariable: true,
       additionalStateVariablesDefined: ["isVariantComponent"],
@@ -81380,65 +81583,6 @@ class SectioningComponent extends BlockComponent {
         };
       }
     };
-    stateVariableDefinitions.createSubmitAllButton = {
-      forRenderer: true,
-      additionalStateVariablesDefined: [
-        {
-          variableName: "suppressAnswerSubmitButtons",
-          forRenderer: true
-        }
-      ],
-      returnDependencies: () => ({
-        sectionWideCheckWork: {
-          dependencyType: "stateVariable",
-          variableName: "sectionWideCheckWork"
-        },
-        sectionAncestor: {
-          dependencyType: "ancestor",
-          componentType: "_sectioningComponent",
-          variableNames: ["suppressAnswerSubmitButtons"]
-        },
-        documentAncestor: {
-          dependencyType: "ancestor",
-          componentType: "document",
-          variableNames: ["suppressAnswerSubmitButtons"]
-        }
-      }),
-      definition({ dependencyValues }) {
-        let warnings = [];
-        let createSubmitAllButton = false;
-        let suppressAnswerSubmitButtons = false;
-        if (dependencyValues.documentAncestor.stateValues.suppressAnswerSubmitButtons || dependencyValues.sectionAncestor && dependencyValues.sectionAncestor.stateValues.suppressAnswerSubmitButtons) {
-          suppressAnswerSubmitButtons = true;
-        } else if (dependencyValues.sectionWideCheckWork) {
-          createSubmitAllButton = true;
-          suppressAnswerSubmitButtons = true;
-        }
-        return {
-          setValue: {
-            createSubmitAllButton,
-            suppressAnswerSubmitButtons
-          },
-          sendWarnings: warnings
-        };
-      }
-    };
-    stateVariableDefinitions.suppressCheckWork = {
-      forRenderer: true,
-      returnDependencies: () => ({
-        autoSubmit: {
-          dependencyType: "flag",
-          flagName: "autoSubmit"
-        }
-      }),
-      definition({ dependencyValues }) {
-        return {
-          setValue: {
-            suppressCheckWork: dependencyValues.autoSubmit
-          }
-        };
-      }
-    };
     return stateVariableDefinitions;
   }
   async submitAllAnswers({
@@ -81446,33 +81590,12 @@ class SectioningComponent extends BlockComponent {
     sourceInformation = {},
     skipRendererUpdate = false
   }) {
-    this.coreFunctions.requestRecordEvent({
-      verb: "submitted",
-      object: {
-        componentIdx: this.componentIdx,
-        componentType: this.componentType
-      },
-      result: {
-        creditAchieved: await this.stateValues.creditAchievedIfSubmit
-      }
+    return submitAllAnswers({
+      component: this,
+      actionId,
+      sourceInformation,
+      skipRendererUpdate
     });
-    let numAnswers = await this.stateValues.answerDescendants;
-    for (let [
-      ind,
-      answer
-    ] of await this.stateValues.answerDescendants.entries()) {
-      if (!await answer.stateValues.justSubmitted) {
-        await this.coreFunctions.performAction({
-          componentIdx: answer.componentIdx,
-          actionName: "submitAnswer",
-          args: {
-            actionId,
-            sourceInformation,
-            skipRendererUpdate: skipRendererUpdate || ind < numAnswers - 1
-          }
-        });
-      }
-    }
   }
   async revealSection({
     actionId,
@@ -82204,6 +82327,7 @@ let Li$1 = class Li extends BaseComponent {
   constructor(args) {
     super(args);
     Object.assign(this.actions, {
+      submitAllAnswers: this.submitAllAnswers.bind(this),
       recordVisibilityChange: this.recordVisibilityChange.bind(this)
     });
   }
@@ -82213,6 +82337,12 @@ let Li$1 = class Li extends BaseComponent {
   static canDisplayChildErrors = true;
   static inSchemaOnlyInheritAs = [];
   static includeBlankStringChildren = true;
+  static createAttributesObject() {
+    let attributes = super.createAttributesObject();
+    let scoredSectionAttributes = returnScoredSectionAttributes();
+    Object.assign(attributes, scoredSectionAttributes);
+    return attributes;
+  }
   static returnChildGroups() {
     return [
       {
@@ -82223,6 +82353,10 @@ let Li$1 = class Li extends BaseComponent {
   }
   static returnStateVariableDefinitions() {
     let stateVariableDefinitions = super.returnStateVariableDefinitions();
+    Object.assign(
+      stateVariableDefinitions,
+      returnScoredSectionStateVariableDefinition()
+    );
     stateVariableDefinitions.item = {
       forRenderer: true,
       returnDependencies: () => ({}),
@@ -82248,6 +82382,18 @@ let Li$1 = class Li extends BaseComponent {
     };
     return stateVariableDefinitions;
   }
+  async submitAllAnswers({
+    actionId,
+    sourceInformation = {},
+    skipRendererUpdate = false
+  }) {
+    return submitAllAnswers({
+      component: this,
+      actionId,
+      sourceInformation,
+      skipRendererUpdate
+    });
+  }
   recordVisibilityChange({ isVisible }) {
     this.coreFunctions.requestRecordEvent({
       verb: "visibilityChanged",
@@ -104035,6 +104181,7 @@ class Document extends BaseComponent {
       stateVariableDefinitions,
       returnScoredSectionStateVariableDefinition()
     );
+    delete stateVariableDefinitions.aggregateScores;
     stateVariableDefinitions.titleChildName = {
       forRenderer: true,
       returnDependencies: () => ({
@@ -104479,22 +104626,6 @@ class Document extends BaseComponent {
         };
       }
     };
-    stateVariableDefinitions.suppressCheckWork = {
-      forRenderer: true,
-      returnDependencies: () => ({
-        autoSubmit: {
-          dependencyType: "flag",
-          flagName: "autoSubmit"
-        }
-      }),
-      definition({ dependencyValues }) {
-        return {
-          setValue: {
-            suppressCheckWork: dependencyValues.autoSubmit
-          }
-        };
-      }
-    };
     stateVariableDefinitions.containerTag = {
       forRenderer: true,
       returnDependencies: () => ({}),
@@ -104507,31 +104638,12 @@ class Document extends BaseComponent {
     sourceInformation = {},
     skipRendererUpdate = false
   }) {
-    this.coreFunctions.requestRecordEvent({
-      verb: "submitted",
-      object: {
-        componentIdx: this.componentIdx,
-        componentType: this.componentType
-      }
+    return submitAllAnswers({
+      component: this,
+      actionId,
+      sourceInformation,
+      skipRendererUpdate
     });
-    let answersToSubmit = [];
-    for (let answer of await this.stateValues.answerDescendants) {
-      if (!await answer.stateValues.justSubmitted) {
-        answersToSubmit.push(answer);
-      }
-    }
-    let numAnswers = answersToSubmit.length;
-    for (let [ind, answer] of answersToSubmit.entries()) {
-      await this.coreFunctions.performAction({
-        componentIdx: answer.componentIdx,
-        actionName: "submitAnswer",
-        args: {
-          actionId,
-          sourceInformation,
-          skipRendererUpdate: skipRendererUpdate || ind < numAnswers - 1
-        }
-      });
-    }
   }
   recordVisibilityChange({ isVisible }) {
     this.coreFunctions.requestRecordEvent({
@@ -105817,6 +105929,7 @@ let P$2 = class P3 extends BlockComponent {
   constructor(args) {
     super(args);
     Object.assign(this.actions, {
+      submitAllAnswers: this.submitAllAnswers.bind(this),
       recordVisibilityChange: this.recordVisibilityChange.bind(this)
     });
   }
@@ -105824,6 +105937,12 @@ let P$2 = class P3 extends BlockComponent {
   static renderChildren = true;
   static canDisplayChildErrors = true;
   static includeBlankStringChildren = true;
+  static createAttributesObject() {
+    let attributes = super.createAttributesObject();
+    let scoredSectionAttributes = returnScoredSectionAttributes();
+    Object.assign(attributes, scoredSectionAttributes);
+    return attributes;
+  }
   static returnChildGroups() {
     return [
       {
@@ -105838,6 +105957,10 @@ let P$2 = class P3 extends BlockComponent {
   }
   static returnStateVariableDefinitions() {
     let stateVariableDefinitions = super.returnStateVariableDefinitions();
+    Object.assign(
+      stateVariableDefinitions,
+      returnScoredSectionStateVariableDefinition()
+    );
     stateVariableDefinitions.text = {
       public: true,
       shadowingInstructions: {
@@ -105858,6 +105981,18 @@ let P$2 = class P3 extends BlockComponent {
     };
     return stateVariableDefinitions;
   }
+  async submitAllAnswers({
+    actionId,
+    sourceInformation = {},
+    skipRendererUpdate = false
+  }) {
+    return submitAllAnswers({
+      component: this,
+      actionId,
+      sourceInformation,
+      skipRendererUpdate
+    });
+  }
   recordVisibilityChange({ isVisible }) {
     this.coreFunctions.requestRecordEvent({
       verb: "visibilityChanged",
@@ -123270,7 +123405,7 @@ function returnStandardAnswerAttributes() {
     disableAfterCorrect: {
       createComponentOfType: "boolean",
       createStateVariable: "disableAfterCorrect",
-      defaultValue: true,
+      defaultValue: false,
       public: true
     },
     submitLabel: {
@@ -123622,10 +123757,16 @@ function returnStandardAnswerStateVariableDefinition() {
       creditAchieved: {
         dependencyType: "stateVariable",
         variableName: "creditAchieved"
+      },
+      nextCreditFactor: {
+        dependencyType: "stateVariable",
+        variableName: "nextCreditFactor",
+        variablesOptional: true
       }
     }),
     definition({ dependencyValues }) {
-      if (dependencyValues.creditAchieved === 1) {
+      const creditAchieved = dependencyValues.creditAchieved;
+      if (creditAchieved === 1 || creditAchieved > 0 && creditAchieved === dependencyValues.nextCreditFactor) {
         return {
           setValue: { hasBeenCorrect: true },
           setEssentialValue: { hasBeenCorrect: true }
@@ -124835,15 +124976,33 @@ class Answer extends InlineComponent {
           dependencyType: "ancestor",
           componentType: "document",
           variableNames: ["suppressAnswerSubmitButtons"]
+        },
+        pAncestor: {
+          dependencyType: "ancestor",
+          componentType: "p",
+          variableNames: ["suppressAnswerSubmitButtons"]
+        },
+        liAncestor: {
+          dependencyType: "ancestor",
+          componentType: "li",
+          variableNames: ["suppressAnswerSubmitButtons"]
+        },
+        divAncestor: {
+          dependencyType: "ancestor",
+          componentType: "div",
+          variableNames: ["suppressAnswerSubmitButtons"]
+        },
+        spanAncestor: {
+          dependencyType: "ancestor",
+          componentType: "span",
+          variableNames: ["suppressAnswerSubmitButtons"]
         }
       }),
       definition: function({ dependencyValues }) {
         let delegateCheckWorkToAncestor = false;
         let delegateCheckWorkToInput = false;
         let delegateCheckWork = false;
-        if (dependencyValues.documentAncestor.stateValues.suppressAnswerSubmitButtons) {
-          delegateCheckWorkToAncestor = delegateCheckWork = true;
-        } else if (dependencyValues.sectionAncestor?.stateValues.suppressAnswerSubmitButtons) {
+        if (dependencyValues.documentAncestor.stateValues.suppressAnswerSubmitButtons || dependencyValues.sectionAncestor?.stateValues.suppressAnswerSubmitButtons || dependencyValues.pAncestor?.stateValues.suppressAnswerSubmitButtons || dependencyValues.liAncestor?.stateValues.suppressAnswerSubmitButtons || dependencyValues.divAncestor?.stateValues.suppressAnswerSubmitButtons || dependencyValues.spanAncestor?.stateValues.suppressAnswerSubmitButtons) {
           delegateCheckWorkToAncestor = delegateCheckWork = true;
         } else if (dependencyValues.inputChildren.length === 1 && !dependencyValues.forceFullCheckworkButton) {
           delegateCheckWorkToInput = delegateCheckWork = true;