@quesmed/types-rn 2.6.218 → 2.6.220

package/models/Job.d.ts

@@ -1,8 +1,8 @@
-import { Id } from '../models';
+import { IChapter, IOsceStation, IQuestionPrescription, Id } from '../models';
 import { EMockTestType } from './MockTest';
 import { IPicture } from './Picture';
 import { EEntitlementType, EProductType } from './Product';
-import { EQuestionType, IQuestionAnswer, IQuestionChoice, IQuestionComment } from './Question';
+import { EQuestionType, IQuestion, IQuestionAnswer, IQuestionCase, IQuestionChoice, IQuestionComment } from './Question';
 import { IUser } from './User';
 export declare enum EJobPriority {
     LOW = 1,
@@ -62,7 +62,8 @@ export declare enum ELightGalleryType {
     EXAMINER = 6,
     CANDIDATE = 7,
     WALKTHROUGH = 8,
-    ACTOR = 9
+    ACTOR = 9,
+    CHOICE_EXPLANATION = 10
 }
 export declare enum EJobRemarkStatus {
     ALL = 0,
@@ -130,6 +131,10 @@ export interface IJobRecordQuestion {
     choices: Array<Pick<IQuestionChoice, 'label' | 'name' | 'answer'> & {
         explanation?: IQuestionChoice['explanation'];
     }>;
+    prescriptions?: Array<Omit<IQuestionPrescription, 'id'>>;
+    cases?: Array<Pick<IQuestionCase, 'label' | 'case'> & {
+        explanation?: IQuestionCase['explanation'];
+    }>;
     irtParameters?: IRTParameters | null;
 }
 export interface IJobRecordChapter {
@@ -157,6 +162,10 @@ export interface IJobRecordMockTest {
     choices: Array<Pick<IQuestionChoice, 'label' | 'name' | 'answer'> & {
         explanation?: IQuestionChoice['explanation'];
     }>;
+    prescriptions?: Array<Omit<IQuestionPrescription, 'id'>>;
+    cases?: Array<Pick<IQuestionCase, 'label' | 'case'> & {
+        explanation?: IQuestionCase['explanation'];
+    }>;
     irtParameters?: IRTParameters | null;
 }
 export interface IJobRecordMetricsSummary {
@@ -171,12 +180,6 @@ export interface IJobRecordMetricsSummary {
     dislikes: number;
     public: boolean;
 }
-export interface IJobRecordChoiceVote {
-    id: Id;
-    label: string;
-    votes: number;
-    percentage: number;
-}
 export interface IJobRecordChoiceSummary {
     id: Id;
     label: string;
@@ -197,12 +200,13 @@ export interface IJobRecord {
     createdBy: IUser['id'];
     createdByUser: Pick<IUser, 'id' | 'firstName' | 'lastName' | 'username' | 'accessLevel'>;
     questionId: number | null;
+    question?: IQuestion;
     stationId: number | null;
+    station?: IOsceStation;
     chapterId: number | null;
+    chapter?: IChapter;
     remarks: IJobRemark[];
     assets: IJobAsset[];
-    metricsSummary: IJobRecordMetricsSummary | null;
-    choiceSummary: IJobRecordChoiceSummary[] | null;
     referenceCount: number;
 }
 export interface IJobMetaData {

package/models/Job.js

@@ -91,6 +91,7 @@ var ELightGalleryType;
     ELightGalleryType[ELightGalleryType["CANDIDATE"] = 7] = "CANDIDATE";
     ELightGalleryType[ELightGalleryType["WALKTHROUGH"] = 8] = "WALKTHROUGH";
     ELightGalleryType[ELightGalleryType["ACTOR"] = 9] = "ACTOR";
+    ELightGalleryType[ELightGalleryType["CHOICE_EXPLANATION"] = 10] = "CHOICE_EXPLANATION";
 })(ELightGalleryType = exports.ELightGalleryType || (exports.ELightGalleryType = {}));
 var EJobRemarkStatus;
 (function (EJobRemarkStatus) {

package/models/Psa.d.ts

@@ -13,6 +13,7 @@ export interface IPrescriptionItem {
 }
 export interface IQuestionPrescription {
     id: Id;
+    index: number;
     questionId: Id;
     doseId: Id;
     doseVisible: boolean;

package/models/Question.d.ts

@@ -89,6 +89,7 @@ export interface IQuestion {
     conceptId: Id;
     stemId: Id | null;
     public: boolean;
+    enabled: number;
     stem?: IChapter;
     themes?: ITheme[];
     concept?: IConcept;

package/package.json

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

package/resolvers/mutation/restricted/marksheet.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TOGGLE_STRIKE_OPTIONS = exports.optimisticEndMarksheet = exports.updateCacheOnEndMarksheet = exports.END_MARKSHEET = exports.LEAVE_MARKSHEET = exports.MODIFY_CURRENT_MARKSHEET_MARK = exports.MODIFY_MARKSHEET_MARK_QUESTIONCHOICEID = exports.MODIFY_MARKSHEET_MARK_STRIKED = exports.MODIFY_MARKSHEET_MARK = exports.MODIFY_MARKSHEET_STATE = exports.MODIFY_TOPIC_SELECTION = exports.MODIFY_BUILDER_CONFIG = exports.MODIFY_MARKSHEET = exports.optimisticModifyMarksheetBuilderConfig = exports.START_OR_JOIN_MARKSHEET = exports.optimisticRemoveFlaggedQuestion = exports.updateCacheRemoveFlaggedQuestion = exports.optimisticAddFlaggedQuestion = exports.updateCacheAddFlaggedQuestion = exports.REMOVE_FLAGGED_QUESTION = exports.ADD_FLAGGED_QUESTION = exports.optimisticSaveMarksheets = exports.updateMarksheets = exports.SAVE_MARKSHEET = exports.QUICK_BUILD_MARKSHEET = exports.RE_BUILD_MARKSHEET = exports.BUILD_UCAT_MARKSHEET = exports.BUILD_MARKSHEET = exports.BUILD_QUESTION_MARKSHEET = void 0;
 const client_1 = require("@apollo/client");
+const utils_1 = require("../../../utils");
 const marksheet_1 = require("../../fragments/marksheet");
 const restricted_1 = require("../../query/restricted");
 exports.BUILD_QUESTION_MARKSHEET = (0, client_1.gql) `
@@ -119,8 +120,26 @@ const updateMarksheets = (cache, result, options) => {
 };
 exports.updateMarksheets = updateMarksheets;
 const optimisticSaveMarksheets = (marksheet, marksheetInput, questionIndex) => {
-    const { timeTaken, choiceId, mark, marksheetId } = marksheetInput;
+    const { timeTaken, choiceId, mark, marksheetId, markId } = marksheetInput;
     const { marks = [], ...rest } = marksheet || {};
+    const currentMark = marks.find((m) => Number(m.id) === Number(markId));
+    if (!currentMark) {
+        return {
+            restricted: {
+                saveMarksheets: [{ ...rest, marks }],
+            },
+        };
+    }
+    const { psaSectionId, choices, typeId } = currentMark.question;
+    const { answerField } = (0, utils_1.getQuestionInfo)(typeId, psaSectionId);
+    const answer = currentMark.question[answerField];
+    const { result, score } = (0, utils_1.evaluateMark)({
+        mark: mark || '',
+        answer,
+        psaSectionId,
+        questionTypeId: typeId,
+        choices,
+    });
     const updatedMark = {
         ...marks[questionIndex],
         marksheetId,
@@ -128,8 +147,8 @@ const optimisticSaveMarksheets = (marksheet, marksheetInput, questionIndex) => {
         questionChoiceId: choiceId ?? null,
         isAnswered: true,
         mark: mark || null,
-        result: 0,
-        score: 0,
+        result,
+        score,
     };
     const updatedMarks = [
         ...marks.slice(0, questionIndex),

package/utils/evaluateMark.d.ts

@@ -4,7 +4,11 @@ export interface IEvaluateMarkData {
     result: EMarkResult;
     maxScore: number;
 }
-export declare function getQuestionMaxScore(questionType: EQuestionType, psaSectionId: number | null): number;
+export type IQuestionInfo = {
+    maxScore: number;
+    answerField: string;
+};
+export declare function getQuestionInfo(questionType: EQuestionType, psaSectionId: number | null): IQuestionInfo;
 export declare function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, }: {
     mark: IMarksheetMarkJSONB;
     answer: IQuestionAnswer;

package/utils/evaluateMark.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.evaluateMark = exports.getQuestionMaxScore = void 0;
+exports.evaluateMark = exports.getQuestionInfo = void 0;
 const models_1 = require("../models");
 function isPrescribeAnswer(data) {
     return Object(data).hasOwnProperty('dose');
@@ -44,51 +44,51 @@ function deepParse(data) {
     }
     return parsed;
 }
-function getQuestionMaxScore(questionType, psaSectionId) {
+function getQuestionInfo(questionType, psaSectionId) {
     switch (questionType) {
         case models_1.EQuestionType.SINGLE_BEST_ANSWER:
             if (psaSectionId) {
-                return 2;
+                return { maxScore: 2, answerField: 'sbaAnswer' };
             }
-            return 1;
+            return { maxScore: 1, answerField: 'sbaAnswer' };
         case models_1.EQuestionType.QUESTION_ANSWER:
             if (psaSectionId) {
-                return 2;
+                return { maxScore: 2, answerField: 'qaAnswer' };
             }
-            return 1;
+            return { maxScore: 1, answerField: 'qaAnswer' };
         case models_1.EQuestionType.MULTIPLE_ANSWERS:
-            return 4;
+            return { maxScore: 4, answerField: 'multiAnswer' };
         case models_1.EQuestionType.PRESCRIPTION_ANSWER:
-            return 10;
+            return { maxScore: 10, answerField: 'prescribeAnswer' };
         case models_1.EQuestionType.EXTENDED_MATCHING_ANSWER:
-            return 1;
+            return { maxScore: 1, answerField: 'emqAnswer' };
         case models_1.EQuestionType.SELECT_THREE_ANSWER:
-            return 1;
+            return { maxScore: 1, answerField: 'select3Answer' };
         case models_1.EQuestionType.RANKING_ANSWER:
-            return 1;
+            return { maxScore: 1, answerField: 'rankingAnswer' };
         case models_1.EQuestionType.SBA_WITH_MULTIPLE_CHOICES:
-            return 1;
+            return { maxScore: 1, answerField: 'sbaAnswer' };
         case models_1.EQuestionType.VERBAL_VERACITY:
-            return 1;
+            return { maxScore: 1, answerField: 'sbaAnswer' };
         case models_1.EQuestionType.VERBAL_READING_COMPREHENSION:
-            return 1;
+            return { maxScore: 1, answerField: 'sbaAnswer' };
         case models_1.EQuestionType.QUANTITATIVE_REASONING_SBA:
-            return 1;
+            return { maxScore: 1, answerField: 'sbaAnswer' };
         case models_1.EQuestionType.DECISION_MAKING_SBA:
-            return 1;
+            return { maxScore: 1, answerField: 'sbaAnswer' };
         case models_1.EQuestionType.DECISION_MAKING_YES_NO:
-            return 2;
+            return { maxScore: 2, answerField: 'multiAnswer' };
         case models_1.EQuestionType.SJT_SINGLE_CHOICE:
-            return 1;
+            return { maxScore: 1, answerField: 'sbaAnswer' };
         case models_1.EQuestionType.SJT_TWO_ANSWERS:
-            return 1;
+            return { maxScore: 1, answerField: 'rankingAnswer' };
         default:
-            return 1;
+            return { maxScore: 1, answerField: 'answer' };
     }
 }
-exports.getQuestionMaxScore = getQuestionMaxScore;
+exports.getQuestionInfo = getQuestionInfo;
 function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, }) {
-    const maxScore = getQuestionMaxScore(questionTypeId, psaSectionId);
+    const { maxScore } = getQuestionInfo(questionTypeId, psaSectionId);
     const data = {
         score: 0,
         result: models_1.EMarkResult.Incorrect,