catchup-library-web 1.13.2 → 1.14.1

package/src/components/activities/ActivityPreviewByData.tsx

@@ -1,5 +1,8 @@
 import { useEffect, useState } from "react";
-import { constructAnswerBasedOnData } from "../../utilization/CatchtivityUtilization";
+import {
+  constructAnswerBasedOnData,
+  retrieveDifficultyByActivityTypeFromData,
+} from "../../utilization/CatchtivityUtilization";
 import DropdownActivityContent from "./DropdownActivityContent";
 import FillInTheBlanksActivityContent from "./FillInTheBlanksActivityContent";
 import GroupingActivityContent from "./GroupingActivityContent";
@@ -23,7 +26,7 @@ const ActivityPreviewByData = ({
   typeOptionList,
   showSolution,
   showEvaluationRubric,
-  showTaxonomy,
+  showDifficulty,
   isFullScreen,
 }: IActivityPreviewByDataProps) => {
   const [key, setKey] = useState(new Date().getTime());
@@ -52,33 +55,6 @@ const ActivityPreviewByData = ({
   }, [typeOptionList, lockedType]);
 
   useEffect(() => {
-    const retrieveTaxonomyNameByActivityTypeFromData = (
-      type: string | null
-    ) => {
-      let taxonomyMap = {
-        name: "",
-      };
-      if (type === "ORDERING") {
-        taxonomyMap = JSON.parse(data["orderingTaxonomyMap"]);
-      } else if (type === "DROPDOWN") {
-        taxonomyMap = JSON.parse(data["dropdownTaxonomyMap"]);
-      } else if (type === "MCSA") {
-        taxonomyMap = JSON.parse(data["MCSATaxonomyMap"]);
-      } else if (type === "MCMA") {
-        taxonomyMap = JSON.parse(data["MCMATaxonomyMap"]);
-      } else if (type === "MATCHING") {
-        taxonomyMap = JSON.parse(data["matchingTaxonomyMap"]);
-      } else if (type === "GROUPING") {
-        taxonomyMap = JSON.parse(data["groupingTaxonomyMap"]);
-      } else if (type === "FILL_IN_THE_BLANKS") {
-        taxonomyMap = JSON.parse(data["fillInTheBlanksTaxonomyMap"]);
-      } else if (type === "OPEN_ENDED") {
-        taxonomyMap = JSON.parse(data["openEndedTaxonomyMap"]);
-      } else if (type === "TRUE_FALSE") {
-        taxonomyMap = JSON.parse(data["trueFalseTaxonomyMap"]);
-      }
-      return taxonomyMap.name;
-    };
     if (!data) return;
     if (!typeOptionList) return;
     if (typeOptionList.length === 0) return;
@@ -88,19 +64,19 @@ const ActivityPreviewByData = ({
         (typeOption: any) => typeOption.id === lockedType
       );
     }
-    if (showTaxonomy) {
+    if (showDifficulty) {
       setOptionList(
         currentTypeOptionList.map((typeOption: any) => ({
           ...typeOption,
           subText: i18n.t(
-            retrieveTaxonomyNameByActivityTypeFromData(typeOption.id)
+            retrieveDifficultyByActivityTypeFromData(typeOption.id, data)
           ),
         }))
       );
     } else {
       setOptionList(currentTypeOptionList);
     }
-  }, [data, lockedType, typeOptionList, showTaxonomy]);
+  }, [data, lockedType, typeOptionList, showDifficulty]);
 
   if (!data) return;
   const answer = constructAnswerBasedOnData(data);

package/src/properties/ActivityProperties.ts

@@ -223,7 +223,7 @@ export interface IActivityPreviewByDataProps {
   showDescription: boolean;
   lockedType: string;
   typeOptionList: any[];
-  showTaxonomy: boolean;
+  showDifficulty: boolean;
   showSolution: boolean;
   showEvaluationRubric: boolean;
   isFullScreen: boolean;
@@ -237,7 +237,7 @@ export interface IActivityPreviewByAnswerDataProps {
   typeOptionList?: any[];
   showSolution?: boolean;
   showEvaluationRubric?: boolean;
-  showTaxonomy?: boolean;
+  showDifficulty?: boolean;
   isFullScreen?: boolean;
   showCorrectAnswer?: boolean;
 }

package/src/utilization/CatchtivityUtilization.ts

@@ -109,93 +109,6 @@ export const retrieveDurationInSecondsOptionList = () => {
   ];
 };
 
