@quesmed/types-rn 2.6.19 → 2.6.21

package/models/Marksheet.d.ts

@@ -1,6 +1,6 @@
 import { IBuildConfigData, IPreBuildMarksheet } from '../resolvers/mutation/restricted/marksheet';
 import { EProductType } from './Product';
-import { IPrescribeAnswer, IPrescribeMark, IQuestion, IQuestionChoice, IQuestionQAAnswer } from './Question';
+import { IPrescribeMark, IQuestion, IQuestionChoice, IQuestionQAAnswer } from './Question';
 import { ETopicType } from './Topic';
 import { Id } from './Type';
 import { IUser } from './User';
@@ -92,7 +92,7 @@ export interface IMarksheet {
     builderConfig?: IBuildConfigData;
     productId: EProductType;
 }
-export type IMarksheetMarkJSONB = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | [IPrescribeMark] | IPrescribeAnswer | null;
+export type IMarksheetMarkJSONB = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | [IPrescribeMark] | null;
 export interface IMarksheetMark {
     id: Id;
     createdAt: number | Date;

package/models/Psa.d.ts

@@ -16,21 +16,15 @@ export interface IQuestionPrescription {
     id: Id;
     questionId: Id;
     doseId: Id;
-    doseDisplay: string;
     doseVisible: boolean;
     drugId: Id;
-    drugDisplay: string;
     drugVisible: boolean;
     routeId: Id;
-    routeDisplay: string;
     routeVisible: boolean;
     frequencyId: Id;
-    frequencyDisplay: string;
     frequencyVisible: boolean;
     durationId: Id;
-    durationDisplay: string;
     durationVisible: boolean;
     unitId: Id;
-    unitDisplay: string;
     unitVisible: boolean;
 }

package/models/Question.d.ts

@@ -25,9 +25,7 @@ export declare enum EQuestionType {
     PRESCRIPTION_ANSWER = 4,
     EXTENDED_MATCHING_ANSWER = 5,
     SELECT_THREE_ANSWER = 6,
-    RANKING_ANSWER = 7,
-    MRCP_PART_1 = 8,
-    MRCP_PART_2 = 9
+    RANKING_ANSWER = 7
 }
 export declare enum EQuestionLike {
     NONE = 0,
@@ -62,7 +60,7 @@ export interface IQuestionCommentLike {
     comment: IQuestionComment;
     likeTrueDislikeFalse: boolean;
 }
-export type IQuestionAnswer = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | IPrescribeAnswer[] | [string, string][] | [string, string, string] | string[];
+export type IQuestionAnswer = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | IPrescribeMark[] | [string, string][] | [string, string, string] | string[];
 export type IQuestionAll = IQuestion | IQuestionSBA | IQuestionQA | IQuestionMultiQ | IQuestionPrescribe | IQuestionEMQ | IQuestionSelect3 | IQuestionRanking;
 export interface IQuestion {
     id: Id;
@@ -197,8 +195,8 @@ export interface IQuestionRanking extends IQuestion {
 }
 export declare function isQuestionPrescribe(data: IQuestionAll): data is IQuestionPrescribe;
 export interface IQuestionPrescribe extends IQuestion {
-    answer: IPrescribeAnswer[];
-    prescribeAnswer: IPrescribeAnswer[];
+    answer: IPrescribeMark[];
+    prescribeAnswer: IQuestionPrescription[];
 }
 export type IPrescribeAnswerData<T> = {
     value: T;
@@ -213,10 +211,10 @@ export interface IPrescribeAnswer {
     duration: IPrescribeAnswerData<string>;
 }
 export interface IPrescribeMark {
-    drug: string;
-    dose: number | string;
-    units: string;
-    route: string;
-    frequency: string;
-    duration: string;
+    drugId: number;
+    doseId: number;
+    unitId: number;
+    routeId: number;
+    frequencyId: number;
+    durationId: number;
 }

package/models/Question.js

@@ -21,8 +21,6 @@ var EQuestionType;
     EQuestionType[EQuestionType["EXTENDED_MATCHING_ANSWER"] = 5] = "EXTENDED_MATCHING_ANSWER";
     EQuestionType[EQuestionType["SELECT_THREE_ANSWER"] = 6] = "SELECT_THREE_ANSWER";
     EQuestionType[EQuestionType["RANKING_ANSWER"] = 7] = "RANKING_ANSWER";
-    EQuestionType[EQuestionType["MRCP_PART_1"] = 8] = "MRCP_PART_1";
-    EQuestionType[EQuestionType["MRCP_PART_2"] = 9] = "MRCP_PART_2";
 })(EQuestionType = exports.EQuestionType || (exports.EQuestionType = {}));
 var EQuestionLike;
 (function (EQuestionLike) {

package/models/User.d.ts

@@ -1,6 +1,6 @@
 import { ICard } from './Card';
 import { IConcept } from './Concept';
-import { IMarksheet, IMarksheetMark } from './Marksheet';
+import { IMarksheet } from './Marksheet';
 import { INotification } from './Notification';
 import { IOsceStation } from './OsceStation';
 import { IQuestion, IQuestionHighlights } from './Question';
@@ -168,10 +168,9 @@ export interface IUserFlaggedQuestion {
     updatedAt: number | Date;
     deletedAt: number | Date;
     questionId: Id;
-    question: IQuestion;
+    question: Pick<IQuestion, 'id' | 'question' | 'conceptId' | 'typeId' | 'concept'>;
     userId: Id;
     markId: Id;
-    mark: IMarksheetMark;
 }
 export interface IUserProgress {
     id: Id;

package/package.json

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

package/resolvers/mutation/restricted/questionDiscussion.js

@@ -436,8 +436,6 @@ const getQuestionHighlightsFragment = (typeId) => {
         case models_1.EQuestionType.RANKING_ANSWER:
             return exports.QUESTION_RANKING_HIGHLIGHT_FIELDS;
         case models_1.EQuestionType.SINGLE_BEST_ANSWER:
-        case models_1.EQuestionType.MRCP_PART_1:
-        case models_1.EQuestionType.MRCP_PART_2:
         default:
             return exports.QUESTION_SBA_HIGHLIGHT_FIELDS;
     }
@@ -458,8 +456,6 @@ const getQuestionTypeName = (typeId) => {
         case models_1.EQuestionType.RANKING_ANSWER:
             return 'QuestionRanking';
         case models_1.EQuestionType.SINGLE_BEST_ANSWER:
-        case models_1.EQuestionType.MRCP_PART_1:
-        case models_1.EQuestionType.MRCP_PART_2:
         default:
             return 'QuestionSBA';
     }
@@ -480,8 +476,6 @@ const getQuestionFragment = (typeId) => {
         case models_1.EQuestionType.RANKING_ANSWER:
             return exports.QUESTION_RANKING_COMMENT_FIELDS;
         case models_1.EQuestionType.SINGLE_BEST_ANSWER:
-        case models_1.EQuestionType.MRCP_PART_1:
-        case models_1.EQuestionType.MRCP_PART_2:
         default:
             return exports.QUESTION_SBA_COMMENT_FIELDS;
     }