@quesmed/types-rn 2.6.211 → 2.6.213

package/models/Marksheet.d.ts

@@ -86,6 +86,10 @@ export interface IMarksheet {
     users: IUser[];
     activeUsers?: IUser[];
     state: EMarksheetState;
+    /**
+     * @deprecated Use !!endedAt instead
+     * And for timed tests, check if (parent.endedAt && new Date(parent.endedAt) <= new Date());
+     */
     completed: boolean;
     timeTaken: number;
     currentMarkId?: number;
@@ -114,10 +118,14 @@ export interface IMarksheetMark {
     question: IQuestion;
     mark: IMarksheetMarkJSONB;
     marksheet?: IMarksheet;
-    isAnswered: boolean;
     striked: number[];
     score: number;
     result: EMarkResult;
+    /**
+     * @deprecated Use !!mark instead
+     */
+    isAnswered: boolean;
+    isInDailyStack: boolean;
 }
 export interface IPreBuildMarksheetRef {
     createdAt: number | Date;

package/package.json

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

package/resolvers/fragments/marksheet.d.ts

@@ -13,3 +13,4 @@ export declare const MODIFY_CURRENT_MARK_FRAGMENT: import("@apollo/client").Docu
 export declare const MARK_FLAGGED_FIELD: import("@apollo/client").DocumentNode;
 export declare const MODIFY_MARKSHEET_COMPLETED_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const NEW_MARK_FIELDS: import("@apollo/client").DocumentNode;
+export declare const DAILY_STACK_FIELDS: import("@apollo/client").DocumentNode;

package/resolvers/fragments/marksheet.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NEW_MARK_FIELDS = exports.MODIFY_MARKSHEET_COMPLETED_FRAGMENT = exports.MARK_FLAGGED_FIELD = exports.MODIFY_CURRENT_MARK_FRAGMENT = exports.MODIFY_TOPIC_SELECTION_FRAGMENT = exports.MODIFY_MARKSHEET_STATE_FRAGMENT = exports.MODIFY_MARKSHEET_MARK_STRIKED_FRAGMENT = exports.MODIFY_MARKSHEET_MARK_QUESTIONCHOICEID_FRAGMENT = exports.MODIFY_CURRENT_MARKSHEET_MARK_FRAGMENT = exports.MARKSHEET_FIELDS = exports.BUILDER_CONFIG_FIELDS = exports.MARKSHEET_MARK_FIELDS = void 0;
+exports.DAILY_STACK_FIELDS = exports.NEW_MARK_FIELDS = exports.MODIFY_MARKSHEET_COMPLETED_FRAGMENT = exports.MARK_FLAGGED_FIELD = exports.MODIFY_CURRENT_MARK_FRAGMENT = exports.MODIFY_TOPIC_SELECTION_FRAGMENT = exports.MODIFY_MARKSHEET_STATE_FRAGMENT = exports.MODIFY_MARKSHEET_MARK_STRIKED_FRAGMENT = exports.MODIFY_MARKSHEET_MARK_QUESTIONCHOICEID_FRAGMENT = exports.MODIFY_CURRENT_MARKSHEET_MARK_FRAGMENT = exports.MARKSHEET_FIELDS = exports.BUILDER_CONFIG_FIELDS = exports.MARKSHEET_MARK_FIELDS = void 0;
 const client_1 = require("@apollo/client");
 const question_1 = require("./question");
 exports.MARKSHEET_MARK_FIELDS = (0, client_1.gql) `
@@ -12,6 +12,7 @@ exports.MARKSHEET_MARK_FIELDS = (0, client_1.gql) `
     questionChoiceId
     marksheetId
     timeTaken
+    isInDailyStack
     isAnswered
     striked
     mark
@@ -150,3 +151,8 @@ exports.NEW_MARK_FIELDS = (0, client_1.gql) `
     score
   }
 `;
+exports.DAILY_STACK_FIELDS = (0, client_1.gql) `
+  fragment DailyStackField on MarksheetMark {
+    isInDailyStack
+  }
+`;

package/resolvers/mutation/restricted/marksheet.js

@@ -70,6 +70,7 @@ exports.SAVE_MARKSHEET = (0, client_1.gql) `
         state
         marks {
           isAnswered
+          isInDailyStack
           result
           score
           id
@@ -356,6 +357,7 @@ exports.MODIFY_MARKSHEET_MARK = (0, client_1.gql) `
         result
         score
         isAnswered
+        isInDailyStack
         striked
       }
     }