-export const retrieveTaxonomyType = () => {
-  return [
-    {
-      value: "BLOOM",
-      text: i18n.t("BLOOM"),
-    },
-  ];
-};
-
-export const retrieveTaxonomyGroupName = () => {
-  return [
-    {
-      type: "BLOOM",
-      value: "BLOOM",
-      text: i18n.t("BLOOM"),
-    },
-  ];
-};
-
-export const retrieveTaxonomyName = () => {
-  return [
-    {
-      stage: 1,
-      groupName: "BLOOM",
-      value: "REMEMBER",
-      text: i18n.t("REMEMBER"),
-    },
-    {
-      stage: 2,
-      groupName: "BLOOM",
-      value: "UNDERSTAND",
-      text: i18n.t("UNDERSTAND"),
-    },
-    {
-      stage: 3,
-      groupName: "BLOOM",
-      value: "APPLY",
-      text: i18n.t("APPLY"),
-    },
-    {
-      stage: 4,
-      groupName: "BLOOM",
-      value: "ANALYZE",
-      text: i18n.t("ANALYZE"),
-    },
-    {
-      stage: 5,
-      groupName: "BLOOM",
-      value: "EVALUATE",
-      text: i18n.t("EVALUATE"),
-    },
-    {
-      stage: 6,
-      groupName: "BLOOM",
-      value: "CREATE",
-      text: i18n.t("CREATE"),
-    },
-  ];
-};
-
-// export const constructInputWithSpecialExpressionList = (inputText: string) => {
-//   const inputPartList = [];
-//   if (!inputText) return [];
-//   const splittedBold = inputText.split("**");
-//   let isBold = false;
-//   for (let i = 0; i < splittedBold.length; i++) {
-//     let isUnderline = false;
-//     const splittedUnderline = splittedBold[i].split("__");
-//     for (let j = 0; j < splittedUnderline.length; j++) {
-//       let isEquation = false;
-//       const splittedEquation = splittedUnderline[j].split("$$");
-//       for (let k = 0; k < splittedEquation.length; k++) {
-//         inputPartList.push({
-//           value: splittedEquation[k],
-//           isEquation,
-//           isUnderline,
-//           isBold,
-//         });
-//         isEquation = !isEquation;
-//       }
-//       isUnderline = !isUnderline;
-//     }
-//     isBold = !isBold;
-//   }
-//   return inputPartList;
-// };
-
 export const constructInputWithSpecialExpressionList = (inputText: string) => {
   const inputPartList = [];
   if (!inputText) return [];
@@ -1477,45 +1390,45 @@ export const findBestFitActivity = (
     activity;
   const parsedData = JSON.parse(data);
   const {
-    orderingTaxonomyMap,
-    dropdownTaxonomyMap,
-    MCSATaxonomyMap,
-    MCMATaxonomyMap,
-    matchingTaxonomyMap,
-    groupingTaxonomyMap,
-    fillInTheBlanksTaxonomyMap,
-    openEndedTaxonomyMap,
-    trueFalseTaxonomyMap,
+    orderingDifficulty,
+    dropdownDifficulty,
+    MCSADifficulty,
+    MCMADifficulty,
+    matchingDifficulty,
+    groupingDifficulty,
+    fillInTheBlanksDifficulty,
+    openEndedDifficulty,
+    trueFalseDifficulty,
   } = parsedData;
-  const taxonomyMap: any = {};
-  if (orderingTaxonomyMap) {
-    taxonomyMap["orderingTaxonomyMap"] = JSON.parse(orderingTaxonomyMap);
+  const difficultyMap: any = {};
+  if (orderingDifficulty) {
+    difficultyMap["orderingDifficulty"] = JSON.parse(orderingDifficulty);
   }
-  if (dropdownTaxonomyMap) {
-    taxonomyMap["dropdownTaxonomyMap"] = JSON.parse(dropdownTaxonomyMap);
+  if (dropdownDifficulty) {
+    difficultyMap["dropdownDifficulty"] = JSON.parse(dropdownDifficulty);
   }
-  if (MCSATaxonomyMap) {
-    taxonomyMap["MCSATaxonomyMap"] = JSON.parse(MCSATaxonomyMap);
+  if (MCSADifficulty) {
+    difficultyMap["MCSADifficulty"] = JSON.parse(MCSADifficulty);
   }
-  if (MCMATaxonomyMap) {
-    taxonomyMap["MCMATaxonomyMap"] = JSON.parse(MCMATaxonomyMap);
+  if (MCMADifficulty) {
+    difficultyMap["MCMADifficulty"] = JSON.parse(MCMADifficulty);
   }
-  if (matchingTaxonomyMap) {
-    taxonomyMap["matchingTaxonomyMap"] = JSON.parse(matchingTaxonomyMap);
+  if (matchingDifficulty) {
+    difficultyMap["matchingDifficulty"] = JSON.parse(matchingDifficulty);
   }
-  if (groupingTaxonomyMap) {
-    taxonomyMap["groupingTaxonomyMap"] = JSON.parse(groupingTaxonomyMap);
+  if (groupingDifficulty) {
+    difficultyMap["groupingDifficulty"] = JSON.parse(groupingDifficulty);
   }
-  if (fillInTheBlanksTaxonomyMap) {
-    taxonomyMap["fillInTheBlanksTaxonomyMap"] = JSON.parse(
-      fillInTheBlanksTaxonomyMap
+  if (fillInTheBlanksDifficulty) {
+    difficultyMap["fillInTheBlanksDifficulty"] = JSON.parse(
+      fillInTheBlanksDifficulty
     );
   }
-  if (trueFalseTaxonomyMap) {
-    taxonomyMap["trueFalseTaxonomyMap"] = JSON.parse(trueFalseTaxonomyMap);
+  if (trueFalseDifficulty) {
+    difficultyMap["trueFalseDifficulty"] = JSON.parse(trueFalseDifficulty);
   }
-  if (openEndedTaxonomyMap) {
-    taxonomyMap["openEndedTaxonomyMap"] = JSON.parse(openEndedTaxonomyMap);
+  if (openEndedDifficulty) {
+    difficultyMap["openEndedDifficulty"] = JSON.parse(openEndedDifficulty);
   }
   let coterieField = "VERBAL";
   if (
@@ -1550,40 +1463,28 @@ export const findBestFitActivity = (
   const activityTemplateValueMap: any = {};
   for (const activityTemplateDTO of activityTemplateDTOList) {
     const { type } = activityTemplateDTO;
-    let currentTaxonomyMap;
+    let currentDifficulty: string = "";
     if (type === "ORDERING") {
-      currentTaxonomyMap = taxonomyMap["orderingTaxonomyMap"];
+      currentDifficulty = difficultyMap["orderingDifficulty"];
     } else if (type === "DROPDOWN") {
-      currentTaxonomyMap = taxonomyMap["dropdownTaxonomyMap"];
+      currentDifficulty = difficultyMap["dropdownDifficulty"];
     } else if (type === "MCSA") {
-      currentTaxonomyMap = taxonomyMap["MCSATaxonomyMap"];
+      currentDifficulty = difficultyMap["MCSADifficulty"];
     } else if (type === "MCMA") {
-      currentTaxonomyMap = taxonomyMap["MCMATaxonomyMap"];
+      currentDifficulty = difficultyMap["MCMADifficulty"];
     } else if (type === "MATCHING") {
-      currentTaxonomyMap = taxonomyMap["matchingTaxonomyMap"];
+      currentDifficulty = difficultyMap["matchingDifficulty"];
     } else if (type === "GROUPING") {
-      currentTaxonomyMap = taxonomyMap["groupingTaxonomyMap"];
+      currentDifficulty = difficultyMap["groupingDifficulty"];
     } else if (type === "FILL_IN_THE_BLANKS") {
-      currentTaxonomyMap = taxonomyMap["fillInTheBlanksTaxonomyMap"];
+      currentDifficulty = difficultyMap["fillInTheBlanksDifficulty"];
     } else if (type === "OPEN_ENDED") {
-      currentTaxonomyMap = taxonomyMap["openEndedTaxonomyMap"];
+      currentDifficulty = difficultyMap["openEndedDifficulty"];
     } else if (type === "TRUE_FALSE") {
-      currentTaxonomyMap = taxonomyMap["trueFalseTaxonomyMap"];
+      currentDifficulty = difficultyMap["trueFalseDifficulty"];
     }
 
-    const {
-      type: taxonomyType,
-      groupName: taxonomyGroupName,
-      name: taxonomyName,
-    } = currentTaxonomyMap;
-    const taxonomyString =
-      taxonomyType.toLowerCase() +
-      taxonomyGroupName.toLowerCase().charAt(0).toUpperCase() +
-      taxonomyGroupName.toLowerCase().substring(1) +
-      taxonomyName.toLowerCase().charAt(0).toUpperCase() +
-      taxonomyName.toLowerCase().substring(1);
-
-    const currentTaxonomyScore = foundModel[taxonomyString];
+    const currentDifficultyScore = foundModel[currentDifficulty];
     const splittedTypeList = type.split("_");
     let activityTemplateString = "";
     for (let i = 0; i < splittedTypeList.length; i++) {
@@ -1596,7 +1497,7 @@ export const findBestFitActivity = (
       }
     }
     const currentActivityTemplateScore = foundModel[activityTemplateString];
-    const currentScore = currentTaxonomyScore * currentActivityTemplateScore;
+    const currentScore = currentDifficultyScore * currentActivityTemplateScore;
     activityTemplateValueMap[type] = currentScore;
     if (currentScore < bestScore) {
       bestScore = currentScore;
@@ -1948,7 +1849,7 @@ export const constructActivityData = (
   bodyMap: any,
   materialMap: any,
   solutionMap: any,
-  taxonomyMap: any,
+  difficulty: string,
   evaluationRubricMap: any
 ) => {
   const constructedData: any = {};
@@ -1964,7 +1865,7 @@ export const constructActivityData = (
       convertToSolutionMapString("ORDERING", solutionMap)
     );
     constructedData["orderingMaterialMap"] = JSON.stringify(materialMap);
-    constructedData["orderingTaxonomyMap"] = JSON.stringify(taxonomyMap);
+    constructedData["orderingDifficulty"] = difficulty;
   } else if (activityTemplateType === "DROPDOWN") {
     constructedData["dropdownBodyMap"] = JSON.stringify(
       convertToBodyMapString("DROPDOWN", bodyMap)
@@ -1983,7 +1884,7 @@ export const constructActivityData = (
     constructedData["dropdownMaterialMap"] = JSON.stringify(
       convertedDropdownMaterialMap
     );
-    constructedData["dropdownTaxonomyMap"] = JSON.stringify(taxonomyMap);
+    constructedData["dropdownDifficulty"] = difficulty;
   } else if (activityTemplateType === "MCSA") {
     constructedData["MCSABodyMap"] = JSON.stringify(
       convertToBodyMapString("MCSA", bodyMap)
@@ -1998,7 +1899,7 @@ export const constructActivityData = (
     constructedData["MCSAMaterialMap"] = JSON.stringify(
       convertedMCSAMaterialMap
     );
-    constructedData["MCSATaxonomyMap"] = JSON.stringify(taxonomyMap);
+    constructedData["MCSADifficulty"] = difficulty;
   } else if (activityTemplateType === "MCMA") {
     constructedData["MCMABodyMap"] = JSON.stringify(
       convertToBodyMapString("MCMA", bodyMap)
@@ -2016,7 +1917,7 @@ export const constructActivityData = (
     constructedData["MCMAMaterialMap"] = JSON.stringify(
       convertedMCMAMaterialMap
     );
-    constructedData["MCMATaxonomyMap"] = JSON.stringify(taxonomyMap);
+    constructedData["MCMADifficulty"] = difficulty;
   } else if (activityTemplateType === "MATCHING") {
     constructedData["matchingBodyMap"] = JSON.stringify(
       convertToBodyMapString("MATCHING", bodyMap)
@@ -2033,7 +1934,7 @@ export const constructActivityData = (
     constructedData["matchingMaterialMap"] = JSON.stringify(
       convertedMatchingMaterialMap
     );
-    constructedData["matchingTaxonomyMap"] = JSON.stringify(taxonomyMap);
+    constructedData["matchingDifficulty"] = difficulty;
   } else if (activityTemplateType === "GROUPING") {
     constructedData["groupingBodyMap"] = JSON.stringify(
       convertToBodyMapString("GROUPING", bodyMap)
@@ -2050,7 +1951,7 @@ export const constructActivityData = (
     constructedData["groupingMaterialMap"] = JSON.stringify(
       convertedGroupingMaterialMap
     );
-    constructedData["groupingTaxonomyMap"] = JSON.stringify(taxonomyMap);
+    constructedData["groupingDifficulty"] = difficulty;
   } else if (activityTemplateType === "FILL_IN_THE_BLANKS") {
     constructedData["fillInTheBlanksBodyMap"] = JSON.stringify(
       convertToBodyMapString("FILL_IN_THE_BLANKS", bodyMap)
@@ -2070,7 +1971,7 @@ export const constructActivityData = (
     constructedData["fillInTheBlanksMaterialMap"] = JSON.stringify(
       convertedFillInTheBlanksMaterialMap
     );
-    constructedData["fillInTheBlanksTaxonomyMap"] = JSON.stringify(taxonomyMap);
+    constructedData["fillInTheBlanksDifficulty"] = difficulty;
   } else if (activityTemplateType === "OPEN_ENDED") {
     constructedData["openEndedBodyMap"] = JSON.stringify(
       convertToBodyMapString("OPEN_ENDED", bodyMap)
@@ -2083,7 +1984,7 @@ export const constructActivityData = (
     );
     constructedData["openEndedMaterialMap"] = JSON.stringify(materialMap);
 
-    constructedData["openEndedTaxonomyMap"] = JSON.stringify(taxonomyMap);
+    constructedData["openEndedDifficulty"] = difficulty;
   } else if (activityTemplateType === "TRUE_FALSE") {
     constructedData["trueFalseBodyMap"] = JSON.stringify(
       convertToBodyMapString("TRUE_FALSE", bodyMap)
@@ -2098,7 +1999,7 @@ export const constructActivityData = (
     constructedData["trueFalseMaterialMap"] = JSON.stringify(
       convertTrueFalseMaterialMap
     );
-    constructedData["trueFalseTaxonomyMap"] = JSON.stringify(taxonomyMap);
+    constructedData["trueFalseDifficulty"] = difficulty;
   }
   return constructedData;
 };
@@ -2389,3 +2290,30 @@ export const constructActivityItemListSolutionOnly = (solutionMap: any) => {
   });
   return itemList;
 };
+
+export const retrieveDifficultyByActivityTypeFromData = (
+  type: string,
+  data: any
+) => {
+  let difficulty = "";
+  if (type === "ORDERING") {
+    difficulty = data["orderingDifficulty"];
+  } else if (type === "DROPDOWN") {
+    difficulty = data["dropdownDifficulty"];
+  } else if (type === "MCSA") {
+    difficulty = data["MCSADifficulty"];
+  } else if (type === "MCMA") {
+    difficulty = data["MCMADifficulty"];
+  } else if (type === "MATCHING") {
+    difficulty = data["matchingDifficulty"];
+  } else if (type === "GROUPING") {
+    difficulty = data["groupingDifficulty"];
+  } else if (type === "FILL_IN_THE_BLANKS") {
+    difficulty = data["fillInTheBlanksDifficulty"];
+  } else if (type === "OPEN_ENDED") {
+    difficulty = data["openEndedDifficulty"];
+  } else if (type === "TRUE_FALSE") {
+    difficulty = data["trueFalseDifficulty"];
+  }
+  return difficulty;
+};

package/src/utilization/IndividualModelUtilization.ts

@@ -1,16 +1,13 @@
 const NUMBER_OF_ACTIVITY_TEMPLATE = 9;
-const NUMBER_OF_TAXONOMY = 6;
-const INITIAL_TAXONOMY_VALUE = 1 / NUMBER_OF_TAXONOMY;
+const NUMBER_OF_DIFFICULTY = 3;
+const INITIAL_DIFFICULTY_VALUE = 1 / NUMBER_OF_DIFFICULTY;
 const INITIAL_TEMPLATE_VALUE = 1 / NUMBER_OF_ACTIVITY_TEMPLATE;
 
 export const constructBaseVerbalIndvidualModel = (userId: any) => {
   return {
-    bloomBloomAnalyze: INITIAL_TAXONOMY_VALUE,
-    bloomBloomApply: INITIAL_TAXONOMY_VALUE,
-    bloomBloomCreate: INITIAL_TAXONOMY_VALUE,
-    bloomBloomEvaluate: INITIAL_TAXONOMY_VALUE,
-    bloomBloomRemember: INITIAL_TAXONOMY_VALUE,
-    bloomBloomUnderstand: INITIAL_TAXONOMY_VALUE,
+    easy: INITIAL_DIFFICULTY_VALUE,
+    medium: INITIAL_DIFFICULTY_VALUE,
+    hard: INITIAL_DIFFICULTY_VALUE,
     dropdown: INITIAL_TEMPLATE_VALUE,
     coterieField: "VERBAL",
     fillInTheBlanks: INITIAL_TEMPLATE_VALUE,
@@ -27,12 +24,9 @@ export const constructBaseVerbalIndvidualModel = (userId: any) => {
 
 export const constructBaseNumericIndividualModel = (userId: any) => {
   return {
-    bloomBloomAnalyze: INITIAL_TAXONOMY_VALUE,
-    bloomBloomApply: INITIAL_TAXONOMY_VALUE,
-    bloomBloomCreate: INITIAL_TAXONOMY_VALUE,
-    bloomBloomEvaluate: INITIAL_TAXONOMY_VALUE,
-    bloomBloomRemember: INITIAL_TAXONOMY_VALUE,
-    bloomBloomUnderstand: INITIAL_TAXONOMY_VALUE,
+    easy: INITIAL_DIFFICULTY_VALUE,
+    medium: INITIAL_DIFFICULTY_VALUE,
+    hard: INITIAL_DIFFICULTY_VALUE,
     dropdown: INITIAL_TEMPLATE_VALUE,
     coterieField: "NUMERIC",
     fillInTheBlanks: INITIAL_TEMPLATE_VALUE,