@nualang/nualang-ui-components 0.1.1301 → 0.1.1303

package/dist/Assignments/AssignmentExerciseSelection/AssignmentExerciseSelection.js

@@ -892,10 +892,12 @@ function SectionList({
   const [courseSectionWithProgress, setCourseSectionWithProgress] = useState([]);
   useEffect(() => {
     if (sections && memberCourseCompletions && selectedExercises) {
-      const sectionsWithProgress = calcCompletions(sections, memberCourseCompletions, true, selectedExercises);
+      const sectionsWithProgress = calcCompletions(sections, memberCourseCompletions, selectedExercises, {
+        includeChallengeBots: isChallengeModeEnabled
+      });
       setCourseSectionWithProgress(sectionsWithProgress);
     }
-  }, [sections, memberCourseCompletions, selectedExercises]);
+  }, [sections, memberCourseCompletions, selectedExercises, isChallengeModeEnabled]);
   const courseSections = courseSectionWithProgress && courseSectionWithProgress.length ? courseSectionWithProgress : sections;
   return /*#__PURE__*/_jsx(_Fragment, {
     children: courseSections.length > 0 ? courseSections.map((section, index) => {

package/dist/Tables/Progress/Progress.js

@@ -663,6 +663,7 @@ function Progress({
       bots: bots,
       courseIds: courseIds,
       featureFlags: featureFlags,
+      reportType: reportType,
       isChallengeModeEnabled: Array.isArray(featureFlags?.classroomModes) && featureFlags.classroomModes.includes("challenge"),
       assignedCourseIds: assignedCourseIds
     })]

package/dist/utils/index.js

@@ -127,7 +127,6 @@ export const getScoreValues = (type, id, completions) => {
   }
 };
 export const calcTopicCompletions = (topic, completions = [], isSectionHidden, assignmentExercises = [], includeChallengeBots = false) => {
-  // console.log({ assignmentExercises, includeChallengeBots, completions, topic });
   let isRoleplaysHidden;
   let isPronunciationHidden;
   let isBotsHidden;
@@ -140,11 +139,6 @@ export const calcTopicCompletions = (topic, completions = [], isSectionHidden, a
     isPhrases = true;
   }
   if (isSectionHidden || topic.isTopicHidden) {
-    console.log({
-      itHAppened: topic,
-      isSectionHidden,
-      topicIsHidden: topic.isTopicHidden
-    });
     isRoleplaysHidden = true;
     isBotsHidden = true;
     isPronunciationHidden = true;
@@ -167,9 +161,6 @@ export const calcTopicCompletions = (topic, completions = [], isSectionHidden, a
     });
   } else if (topic && topic.hiddenExercises) {
     topic.hiddenExercises.forEach(exercise => {
-      console.log({
-        happenedHEREE: exercise
-      });
       if (exercise === "roleplays") {
         isRoleplaysHidden = true;
       }
@@ -201,44 +192,21 @@ export const calcTopicCompletions = (topic, completions = [], isSectionHidden, a
   const completedPronunciation = Array.isArray(completions) ? completions.filter(c => c.topicId === topic.topicId && c.exercise === "pronunciation").length : 0;
   const completedTranslation = Array.isArray(completions) ? completions.filter(c => c.topicId === topic.topicId && c.exercise === "translation").length : 0;
   const completedListening = Array.isArray(completions) ? completions.filter(c => c.topicId === topic.topicId && c.exercise === "listening").length : 0;
-  console.log({
-    topic,
-    completedTranslation,
-    completedListening,
-    isPronunciationHidden,
-    isTranslationHidden,
-    isListeningHidden
-  });
   completedExerciseCount += !isPronunciationHidden && completedPronunciation > 0 ? 1 : 0;
   completedExerciseCount += !isTranslationHidden && completedTranslation > 0 ? 1 : 0;
   completedExerciseCount += !isListeningHidden && completedListening > 0 ? 1 : 0;
-  console.log({
-    completedTranslation,
-    isTranslationHidden,
-    completedExerciseCount
-  });
-  // console.log({ completedPronunciation, completedTranslation, completedListening, completedExerciseCount, totalExercises });
   let completedRoleplays = 0;
   let completedGames = 0;
   let totalNumberOfGames = 0;
   let completedBots = 0;
   const roleplays = topic.roleplays.map(roleplay => {
     const isUnassignedRoleplay = assignmentExercises ? assignmentExercises && !assignmentExercises.some(e => e.roleplayId === roleplay.roleplayId) : false;
-    console.log({
-      assignmentExercises,
-      roleplay,
-      isRoleplaysHidden,
-      isSectionHidden,
-      topicIsHidden: topic.isTopicHidden,
-      isUnassignedRoleplay
-    });
     if (isRoleplaysHidden || roleplay.isRoleplayHidden || isSectionHidden || topic.isTopicHidden || isUnassignedRoleplay) {
       return {
         ...roleplay,
         completedCount: 0
       };
     }
-    // console.log({ uiCompletions: completions })
     const roleplayCompletions = Array.isArray(completions) ? completions.filter(completion => completion.gameId && completion.roleplayId === roleplay.roleplayId) : [];
     let numberOfRoleplayExercises = 0;
     let numberOfCompletedRoleplayExercises = 0;
@@ -280,10 +248,6 @@ export const calcTopicCompletions = (topic, completions = [], isSectionHidden, a
       totalExercises++;
       const completedCount = Array.isArray(roleplayCompletions) ? roleplayCompletions.filter(c => c.exercise === name).length : 0;
       if (completedCount > 0) {
-        console.log({
-          name,
-          completedCount
-        });
         numberOfCompletedRoleplayExercises++;
         completedGames++;
         completedExerciseCount++;
@@ -299,21 +263,8 @@ export const calcTopicCompletions = (topic, completions = [], isSectionHidden, a
     };
   });
   const bots = topic.bots.map(bot => {
-    console.log({
-      completions
-    });
     const isUnassignedBot = assignmentExercises ? assignmentExercises && !assignmentExercises.some(e => e.botId === bot.botId) : false;
-    if (isBotsHidden || bot.isBotHidden || bot.isChallengeBot && !includeChallengeBots || isSectionHidden || topic.isTopicHidden
-    // ||
-    // isUnassignedBot
-    ) {
-      // console.log({ itHAppened: bot, })
-      //       console.log({ isBotsHidden ,
-      // ishiddne: bot.isBotHidden ,
-      // mine: (bot.isChallengeBot && !includeChallengeBots),
-      // isSectionHidden ,
-      // topichidden: topic.isTopicHidden ,
-      // isUnassignedBot });
+    if (isBotsHidden || bot.isBotHidden || bot.isChallengeBot && !includeChallengeBots || isSectionHidden || topic.isTopicHidden || isUnassignedBot) {
       return {
         ...bot,
         completedCount: 0
@@ -389,7 +340,7 @@ export const calcTopicCompletions = (topic, completions = [], isSectionHidden, a
     }
   };
 };
-export const calcCompletions = (sections = [], completions = [], assignmentExercises, opts = {}) => sections.map(section => {
+export const calcCompletions = (sections = [], completions = [], assignmentExercises = [], opts = {}) => sections.map(section => {
   const {
     includeChallengeBots = false
   } = opts;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nualang/nualang-ui-components",
-  "version": "0.1.1301",
+  "version": "0.1.1303",
   "type": "module",
   "main": "dist/index.js",
   "files": [