@quesmed/types 1.0.26 → 1.0.27

package/models/Marksheet.d.ts

@@ -1,4 +1,4 @@
-import { IPrescribeAnswer, IQuestion, IQuestionQAAnswer } 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] | [IQuestionQAAnswer] | [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

@@ -67,7 +67,19 @@ export interface IQuestionPrescribe extends IQuestion {
     answer: IPrescribeAnswer[];
     prescribeAnswer: IPrescribeAnswer[];
 }
+export declare type IPrescribeAnswerData<T> = {
+    value: T;
+    display: boolean;
+};
 export interface IPrescribeAnswer {
+    drug: IPrescribeAnswerData<string>;
+    dose: IPrescribeAnswerData<number>;
+    units: IPrescribeAnswerData<string>;
+    route: IPrescribeAnswerData<string>;
+    frequency: IPrescribeAnswerData<string>;
+    duration: IPrescribeAnswerData<string>;
+}
+export interface IPrescribeMark {
     drug: string;
     dose: number;
     units: string;

package/package.json

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

package/utils/commonFunctions.js

@@ -3,67 +3,95 @@ 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';
     }
-    else if (obj.route.includes('topical')) {
-        obj.route = 'top';
+    else if (obj.route.value.includes('topical')) {
+        obj.route.value = 'top';
     }
-    obj.units = obj.units.toLowerCase().replace(/\s/g, '');
-    if (obj.units === 'milligram' || obj.units === 'milligrams') {
-        obj.units = 'mg';
+    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 === 'microgram' || obj.units === 'micrograms') {
-        obj.units = 'mcg';
+    else if (obj.units.value === 'microgram' || obj.units.value === 'micrograms') {
+        obj.units.value = 'mcg';
     }
-    else if (obj.units === 'gram' || obj.units === 'grams') {
-        obj.units = 'g';
+    else if (obj.units.value === 'gram' || obj.units.value === 'grams') {
+        obj.units.value = 'g';
     }
-    else if (obj.units === 'unit') {
-        obj.units = 'units';
+    else if (obj.units.value === 'unit') {
+        obj.units.value = 'units';
     }
     let m;
     const durationMatches = [];
-    while ((m = floatRegex.exec(obj.duration)) !== null) {
+    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.includes('once')) {
-        obj.frequency = 'od';
+    else if (obj.frequency.value.includes('once')) {
+        obj.frequency.value = 'od';
     }
-    else if (obj.frequency.includes('nightly')) {
-        obj.frequency = 'od';
+    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;
 }
@@ -117,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;
             }