@quesmed/types 2.6.20 → 2.6.22

package/dist/mjs/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/dist/mjs/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/dist/mjs/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/dist/mjs/models/Question.js

@@ -18,8 +18,6 @@ export 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 || (EQuestionType = {}));
 export var EQuestionLike;
 (function (EQuestionLike) {

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

@@ -579,30 +579,12 @@ export const BUILD_QUESTION_MARKSHEET = gql `
               dislikes
               isLikedByMe
               prescribeAnswer: answer {
-                dose {
-                  value
-                  display
-                }
-                drug {
-                  value
-                  display
-                }
-                route {
-                  value
-                  display
-                }
-                frequency {
-                  display
-                  value
-                }
-                duration {
-                  display
-                  value
-                }
-                units {
-                  display
-                  value
-                }
+                doseId
+                durationId
+                drugId
+                routeId
+                unitId
+                frequencyId
               }
             }
             ... on QuestionEMQ {
@@ -1597,30 +1579,12 @@ export const BUILD_MARKSHEET = gql `
               dislikes
               isLikedByMe
               prescribeAnswer: answer {
-                dose {
-                  value
-                  display
-                }
-                drug {
-                  value
-                  display
-                }
-                route {
-                  value
-                  display
-                }
-                frequency {
-                  display
-                  value
-                }
-                duration {
-                  display
-                  value
-                }
-                units {
-                  display
-                  value
-                }
+                doseId
+                durationId
+                drugId
+                routeId
+                unitId
+                frequencyId
               }
             }
             ... on QuestionEMQ {
@@ -2620,30 +2584,12 @@ export const RE_BUILD_MARKSHEET = gql `
               dislikes
               isLikedByMe
               prescribeAnswer: answer {
-                dose {
-                  value
-                  display
-                }
-                drug {
-                  value
-                  display
-                }
-                route {
-                  value
-                  display
-                }
-                frequency {
-                  display
-                  value
-                }
-                duration {
-                  display
-                  value
-                }
-                units {
-                  display
-                  value
-                }
+                doseId
+                durationId
+                drugId
+                routeId
+                unitId
+                frequencyId
               }
             }
             ... on QuestionEMQ {
@@ -3621,30 +3567,12 @@ export const QUICK_BUILD_MARKSHEET = gql `
               dislikes
               isLikedByMe
               prescribeAnswer: answer {
-                dose {
-                  value
-                  display
-                }
-                drug {
-                  value
-                  display
-                }
-                route {
-                  value
-                  display
-                }
-                frequency {
-                  display
-                  value
-                }
-                duration {
-                  display
-                  value
-                }
-                units {
-                  display
-                  value
-                }
+                doseId
+                durationId
+                drugId
+                routeId
+                unitId
+                frequencyId
               }
             }
             ... on QuestionEMQ {

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

@@ -432,8 +432,6 @@ export const getQuestionHighlightsFragment = (typeId) => {
         case EQuestionType.RANKING_ANSWER:
             return QUESTION_RANKING_HIGHLIGHT_FIELDS;
         case EQuestionType.SINGLE_BEST_ANSWER:
-        case EQuestionType.MRCP_PART_1:
-        case EQuestionType.MRCP_PART_2:
         default:
             return QUESTION_SBA_HIGHLIGHT_FIELDS;
     }
@@ -453,8 +451,6 @@ export const getQuestionTypeName = (typeId) => {
         case EQuestionType.RANKING_ANSWER:
             return 'QuestionRanking';
         case EQuestionType.SINGLE_BEST_ANSWER:
-        case EQuestionType.MRCP_PART_1:
-        case EQuestionType.MRCP_PART_2:
         default:
             return 'QuestionSBA';
     }
@@ -474,8 +470,6 @@ const getQuestionFragment = (typeId) => {
         case EQuestionType.RANKING_ANSWER:
             return QUESTION_RANKING_COMMENT_FIELDS;
         case EQuestionType.SINGLE_BEST_ANSWER:
-        case EQuestionType.MRCP_PART_1:
-        case EQuestionType.MRCP_PART_2:
         default:
             return QUESTION_SBA_COMMENT_FIELDS;
     }

package/dist/mjs/resolvers/query/restricted/marksheet.js

@@ -581,30 +581,12 @@ export const MARKSHEET = gql `
               dislikes
               isLikedByMe
               prescribeAnswer: answer {
-                dose {
-                  value
-                  display
-                }
-                drug {
-                  value
-                  display
-                }
-                route {
-                  value
-                  display
-                }
-                frequency {
-                  display
-                  value
-                }
-                duration {
-                  display
-                  value
-                }
-                units {
-                  display
-                  value
-                }
+                doseId
+                durationId
+                drugId
+                routeId
+                unitId
+                frequencyId
               }
             }
             ... on QuestionEMQ {
@@ -1700,30 +1682,12 @@ export const FLAGGED_QUESTIONS_MARKSHEET = gql `
               dislikes
               isLikedByMe
               prescribeAnswer: answer {
-                dose {
-                  value
-                  display
-                }
-                drug {
-                  value
-                  display
-                }
-                route {
-                  value
-                  display
-                }
-                frequency {
-                  display
-                  value
-                }
-                duration {
-                  display
-                  value
-                }
-                units {
-                  display
-                  value
-                }
+                doseId
+                durationId
+                drugId
+                routeId
+                unitId
+                frequencyId
               }
             }
             ... on QuestionEMQ {

package/dist/mjs/resolvers/query/restricted/question.js

@@ -509,30 +509,12 @@ export const QUESTION = gql `
           dislikes
           isLikedByMe
           prescribeAnswer: answer {
-            dose {
-              value
-              display
-            }
-            drug {
-              value
-              display
-            }
-            route {
-              value
-              display
-            }
-            frequency {
-              display
-              value
-            }
-            duration {
-              display
-              value
-            }
-            units {
-              display
-              value
-            }
+            doseId
+            durationId
+            drugId
+            routeId
+            unitId
+            frequencyId
           }
         }
         ... on QuestionEMQ {

package/dist/mjs/utils/commonFunctions.d.ts

@@ -1,9 +1,8 @@
-import { IMarksheetMark, IPrescribeAnswer, IPrescribeMark } from '../models';
-export declare function mapPrescribeMarkToAnswer(obj: IPrescribeMark): IPrescribeAnswer;
-export declare function formatPrescribeAnswer(baseAnswer: IPrescribeAnswer): IPrescribeAnswer;
+import { IMarksheetMark, IPrescribeMark, IQuestionPrescription } from '../models';
 export interface ICorrectMarkData {
     correct: boolean;
     incorrect: boolean;
     correctIndex: number;
 }
+export declare function mapPrescribeMarkToAnswer(obj: IQuestionPrescription | IPrescribeMark): IPrescribeMark;
 export declare function correctMark(mark: IMarksheetMark): ICorrectMarkData;

package/dist/mjs/utils/commonFunctions.js

@@ -1,160 +1,5 @@
 import { EQuestionType, } from '../models';
-import { wordsToNumber } from './wordsToNumber';
-const floatRegex = /([0-9]*[.])?[0-9]+/gm;
-const ACCEPTED_FREQ = ['stat', 'od', 'bd', 'tds', 'qds'];
-export function mapPrescribeMarkToAnswer(obj) {
-    return {
-        drug: {
-            value: obj.drug,
-            display: false,
-        },
-        dose: {
-            value: parseFloat(obj.dose),
-            display: false,
-        },
-        units: {
-            value: obj.units,
-            display: false,
-        },
-        route: {
-            value: obj.route,
-            display: false,
-        },
-        frequency: {
-            value: obj.frequency,
-            display: false,
-        },
-        duration: {
-            value: obj.duration,
-            display: false,
-        },
-    };
-}
-export function formatPrescribeAnswer(baseAnswer) {
-    const obj = Object.assign({}, baseAnswer, {
-        drug: Object.assign({}, baseAnswer.drug, {
-            value: baseAnswer.drug?.value ?? '',
-        }),
-        dose: Object.assign({}, baseAnswer.dose, {
-            value: baseAnswer.dose?.value ?? 0,
-        }),
-        units: Object.assign({}, baseAnswer.units, {
-            value: baseAnswer.units?.value ?? '',
-        }),
-        route: Object.assign({}, baseAnswer.route, {
-            value: baseAnswer.route?.value ?? '',
-        }),
-        frequency: Object.assign({}, baseAnswer.frequency, {
-            value: baseAnswer.frequency?.value ?? '',
-        }),
-        duration: Object.assign({}, baseAnswer.duration, {
-            value: baseAnswer.duration?.value ?? '',
-        }),
-    });
-    // DRUG
-    obj.drug.value = obj.drug.value.toLowerCase().replace(/\s/g, '');
-    // ROUTE
-    obj.route.value = obj.route.value
-        .toLowerCase()
-        .replace(/\s/g, '')
-        .replace(/\//g, '');
-    if (obj.route.value.includes('oral')) {
-        obj.route.value = 'po';
-    }
-    else if (obj.route.value.includes('intravenous')) {
-        obj.route.value = 'iv';
-    }
-    else if (obj.route.value.includes('intramuscular')) {
-        obj.route.value = 'im';
-    }
-    else if (obj.route.value.includes('subcutaneous')) {
-        obj.route.value = 'sc';
-    }
-    else if (obj.route.value.includes('inhale')) {
-        obj.route.value = 'inh';
-    }
-    else if (obj.route.value.includes('nebuli')) {
-        obj.route.value = 'neb';
-    }
-    else if (obj.route.value.includes('topical')) {
-        obj.route.value = 'top';
-    }
-    else if (obj.route.value.includes('rectal')) {
-        obj.route.value = 'pr';
-    }
-    // UNITS
-    obj.units.value = obj.units.value.toLowerCase().replace(/\s/g, '');
-    switch (obj.units.value) {
-        case 'milligram':
-        case 'milligrams':
-            obj.units.value = 'mg';
-            break;
-        case 'microgram':
-        case 'micrograms':
-            obj.units.value = 'mcg';
-            break;
-        case 'gram':
-        case 'grams':
-            obj.units.value = 'g';
-            break;
-        case 'unit':
-            obj.units.value = 'units';
-            break;
-    }
-    // DURATION
-    let m;
-    const durationMatches = new Set();
-    while ((m = floatRegex.exec(obj.duration.value)) !== null) {
-        if (m.index === floatRegex.lastIndex) {
-            floatRegex.lastIndex++;
-        }
-        m.forEach((match) => durationMatches.add(match));
-    }
-    const durationWords = wordsToNumber(obj.duration.value, false);
-    if (durationWords !== 0) {
-        durationMatches.add(durationWords.toString());
-    }
-    obj.duration.value = [...durationMatches].filter((x) => !!x).join(',');
-    // FREQUENCY
-    const orgFrequencyValue = obj.frequency.value.toLowerCase();
-    const timesPerDay = obj.frequency.value.includes('times per day') ||
-        obj.frequency.value.includes('times a day');
-    // remove whitespace for processing
-    obj.frequency.value = orgFrequencyValue.replace(/\s/g, '');
-    const freqWordsToInt = wordsToNumber(orgFrequencyValue, true);
-    const frequencyIncHourly = obj.frequency.value.includes('hour');
-    const textToInt = parseInt(obj.frequency.value);
-    if (obj.frequency.value === 'once-off') {
-        obj.frequency.value = 'stat';
-    }
-    else if (obj.frequency.value.includes('once') ||
-        (frequencyIncHourly && textToInt === 24) ||
-        (timesPerDay && freqWordsToInt === 1)) {
-        obj.frequency.value = 'od';
-    }
-    else if (obj.frequency.value.includes('nightly') ||
-        obj.frequency.value === 'on') {
-        obj.frequency.value = 'od';
-    }
-    else if (obj.frequency.value.includes('twice') ||
-        (frequencyIncHourly && textToInt === 12) ||
-        (timesPerDay && freqWordsToInt === 2)) {
-        obj.frequency.value = 'bd';
-    }
-    else if (obj.frequency.value.includes('trice') ||
-        (frequencyIncHourly && textToInt === 8) ||
-        (timesPerDay && freqWordsToInt === 3)) {
-        obj.frequency.value = 'tds';
-    }
-    else if ((frequencyIncHourly && textToInt === 6) ||
-        (timesPerDay && freqWordsToInt === 4)) {
-        obj.frequency.value = 'qds';
-    }
-    else if (!ACCEPTED_FREQ.includes(obj.frequency.value)) {
-        obj.frequency.value = wordsToNumber(orgFrequencyValue, true).toString();
-    }
-    return obj;
-}
+import { compareObjects } from './object';
 function createHashMap(arr) {
     const map = new Map();
     for (const innerArr of arr) {
@@ -164,6 +9,16 @@ function createHashMap(arr) {
     }
     return map;
 }
+export function mapPrescribeMarkToAnswer(obj) {
+    return {
+        drugId: obj.drugId,
+        doseId: obj.doseId,
+        durationId: obj.durationId,
+        frequencyId: obj.frequencyId,
+        unitId: obj.unitId,
+        routeId: obj.routeId,
+    };
+}
 export function correctMark(mark) {
     const data = {
         correct: false,
@@ -227,41 +82,19 @@ export function correctMark(mark) {
             }
         }
         else if (EQuestionType.PRESCRIPTION_ANSWER === mark.question.typeId) {
-            const answers = answer.map(formatPrescribeAnswer);
-            let attempt = formatPrescribeAnswer(mapPrescribeMarkToAnswer({
-                drug: '',
-                dose: -1,
-                units: '',
-                route: '',
-                frequency: '',
-                duration: '',
-            }));
-            if (typeof flatAttempt === 'object' &&
-                Object.keys(flatAttempt).length === 6) {
-                attempt = formatPrescribeAnswer(mapPrescribeMarkToAnswer(flatAttempt));
-            }
             let foundCorrect = false;
             let index = 0;
-            for (const answer of answers) {
-                const doseCorrect = answer.dose.display || answer.dose.value === attempt.dose.value;
-                const drugCorrect = answer.drug.display || answer.drug.value === attempt.drug.value;
-                const durationCorrect = answer.duration.display ||
-                    answer.duration.value.split(',').includes(attempt.duration.value) ||
-                    answer.duration.value === attempt.duration.value;
-                const frequencyCorrect = answer.frequency.display ||
-                    answer.frequency.value === attempt.frequency.value;
-                const routeCorrect = answer.route.display || answer.route.value === attempt.route.value;
-                const unitsCorrect = answer.units.display || answer.units.value === attempt.units.value;
-                if (doseCorrect &&
-                    drugCorrect &&
-                    durationCorrect &&
-                    frequencyCorrect &&
-                    routeCorrect &&
-                    unitsCorrect) {
-                    foundCorrect = true;
-                    break;
+            if (typeof flatAttempt === 'object' &&
+                Object.keys(flatAttempt).length > 0) {
+                const answers = answer.map(mapPrescribeMarkToAnswer);
+                const attempt = mapPrescribeMarkToAnswer(flatAttempt);
+                for (const answer of answers) {
+                    if (compareObjects(answer, attempt)) {
+                        foundCorrect = true;
+                        break;
+                    }
+                    index++;
                 }
-                index++;
             }
             if (foundCorrect) {
                 data.correct = true;

package/dist/mjs/utils/index.d.ts

@@ -1,5 +1,6 @@
 export * from './commonFunctions';
 export * from './lightgallery';
+export * from './object';
 export * from './offlineLink';
 export * from './random';
 export * from './supermemo';

package/dist/mjs/utils/index.js

@@ -1,5 +1,6 @@
 export * from './commonFunctions';
 export * from './lightgallery';
+export * from './object';
 export * from './offlineLink';
 export * from './random';
 export * from './supermemo';

package/dist/mjs/utils/object.d.ts

@@ -0,0 +1 @@
+export declare function compareObjects<T = Record<string, unknown>, V = Record<string, unknown>>(obj1: T, obj2: V): boolean;

package/dist/mjs/utils/object.js

@@ -0,0 +1,16 @@
+export function compareObjects(obj1, obj2) {
+    const ob1 = obj1;
+    const ob2 = obj2;
+    const keys1 = Object.keys(ob1);
+    const keys2 = Object.keys(ob2);
+    if (keys1.length !== keys2.length) {
+        return false;
+    }
+    for (let i = 0; i < keys1.length; i++) {
+        const key = keys1[i];
+        if (ob1[key] !== ob2[key]) {
+            return false;
+        }
+    }
+    return true;
+}

package/package.json

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