@quesmed/types 1.5.3 → 1.5.6

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

@@ -42,7 +42,7 @@ export interface IOsceStation {
     walkthroughPictures?: IOsceWalkthroughPicture[];
 }
 export interface IOsceStationItem extends IOsceStation {
-    attempted: boolean;
+    lastOsceMarksheetId: Id;
     score: number;
 }
 export declare const OSCE_GLOBAL_RATING: {

package/package.json

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

package/resolvers/fragments/osce.js

@@ -50,7 +50,7 @@ exports.OSCE_STATION_FIELDS = (0, client_1.gql) `
     }
 
     # user-specific keys
-    # attempted
+    # lastOsceMarksheetId
     # score
   }
 `;
@@ -90,6 +90,7 @@ exports.OSCE_MARKSHEET_FIELDS = (0, client_1.gql) `
     pausedAt
     timeRemaining
     totalStationTime
+    stageTime
     stage
     marks {
       ...OsceMarksheetMarkFields

package/resolvers/fragments/osce.mjs

@@ -47,7 +47,7 @@ export const OSCE_STATION_FIELDS = gql `
     }
 
     # user-specific keys
-    # attempted
+    # lastOsceMarksheetId
     # score
   }
 `;
@@ -87,6 +87,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;
@@ -67,7 +67,6 @@ export declare const SAVE_OSCE_MARKSHEET: import("@apollo/client").DocumentNode;
 export interface ISaveOsceMarksheetVar {
     osceMarksheetId: Id;
     globalScore?: number;
-    timeTaken?: number;
     feedback?: string;
 }
 export declare type ISaveOsceMarksheetData = RestrictedData<graphqlNormalize & IOsceMarksheet, 'saveOsceMarksheet'>;

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
       }
     }
@@ -168,16 +171,16 @@ exports.SAVE_OSCE_MARKSHEET = (0, client_1.gql) `
     $osceMarksheetId: Int!
     $feedback: String
     $globalScore: Int
-    $timeTaken: Int
   ) {
     restricted {
       saveOsceMarksheet(
         osceMarksheetId: $osceMarksheetId
         feedback: $feedback
         globalScore: $globalScore
-        timeTaken: $timeTaken
       ) {
-        ...OsceMarksheetFields
+        id
+        feedback
+        globalScore
       }
     }
   }
@@ -195,14 +198,12 @@ exports.END_OSCE_MARKSHEET = (0, client_1.gql) `
     $osceMarksheetId: Int!
     $feedback: String
     $globalScore: Int
-    $timeTaken: Int
   ) {
     restricted {
       endOsceMarksheet(
         osceMarksheetId: $osceMarksheetId
         feedback: $feedback
         globalScore: $globalScore
-        timeTaken: $timeTaken
       ) {
         ...OsceMarksheetFields
       }

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
       }
     }
@@ -164,16 +167,16 @@ export const SAVE_OSCE_MARKSHEET = gql `
     $osceMarksheetId: Int!
     $feedback: String
     $globalScore: Int
-    $timeTaken: Int
   ) {
     restricted {
       saveOsceMarksheet(
         osceMarksheetId: $osceMarksheetId
         feedback: $feedback
         globalScore: $globalScore
-        timeTaken: $timeTaken
       ) {
-        ...OsceMarksheetFields
+        id
+        feedback
+        globalScore
       }
     }
   }
@@ -191,14 +194,12 @@ export const END_OSCE_MARKSHEET = gql `
     $osceMarksheetId: Int!
     $feedback: String
     $globalScore: Int
-    $timeTaken: Int
   ) {
     restricted {
       endOsceMarksheet(
         osceMarksheetId: $osceMarksheetId
         feedback: $feedback
         globalScore: $globalScore
-        timeTaken: $timeTaken
       ) {
         ...OsceMarksheetFields
       }

package/resolvers/query/restricted/osce.js

@@ -70,7 +70,7 @@ exports.OSCE_STATIONS = (0, client_1.gql) `
         topicIds: $topicIds
       ) {
         ...OsceStationFields
-        attempted
+        lastOsceMarksheetId
         score
       }
     }
@@ -103,7 +103,7 @@ exports.SEARCH_OSCE_STATIONS = (0, client_1.gql) `
     restricted {
       searchOsceStations(search: $search) {
         ...OsceStationFields
-        attempted
+        lastOsceMarksheetId
         score
       }
     }

package/resolvers/query/restricted/osce.mjs

@@ -67,7 +67,7 @@ export const OSCE_STATIONS = gql `
         topicIds: $topicIds
       ) {
         ...OsceStationFields
-        attempted
+        lastOsceMarksheetId
         score
       }
     }
@@ -100,7 +100,7 @@ export const SEARCH_OSCE_STATIONS = gql `
     restricted {
       searchOsceStations(search: $search) {
         ...OsceStationFields
-        attempted
+        lastOsceMarksheetId
         score
       }
     }

package/resolvers/query/restricted/replication.js

@@ -142,7 +142,7 @@ const osceStationReplicationQuery = `query OsceStationReplication($lastId: Strin
     }
 
     # user-specific keys
-    # attempted
+    # lastOsceMarksheetId
     # score
   }
 

package/resolvers/query/restricted/replication.mjs

@@ -137,7 +137,7 @@ const osceStationReplicationQuery = `query OsceStationReplication($lastId: Strin
     }
 
     # user-specific keys
-    # attempted
+    # lastOsceMarksheetId
     # score
   }