@@ -462,6 +464,7 @@ exports.TOGGLE_STRIKE_OPTIONS = (0, client_1.gql) `
         id
         index
         isAnswered
+        isInDailyStack
         mark
         result
         score

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

@@ -27,10 +27,11 @@ export declare const optimisticToggleFlaggedQuestion: (mark: IMarksheetMark, fla
             question: import("../../../models").IQuestion;
             mark: import("../../../models").IMarksheetMarkJSONB;
             marksheet?: IMarksheet | undefined;
-            isAnswered: boolean;
             striked: number[];
             score: number;
             result: import("../../../models").EMarkResult;
+            isAnswered: boolean;
+            isInDailyStack: boolean;
         };
     };
 };

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

@@ -1,5 +1,5 @@
 import { ApolloCache } from '@apollo/client';
-import { ITodo, Id } from '../../../models';
+import { IMarksheet, ITodo, Id } from '../../../models';
 import { ApolloUpdateOptions, ApolloUpdateResultRestricted } from '../../apollo';
 import { RestrictedData, graphqlNormalize } from '../../types';
 import { IUserCompletedCard } from './../../../models/User';
@@ -30,20 +30,24 @@ export declare const optimisticSaveTodos: (todo: ITodo, cardIndex: number, todoI
 export declare const ADD_TO_DAILY_STACK: import("@apollo/client").DocumentNode;
 export interface IAddToDailyStackVar {
     conceptIds: Id[];
+    marksheetId?: Id;
 }
 export type IAddToDailyStackData = RestrictedData<graphqlNormalize & {
     addedUserCompletedCards: (graphqlNormalize & IUserCompletedCard)[];
     dailyFeed: graphqlNormalize & ITodo;
+    marks: graphqlNormalize & IMarksheet['marks'];
 }, 'addToDailyStack'>;
 export declare const REMOVE_FROM_DAILY_STACK: import("@apollo/client").DocumentNode;
 export interface IRemoveFromDailyStackVar {
     cardId?: Id;
     todoId?: Id;
     conceptId?: Id;
+    marksheetId?: Id;
 }
 export type IRemoveFromDailyStackData = RestrictedData<graphqlNormalize & {
     removedUserCompletedCards: (graphqlNormalize & IUserCompletedCard)[];
     dailyFeed: graphqlNormalize & ITodo;
+    marks: graphqlNormalize & IMarksheet['marks'];
 }, 'removeFromDailyStack'>;
 export declare const updateCacheOnRemoveFromDailyStack: (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<IRemoveFromDailyStackData>, options: ApolloUpdateOptions) => void;
 export declare const updateCacheOnAddToDailyStack: (cache: ApolloCache<any>, result: ApolloUpdateResultRestricted<IAddToDailyStackData>) => void;

package/resolvers/mutation/restricted/todo.js

@@ -117,9 +117,9 @@ const optimisticSaveTodos = (todo, cardIndex, todoInput) => {
 exports.optimisticSaveTodos = optimisticSaveTodos;
 exports.ADD_TO_DAILY_STACK = (0, client_1.gql) `
   ${fragments_1.PICTURE_FIELDS}
