@quesmed/types-rn 2.6.211 → 2.6.212

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quesmed/types-rn",
-  "version": "2.6.211",
+  "version": "2.6.212",
   "description": "Typescript types for Quesmed",
   "keywords": [
     "quesmed",

package/utils/evaluateMark.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.evaluateMark = void 0;
 const models_1 = require("../models");
-const object_1 = require("./object");
 function isPrescribeAnswer(data) {
     return Object(data).hasOwnProperty('dose');
 }
@@ -153,21 +152,43 @@ function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, })
                 break;
             }
             case models_1.EQuestionType.PRESCRIPTION_ANSWER: {
-                let foundCorrect = false;
-                if (typeof flatAttempt === 'object' &&
-                    Object.keys(flatAttempt).length > 0) {
-                    const answers = answer.map(mapPrescribeMarkToAnswer);
-                    const attempt = mapPrescribeMarkToAnswer(flatAttempt);
-                    foundCorrect = answers.some((ans) => (0, object_1.compareObjects)(ans, attempt));
-                }
-                if (foundCorrect) {
-                    data.score = 1;
-                    data.result = models_1.EMarkResult.Correct;
+                if (typeof flatAttempt !== 'object' ||
+                    !flatAttempt ||
+                    Object.keys(flatAttempt).length === 0) {
+                    data.score = 0;
+                    data.result = models_1.EMarkResult.Incorrect;
+                    break;
                 }
-                else {
+                const answers = answer.map(mapPrescribeMarkToAnswer);
+                const attempt = mapPrescribeMarkToAnswer(flatAttempt);
+                // Find all answers with matching drug
+                const matchingDrugAnswers = answers.filter((ans) => ans.drugId === attempt.drugId);
+                if (matchingDrugAnswers.length === 0) {
                     data.score = 0;
                     data.result = models_1.EMarkResult.Incorrect;
+                    break;
+                }
+                // Base score for correct drug
+                const DRUG_SCORE = 5;
+                const COMPONENT_SCORES = {
+                    3: 5,
+                    2: 3,
+                    1: 2,
+                    0: 0, // no components are correct
+                };
+                // Find the best matching answer (highest component score)
+                let bestCorrectCount = -1;
+                for (const matchingDrugAnswer of matchingDrugAnswers) {
+                    const correctCount = Number(matchingDrugAnswer.doseId === attempt.doseId) +
+                        Number(matchingDrugAnswer.routeId === attempt.routeId) +
+                        Number(matchingDrugAnswer.frequencyId === attempt.frequencyId);
+                    if (correctCount > bestCorrectCount) {
+                        bestCorrectCount = correctCount;
+                    }
                 }
+                data.score = DRUG_SCORE + COMPONENT_SCORES[bestCorrectCount];
+                data.result =
+                    bestCorrectCount === 3 ? models_1.EMarkResult.Correct : models_1.EMarkResult.Partial;
                 break;
             }
             case models_1.EQuestionType.EXTENDED_MATCHING_ANSWER: {