catchup-library-web 2.2.9 → 2.2.11

package/dist/index.js

@@ -6236,11 +6236,8 @@ var MCSAActivityMaterialContent = ({
   const [displayAnswerMap, setDisplayAnswerMap] = (0, import_react23.useState)(answerMap);
   (0, import_react23.useEffect)(() => {
     if (showCorrectAnswer) {
-      const correctAnswerMap = {};
-      Object.keys(materialMap).forEach((materialKey) => {
-        correctAnswerMap[materialKey] = materialMap[materialKey][0];
-      });
-      setDisplayAnswerMap(correctAnswerMap);
+      const correctAnswer2 = retrieveCorrectAnswer();
+      setDisplayAnswerMap({ correctAnswer: correctAnswer2 });
     } else {
       setDisplayAnswerMap(answerMap);
     }
@@ -7201,16 +7198,16 @@ var ActivityEvaluationRubricContent = ({
     Object.keys(evaluationRubricMap).map((key, index) => {
       const currentItem = JSON.parse(evaluationRubricMap[key]);
       const { value } = currentItem;
-      const matchedRegex = value.match(/\[(\d+)\]\s*(.*)/);
-      let score = 0;
+      const matchedRegex = value.match(/\[(\d+)\]\s*([\s\S]*)/);
+      let points = 0;
       let evaluationRubric = value;
       if (matchedRegex) {
-        score = parseFloat(matchedRegex[1]);
+        points = parseFloat(matchedRegex[1]);
         evaluationRubric = matchedRegex[2];
       }
       return /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)("div", { className: "my-2 flex flex-row gap-x-3", children: [
         /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)("div", { className: "font-bold text-xl whitespace-nowrap", children: [
-          score,
+          points,
           " ",
           i18n_default.t("points")
         ] }),

package/dist/index.mjs

@@ -6013,11 +6013,8 @@ var MCSAActivityMaterialContent = ({
   const [displayAnswerMap, setDisplayAnswerMap] = useState22(answerMap);
   useEffect13(() => {
     if (showCorrectAnswer) {
-      const correctAnswerMap = {};
-      Object.keys(materialMap).forEach((materialKey) => {
-        correctAnswerMap[materialKey] = materialMap[materialKey][0];
-      });
-      setDisplayAnswerMap(correctAnswerMap);
+      const correctAnswer2 = retrieveCorrectAnswer();
+      setDisplayAnswerMap({ correctAnswer: correctAnswer2 });
     } else {
       setDisplayAnswerMap(answerMap);
     }
@@ -6978,16 +6975,16 @@ var ActivityEvaluationRubricContent = ({
     Object.keys(evaluationRubricMap).map((key, index) => {
       const currentItem = JSON.parse(evaluationRubricMap[key]);
       const { value } = currentItem;
-      const matchedRegex = value.match(/\[(\d+)\]\s*(.*)/);
-      let score = 0;
+      const matchedRegex = value.match(/\[(\d+)\]\s*([\s\S]*)/);
+      let points = 0;
       let evaluationRubric = value;
       if (matchedRegex) {
-        score = parseFloat(matchedRegex[1]);
+        points = parseFloat(matchedRegex[1]);
         evaluationRubric = matchedRegex[2];
       }
       return /* @__PURE__ */ jsxs34("div", { className: "my-2 flex flex-row gap-x-3", children: [
         /* @__PURE__ */ jsxs34("div", { className: "font-bold text-xl whitespace-nowrap", children: [
-          score,
+          points,
           " ",
           i18n_default.t("points")
         ] }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "catchup-library-web",
-  "version": "2.2.9",
+  "version": "2.2.11",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/components/activities/evaluation-rubric-contents/ActivityEvaluationRubricContent.tsx

@@ -44,19 +44,19 @@ const ActivityEvaluationRubricContent = ({
         {Object.keys(evaluationRubricMap).map((key, index) => {
           const currentItem = JSON.parse(evaluationRubricMap[key]);
           const { value } = currentItem;
-          const matchedRegex = value.match(/\[(\d+)\]\s*(.*)/);
-          let score = 0;
+          const matchedRegex = value.match(/\[(\d+)\]\s*([\s\S]*)/);
+          let points = 0;
           let evaluationRubric = value;
 
           if (matchedRegex) {
-            score = parseFloat(matchedRegex[1]);
+            points = parseFloat(matchedRegex[1]);
             evaluationRubric = matchedRegex[2];
           }
 
           return (
             <div key={`${key}_${index}`} className="my-2 flex flex-row gap-x-3">
               <div className="font-bold text-xl whitespace-nowrap">
-                {score} {i18n.t("points")}
+                {points} {i18n.t("points")}
               </div>
               <p className="flex-1 text-xl whitespace-pre-wrap">
                 {constructInputWithSpecialExpressionList(evaluationRubric).map(

package/src/components/activities/material-contents/MCSAActivityMaterialContent.tsx

@@ -21,12 +21,8 @@ const MCSAActivityMaterialContent = ({
 
   useEffect(() => {
     if (showCorrectAnswer) {
-      // Create correct answer map where each key maps to the first item (correct answer)
-      const correctAnswerMap: any = {};
-      Object.keys(materialMap).forEach((materialKey) => {
-        correctAnswerMap[materialKey] = materialMap[materialKey][0];
-      });
-      setDisplayAnswerMap(correctAnswerMap);
+      const correctAnswer = retrieveCorrectAnswer();
+      setDisplayAnswerMap({ correctAnswer });
     } else {
       setDisplayAnswerMap(answerMap);
     }