-  mutation AddToDailyStack($conceptIds: [Int!]!) {
+  mutation AddToDailyStack($conceptIds: [Int!]!, $marksheetId: Int) {
     restricted {
-      addToDailyStack(conceptIds: $conceptIds) {
+      addToDailyStack(conceptIds: $conceptIds, marksheetId: $marksheetId) {
         addedUserCompletedCards {
           id
           createdAt
@@ -152,6 +152,10 @@ exports.ADD_TO_DAILY_STACK = (0, client_1.gql) `
             }
           }
         }
+        marks {
+          id
+          isInDailyStack
+        }
         dailyFeed {
           id
           marks {
@@ -163,12 +167,18 @@ exports.ADD_TO_DAILY_STACK = (0, client_1.gql) `
   }
 `;
 exports.REMOVE_FROM_DAILY_STACK = (0, client_1.gql) `
-  mutation RemoveFromDailyStack($cardId: Int, $todoId: Int, $conceptId: Int) {
+  mutation RemoveFromDailyStack(
+    $cardId: Int
+    $todoId: Int
+    $conceptId: Int
+    $marksheetId: Int
+  ) {
     restricted {
       removeFromDailyStack(
         cardId: $cardId
         todoId: $todoId
         conceptId: $conceptId
+        marksheetId: $marksheetId
       ) {
         removedUserCompletedCards {
           id
@@ -178,6 +188,10 @@ exports.REMOVE_FROM_DAILY_STACK = (0, client_1.gql) `
             name
           }
         }
+        marks {
+          id
+          isInDailyStack
+        }
         dailyFeed {
           id
           marks {
@@ -217,6 +231,20 @@ const updateCacheOnRemoveFromDailyStack = (cache, result, options) => {
             },
         });
     }
+    if (data.marks?.length) {
+        for (const mark of data.marks) {
+            cache.writeFragment({
+                id: cache.identify({
+                    id: mark.id,
+                    __typename: 'MarksheetMark',
+                }),
+                data: {
+                    isInDailyStack: mark.isInDailyStack,
+                },
+                fragment: fragments_1.DAILY_STACK_FIELDS,
+            });
+        }
+    }
     if (todoId) {
         const prevData = cache.readQuery({
             variables: { id: todoId },
@@ -267,6 +295,20 @@ const updateCacheOnAddToDailyStack = (cache, result) => {
             },
         });
     }
+    if (data?.marks?.length) {
+        for (const mark of data.marks) {
+            cache.writeFragment({
+                id: cache.identify({
+                    id: mark.id,
+                    __typename: 'MarksheetMark',
+                }),
+                data: {
+                    isInDailyStack: mark.isInDailyStack,
+                },
+                fragment: fragments_1.DAILY_STACK_FIELDS,
+            });
+        }
+    }
 };
 exports.updateCacheOnAddToDailyStack = updateCacheOnAddToDailyStack;
 exports.REFRESH_DAILY_TASK = (0, client_1.gql) `

package/resolvers/query/restricted/marksheet.d.ts

@@ -8,12 +8,11 @@ export interface IMarksheetVar {
 export type IMarksheetData = RestrictedData<graphqlNormalize & IMarksheet, 'marksheet'>;
 export declare const MARKSHEET: import("@apollo/client").DocumentNode;
 export interface IMarksheetsVar {
-    filter: {
+    options: {
         limit: number;
         order?: ESortOrder;
-        offset?: number;
+        lastId?: number;
         solo?: boolean;
-        period?: number;
     };
 }
 export interface IMarksheetsWindowVar {

package/resolvers/query/restricted/marksheet.js

@@ -14,14 +14,18 @@ exports.MARKSHEET = (0, client_1.gql) `
   }
 `;
 exports.MARKSHEETS = (0, client_1.gql) `
-  query Marksheets($filter: MarksheetFilterInput!) {
+  query Marksheets($options: MarksheetOptions!) {
     restricted {
-      marksheets(filter: $filter) {
+      marksheets(options: $options) {
         results {
           id
           source
           endedAt
           topicNames
+          entitlement {
+            id
+            name
+          }
           correct
           incorrect
           totalQuestions
@@ -45,7 +49,6 @@ exports.MARKSHEETS = (0, client_1.gql) `
           }
         }
         total
-        score
       }
     }
   }

package/resolvers/query/restricted/user.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.USER_ACTIVITY = exports.USER_STATS = exports.DAILY_FEED = exports.USER_COMPLETED_DATA = exports.REFERRALS = exports.GET_USER_SUBSCRIPTIONS = exports.USER = void 0;
 const client_1 = require("@apollo/client");
-const fragments_1 = require("../../fragments");
 const user_1 = require("../../fragments/user");
 exports.USER = (0, client_1.gql) `
   ${user_1.USER_FIELDS}
@@ -50,11 +49,10 @@ exports.REFERRALS = (0, client_1.gql) `
   }
 `;
 exports.USER_COMPLETED_DATA = (0, client_1.gql) `
-  ${fragments_1.PICTURE_FIELDS}
-  query CompletedQuestionCards {
+  query CompletedQuestionCards($marksheetId: Int) {
     restricted {
       user {
-        completedCards {
+        completedCards(marksheetId: $marksheetId) {
           id
           createdAt
           updatedAt
@@ -62,31 +60,7 @@ exports.USER_COMPLETED_DATA = (0, client_1.gql) `
             id
             name
           }
-          lastSeen
-          reviewDate
-          score
-          iteration
-          optimalFactor
-          cardId
-          card {
-            id
-            conceptId
-            concept {
-              id
-              name
-            }
-            topic {
-              id
-              name
-            }
-            question
-            explanation
-            pictures {
-              ...PictureFields
-            }
-          }
         }
-        completedCardsCount
       }
     }
   }

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: {