@quesmed/types-rn 2.6.206 → 2.6.207

package/package.json

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

package/resolvers/query/restricted/analytics.js

@@ -63,7 +63,7 @@ exports.UCAT_THEME_ANALYTICS = (0, client_1.gql) `
   query UcatThemeAnalytics(
     $entitlementId: Int
     $themeId: Int
-    $updatedAt: Int
+    $updatedAt: Date
   ) {
     restricted {
       ucatThemeAnalytics(

package/utils/commonFunctions.d.ts

@@ -3,6 +3,7 @@ export interface ICorrectMarkData {
     correct: boolean;
     incorrect: boolean;
     correctIndex: number;
+    partial: boolean;
 }
 export declare function isPrescribeAnswer(data: IPrescribeAnswer | IPrescribeMark): data is IPrescribeAnswer;
 export declare function mapPrescribeMarkToAnswer(obj: IPrescribeAnswer | IPrescribeMark): IPrescribeMark;

package/utils/commonFunctions.js

@@ -40,6 +40,7 @@ function correctMark(mark) {
         correct: false,
         incorrect: false,
         correctIndex: -1,
+        partial: false,
     };
     if (!mark || !mark.mark) {
         return data;
@@ -58,7 +59,6 @@ function correctMark(mark) {
             models_1.EQuestionType.VERBAL_READING_COMPREHENSION,
             models_1.EQuestionType.DECISION_MAKING_SBA,
             models_1.EQuestionType.QUANTITATIVE_REASONING_SBA,
-            models_1.EQuestionType.SJT_SINGLE_CHOICE,
         ].includes(mark.question.typeId)) {
             const answer = flatAnswer;
             const attempt = flatAttempt;
@@ -84,10 +84,7 @@ function correctMark(mark) {
                 data.incorrect = true;
             }
         }
-        else if ([
-            models_1.EQuestionType.MULTIPLE_ANSWERS,
-            models_1.EQuestionType.DECISION_MAKING_YES_NO,
-        ].includes(mark.question.typeId)) {
+        else if (models_1.EQuestionType.MULTIPLE_ANSWERS === mark.question.typeId) {
             const [answerA, answerB] = answer.map((x) => x.sort());
             let [attemptA, attemptB] = [[], []];
             if (Array.isArray(jsonAnswer) &&
@@ -108,6 +105,35 @@ function correctMark(mark) {
                 data.incorrect = true;
             }
         }
+        else if (models_1.EQuestionType.DECISION_MAKING_YES_NO === mark.question.typeId) {
+            const [answerA, answerB] = answer.map((x) => [...x].sort());
+            let [attemptA, attemptB] = [[], []];
+            if (Array.isArray(jsonAnswer) &&
+                jsonAnswer.length === 2 &&
+                Array.isArray(jsonAnswer[0]) &&
+                Array.isArray(jsonAnswer[1])) {
+                [attemptA, attemptB] = jsonAnswer.map((x) => [...x].sort());
+            }
+            // Count correct matches
+            let correctCount = 0;
+            // Count matches in A
+            correctCount += attemptA.filter((x) => answerA.includes(x)).length;
+            // Count matches in B
+            correctCount += attemptB.filter((x) => answerB.includes(x)).length;
+            const totalStatements = answerA.length + answerB.length;
+            if (correctCount === totalStatements) {
+                // 5 / 5
+                data.correct = true;
+            }
+            else if (correctCount === totalStatements - 1) {
+                // 4 / 5
+                data.partial = true;
+            }
+            else {
+                // 3 or fewer
+                data.incorrect = true;
+            }
+        }
         else if (models_1.EQuestionType.PRESCRIPTION_ANSWER === mark.question.typeId) {
             let foundCorrect = false;
             let index = 0;
@@ -203,6 +229,28 @@ function correctMark(mark) {
                 data.correct = true;
             }
         }
+        else if (models_1.EQuestionType.SJT_SINGLE_CHOICE === mark.question.typeId) {
+            const answer = flatAnswer;
+            const attempt = flatAttempt;
+            const options = mark.question.choices.map((o) => o.label);
+            const answerIndex = options.indexOf(answer);
+            const attemptIndex = options.indexOf(attempt);
+            if (answerIndex === -1 || attemptIndex === -1) {
+                data.incorrect = true;
+            }
+            else {
+                const distance = Math.abs(answerIndex - attemptIndex);
+                if (distance === 0) {
+                    data.correct = true;
+                }
+                else if (distance === 1) {
+                    data.partial = true;
+                }
+                else {
+                    data.incorrect = true;
+                }
+            }
+        }
     }
     catch (e) {
         console.error(e);