@quesmed/types 1.0.23 → 1.0.27

package/models/Marksheet.d.ts

@@ -1,4 +1,4 @@
-import { IPrescribeAnswer, IQuestion } from './Question';
+import { IPrescribeMark, IQuestion, IQuestionQAAnswer } from './Question';
 import { Id } from './Type';
 export interface IMarksheet {
     id: Id;
@@ -13,7 +13,7 @@ export declare enum EQuestionLike {
     DISLIKE = 1,
     REMOVE = 2
 }
-export declare type IMarksheetMarkJSONB = string | [string] | [string[], string[]] | [IPrescribeAnswer] | null;
+export declare type IMarksheetMarkJSONB = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | [IPrescribeMark] | null;
 export interface IMarksheetMark {
     id: Id;
     index: number;

package/models/Question.d.ts

@@ -1,13 +1,24 @@
 import { IConcept } from './Concept';
 import { IQuestionPicture } from './Picture';
 import { Id } from './Type';
+export declare enum EPsaSectionType {
+    PRESCRIBING = 1,
+    PRESCRIPTION_REVIEW = 2,
+    PLANNING_MANAGEMENT = 3,
+    PROVIDING_INFORMATION = 4,
+    CALCULATION_SKILLS = 5,
+    ADVERSE_DRUG_REACTION = 6,
+    DRUG_MONITORING = 7,
+    DATA_INTERPRETATION = 8
+}
 export declare enum EQuestionType {
     SINGLE_BEST_ANSWER = 1,
     QUESTION_ANSWER = 2,
     MULTIPLE_ANSWERS = 3,
     PRESCRIPTION_ANSWER = 4
 }
-export declare type IQuestionAnswer = string | [string] | [string[], string[]] | IPrescribeAnswer[];
+export declare type IQuestionAnswer = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | IPrescribeAnswer[];
+export declare type IQuestionAll = IQuestion | IQuestionSBA | IQuestionQA | IQuestionMultiQ | IQuestionPrescribe;
 export interface IQuestion {
     id: Id;
     typeId: Id;
@@ -20,6 +31,9 @@ export interface IQuestion {
     totalVotes: number;
     choices: IQuestionChoice[];
     pictures: IQuestionPicture[];
+    difficulty: number;
+    elo: number;
+    psaSectionId: EPsaSectionType;
 }
 export interface IQuestionChoice {
     id: Id;
@@ -29,27 +43,47 @@ export interface IQuestionChoice {
     answer: boolean;
     votes: number;
 }
+export declare function isQuestionSBA(data: IQuestionAll): data is IQuestionSBA;
 export interface IQuestionSBA extends IQuestion {
     answer: [string];
     sbaAnswer: [string];
 }
+export interface IQuestionQAAnswer {
+    dose: string;
+    units: string;
+}
+export declare function isQuestionQA(data: IQuestionAll): data is IQuestionQA;
 export interface IQuestionQA extends IQuestion {
-    answer: [string];
-    qaAnswer: [string];
+    answer: [IQuestionQAAnswer];
+    qaAnswer: [IQuestionQAAnswer];
 }
+export declare function isQuestionMultiQ(data: IQuestionAll): data is IQuestionMultiQ;
 export interface IQuestionMultiQ extends IQuestion {
     answer: [string[], string[]];
     multiAnswer: [string[], string[]];
 }
+export declare function isQuestionPrescribe(data: IQuestionAll): data is IQuestionPrescribe;
 export interface IQuestionPrescribe extends IQuestion {
     answer: IPrescribeAnswer[];
     prescribeAnswer: IPrescribeAnswer[];
 }
+export declare type IPrescribeAnswerData<T> = {
+    value: T;
+    display: boolean;
+};
 export interface IPrescribeAnswer {
-    dose: number;
+    drug: IPrescribeAnswerData<string>;
+    dose: IPrescribeAnswerData<number>;
+    units: IPrescribeAnswerData<string>;
+    route: IPrescribeAnswerData<string>;
+    frequency: IPrescribeAnswerData<string>;
+    duration: IPrescribeAnswerData<string>;
+}
+export interface IPrescribeMark {
     drug: string;
-    route: string;
+    dose: number;
     units: string;
-    duration: string;
+    route: string;
     frequency: string;
+    duration: string;
 }

package/models/Question.js

@@ -1,6 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EQuestionType = void 0;
+exports.isQuestionPrescribe = exports.isQuestionMultiQ = exports.isQuestionQA = exports.isQuestionSBA = exports.EQuestionType = exports.EPsaSectionType = void 0;
+var EPsaSectionType;
+(function (EPsaSectionType) {
+    EPsaSectionType[EPsaSectionType["PRESCRIBING"] = 1] = "PRESCRIBING";
+    EPsaSectionType[EPsaSectionType["PRESCRIPTION_REVIEW"] = 2] = "PRESCRIPTION_REVIEW";
+    EPsaSectionType[EPsaSectionType["PLANNING_MANAGEMENT"] = 3] = "PLANNING_MANAGEMENT";
+    EPsaSectionType[EPsaSectionType["PROVIDING_INFORMATION"] = 4] = "PROVIDING_INFORMATION";
+    EPsaSectionType[EPsaSectionType["CALCULATION_SKILLS"] = 5] = "CALCULATION_SKILLS";
+    EPsaSectionType[EPsaSectionType["ADVERSE_DRUG_REACTION"] = 6] = "ADVERSE_DRUG_REACTION";
+    EPsaSectionType[EPsaSectionType["DRUG_MONITORING"] = 7] = "DRUG_MONITORING";
+    EPsaSectionType[EPsaSectionType["DATA_INTERPRETATION"] = 8] = "DATA_INTERPRETATION";
+})(EPsaSectionType = exports.EPsaSectionType || (exports.EPsaSectionType = {}));
 var EQuestionType;
 (function (EQuestionType) {
     EQuestionType[EQuestionType["SINGLE_BEST_ANSWER"] = 1] = "SINGLE_BEST_ANSWER";
@@ -8,3 +19,19 @@ var EQuestionType;
     EQuestionType[EQuestionType["MULTIPLE_ANSWERS"] = 3] = "MULTIPLE_ANSWERS";
     EQuestionType[EQuestionType["PRESCRIPTION_ANSWER"] = 4] = "PRESCRIPTION_ANSWER";
 })(EQuestionType = exports.EQuestionType || (exports.EQuestionType = {}));
+function isQuestionSBA(data) {
+    return data.typeId === EQuestionType.SINGLE_BEST_ANSWER;
+}
+exports.isQuestionSBA = isQuestionSBA;
+function isQuestionQA(data) {
+    return data.typeId === EQuestionType.QUESTION_ANSWER;
+}
+exports.isQuestionQA = isQuestionQA;
+function isQuestionMultiQ(data) {
+    return data.typeId === EQuestionType.MULTIPLE_ANSWERS;
+}
+exports.isQuestionMultiQ = isQuestionMultiQ;
+function isQuestionPrescribe(data) {
+    return data.typeId === EQuestionType.PRESCRIPTION_ANSWER;
+}
+exports.isQuestionPrescribe = isQuestionPrescribe;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quesmed/types",
-  "version": "1.0.23",
+  "version": "1.0.27",
   "description": "Typescript types for Quesmed",
   "main": "index.js",
   "types": "dist/index.d.ts",

package/utils/commonFunctions.js

@@ -2,62 +2,96 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.correctMark = void 0;
 const models_1 = require("../models");
+const floatRegex = /([0-9]*[.])?[0-9]+/gm;
+function mapPrescribeMarkToAnswer(obj) {
+    return {
+        drug: {
+            value: obj.drug,
+            display: false,
+        },
+        dose: {
+            value: 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,
+        },
+    };
+}
 function formatPrescribeAnswer(obj) {
-    obj.drug = obj.drug.toLowerCase().replace(/\s/g, '');
-    obj.route = obj.route.toLowerCase().replace(/\s/g, '');
-    if (obj.route === 'oral') {
-        obj.route = 'po';
+    obj.drug.value = obj.drug.value.toLowerCase().replace(/\s/g, '');
+    obj.route.value = obj.route.value.toLowerCase().replace(/\s/g, '');
+    if (obj.route.value === 'oral') {
+        obj.route.value = 'po';
     }
-    else if (obj.route.includes('intravenous')) {
-        obj.route = 'iv';
+    else if (obj.route.value.includes('intravenous')) {
+        obj.route.value = 'iv';
     }
-    else if (obj.route.includes('intramuscular')) {
-        obj.route = 'im';
+    else if (obj.route.value.includes('intramuscular')) {
+        obj.route.value = 'im';
     }
-    else if (obj.route.includes('subcutaneous')) {
-        obj.route = 'sc';
+    else if (obj.route.value.includes('subcutaneous')) {
+        obj.route.value = 'sc';
     }
-    else if (obj.route.includes('inhale')) {
-        obj.route = 'inh';
+    else if (obj.route.value.includes('inhale')) {
+        obj.route.value = 'inh';
     }
-    else if (obj.route.includes('nebuli')) {
-        obj.route = 'neb';
+    else if (obj.route.value.includes('nebuli')) {
+        obj.route.value = 'neb';
     }
-    obj.units = obj.units.toLowerCase().replace(/\s/g, '');
-    if (obj.units === 'milligram' || obj.units === 'milligrams') {
-        obj.units = 'mg';
+    else if (obj.route.value.includes('topical')) {
+        obj.route.value = 'top';
     }
-    else if (obj.units === 'microgram' || obj.units === 'micrograms') {
-        obj.units = 'mcg';
+    obj.units.value = obj.units.value.toLowerCase().replace(/\s/g, '');
+    if (obj.units.value === 'milligram' || obj.units.value === 'milligrams') {
+        obj.units.value = 'mg';
     }
-    else if (obj.units === 'gram' || obj.units === 'grams') {
-        obj.units = 'g';
+    else if (obj.units.value === 'microgram' || obj.units.value === 'micrograms') {
+        obj.units.value = 'mcg';
     }
-    else if (obj.units === 'unit') {
-        obj.units = 'units';
+    else if (obj.units.value === 'gram' || obj.units.value === 'grams') {
+        obj.units.value = 'g';
+    }
+    else if (obj.units.value === 'unit') {
+        obj.units.value = 'units';
     }
     let m;
-    const regex = /\d/gm;
     const durationMatches = [];
-    while ((m = regex.exec(obj.duration)) !== null) {
-        if (m.index === regex.lastIndex) {
-            regex.lastIndex++;
+    while ((m = floatRegex.exec(obj.duration.value)) !== null) {
+        if (m.index === floatRegex.lastIndex) {
+            floatRegex.lastIndex++;
         }
         m.forEach((match) => durationMatches.push(match));
     }
-    obj.duration = durationMatches.join(',');
-    obj.frequency = obj.frequency.toLowerCase().replace(/\s/g, '');
-    if (obj.frequency === 'once-off') {
-        obj.frequency = 'stat';
+    obj.duration.value = durationMatches.join(',');
+    obj.frequency.value = obj.frequency.value.toLowerCase().replace(/\s/g, '');
+    if (obj.frequency.value === 'once-off') {
+        obj.frequency.value = 'stat';
+    }
+    else if (obj.frequency.value.includes('once')) {
+        obj.frequency.value = 'od';
     }
-    else if (obj.frequency.includes('once')) {
-        obj.frequency = 'po';
+    else if (obj.frequency.value.includes('nightly')) {
+        obj.frequency.value = 'od';
     }
-    else if (obj.frequency.includes('twice')) {
-        obj.frequency = 'bd';
+    else if (obj.frequency.value.includes('twice')) {
+        obj.frequency.value = 'bd';
     }
-    else if (obj.frequency.includes('trice')) {
-        obj.frequency = 'tds';
+    else if (obj.frequency.value.includes('trice')) {
+        obj.frequency.value = 'tds';
     }
     return obj;
 }
@@ -87,7 +121,7 @@ function correctMark(mark) {
         }
     }
     else if (models_1.EQuestionType.QUESTION_ANSWER === mark.question.typeId) {
-        const answer = flatAnswer.toLowerCase().replace(/\s/g, '');
+        const answer = flatAnswer.dose.toLowerCase().replace(/\s/g, '');
         const attempt = flatAttempt.toLowerCase().replace(/\s/g, '');
         if (answer === attempt) {
             data.correct = true;
@@ -111,16 +145,16 @@ function correctMark(mark) {
     }
     else if (models_1.EQuestionType.PRESCRIPTION_ANSWER === mark.question.typeId) {
         const answers = answer.map(formatPrescribeAnswer);
-        const attempt = formatPrescribeAnswer(flatAttempt);
+        const attempt = formatPrescribeAnswer(mapPrescribeMarkToAnswer(flatAttempt));
         let foundCorrect = false;
         let index = 0;
         for (const answer of answers) {
-            if (answer.dose === attempt.dose &&
-                answer.drug === attempt.drug &&
-                answer.duration.split(',').includes(attempt.duration) &&
-                answer.frequency === attempt.frequency &&
-                answer.route === attempt.route &&
-                answer.units === attempt.units) {
+            if (answer.dose.value === attempt.dose.value &&
+                answer.drug.value === attempt.drug.value &&
+                answer.duration.value.split(',').includes(attempt.duration.value) &&
+                answer.frequency.value === attempt.frequency.value &&
+                answer.route.value === attempt.route.value &&
+                answer.units.value === attempt.units.value) {
                 foundCorrect = true;
                 break;
             }