@quesmed/types-rn 2.6.268 → 2.6.269

package/models/OsceMarksheet.d.ts

@@ -26,6 +26,8 @@ export interface IOsceMarksheetMark {
     osceMarksheet?: IOsceMarksheet;
     osceStationMarkId: Id;
     osceStationMark?: IOsceStationMark;
+    secondaryMark: number | null;
+    score: number | null;
 }
 export declare enum EOsceRoles {
     ALL = 0,

package/package.json

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

package/resolvers/fragments/osce.js

@@ -100,6 +100,8 @@ exports.OSCE_MARKSHEET_MARK_FIELDS = (0, client_1.gql) `
     id
     index
     mark
+    score
+    secondaryMark
     selectedChoice
     osceMarksheetId
     osceStationMarkId

package/resolvers/mutation/restricted/osce.d.ts

@@ -45,6 +45,7 @@ export declare const MARK_OSCE_MARKSHEET_MARK: import("@apollo/client").Document
 export interface IMarkOsceMarksheetMarkVar {
     osceMarksheetMarkId: Id;
     mark: number | EPaceMarkType;
+    secondaryMark?: number;
     corrected?: Boolean;
 }
 export type IMarkOsceMarksheetMarkData = RestrictedData<graphqlNormalize & Partial<IOsceMarksheetMark>, 'markOsceMarksheetMark'>;

package/resolvers/mutation/restricted/osce.js

@@ -84,16 +84,19 @@ exports.CHANGE_OSCE_ROLE = (0, client_1.gql) `
   }
 `;
 exports.MARK_OSCE_MARKSHEET_MARK = (0, client_1.gql) `
-  mutation MarkOsceMarksheetMark($osceMarksheetMarkId: Int!, $mark: Int!, $corrected: Boolean) {
+  mutation MarkOsceMarksheetMark($osceMarksheetMarkId: Int!, $mark: Int!, $secondaryMark: Int, $corrected: Boolean) {
     restricted {
       markOsceMarksheetMark(
         osceMarksheetMarkId: $osceMarksheetMarkId
         mark: $mark
+        secondaryMark: $secondaryMark
         corrected: $corrected
       ) {
         id
         selectedChoice
         mark
+        score
+        secondaryMark
       }
     }
   }
@@ -103,10 +106,13 @@ const optimisticMarkOsceMarksheetMark = (variables, productType) => {
     if (productType === models_1.EProductType.PACES) {
         data.selectedChoice = variables.mark;
         data.mark = null;
+        data.secondaryMark = variables.secondaryMark;
+        data.score = null;
     }
     else {
         data.mark = variables.mark;
         data.selectedChoice = null;
+        data.score = variables.mark;
     }
     return {
         restricted: {
@@ -133,6 +139,8 @@ const updateCacheOnMarkOsceMarksheetMark = (cache, result, options) => {
         fields: {
             selectedChoice: () => markOsceMarksheetMark.selectedChoice,
             mark: () => markOsceMarksheetMark.mark,
+            secondaryMark: () => markOsceMarksheetMark.secondaryMark,
+            score: () => markOsceMarksheetMark.score,
         },
     });
     if (!variables.corrected) {
@@ -159,6 +167,8 @@ const updateCacheOnMarkOsceMarksheetMark = (cache, result, options) => {
       fragment OsceMarksheetMarksForScore on OsceMarksheet {
         marks {
           mark
+          score
+          secondaryMark
         }
       }
     `,
@@ -166,12 +176,14 @@ const updateCacheOnMarkOsceMarksheetMark = (cache, result, options) => {
     if (!marksheet?.marks?.length) {
         return;
     }
-    const total = marksheet.marks.length;
-    const scored = marksheet.marks.filter(({ mark }) => Boolean(mark)).length;
+    const hasSecondaryMarks = marksheet.marks.some((m) => m.secondaryMark);
+    const total = hasSecondaryMarks ? 2 * marksheet.marks.length : marksheet.marks.length;
+    // const scored = marksheet.marks.filter(({ mark }) => Boolean(mark)).length;
+    const userScore = marksheet.marks.reduce((sum, m) => sum + Number(m.score), 0);
     cache.modify({
         id: cache.identify({ id: marksheetId, __typename: 'OsceMarksheet' }),
         fields: {
-            score: () => scored / total,
+            score: () => userScore / total,
         },
     });
 };