@quesmed/types 2.6.271 → 2.6.273

package/dist/cjs/models/OsceMarksheet.d.ts

@@ -19,7 +19,8 @@ export interface IOsceMarksheetMark {
     id: Id;
     index: number;
     mark: number | null;
-    comment?: string;
+    comment1?: string;
+    comment2?: string;
     suggestion?: string;
     selectedChoice: Nullable<EPaceMarkType>;
     osceMarksheetId: Id;

package/dist/cjs/resolvers/fragments/osce.js

@@ -103,7 +103,8 @@ exports.OSCE_MARKSHEET_MARK_FIELDS = (0, client_1.gql) `
     score
     secondaryMark
     selectedChoice
-    comment
+    comment1
+    comment2
     suggestion
     osceMarksheetId
     osceStationMarkId
@@ -260,7 +261,8 @@ exports.UPSERT_STATION_NOTE_FRAGMENT = (0, client_1.gql) `
 exports.AUTO_MARKED_OSCE_MARKSHEET_MARK_FIELDS = (0, client_1.gql) `
   fragment AutoMarkedOsceMarksheetMarkFields on OsceMarksheetMark {
     mark
-    comment
+    comment1
+    comment2
     suggestion
   }
 `;

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

@@ -42,6 +42,10 @@ export interface IChangeOsceRoleVar {
 }
 export type IChangeOsceRoleData = RestrictedData<graphqlNormalize & IOsceMarksheet, 'changeOsceRole'>;
 export declare const MARK_OSCE_MARKSHEET_MARK: import("@apollo/client").DocumentNode;
+export declare const getStationScore: (marks: IOsceMarksheetMark[]) => {
+    total: number;
+    userScore: number;
+};
 export interface IMarkOsceMarksheetMarkVar {
     osceMarksheetMarkId: Id;
     mark: number | EPaceMarkType;

package/dist/cjs/resolvers/mutation/restricted/osce.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.END_VOICE_SESSION = exports.CREATE_VOICE_SESSION = exports.optimisticSetOsceMarksheetFeedback = exports.updateCacheOnSetOsceMarksheetFeedback = exports.SET_OSCE_MARKSHEET_FEEDBACK = exports.updateCacheOnAutoMarkOsceMarksheet = exports.AUTO_MARK_OSCE_MARKSHEET = exports.STREAM_OSCE_CHAT_MESSAGE = exports.LEAVE_OSCE_MARKSHEET = exports.optimisticEndOsceMarksheet = exports.updateCacheOnEndOsceMarksheet = exports.END_OSCE_MARKSHEET = exports.MODIFY_OSCE_MARKSHEET = exports.updateCacheOnSaveOsceMarksheet = exports.SAVE_OSCE_MARKSHEET = exports.PRESTART_OSCE_MARKSHEET = exports.START_OSCE_TIMER = exports.START_OSCE_MARKSHEET = exports.SELECT_OSCE_STATION = exports.updateCacheOnMarkOsceMarksheetMark = exports.optimisticMarkOsceMarksheetMark = exports.MARK_OSCE_MARKSHEET_MARK = exports.CHANGE_OSCE_ROLE = exports.BUILD_OSCE_MARKSHEET = exports.CREATE_OR_JOIN_OSCE_MARKSHEET = exports.CANCEL_OSCE_MATCHMAKING = exports.CHECK_OSCE_MATCHMAKING = exports.ACCEPT_OSCE_MATCHMAKING = exports.START_OSCE_MATCHMAKING = void 0;
+exports.END_VOICE_SESSION = exports.CREATE_VOICE_SESSION = exports.optimisticSetOsceMarksheetFeedback = exports.updateCacheOnSetOsceMarksheetFeedback = exports.SET_OSCE_MARKSHEET_FEEDBACK = exports.updateCacheOnAutoMarkOsceMarksheet = exports.AUTO_MARK_OSCE_MARKSHEET = exports.STREAM_OSCE_CHAT_MESSAGE = exports.LEAVE_OSCE_MARKSHEET = exports.optimisticEndOsceMarksheet = exports.updateCacheOnEndOsceMarksheet = exports.END_OSCE_MARKSHEET = exports.MODIFY_OSCE_MARKSHEET = exports.updateCacheOnSaveOsceMarksheet = exports.SAVE_OSCE_MARKSHEET = exports.PRESTART_OSCE_MARKSHEET = exports.START_OSCE_TIMER = exports.START_OSCE_MARKSHEET = exports.SELECT_OSCE_STATION = exports.updateCacheOnMarkOsceMarksheetMark = exports.optimisticMarkOsceMarksheetMark = exports.getStationScore = exports.MARK_OSCE_MARKSHEET_MARK = exports.CHANGE_OSCE_ROLE = exports.BUILD_OSCE_MARKSHEET = exports.CREATE_OR_JOIN_OSCE_MARKSHEET = exports.CANCEL_OSCE_MATCHMAKING = exports.CHECK_OSCE_MATCHMAKING = exports.ACCEPT_OSCE_MATCHMAKING = exports.START_OSCE_MATCHMAKING = void 0;
 const client_1 = require("@apollo/client");
 const models_1 = require("../../../models");
 const fragments_1 = require("../../fragments");
@@ -101,6 +101,46 @@ exports.MARK_OSCE_MARKSHEET_MARK = (0, client_1.gql) `
     }
   }
 `;
+const getStationScore = (marks) => {
+    const MarkMap = {
+        1: 2,
+        2: 1,
+        3: 0,
+    };
+    if (!marks?.length) {
+        return {
+            total: 0,
+            userScore: 0,
+        };
+    }
+    const { total, userScore } = marks.reduce((acc, mark) => {
+        const choices = mark.osceStationMark?.choices;
+        const multiplier = mark.secondaryMark ? 2 : 1;
+        // Maximum possible score
+        acc.total += choices?.length
+            ? choices.reduce((sum, choice) => sum + multiplier * choice.score, 0)
+            : 1;
+        if (choices) {
+            // paces product
+            acc.userScore += MarkMap[mark.mark] ?? 0;
+            if (mark.secondaryMark) {
+                acc.userScore += MarkMap[mark.secondaryMark] ?? 0;
+            }
+        }
+        else {
+            acc.userScore += mark.mark ? 1 : 0;
+        }
+        return acc;
+    }, {
+        total: 0,
+        userScore: 0,
+    });
+    return {
+        total,
+        userScore,
+    };
+};
+exports.getStationScore = getStationScore;
 const optimisticMarkOsceMarksheetMark = (variables, productType) => {
     const data = {};
     if (productType === models_1.EProductType.PACES) {
@@ -169,6 +209,13 @@ const updateCacheOnMarkOsceMarksheetMark = (cache, result, options) => {
           mark
           score
           secondaryMark
+          selectedChoice
+          osceStationMark {
+            id
+            choices {
+              score
+            }
+          }
         }
       }
     `,
@@ -176,10 +223,7 @@ const updateCacheOnMarkOsceMarksheetMark = (cache, result, options) => {
     if (!marksheet?.marks?.length) {
         return;
     }
-    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);
+    const { total, userScore } = (0, exports.getStationScore)(marksheet.marks);
     cache.modify({
         id: cache.identify({ id: marksheetId, __typename: 'OsceMarksheet' }),
         fields: {
@@ -368,7 +412,8 @@ const updateCacheOnEndOsceMarksheet = (productType) => (cache, result, options)
             fields: {
                 secondaryMark: () => mark.secondaryMark,
                 mark: () => mark.mark,
-                comment: () => mark.comment,
+                comment1: () => mark.comment1,
+                comment2: () => mark.comment2,
                 suggestion: () => mark.suggestion,
             },
         });
@@ -462,7 +507,8 @@ const updateCacheOnAutoMarkOsceMarksheet = (cache, result, options) => {
             fields: {
                 mark: () => mark.mark,
                 secondaryMark: () => mark.secondaryMark,
-                comment: () => mark.comment,
+                comment1: () => mark.comment1,
+                comment2: () => mark.comment2,
                 suggestion: () => mark.suggestion,
             },
         });

package/dist/mjs/models/OsceMarksheet.d.ts

@@ -19,7 +19,8 @@ export interface IOsceMarksheetMark {
     id: Id;
     index: number;
     mark: number | null;
-    comment?: string;
+    comment1?: string;
+    comment2?: string;
     suggestion?: string;
     selectedChoice: Nullable<EPaceMarkType>;
     osceMarksheetId: Id;

package/dist/mjs/resolvers/fragments/osce.js

@@ -100,7 +100,8 @@ export const OSCE_MARKSHEET_MARK_FIELDS = gql `
     score
     secondaryMark
     selectedChoice
-    comment
+    comment1
+    comment2
     suggestion
     osceMarksheetId
     osceStationMarkId
@@ -257,7 +258,8 @@ export const UPSERT_STATION_NOTE_FRAGMENT = gql `
 export const AUTO_MARKED_OSCE_MARKSHEET_MARK_FIELDS = gql `
   fragment AutoMarkedOsceMarksheetMarkFields on OsceMarksheetMark {
     mark
-    comment
+    comment1
+    comment2
     suggestion
   }
 `;

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

@@ -42,6 +42,10 @@ export interface IChangeOsceRoleVar {
 }
 export type IChangeOsceRoleData = RestrictedData<graphqlNormalize & IOsceMarksheet, 'changeOsceRole'>;
 export declare const MARK_OSCE_MARKSHEET_MARK: import("@apollo/client").DocumentNode;
+export declare const getStationScore: (marks: IOsceMarksheetMark[]) => {
+    total: number;
+    userScore: number;
+};
 export interface IMarkOsceMarksheetMarkVar {
     osceMarksheetMarkId: Id;
     mark: number | EPaceMarkType;

package/dist/mjs/resolvers/mutation/restricted/osce.js

@@ -98,6 +98,45 @@ export const MARK_OSCE_MARKSHEET_MARK = gql `
     }
   }
 `;
+export const getStationScore = (marks) => {
+    const MarkMap = {
+        1: 2,
+        2: 1,
+        3: 0,
+    };
+    if (!marks?.length) {
+        return {
+            total: 0,
+            userScore: 0,
+        };
+    }
+    const { total, userScore } = marks.reduce((acc, mark) => {
+        const choices = mark.osceStationMark?.choices;
+        const multiplier = mark.secondaryMark ? 2 : 1;
+        // Maximum possible score
+        acc.total += choices?.length
+            ? choices.reduce((sum, choice) => sum + multiplier * choice.score, 0)
+            : 1;
+        if (choices) {
+            // paces product
+            acc.userScore += MarkMap[mark.mark] ?? 0;
+            if (mark.secondaryMark) {
+                acc.userScore += MarkMap[mark.secondaryMark] ?? 0;
+            }
+        }
+        else {
+            acc.userScore += mark.mark ? 1 : 0;
+        }
+        return acc;
+    }, {
+        total: 0,
+        userScore: 0,
+    });
+    return {
+        total,
+        userScore,
+    };
+};
 export const optimisticMarkOsceMarksheetMark = (variables, productType) => {
     const data = {};
     if (productType === EProductType.PACES) {
@@ -165,6 +204,13 @@ export const updateCacheOnMarkOsceMarksheetMark = (cache, result, options) => {
           mark
           score
           secondaryMark
+          selectedChoice
+          osceStationMark {
+            id
+            choices {
+              score
+            }
+          }
         }
       }
     `,
@@ -172,10 +218,7 @@ export const updateCacheOnMarkOsceMarksheetMark = (cache, result, options) => {
     if (!marksheet?.marks?.length) {
         return;
     }
-    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);
+    const { total, userScore } = getStationScore(marksheet.marks);
     cache.modify({
         id: cache.identify({ id: marksheetId, __typename: 'OsceMarksheet' }),
         fields: {
@@ -362,7 +405,8 @@ export const updateCacheOnEndOsceMarksheet = (productType) => (cache, result, op
             fields: {
                 secondaryMark: () => mark.secondaryMark,
                 mark: () => mark.mark,
-                comment: () => mark.comment,
+                comment1: () => mark.comment1,
+                comment2: () => mark.comment2,
                 suggestion: () => mark.suggestion,
             },
         });
@@ -454,7 +498,8 @@ export const updateCacheOnAutoMarkOsceMarksheet = (cache, result, options) => {
             fields: {
                 mark: () => mark.mark,
                 secondaryMark: () => mark.secondaryMark,
-                comment: () => mark.comment,
+                comment1: () => mark.comment1,
+                comment2: () => mark.comment2,
                 suggestion: () => mark.suggestion,
             },
         });

package/package.json

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