@nualang/nualang-ui-components 0.1.1285 → 0.1.1286

package/dist/Lists/Exercises/Exercises.js

@@ -761,7 +761,7 @@ function BotListItem({
             display: "flex",
             alignItems: "center",
             gap: "8px",
-            children: [bot.botName || "", /*#__PURE__*/(0, _jsxRuntime.jsx)(ChallengeBotHtmlTooltip, {
+            children: [bot.botName || "", isCreator ? /*#__PURE__*/(0, _jsxRuntime.jsx)(ChallengeBotHtmlTooltip, {
               placement: "right",
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Chip, {
                 label: t("challenge_mode"),
@@ -769,6 +769,11 @@ function BotListItem({
                 variant: "outlined",
                 color: "primary"
               })
+            }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Chip, {
+              label: t("challenge_mode"),
+              size: "small",
+              variant: "outlined",
+              color: "primary"
             })]
           }) : !isBotChallenge ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
             children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
@@ -791,7 +796,7 @@ function BotListItem({
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
               variant: "body1",
               children: bot.botName || ""
-            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(ChallengeBotHtmlTooltip, {
+            }), isCreator ? /*#__PURE__*/(0, _jsxRuntime.jsx)(ChallengeBotHtmlTooltip, {
               placement: "right",
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Chip, {
                 label: t("challenge_mode"),
@@ -799,6 +804,11 @@ function BotListItem({
                 variant: "outlined",
                 color: "primary"
               })
+            }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Chip, {
+              label: t("challenge_mode"),
+              size: "small",
+              variant: "outlined",
+              color: "primary"
             })]
           }),
           secondary: isLargeScreen ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {

package/dist/Tables/Progress/ProgressTable.js

@@ -488,27 +488,19 @@ function ExerciseCellData({
     let type = null;
     let color;
     if (exercise === "roleplays" && roleplayId && completions?.length > 0) {
-      const uniqueCompletions = new Set(completions.map(completion => completion.exercise));
+      const roleplayCompletionData = data?.percentComplete["roleplays"].completedCounts.find(c => c.roleplayId === roleplayId);
       icon = /*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
-        children: `${uniqueCompletions.size} / 6`
+        children: `${roleplayCompletionData?.completedCount} / ${roleplayCompletionData?.total}`
       });
-      type = uniqueCompletions.size > 0 ? uniqueCompletions.size === 6 ? "completed" : "partial" : "incompleted";
-      switch (uniqueCompletions.size) {
-        case 0:
+      type = roleplayCompletionData?.completedCount > 0 ? roleplayCompletionData?.completedCount === roleplayCompletionData?.total ? "completed" : "partial" : "incompleted";
+      switch (type) {
+        case "incompleted":
           color = _colors.red[400];
           break;
-        case 1:
-        case 2:
-          color = _colors.orange[400];
-          break;
-        case 3:
+        case "partial":
           color = _colors.yellow[400];
           break;
-        case 4:
-        case 5:
-          color = _colors.lightGreen[400];
-          break;
-        case 6:
+        case "completed":
           color = _colors.green[400];
           break;
         default:

package/dist/utils/index.js

@@ -229,21 +229,6 @@ const calcTopicCompletions = (topic, completions = [], isSectionHidden, assignme
   let totalNumberOfGames = 0;
   let completedBots = 0;
   const roleplays = topic.roleplays.map(roleplay => {
-    const {
-      isFillInTheBlanksHidden = "false",
-      isActItOutHidden = "false",
-      isActItOutListeningHidden = "false",
-      isActItOutListeningSpeakingHidden = "false",
-      isActItOutSpeakingHidden = "false"
-    } = roleplay;
-    const trueCount = Object.values({
-      isFillInTheBlanksHidden,
-      isActItOutHidden,
-      isActItOutListeningHidden,
-      isActItOutListeningSpeakingHidden,
-      isActItOutSpeakingHidden
-    }).filter(value => value === "true").length;
-    const numberOfUnhiddenGames = 6 - trueCount;
     const isUnassignedRoleplay = assignmentExercises ? assignmentExercises && !assignmentExercises.some(e => e.roleplayId === roleplay.roleplayId) : false;
     if (isRoleplaysHidden || roleplay.isRoleplayHidden || isSectionHidden || topic.isTopicHidden || isUnassignedRoleplay) {
       return {
@@ -251,17 +236,59 @@ const calcTopicCompletions = (topic, completions = [], isSectionHidden, assignme
         completedCount: 0
       };
     }
-    const uniqueCompletions = Array.isArray(completions) ? Array.from(new Map(completions.filter(completion => completion.gameId && completion.roleplayId === roleplay.roleplayId).map(completion => [completion.exercise, completion])).values()) : [];
-    completedGames += uniqueCompletions.length;
-    totalNumberOfGames += numberOfUnhiddenGames;
-    if (uniqueCompletions?.length === numberOfUnhiddenGames) {
+    const roleplayCompletions = Array.isArray(completions) ? completions.filter(completion => completion.gameId && completion.roleplayId === roleplay.roleplayId) : [];
+    let numberOfRoleplayExercises = 0;
+    let numberOfCompletedRoleplayExercises = 0;
+
+    // Define all possible roleplay exercises and their config
+    const roleplayExercises = [{
+      name: "roleplay-story",
+      hiddenKey: null
+    }, {
+      name: "roleplay-fill-in-the-blanks",
+      hiddenKey: "isFillInTheBlanksHidden"
+    }, {
+      name: "roleplay-act-it-out",
+      hiddenKey: "isActItOutHidden"
+    }, {
+      name: "roleplay-act-it-out-listening",
+      hiddenKey: "isActItOutListeningHidden"
+    }, {
+      name: "roleplay-act-it-out-speaking",
+      hiddenKey: "isActItOutSpeakingHidden"
+    }, {
+      name: "roleplay-act-it-out-listening-speaking",
+      hiddenKey: "isActItOutListeningSpeakingHidden"
+    }];
+    roleplayExercises.forEach(({
+      name,
+      hiddenKey
+    }) => {
+      // Check if the exercise is hidden
+      if (hiddenKey && roleplay?.[hiddenKey] === "true") {
+        return;
+      }
+      const isAssigned = !assignmentExercises || assignmentExercises.some(e => e.name === name && e.roleplayId === roleplay.roleplayId);
+      if (!isAssigned) {
+        return;
+      }
+      numberOfRoleplayExercises++;
+      totalNumberOfGames++;
+      totalExercises++;
+      const completedCount = Array.isArray(roleplayCompletions) ? roleplayCompletions.filter(c => c.exercise === name).length : 0;
+      if (completedCount > 0) {
+        numberOfCompletedRoleplayExercises++;
+        completedGames++;
+        completedExerciseCount++;
+      }
+    });
+    if (numberOfCompletedRoleplayExercises === numberOfRoleplayExercises) {
       completedRoleplays++;
     }
-    completedExerciseCount += uniqueCompletions.length;
-    totalExercises += numberOfUnhiddenGames;
     return {
       ...roleplay,
-      completedCount: uniqueCompletions.length
+      completedCount: numberOfCompletedRoleplayExercises,
+      total: numberOfRoleplayExercises
     };
   });
   const bots = topic.bots.map(bot => {
@@ -308,7 +335,11 @@ const calcTopicCompletions = (topic, completions = [], isSectionHidden, assignme
       },
       roleplays: {
         completed: completedRoleplays,
-        completedCount: roleplays.map(roleplay => [roleplay.roleplayId, roleplay.completedCount]),
+        completedCounts: roleplays.map(roleplay => ({
+          roleplayId: roleplay.roleplayId,
+          completedCount: roleplay.completedCount,
+          total: roleplay.total
+        })),
         total: roleplays.length,
         percentage: Math.floor(completedGames / totalNumberOfGames * 100)
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nualang/nualang-ui-components",
-  "version": "0.1.1285",
+  "version": "0.1.1286",
   "main": "dist/index.js",
   "files": [
     "dist",
@@ -20,7 +20,7 @@
     "@hookform/resolvers": "^3.6.0",
     "@json2csv/plainjs": "^7.0.1",
     "@nualang/avatars": "2.0.3",
-    "@nualang/nualang-api-and-queries": "^1.1.16",
+    "@nualang/nualang-api-and-queries": "^1.1.20",
     "@storybook/theming": "^8.6.12",
     "@stripe/react-stripe-js": "^2.1.1",
     "@stripe/stripe-js": "^1.54.2",