@quesmed/types 1.0.11 → 1.0.15

package/models/Marksheet.d.ts

@@ -1,4 +1,4 @@
-import { IQuestion } from './Question';
+import { IPrescribeAnswer, IQuestion } from './Question';
 import { Id } from './Type';
 export interface IMarksheet {
     id: Id;
@@ -13,14 +13,17 @@ export declare enum EQuestionLike {
     DISLIKE = 1,
     REMOVE = 2
 }
+export declare type IMarksheetMarkJSONB = string | [string] | [string[], string[]] | [IPrescribeAnswer] | null;
 export interface IMarksheetMark {
     id: Id;
     index: number;
+    marksheetId: Id;
     questionChoiceId: Id;
     timeTaken: number;
-    question: IQuestion;
-    mark?: string;
     flagged: boolean;
+    questionId: Id;
+    question: IQuestion;
+    mark: IMarksheetMarkJSONB;
     like: number;
     dislike: number;
     isLikeByMe: string;

package/models/OsceMarksheet.d.ts

@@ -1,6 +1,14 @@
-import { IOsceGroup } from "../resolvers/subscription";
-import { IOsceStation, IOsceStationMark, IOsceType } from "./OsceStation";
-import { Id } from "./Type";
+import { IOsceStation, IOsceStationMark, IOsceType } from './OsceStation';
+import { Id } from './Type';
+import { IUser } from './User';
+export interface IOsceMarksheetUser {
+    id: Id;
+    createdAt: Date | string;
+    osceMarksheetId: Id;
+    userId: Id;
+    user?: IUser;
+    role: EOsceRoles;
+}
 export interface IOsceMarksheetMark {
     id: Id;
     mark: boolean;
@@ -23,7 +31,8 @@ export declare enum EOsceMarksheetAction {
     CONTINUE = 4,
     CONNECT = 5,
     DISCONNECT = 6,
-    SELECT = 7
+    SELECT = 7,
+    LEFT = 8
 }
 export interface IOsceMarksheet {
     id: Id;
@@ -32,9 +41,9 @@ export interface IOsceMarksheet {
     timeTaken: number;
     osceStationId: Id;
     osceStation?: IOsceStation;
-    userId: Id;
+    userId?: Id;
+    role?: EOsceRoles;
     solo: boolean;
-    role: EOsceRoles;
     score: number;
     globalScore: number;
     feedback: string;
@@ -46,7 +55,7 @@ export interface IOsceMarksheet {
     endedAt: Date | string;
     timeRemaining: number;
     marks: IOsceMarksheetMark[];
-    users: IOsceGroup["members"];
+    users: IOsceMarksheetUser[];
     completed: boolean;
 }
 export interface IDashboardOsce {

package/models/OsceMarksheet.js

@@ -18,4 +18,5 @@ var EOsceMarksheetAction;
     EOsceMarksheetAction[EOsceMarksheetAction["CONNECT"] = 5] = "CONNECT";
     EOsceMarksheetAction[EOsceMarksheetAction["DISCONNECT"] = 6] = "DISCONNECT";
     EOsceMarksheetAction[EOsceMarksheetAction["SELECT"] = 7] = "SELECT";
+    EOsceMarksheetAction[EOsceMarksheetAction["LEFT"] = 8] = "LEFT";
 })(EOsceMarksheetAction = exports.EOsceMarksheetAction || (exports.EOsceMarksheetAction = {}));

package/models/Question.d.ts

@@ -7,6 +7,7 @@ export declare enum EQuestionType {
     MULTIPLE_ANSWERS = 3,
     PRESCRIPTION_ANSWER = 4
 }
+export declare type IQuestionAnswer = [string] | [string[], string[]] | IPrescribeAnswer[];
 export interface IQuestion {
     id: Id;
     typeId: Id;
@@ -15,7 +16,7 @@ export interface IQuestion {
     concept?: IConcept;
     question: string;
     explanation?: string;
-    answer: any;
+    answer: IQuestionAnswer;
     totalVotes: number;
     choices: IQuestionChoice[];
     pictures: IQuestionPicture[];

package/package.json

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

package/resolvers/mutation/restricted/osce.d.ts

@@ -24,7 +24,8 @@ export interface ISelectOsceMarksheetStationVar {
     osceMarksheetId: Id;
     osceStationId: Id;
 }
-export declare type ISelectOsceMarksheetStationData = boolean;
+export interface ISelectOsceMarksheetStationData extends IOsceMarksheet {
+}
 export interface IStartOsceMarksheetData extends IOsceMarksheet {
 }
 export interface IPrestartOsceMarksheetVar {

package/utils/commonFunctions.d.ts

@@ -0,0 +1,7 @@
+import { IMarksheetMark } from '../models';
+export interface ICorrectMarkData {
+    correct: boolean;
+    incorrect: boolean;
+    correctIndex: number;
+}
+export declare function correctMark(mark: IMarksheetMark): ICorrectMarkData;

package/utils/commonFunctions.js

@@ -0,0 +1,139 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.correctMark = void 0;
+const models_1 = require("../models");
+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';
+    }
+    else if (obj.route.includes('intravenous')) {
+        obj.route = 'iv';
+    }
+    else if (obj.route.includes('intramuscular')) {
+        obj.route = 'im';
+    }
+    else if (obj.route.includes('subcutaneous')) {
+        obj.route = 'sc';
+    }
+    else if (obj.route.includes('inhale')) {
+        obj.route = 'inh';
+    }
+    else if (obj.route.includes('nebuli')) {
+        obj.route = 'neb';
+    }
+    obj.units = obj.units.toLowerCase().replace(/\s/g, '');
+    if (obj.units === 'milligram' || obj.units === 'milligrams') {
+        obj.units = 'mg';
+    }
+    else if (obj.units === 'microgram' || obj.units === 'micrograms') {
+        obj.units = 'mcg';
+    }
+    else if (obj.units === 'gram' || obj.units === 'grams') {
+        obj.units = 'g';
+    }
+    else if (obj.units === 'unit') {
+        obj.units = 'units';
+    }
+    let m;
+    const regex = /\d/gm;
+    const durationMatches = [];
+    while ((m = regex.exec(obj.duration)) !== null) {
+        if (m.index === regex.lastIndex) {
+            regex.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';
+    }
+    else if (obj.frequency.includes('once')) {
+        obj.frequency = 'po';
+    }
+    else if (obj.frequency.includes('twice')) {
+        obj.frequency = 'bd';
+    }
+    else if (obj.frequency.includes('trice')) {
+        obj.frequency = 'tds';
+    }
+    return obj;
+}
+const answerRegex = /answer/gi;
+function correctMark(mark) {
+    const data = {
+        correct: false,
+        incorrect: false,
+        correctIndex: -1,
+    };
+    if (!mark || !mark.mark) {
+        return data;
+    }
+    const qKeys = Object.keys(mark.question);
+    const answerKey = qKeys.find((k) => answerRegex.exec(k)) || 'answer';
+    const answer = mark.question[answerKey];
+    const flatAnswer = answer[0];
+    const flatAttempt = mark.mark[0];
+    if (models_1.EQuestionType.SINGLE_BEST_ANSWER === mark.question.typeId) {
+        const answer = flatAnswer;
+        const attempt = flatAttempt;
+        if (answer === attempt) {
+            data.correct = true;
+        }
+        else {
+            data.incorrect = true;
+        }
+    }
+    else if (models_1.EQuestionType.QUESTION_ANSWER === mark.question.typeId) {
+        const answer = flatAnswer.toLowerCase().replace(/\s/g, '');
+        const attempt = flatAttempt.toLowerCase().replace(/\s/g, '');
+        if (answer === attempt) {
+            data.correct = true;
+        }
+        else {
+            data.incorrect = true;
+        }
+    }
+    else if (models_1.EQuestionType.MULTIPLE_ANSWERS === mark.question.typeId) {
+        const [answerA, answerB] = answer.map((x) => x.sort());
+        const [attemptA, attemptB] = mark.mark.map((x) => x.sort());
+        if (answerA.length !== attemptA.length || answerB.length !== attemptB.length) {
+            data.incorrect = true;
+        }
+        else if (attemptA.every((x, i) => x === answerA[i]) && attemptB.every((x, i) => answerB[i])) {
+            data.correct = true;
+        }
+        else {
+            data.incorrect = true;
+        }
+    }
+    else if (models_1.EQuestionType.PRESCRIPTION_ANSWER === mark.question.typeId) {
+        const answers = answer.map(formatPrescribeAnswer);
+        const attempt = formatPrescribeAnswer(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) {
+                foundCorrect = true;
+                break;
+            }
+            index++;
+        }
+        if (foundCorrect) {
+            data.correct = true;
+            data.correctIndex = index;
+        }
+        else {
+            data.incorrect = true;
+        }
+    }
+    return data;
+}
+exports.correctMark = correctMark;