@quesmed/types 1.5.5 → 1.5.9

package/models/OsceMarksheet.d.ts

@@ -64,6 +64,7 @@ export interface IOsceMarksheet {
     pausedAt: number | Date;
     timeRemaining: string;
     totalStationTime: string;
+    stageTime: string;
     stage: EOsceStage;
     marks: IOsceMarksheetMark[];
     users: IOsceMarksheetUser[];
@@ -97,6 +98,7 @@ export interface IOsceMarksheetTimer {
     osceMarksheetId: number;
     timeRemaining: string;
     totalStationTime: string;
+    stageTime: string;
     stage: EOsceStage;
     state: EOsceTimerState;
 }

package/models/OsceMarksheet.js

@@ -46,6 +46,7 @@ function createTimerPayload(osceMarksheet) {
         osceMarksheetId: osceMarksheet.id,
         timeRemaining: '00:00',
         totalStationTime: '00:00',
+        stageTime: '/00 secs',
         stage: EOsceStage.READING,
         state: EOsceTimerState.PAUSE,
     };
@@ -85,13 +86,16 @@ function createTimerPayload(osceMarksheet) {
     }
     if (timeRemainingDuration > stationDuration - osceMarksheet.readingTime) {
         payload.stage = EOsceStage.READING;
+        payload.stageTime = `/${osceMarksheet.readingTime} secs`;
     }
     else if (timeRemainingDuration >
         stationDuration - osceMarksheet.readingTime - osceMarksheet.stationTime * 60) {
         payload.stage = EOsceStage.STATION;
+        payload.stageTime = `/${osceMarksheet.stationTime} mins`;
     }
     else {
         payload.stage = EOsceStage.FEEDBACK;
+        payload.stageTime = `/${osceMarksheet.feedbackTime} mins`;
     }
     payload.timeRemaining = (0, utils_1.printDuration)(timeRemainingDuration);
     return payload;

package/models/OsceMarksheet.mjs

@@ -43,6 +43,7 @@ export function createTimerPayload(osceMarksheet) {
         osceMarksheetId: osceMarksheet.id,
         timeRemaining: '00:00',
         totalStationTime: '00:00',
+        stageTime: '/00 secs',
         stage: EOsceStage.READING,
         state: EOsceTimerState.PAUSE,
     };
@@ -82,13 +83,16 @@ export function createTimerPayload(osceMarksheet) {
     }
     if (timeRemainingDuration > stationDuration - osceMarksheet.readingTime) {
         payload.stage = EOsceStage.READING;
+        payload.stageTime = `/${osceMarksheet.readingTime} secs`;
     }
     else if (timeRemainingDuration >
         stationDuration - osceMarksheet.readingTime - osceMarksheet.stationTime * 60) {
         payload.stage = EOsceStage.STATION;
+        payload.stageTime = `/${osceMarksheet.stationTime} mins`;
     }
     else {
         payload.stage = EOsceStage.FEEDBACK;
+        payload.stageTime = `/${osceMarksheet.feedbackTime} mins`;
     }
     payload.timeRemaining = printDuration(timeRemainingDuration);
     return payload;

package/models/OsceStation.d.ts

@@ -2,6 +2,7 @@ import { EDifficultyType } from './Difficulty';
 import { IOsceActorPicture, IOsceCandidatePicture, IOsceExaminerPicture, IOsceWalkthroughPicture } from './Picture';
 import { ITopic } from './Topic';
 import { Id } from './Type';
+import { IVideo } from './Video';
 export interface IOsceType {
     id: Id;
     name: string;
@@ -40,6 +41,7 @@ export interface IOsceStation {
     actorPictures?: IOsceActorPicture[];
     examinerPictures?: IOsceExaminerPicture[];
     walkthroughPictures?: IOsceWalkthroughPicture[];
+    videos?: IVideo[];
 }
 export interface IOsceStationItem extends IOsceStation {
     lastOsceMarksheetId: Id;

package/models/Video.d.ts

@@ -1,5 +1,6 @@
 import { IConcept } from './Concept';
 import { IFile } from './File';
+import { IOsceStation } from './OsceStation';
 import { Id } from './Type';
 export interface IVideo {
     id: Id;
@@ -15,6 +16,7 @@ export interface IVideo {
     description: string;
     duration: number;
     concepts: IConcept[];
+    osceStation: IOsceStation;
     files: IFile[];
     send1hrPushAt: number | Date | null;
     sent1hrPushAt: number | Date | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quesmed/types",
-  "version": "1.5.5",
+  "version": "1.5.9",
   "description": "Typescript types for Quesmed",
   "main": "index.js",
   "module": "index.mjs",

package/resolvers/fragments/osce.js

@@ -48,6 +48,18 @@ exports.OSCE_STATION_FIELDS = (0, client_1.gql) `
     walkthroughPictures {
       ...OscePictureFields
     }
+    videos {
+      id
+      title
+      museId
+      thumbnail
+      concepts {
+        name
+      }
+      live
+      description
+      duration
+    }
 
     # user-specific keys
     # lastOsceMarksheetId
@@ -90,6 +102,7 @@ exports.OSCE_MARKSHEET_FIELDS = (0, client_1.gql) `
     pausedAt
     timeRemaining
     totalStationTime
+    stageTime
     stage
     marks {
       ...OsceMarksheetMarkFields

package/resolvers/fragments/osce.mjs

@@ -45,6 +45,18 @@ export const OSCE_STATION_FIELDS = gql `
     walkthroughPictures {
       ...OscePictureFields
     }
+    videos {
+      id
+      title
+      museId
+      thumbnail
+      concepts {
+        name
+      }
+      live
+      description
+      duration
+    }
 
     # user-specific keys
     # lastOsceMarksheetId
@@ -87,6 +99,7 @@ export const OSCE_MARKSHEET_FIELDS = gql `
     pausedAt
     timeRemaining
     totalStationTime
+    stageTime
     stage
     marks {
       ...OsceMarksheetMarkFields

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

@@ -1,4 +1,4 @@
-import { EOsceMarksheetAction, EOsceRoles, Id, IOsceMarksheet, IOsceMarksheetMark, IOsceMarksheetTimer } from '../../../models';
+import { EOsceMarksheetAction, EOsceRoles, Id, IOsceMarksheet, IOsceMarksheetMark } from '../../../models';
 import { IOsceMatchmakingAction } from '../../subscription/osce';
 import { graphqlNormalize, RestrictedData } from '../../types';
 export declare const START_OSCE_MATCHMAKING: import("@apollo/client").DocumentNode;
@@ -54,7 +54,7 @@ export declare const START_OSCE_TIMER: import("@apollo/client").DocumentNode;
 export interface IStartOsceTimerVar {
     osceMarksheetId: Id;
 }
-export declare type IStartOsceTimerData = RestrictedData<graphqlNormalize & IOsceMarksheetTimer, 'startOsceTimer'>;
+export declare type IStartOsceTimerData = RestrictedData<graphqlNormalize & IOsceMarksheet, 'startOsceTimer'>;
 export declare const PRESTART_OSCE_MARKSHEET: import("@apollo/client").DocumentNode;
 export interface IPrestartOsceMarksheetVar {
     osceMarksheetId: Id;

package/resolvers/mutation/restricted/osce.js

@@ -130,9 +130,12 @@ exports.START_OSCE_TIMER = (0, client_1.gql) `
   mutation StartOsceTimer($osceMarksheetId: Int!) {
     restricted {
       startOsceTimer(osceMarksheetId: $osceMarksheetId) {
-        osceMarksheetId
+        id
+        startedAt
+        endedAt
         timeRemaining
         totalStationTime
+        stage
         state
       }
     }
@@ -175,7 +178,9 @@ exports.SAVE_OSCE_MARKSHEET = (0, client_1.gql) `
         feedback: $feedback
         globalScore: $globalScore
       ) {
-        ...OsceMarksheetFields
+        id
+        feedback
+        globalScore
       }
     }
   }

package/resolvers/mutation/restricted/osce.mjs

@@ -126,9 +126,12 @@ export const START_OSCE_TIMER = gql `
   mutation StartOsceTimer($osceMarksheetId: Int!) {
     restricted {
       startOsceTimer(osceMarksheetId: $osceMarksheetId) {
-        osceMarksheetId
+        id
+        startedAt
+        endedAt
         timeRemaining
         totalStationTime
+        stage
         state
       }
     }
@@ -171,7 +174,9 @@ export const SAVE_OSCE_MARKSHEET = gql `
         feedback: $feedback
         globalScore: $globalScore
       ) {
-        ...OsceMarksheetFields
+        id
+        feedback
+        globalScore
       }
     }
   }

package/resolvers/query/restricted/quesBook.js

@@ -9,6 +9,8 @@ exports.OSCE_BOOK = (0, client_1.gql) `
     restricted {
       osceBook {
         ...OsceStationFields
+        lastOsceMarksheetId
+        score
       }
     }
   }

package/resolvers/query/restricted/quesBook.mjs

@@ -6,6 +6,8 @@ export const OSCE_BOOK = gql `
     restricted {
       osceBook {
         ...OsceStationFields
+        lastOsceMarksheetId
+        score
       }
     }
   }

package/resolvers/query/restricted/video.d.ts

@@ -4,7 +4,7 @@ export interface IVideoVar {
 }
 export declare type IVideoData = IVideo;
 export interface IVideosVar {
-    filter: 'new' | 'popular' | 'personal' | 'live';
+    filter: 'new' | 'popular' | 'personal' | 'live' | 'osce';
     limit: number;
 }
 export declare type IVideosData = IVideo[];