catchup-library-web 2.0.7 → 2.0.9

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

@@ -7,7 +7,7 @@ import { IOrderingActivityMaterialProps } from "../../../properties/ActivityProp
 
 const OrderingActivityMaterialContent = ({
   uniqueValue,
-  answer,
+  answerMap,
   materialMap,
   contentMap,
   checkCanAnswerQuestion,
@@ -44,21 +44,11 @@ const OrderingActivityMaterialContent = ({
 
   useEffect(() => {
     if (!showCorrectAnswer) return;
-    const answerMap = answer.data.find(
-      (answerData: any) => answerData.type === "ORDERING"
-    ).answerMap;
     Object.keys(answerMap).forEach((answerKey, index) => {
       answerMap[answerKey] = index;
     });
   }, [showCorrectAnswer]);
 
-  const retrieveAnswerMap = () => {
-    const foundIndex = answer.data.findIndex(
-      (answerData: any) => answerData.type === "ORDERING"
-    );
-    return answer.data[foundIndex].answerMap;
-  };
-
   const checkAnswerState = (correctAnswer: string, learnerAnswer: string) => {
     if (!isPreview) return null;
     if (correctAnswer === learnerAnswer) {
@@ -120,7 +110,7 @@ const OrderingActivityMaterialContent = ({
       draggedKey !== null &&
       dropTargetKey !== draggedKey
     ) {
-      onChange(answer, draggedKey, dropTargetKey);
+      onChange(answerMap, draggedKey, dropTargetKey);
     }
     setDraggedKey(null);
     setDropTargetKey(null);
@@ -168,7 +158,7 @@ const OrderingActivityMaterialContent = ({
       draggedKey !== null &&
       dropTargetKey !== draggedKey
     ) {
-      onChange(answer, draggedKey, dropTargetKey);
+      onChange(answerMap, draggedKey, dropTargetKey);
     }
     setDraggedKey(null);
     setDropTargetKey(null);
@@ -185,14 +175,12 @@ const OrderingActivityMaterialContent = ({
     } else if (selectedKey === materialKey) {
       setSelectedKey(null);
     } else {
-      onChange(answer, selectedKey, materialKey);
+      onChange(answerMap, selectedKey, materialKey);
       setSelectedKey(null);
     }
     setDraggedKey(null);
   };
 
-  const answerMap = retrieveAnswerMap();
-
   return (
     <div
       className="flex flex-row flex-wrap"

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

@@ -1,5 +1,4 @@
 import { useEffect, useState } from "react";
-import useScreenSize from "../../../hooks/useScreenSize";
 import i18n from "../../../language/i18n";
 import ShowMaterialMediaByContentType from "./ShowMaterialMediaByContentType";
 import { InlineMath } from "react-katex";
@@ -11,7 +10,7 @@ import { shuffleArray } from "../../../utilization/AppUtilization";
 
 const TrueFalseActivityMaterialContent = ({
   uniqueValue,
-  answer,
+  answerMap,
   materialMap,
   contentMap,
   checkCanAnswerQuestion,
@@ -19,7 +18,6 @@ const TrueFalseActivityMaterialContent = ({
   isPreview,
   showCorrectAnswer,
 }: ITrueFalseActivityMaterialProps) => {
-  const { screenSize } = useScreenSize();
   const [shuffleOptionList, setShuffleOptionList] = useState<any[]>([]);
 
   useEffect(() => {
@@ -35,29 +33,9 @@ const TrueFalseActivityMaterialContent = ({
 
   useEffect(() => {
     if (!showCorrectAnswer) return;
-    answer.data.find(
-      (answerData: any) => answerData.type === "TRUE_FALSE"
-    ).answerMap = materialMap;
+    answerMap = materialMap;
   }, [showCorrectAnswer]);
 
-  const retrieveAnswer = () => {
-    if (!answer)
-      return {
-        answerMap: {
-          trueList: [],
-          falseList: [],
-        },
-      };
-    return answer.data.find(
-      (answerData: any) => answerData.type === "TRUE_FALSE"
-    );
-  };
-
-  const retrieveAnswerMap = () => {
-    const { answerMap } = retrieveAnswer();
-    return answerMap;
-  };
-
   const checkAnswerState = (correctAnswer: string, learnerAnswer: string) => {
     if (!isPreview) return null;
     if (correctAnswer === learnerAnswer) {
@@ -66,7 +44,6 @@ const TrueFalseActivityMaterialContent = ({
     return "INCORRECT";
   };
 
-  const answerMap = retrieveAnswerMap();
   return (
     <div className="">
       <div className="hidden md:block">
@@ -160,7 +137,7 @@ const TrueFalseActivityMaterialContent = ({
                         alt="checkbox"
                         size="small"
                         onClick={() => {
-                          onChange(answer, "TRUE", shuffleOption);
+                          onChange(answerMap, "TRUE", shuffleOption);
                         }}
                       />
                     </div>
@@ -176,7 +153,7 @@ const TrueFalseActivityMaterialContent = ({
                         alt="checkbox"
                         size="small"
                         onClick={() => {
-                          onChange(answer, "FALSE", shuffleOption);
+                          onChange(answerMap, "FALSE", shuffleOption);
                         }}
                       />
                     </div>

package/src/properties/ActivityProperties.ts

@@ -20,7 +20,7 @@ export interface IActivityBodyContentProps {
 }
 
 export interface IOrderingActivityProps {
-  answer: any;
+  answerMap: any;
   data: any;
   canAnswerQuestion: () => boolean;
   changeAnswer: (e: any) => void;
@@ -31,7 +31,7 @@ export interface IOrderingActivityProps {
 
 export interface IOrderingActivityMaterialProps {
   uniqueValue: string;
-  answer: any;
+  answerMap: any;
   materialMap: any;
   contentMap: any;
   checkCanAnswerQuestion: () => boolean;
@@ -41,7 +41,7 @@ export interface IOrderingActivityMaterialProps {
 }
 
 export interface IDropdownActivityProps {
-  answer: any;
+  answerMap: any;
   data: any;
   canAnswerQuestion: () => boolean;
   changeAnswer: (e: any) => void;
@@ -52,7 +52,7 @@ export interface IDropdownActivityProps {
 
 export interface IDropdownActivityMaterialProps {
   uniqueValue: string;
-  answer: any;
+  answerMap: any;
   materialMap: any;
   contentMap: any;
   checkCanAnswerQuestion: () => boolean;
@@ -62,7 +62,7 @@ export interface IDropdownActivityMaterialProps {
 }
 
 export interface IMCSAActivityProps {
-  answer: any;
+  answerMap: any;
   data: any;
   canAnswerQuestion: () => boolean;
   changeAnswer: (e: any) => void;
@@ -73,7 +73,7 @@ export interface IMCSAActivityProps {
 
 export interface IMCSAActivityMaterialProps {
   uniqueValue: string;
-  answer: any;
+  answerMap: any;
   materialMap: any;
   contentMap: any;
   checkCanAnswerQuestion: () => boolean;
@@ -82,7 +82,7 @@ export interface IMCSAActivityMaterialProps {
 }
 
 export interface IMCMAActivityProps {
-  answer: any;
+  answerMap: any;
   data: any;
   canAnswerQuestion: () => boolean;
   changeAnswer: (e: any) => void;
@@ -93,7 +93,7 @@ export interface IMCMAActivityProps {
 
 export interface IMCMAActivityMaterialProps {
   uniqueValue: string;
-  answer: any;
+  answerMap: any;
   materialMap: any;
   contentMap: any;
   checkCanAnswerQuestion: () => boolean;
@@ -102,7 +102,7 @@ export interface IMCMAActivityMaterialProps {
 }
 
 export interface IGroupingActivityProps {
-  answer: any;
+  answerMap: any;
   data: any;
   canAnswerQuestion: () => boolean;
   changeAnswer: (e: any) => void;
@@ -112,7 +112,7 @@ export interface IGroupingActivityProps {
 
 export interface IGroupingActivityMaterialProps {
   uniqueValue: string;
-  answer: any;
+  answerMap: any;
   materialMap: any;
   contentMap: any;
   checkCanAnswerQuestion: () => boolean;
@@ -122,7 +122,7 @@ export interface IGroupingActivityMaterialProps {
 }
 
 export interface IMatchingActivityProps {
-  answer: any;
+  answerMap: any;
   data: any;
   canAnswerQuestion: () => boolean;
   changeAnswer: (e: any) => void;
@@ -132,7 +132,7 @@ export interface IMatchingActivityProps {
 
 export interface IMatchingActivityMaterialProps {
   uniqueValue: string;
-  answer: any;
+  answerMap: any;
   materialMap: any;
   contentMap: any;
   checkCanAnswerQuestion: () => boolean;
@@ -142,7 +142,7 @@ export interface IMatchingActivityMaterialProps {
 }
 
 export interface IFillInTheBlanksActivityProps {
-  answer: any;
+  answerMap: any;
   data: any;
   canAnswerQuestion: () => boolean;
   changeAnswer: (e: any) => void;
@@ -153,7 +153,7 @@ export interface IFillInTheBlanksActivityProps {
 
 export interface IFillInTheBlanksActivityMaterialProps {
   uniqueValue: string;
-  answer: any;
+  answerMap: any;
   optionList: any;
   materialMap: any;
   contentMap: any;
@@ -164,7 +164,7 @@ export interface IFillInTheBlanksActivityMaterialProps {
 }
 
 export interface IOpenEndedActivityProps {
-  answer: any;
+  answerMap: any;
   data: any;
   changeAnswer: (e: any) => void;
   canAnswerQuestion: () => boolean;
@@ -174,14 +174,14 @@ export interface IOpenEndedActivityProps {
 }
 
 export interface IOpenEndedActivityMaterialProps {
-  answer: any;
+  answerMap: any;
   contentMap: any;
   checkCanAnswerQuestion: () => boolean;
   onChange: (e1: any, e2: any) => void;
 }
 
 export interface ITrueFalseActivityProps {
-  answer: any;
+  answerMap: any;
   data: any;
   canAnswerQuestion: () => boolean;
   changeAnswer: (e: any) => void;
@@ -192,7 +192,7 @@ export interface ITrueFalseActivityProps {
 
 export interface ITrueFalseActivityMaterialProps {
   uniqueValue: string;
-  answer: any;
+  answerMap: any;
   materialMap: any;
   contentMap: any;
   checkCanAnswerQuestion: () => boolean;
@@ -232,10 +232,11 @@ export interface IActivityPreviewByDataProps {
 
 export interface IActivityPreviewByAnswerDataProps {
   data: any;
+  answerType?: string | null;
   showType?: boolean;
   showDescription?: boolean;
-  lockedType?: string | null;
-  typeOptionList?: any[];
+  lockedTypeList?: any[];
+  // typeOptionList?: any[];
   showSolution?: boolean;
   showEvaluationRubric?: boolean;
   showDifficulty?: boolean;

package/src/utilization/CatchtivityUtilization.ts

@@ -1178,47 +1178,31 @@ const retrieveDefaultTrueFalseMap = () => {
 };
 
 export const retrieveCurrentDefaultDataMap = (
-  activityTemplate: any,
+  activityTemplateType: any,
   activityData: any
 ) => {
-  const defaultDataMap: any = {
-    activityTemplateId: activityTemplate.id,
-    type: activityTemplate.type,
-  };
-  if (activityTemplate.type === "ORDERING") {
-    defaultDataMap.answerMap = retrieveDefaultOrderingDataMap(
-      activityData.orderingMaterialMap
-    );
-  } else if (activityTemplate.type === "DROPDOWN") {
-    defaultDataMap.answerMap = retrieveDefaultDropdownMap(
-      activityData.dropdownMaterialMap
-    );
-  } else if (activityTemplate.type === "MCSA") {
-    defaultDataMap.answerMap = retrieveDefaultMCSAMap(
-      activityData.MCSAMaterialMap
-    );
-  } else if (activityTemplate.type === "MCMA") {
-    defaultDataMap.answerMap = retrieveDefaultMCMAMap(
-      activityData.MCMAMaterialMap
-    );
-  } else if (activityTemplate.type === "MATCHING") {
-    defaultDataMap.answerMap = retrieveDefaultMatchingMap(
-      activityData.matchingMaterialMap
-    );
-  } else if (activityTemplate.type === "GROUPING") {
-    defaultDataMap.answerMap = retrieveDefaultGroupingMap(
-      activityData.groupingMaterialMap
-    );
-  } else if (activityTemplate.type === "FILL_IN_THE_BLANKS") {
-    defaultDataMap.answerMap = retrieveDefaultFillInTheBlanksMap(
+  if (activityTemplateType === "ORDERING") {
+    return retrieveDefaultOrderingDataMap(activityData.orderingMaterialMap);
+  } else if (activityTemplateType === "DROPDOWN") {
+    return retrieveDefaultDropdownMap(activityData.dropdownMaterialMap);
+  } else if (activityTemplateType === "MCSA") {
+    return retrieveDefaultMCSAMap(activityData.MCSAMaterialMap);
+  } else if (activityTemplateType === "MCMA") {
+    return retrieveDefaultMCMAMap(activityData.MCMAMaterialMap);
+  } else if (activityTemplateType === "MATCHING") {
+    return retrieveDefaultMatchingMap(activityData.matchingMaterialMap);
+  } else if (activityTemplateType === "GROUPING") {
+    return retrieveDefaultGroupingMap(activityData.groupingMaterialMap);
+  } else if (activityTemplateType === "FILL_IN_THE_BLANKS") {
+    return retrieveDefaultFillInTheBlanksMap(
       activityData.fillInTheBlanksMaterialMap
     );
-  } else if (activityTemplate.type === "OPEN_ENDED") {
-    defaultDataMap.answerMap = retrieveDefaultOpenEndedMap();
-  } else if (activityTemplate.type === "TRUE_FALSE") {
-    defaultDataMap.answerMap = retrieveDefaultTrueFalseMap();
+  } else if (activityTemplateType === "OPEN_ENDED") {
+    return retrieveDefaultOpenEndedMap();
+  } else if (activityTemplateType === "TRUE_FALSE") {
+    return retrieveDefaultTrueFalseMap();
   }
-  return defaultDataMap;
+  return {};
 };
 
 export const constructActivityAnswerMap = (
@@ -1254,7 +1238,7 @@ export const constructActivityAnswerMap = (
   } else if (activityTemplate.type === "TRUE_FALSE") {
     activityData.trueFalseMaterialMap = { trueList: [], falseList: [] };
   }
-  return retrieveCurrentDefaultDataMap(activityTemplate, activityData);
+  return retrieveCurrentDefaultDataMap(activityTemplate.type, activityData);
 };
 
 export const ignoreMathematicalExpression = (inputText: string) => {
@@ -1268,64 +1252,9 @@ export const ignoreMathematicalExpression = (inputText: string) => {
     .replaceAll("\\sqrt", "");
 };
 
-export const checkIfAnswerIsEmpty = (answer: any) => {
-  const { data } = answer;
-  if (data && data.length > 0) {
-    const foundAnswer = data[0];
-    const { type, answerMap } = foundAnswer;
-    if (type === "ORDERING") {
-      return false;
-    } else if (type === "DROPDOWN") {
-      for (const key of Object.keys(answerMap)) {
-        if (answerMap[key] !== "DEFAULT_OPTION") {
-          return false;
-        }
-      }
-    } else if (type === "MCSA") {
-      const key = Object.keys(answerMap)[0];
-      if (answerMap[key] !== "ANSWER_KEY") {
-        return false;
-      }
-    } else if (type === "MCMA") {
-      const key = Object.keys(answerMap)[0];
-      if (answerMap[key].length !== 0) {
-        return false;
-      }
-    } else if (type === "MATCHING") {
-      for (const key of Object.keys(answerMap)) {
-        if (answerMap[key]) {
-          return false;
-        }
-      }
-    } else if (type === "GROUPING") {
-      for (const key of Object.keys(answerMap)) {
-        if (answerMap[key].length !== 0) {
-          return false;
-        }
-      }
-    } else if (type === "FILL_IN_THE_BLANKS") {
-      for (const key of Object.keys(answerMap)) {
-        if (answerMap[key]) {
-          return false;
-        }
-      }
-    } else if (type === "OPEN_ENDED") {
-      const key = Object.keys(answerMap)[0];
-      if (answerMap[key]) {
-        return false;
-      }
-    } else if (type === "TRUE_FALSE") {
-      return (
-        answerMap.trueList.length === 0 && answerMap.falseList.length === 0
-      );
-    }
-  }
-  return true;
-};
-
 export const constructActivityAnswerStateList = (
-  answerList: any,
-  activityList: any
+  answerList: any[],
+  activityList: any[]
 ) => {
   const stateList: any = [];
   activityList.forEach((activity: any, index: number) => {
@@ -1339,17 +1268,15 @@ export const constructActivityAnswerStateList = (
 };
 
 export const retrieveActivityAnswerFromAnswerList = (
-  answerList: any,
+  answerList: any[],
   activity: any
 ) => {
-  // if (!answerList || !activity) return;
   return answerList.find(
-    (answer: any) =>
-      parseFloat(answer.activityDTO.id) === parseFloat(activity.id)
+    (answer: any) => parseFloat(answer.activityId) === parseFloat(activity.id)
   );
 };
 
-export const checkActivityAnswerState = (answerList: any, activity: any) => {
+export const checkActivityAnswerState = (answerList: any[], activity: any) => {
   const activityAnswer = retrieveActivityAnswerFromAnswerList(
     answerList,
     activity
@@ -1579,7 +1506,7 @@ export const retrieveEachTimeSpentInSeconds = (
   if (!activityProgressList || !activity) return 0;
   const foundActivityProgress = activityProgressList.find(
     (activityProgress: any) =>
-      parseFloat(activityProgress.activityDTO.id) === parseFloat(activity.id)
+      parseFloat(activityProgress.activityId) === parseFloat(activity.id)
   );
   if (foundActivityProgress) {
     return foundActivityProgress.timeSpent / 1000;
@@ -1997,53 +1924,40 @@ export const constructActivityData = (
 };
 
 export const constructAnswerBasedOnData = (data: any) => {
-  const answer: any = { data: [] };
   if (Object.keys(data).find((dataKey) => dataKey === "orderingMaterialMap")) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "ORDERING" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "ORDERING" },
+      JSON.parse(JSON.stringify(data))
     );
   }
   if (Object.keys(data).find((dataKey) => dataKey === "dropdownMaterialMap")) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "DROPDOWN" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "DROPDOWN" },
+      JSON.parse(JSON.stringify(data))
     );
   }
   if (Object.keys(data).find((dataKey) => dataKey === "MCSAMaterialMap")) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "MCSA" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "MCSA" },
+      JSON.parse(JSON.stringify(data))
     );
   }
   if (Object.keys(data).find((dataKey) => dataKey === "MCMAMaterialMap")) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "MCMA" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "MCMA" },
+      JSON.parse(JSON.stringify(data))
     );
   }
   if (Object.keys(data).find((dataKey) => dataKey === "matchingMaterialMap")) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "MATCHING" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "MATCHING" },
+      JSON.parse(JSON.stringify(data))
     );
   }
   if (Object.keys(data).find((dataKey) => dataKey === "groupingMaterialMap")) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "GROUPING" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "GROUPING" },
+      JSON.parse(JSON.stringify(data))
     );
   }
   if (
@@ -2051,30 +1965,24 @@ export const constructAnswerBasedOnData = (data: any) => {
       (dataKey) => dataKey === "fillInTheBlanksMaterialMap"
     )
   ) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "FILL_IN_THE_BLANKS" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "FILL_IN_THE_BLANKS" },
+      JSON.parse(JSON.stringify(data))
     );
   }
   if (Object.keys(data).find((dataKey) => dataKey === "openEndedMaterialMap")) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "OPEN_ENDED" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "OPEN_ENDED" },
+      JSON.parse(JSON.stringify(data))
     );
   }
   if (Object.keys(data).find((dataKey) => dataKey === "trueFalseMaterialMap")) {
-    answer.data.push(
-      constructActivityAnswerMap(
-        { type: "TRUE_FALSE" },
-        JSON.parse(JSON.stringify(data))
-      )
+    return constructActivityAnswerMap(
+      { type: "TRUE_FALSE" },
+      JSON.parse(JSON.stringify(data))
     );
   }
-  return answer;
+  return {};
 };
 
 export const constructActivityItemListBodyOnly = (bodyMap: any) => {