@speakableio/core 1.0.15 → 1.0.17

package/dist/index.native.mjs

@@ -1035,15 +1035,26 @@ var getScore = withErrorHandler(_getScore, "getScore");
 
 // src/domains/assignment/utils/calculateScoreAndProgress.ts
 var calculateScoreAndProgress = (scores, cardsList, weights) => {
+  const filteredScoreCards = Object.keys((scores == null ? void 0 : scores.cards) || {}).reduce(
+    (acc, cardId) => {
+      var _a;
+      const cardScores = (_a = scores == null ? void 0 : scores.cards) == null ? void 0 : _a[cardId];
+      if (cardScores && !cardScores.media_area_opened) {
+        acc[cardId] = cardScores;
+      }
+      return acc;
+    },
+    {}
+  );
   const totalSetPoints = cardsList.reduce((acc, cardId) => {
     acc += (weights == null ? void 0 : weights[cardId]) || 1;
     return acc;
   }, 0);
-  const totalPointsAwarded = Object.keys((scores == null ? void 0 : scores.cards) || {}).reduce((acc, cardId) => {
-    var _a, _b;
-    const cardScores = (_a = scores == null ? void 0 : scores.cards) == null ? void 0 : _a[cardId];
+  const totalPointsAwarded = Object.keys(filteredScoreCards).reduce((acc, cardId) => {
+    var _a;
+    const cardScores = filteredScoreCards[cardId];
     if ((cardScores == null ? void 0 : cardScores.completed) || (cardScores == null ? void 0 : cardScores.score) || (cardScores == null ? void 0 : cardScores.score) === 0) {
-      const score2 = (cardScores == null ? void 0 : cardScores.score) || (cardScores == null ? void 0 : cardScores.score) === 0 ? Number((_b = cardScores == null ? void 0 : cardScores.score) != null ? _b : 0) : null;
+      const score2 = (cardScores == null ? void 0 : cardScores.score) || (cardScores == null ? void 0 : cardScores.score) === 0 ? Number((_a = cardScores == null ? void 0 : cardScores.score) != null ? _a : 0) : null;
       const weight = (weights == null ? void 0 : weights[cardId]) || 1;
       const fraction = (score2 != null ? score2 : 0) / 100;
       if (score2 || score2 === 0) {
@@ -1054,9 +1065,8 @@ var calculateScoreAndProgress = (scores, cardsList, weights) => {
     }
     return acc;
   }, 0);
-  const totalCompletedCards = Object.keys((scores == null ? void 0 : scores.cards) || {}).reduce((acc, cardId) => {
-    var _a;
-    const cardScores = (_a = scores == null ? void 0 : scores.cards) == null ? void 0 : _a[cardId];
+  const totalCompletedCards = Object.keys(filteredScoreCards).reduce((acc, cardId) => {
+    const cardScores = filteredScoreCards[cardId];
     if ((cardScores == null ? void 0 : cardScores.completed) || (cardScores == null ? void 0 : cardScores.score) || (cardScores == null ? void 0 : cardScores.score) === 0) {
       acc += 1;
     }
@@ -2443,6 +2453,10 @@ function useActivity({
     enabled: querySet.isSuccess,
     asObject: true
   });
+  const scorableCardIds = (contentCardsToUse != null ? contentCardsToUse : []).filter((cardId) => {
+    const card = cardsObject == null ? void 0 : cardsObject[cardId];
+    return (card == null ? void 0 : card.type) !== "MEDIA_PAGE" /* MEDIA_PAGE */;
+  });
   const scoreQuery = useScore({
     isAssignment,
     activityId: id,
@@ -2456,7 +2470,7 @@ function useActivity({
     activityId,
     isAssignment,
     userId,
-    cardIds: contentCardsToUse != null ? contentCardsToUse : [],
+    cardIds: scorableCardIds,
     weights: weightsToUse != null ? weightsToUse : {}
   });
   const { mutationClearScore } = useClearScore();
@@ -2526,7 +2540,7 @@ function useActivity({
             maxPoints: (_n = (_m = assignmentQuery.data) == null ? void 0 : _m.maxPoints) != null ? _n : 0
           },
           userId,
-          cardIds: contentCardsToUse != null ? contentCardsToUse : [],
+          cardIds: scorableCardIds,
           scores: scoreQuery.data,
           weights: weightsToUse != null ? weightsToUse : {},
           status: someCardIsManualGraded ? "PENDING_REVIEW" : "SUBMITTED"