@quesmed/types-rn 2.5.106 → 2.5.108

package/models/OsceStation.d.ts

@@ -31,6 +31,13 @@ export declare enum EOsceType {
     INTERPRETATION = 5,
     ABCDE = 6
 }
+export declare enum EStationPictureType {
+    ALL = 0,
+    ACTOR = 1,
+    CANDIDATE = 2,
+    EXAMINER = 3,
+    WALKTHROUGH = 4
+}
 export interface IOsceStation {
     id: Id;
     createdAt: number | Date;
@@ -45,6 +52,8 @@ export interface IOsceStation {
     actorBrief: string;
     explanation: string;
     marks: IOsceStationMark[];
+    totalMarks: number;
+    completedMarks: number;
     topics?: ITopic[];
     candidatePictures?: IPicture[];
     actorPictures?: IPicture[];

package/models/OsceStation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OSCE_GLOBAL_RATING = exports.EOsceType = void 0;
+exports.OSCE_GLOBAL_RATING = exports.EStationPictureType = exports.EOsceType = void 0;
 var EOsceType;
 (function (EOsceType) {
     EOsceType[EOsceType["ALL"] = 0] = "ALL";
@@ -11,6 +11,14 @@ var EOsceType;
     EOsceType[EOsceType["INTERPRETATION"] = 5] = "INTERPRETATION";
     EOsceType[EOsceType["ABCDE"] = 6] = "ABCDE";
 })(EOsceType = exports.EOsceType || (exports.EOsceType = {}));
+var EStationPictureType;
+(function (EStationPictureType) {
+    EStationPictureType[EStationPictureType["ALL"] = 0] = "ALL";
+    EStationPictureType[EStationPictureType["ACTOR"] = 1] = "ACTOR";
+    EStationPictureType[EStationPictureType["CANDIDATE"] = 2] = "CANDIDATE";
+    EStationPictureType[EStationPictureType["EXAMINER"] = 3] = "EXAMINER";
+    EStationPictureType[EStationPictureType["WALKTHROUGH"] = 4] = "WALKTHROUGH";
+})(EStationPictureType = exports.EStationPictureType || (exports.EStationPictureType = {}));
 exports.OSCE_GLOBAL_RATING = {
     [EOsceType.ABCDE]: `1. Fail - The candidate did not perform large parts of the scenario to the required standard
 2. Borderline - It is not clear whether the candidate demonstrated acceptable performance: either the whole task was performed slightly below passing level or there were some key errors or omissions

package/models/Picture.d.ts

@@ -1,3 +1,4 @@
+import { EStationPictureType } from './OsceStation';
 import { ITopic } from './Topic';
 import { Id } from './Type';
 export interface IPicture {
@@ -33,18 +34,8 @@ export interface IStationPicture {
     pictureId: Id;
     picture: IPicture;
     pictureIdx: number;
-}
-export interface IOsceActorPicture extends IStationPicture {
-    osceStationId: Id;
-}
-export interface IOsceCandidatePicture extends IStationPicture {
-    osceStationId: Id;
-}
-export interface IOsceExaminerPicture extends IStationPicture {
-    osceStationId: Id;
-}
-export interface IOsceWalkthroughPicture extends IStationPicture {
     osceStationId: Id;
+    type: EStationPictureType;
 }
 export interface IQuestionPicture {
     id: Id;

package/package.json

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

package/resolvers/fragments/osce.js

@@ -38,6 +38,8 @@ exports.OSCE_STATION_FIELDS = (0, client_1.gql) `
     marks {
       ...OsceStationMarkFields
     }
+    totalMarks
+    completedMarks
     topics {
       id
       name

package/utils/commonFunctions.js

@@ -55,7 +55,9 @@ function formatPrescribeAnswer(baseAnswer) {
             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, '')
@@ -84,20 +86,26 @@ function formatPrescribeAnswer(baseAnswer) {
     else if (obj.route.value.includes('rectal')) {
         obj.route.value = 'pr';
     }
+    // UNITS
     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.value === 'microgram' ||
-        obj.units.value === 'micrograms') {
-        obj.units.value = 'mcg';
-    }
-    else if (obj.units.value === 'gram' || obj.units.value === 'grams') {
-        obj.units.value = 'g';
-    }
-    else if (obj.units.value === 'unit') {
-        obj.units.value = 'units';
+    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) {
@@ -111,6 +119,7 @@ function formatPrescribeAnswer(baseAnswer) {
         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');
@@ -242,7 +251,8 @@ function correctMark(mark) {
                 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.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;