@quesmed/types 2.5.20 → 2.5.22

package/dist/cjs/models/OsceMarksheet.d.ts

@@ -37,12 +37,15 @@ export declare enum EOsceMarksheetAction {
     DISCONNECT = 6,
     SELECT = 7,
     LEFT = 8,
-    KICK = 9
+    KICK = 9,
+    ROLE_CHANGE = 10
 }
 export declare enum EOsceMarksheetState {
     LOBBY = 0,
-    PRESTART = 1,
-    STATION = 2
+    STATION_BUILDER = 1,
+    PRESTART = 2,
+    STATION = 3,
+    RESULT = 4
 }
 export interface IOsceMarksheet {
     id: Id;
@@ -58,6 +61,7 @@ export interface IOsceMarksheet {
     globalScore: number;
     feedback: string;
     agoraId: string;
+    sessionId: string;
     readingTime: number;
     stationTime: number;
     feedbackTime: number;
@@ -70,12 +74,13 @@ export interface IOsceMarksheet {
     stage: EOsceStage;
     marks: IOsceMarksheetMark[];
     users: IUser[];
+    activeUsers?: IUser[];
     members: IOsceMarksheetMember[];
     state: EOsceMarksheetState;
     completed: boolean;
 }
 export interface IDashboardOsce {
-    lastAgoraId: string;
+    lastSessionId: string;
     types: IOsceType[];
     avgScore: number;
     completed: number;

package/dist/cjs/models/OsceMarksheet.js

@@ -22,12 +22,15 @@ var EOsceMarksheetAction;
     EOsceMarksheetAction[EOsceMarksheetAction["SELECT"] = 7] = "SELECT";
     EOsceMarksheetAction[EOsceMarksheetAction["LEFT"] = 8] = "LEFT";
     EOsceMarksheetAction[EOsceMarksheetAction["KICK"] = 9] = "KICK";
+    EOsceMarksheetAction[EOsceMarksheetAction["ROLE_CHANGE"] = 10] = "ROLE_CHANGE";
 })(EOsceMarksheetAction = exports.EOsceMarksheetAction || (exports.EOsceMarksheetAction = {}));
 var EOsceMarksheetState;
 (function (EOsceMarksheetState) {
     EOsceMarksheetState[EOsceMarksheetState["LOBBY"] = 0] = "LOBBY";
-    EOsceMarksheetState[EOsceMarksheetState["PRESTART"] = 1] = "PRESTART";
-    EOsceMarksheetState[EOsceMarksheetState["STATION"] = 2] = "STATION";
+    EOsceMarksheetState[EOsceMarksheetState["STATION_BUILDER"] = 1] = "STATION_BUILDER";
+    EOsceMarksheetState[EOsceMarksheetState["PRESTART"] = 2] = "PRESTART";
+    EOsceMarksheetState[EOsceMarksheetState["STATION"] = 3] = "STATION";
+    EOsceMarksheetState[EOsceMarksheetState["RESULT"] = 4] = "RESULT";
 })(EOsceMarksheetState = exports.EOsceMarksheetState || (exports.EOsceMarksheetState = {}));
 var EOsceTimerState;
 (function (EOsceTimerState) {

package/dist/cjs/models/User.d.ts

@@ -56,7 +56,7 @@ export interface IDailyProgressData {
     totalCorrect: number;
     intensity: EPracticeIntensity;
 }
-export interface IMonthlyProgressData {
+export interface IUserProgressData {
     marksheetCount: number;
     questionsCount: number;
     daysInCurrentStreak: number;
@@ -97,7 +97,7 @@ export interface IUser {
     completedRedCardsCount?: number | null;
     dailyFeed: ITodo;
     dailyProgress: IDailyProgressData[];
-    monthlyProgress: IMonthlyProgressData;
+    userProgress: IUserProgressData;
     notifications: INotification[];
     subscriptions: ISubscription[];
     qbankSubscriptionEndDate: number | Date | null;

package/dist/cjs/resolvers/fragments/osce.js

@@ -94,6 +94,7 @@ exports.OSCE_MARKSHEET_FIELDS = (0, client_1.gql) `
     score
     feedback
     agoraId
+    sessionId
     readingTime
     stationTime
     feedbackTime
@@ -121,6 +122,10 @@ exports.OSCE_MARKSHEET_FIELDS = (0, client_1.gql) `
       id
       displayName
     }
+    activeUsers {
+      id
+      displayName
+    }
     state
     completed
   }
@@ -128,7 +133,7 @@ exports.OSCE_MARKSHEET_FIELDS = (0, client_1.gql) `
 exports.OSCE_MATCHMAKING_ACTION_FIELDS = (0, client_1.gql) `
   fragment OsceMatchmakingActionFields on OsceMatchmakingAction {
     osceMarksheetId
-    agoraId
+    sessionId
     matchedUsers
     userId
     classYear

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

@@ -1,14 +1,14 @@
-import { EOsceMarksheetAction, EOsceRoles, Id, IOsceMarksheet, IOsceMarksheetMark } from '../../../models';
+import { EOsceMarksheetAction, EOsceRoles, EStudyAction, 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;
 export interface IStartOsceMatchmakingVar {
-    agoraId: string;
+    sessionId: string;
 }
 export type IStartOsceMatchmakingData = RestrictedData<boolean, 'startOsceMatchmaking'>;
 export declare const ACCEPT_OSCE_MATCHMAKING: import("@apollo/client").DocumentNode;
 export interface IAcceptOsceMatchmakingVar {
-    agoraId: string;
+    sessionId: string;
 }
 export type IAcceptOsceMatchmakingData = RestrictedData<boolean, 'acceptOsceMatchmaking'>;
 export declare const CHECK_OSCE_MATCHMAKING: import("@apollo/client").DocumentNode;
@@ -16,14 +16,19 @@ export type ICheckOsceMatchmakingVar = null;
 export type ICheckOsceMatchmakingData = RestrictedData<graphqlNormalize & IOsceMatchmakingAction, 'checkOsceMatchmaking'>;
 export declare const CANCEL_OSCE_MATCHMAKING: import("@apollo/client").DocumentNode;
 export interface ICancelOsceMatchmakingVar {
-    agoraId: string;
+    sessionId: string;
 }
 export type ICancelOsceMatchmakingData = RestrictedData<boolean, 'cancelOsceMatchmaking'>;
+export declare const CREATE_OR_JOIN_OSCE_MARKSHEET: import("@apollo/client").DocumentNode;
+export interface ICreateOrJoinOsceMarksheetVar {
+    sessionId?: string;
+    action: EStudyAction;
+}
+export type ICreateOrJoinOsceMarksheetData = RestrictedData<graphqlNormalize & IOsceMarksheet, 'createOrJoinOsceMarksheet'>;
 export declare const BUILD_OSCE_MARKSHEET: import("@apollo/client").DocumentNode;
 export interface IBuildOsceMarksheetVar {
     osceStationId?: Id;
-    agoraId?: string;
-    solo?: boolean;
+    osceMarksheetId?: Id;
 }
 export type IBuildOsceMarksheetData = RestrictedData<graphqlNormalize & IOsceMarksheet, 'buildOsceMarksheet'>;
 export declare const CHANGE_OSCE_ROLE: import("@apollo/client").DocumentNode;

package/dist/cjs/resolvers/mutation/restricted/osce.js

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LEAVE_OSCE_MARKSHEET = exports.END_OSCE_MARKSHEET = exports.OSCE_MARKSHEET_ACTIONS = exports.SAVE_OSCE_MARKSHEET = exports.PRESTART_OSCE_MARKSHEET = exports.START_OSCE_TIMER = exports.START_OSCE_MARKSHEET = exports.SELECT_OSCE_STATION = exports.optimisticMarkOsceMarksheetMark = exports.MARK_OSCE_MARKSHEET_MARK = exports.CHANGE_OSCE_ROLE = exports.BUILD_OSCE_MARKSHEET = exports.CANCEL_OSCE_MATCHMAKING = exports.CHECK_OSCE_MATCHMAKING = exports.ACCEPT_OSCE_MATCHMAKING = exports.START_OSCE_MATCHMAKING = void 0;
+exports.LEAVE_OSCE_MARKSHEET = exports.END_OSCE_MARKSHEET = exports.OSCE_MARKSHEET_ACTIONS = exports.SAVE_OSCE_MARKSHEET = exports.PRESTART_OSCE_MARKSHEET = exports.START_OSCE_TIMER = exports.START_OSCE_MARKSHEET = exports.SELECT_OSCE_STATION = exports.optimisticMarkOsceMarksheetMark = exports.MARK_OSCE_MARKSHEET_MARK = exports.CHANGE_OSCE_ROLE = exports.BUILD_OSCE_MARKSHEET = exports.CREATE_OR_JOIN_OSCE_MARKSHEET = exports.CANCEL_OSCE_MATCHMAKING = exports.CHECK_OSCE_MATCHMAKING = exports.ACCEPT_OSCE_MATCHMAKING = exports.START_OSCE_MATCHMAKING = void 0;
 const client_1 = require("@apollo/client");
 const osce_1 = require("../../fragments/osce");
 const osce_2 = require("./../../fragments/osce");
 exports.START_OSCE_MATCHMAKING = (0, client_1.gql) `
-  mutation StartOsceMatchmaking($agoraId: String!) {
+  mutation StartOsceMatchmaking($sessionId: String!) {
     restricted {
-      startOsceMatchmaking(agoraId: $agoraId)
+      startOsceMatchmaking(sessionId: $sessionId)
     }
   }
 `;
 exports.ACCEPT_OSCE_MATCHMAKING = (0, client_1.gql) `
-  mutation AcceptOsceMatchmaking($agoraId: String!) {
+  mutation AcceptOsceMatchmaking($sessionId: String!) {
     restricted {
-      acceptOsceMatchmaking(agoraId: $agoraId)
+      acceptOsceMatchmaking(sessionId: $sessionId)
     }
   }
 `;
@@ -29,9 +29,29 @@ exports.CHECK_OSCE_MATCHMAKING = (0, client_1.gql) `
   }
 `;
 exports.CANCEL_OSCE_MATCHMAKING = (0, client_1.gql) `
-  mutation CancelOsceMatchmaking($agoraId: String!) {
+  mutation CancelOsceMatchmaking($sessionId: String!) {
     restricted {
-      cancelOsceMatchmaking(agoraId: $agoraId)
+      cancelOsceMatchmaking(sessionId: $sessionId)
+    }
+  }
+`;
+exports.CREATE_OR_JOIN_OSCE_MARKSHEET = (0, client_1.gql) `
+  ${osce_2.OSCE_STATION_FIELDS}
+  ${osce_1.OSCE_MARKSHEET_FIELDS}
+  mutation CreateOrJoinOsceMarksheet(
+    $sessionId: String!
+    $action: Int!
+  ) {
+    restricted {
+      createOrJoinOsceMarksheet(
+        sessionId: $sessionId
+        action: $action
+      ) {
+        ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
+      }
     }
   }
 `;
@@ -39,15 +59,13 @@ exports.BUILD_OSCE_MARKSHEET = (0, client_1.gql) `
   ${osce_2.OSCE_STATION_FIELDS}
   ${osce_1.OSCE_MARKSHEET_FIELDS}
   mutation BuildOsceMarksheet(
-    $osceStationId: Int
-    $agoraId: String
-    $solo: Boolean
+    $osceStationId: Int!
+    $osceMarksheetId: Int
   ) {
     restricted {
       buildOsceMarksheet(
         osceStationId: $osceStationId
-        agoraId: $agoraId
-        solo: $solo
+        osceMarksheetId: $osceMarksheetId
       ) {
         ...OsceMarksheetFields
         osceStation {

package/dist/cjs/resolvers/mutation/restricted/users.js

@@ -190,6 +190,12 @@ exports.UPSERT_USER_VIDEO_STATUS = (0, client_1.gql) `
         id
         status
         videoId
+        video {
+          concepts {
+            id
+            topicId
+          }
+        }
         userId
         createdAt
       }

package/dist/cjs/resolvers/query/restricted/marksheet.d.ts

@@ -29,6 +29,11 @@ export type IMarksheetsData = RestrictedData<{
     total: number;
     score: number;
 }, 'marksheets'>;
+export type IMarksheetsWindowData = RestrictedData<{
+    results: (graphqlNormalize & IMarksheet)[];
+    total: number;
+    score: number;
+}, 'marksheetsWindow'>;
 export interface PaginatedMarksheets {
     results: (graphqlNormalize & IMarksheet)[];
     total: number;

package/dist/cjs/resolvers/query/restricted/marksheet.js

@@ -758,6 +758,7 @@ exports.FLAGGED_QUESTIONS = (0, client_1.gql) `
             concept {
               id
               name
+              status
               topic {
                 name
                 typeId

package/dist/cjs/resolvers/query/restricted/osce.d.ts

@@ -47,6 +47,6 @@ export interface ISearchOsceStationsVar {
 export type ISearchOsceStationsData = RestrictedData<(graphqlNormalize & IOsceStation)[], 'searchOsceStations'>;
 export declare const HEARTBEAT: import("@apollo/client").DocumentNode;
 export interface IHeartbeatVar {
-    agoraId: string;
+    sessionId: string;
 }
 export type IHeartBeatData = RestrictedData<boolean, 'heartbeat'>;

package/dist/cjs/resolvers/query/restricted/osce.js

@@ -26,7 +26,7 @@ exports.DASHBOARD_OSCE = (0, client_1.gql) `
   query DashboardOsce($solo: Boolean!) {
     restricted {
       dashboardOsce(solo: $solo) {
-        lastAgoraId
+        lastSessionId
         types {
           id
           name
@@ -129,9 +129,9 @@ exports.SEARCH_OSCE_STATIONS = (0, client_1.gql) `
   }
 `;
 exports.HEARTBEAT = (0, client_1.gql) `
-  query Heartbeat($agoraId: String!) {
+  query Heartbeat($sessionId: String!) {
     restricted {
-      heartbeat(agoraId: $agoraId)
+      heartbeat(sessionId: $sessionId)
     }
   }
 `;

package/dist/cjs/resolvers/query/restricted/qBank.js

@@ -78,7 +78,7 @@ exports.DASHBOARD_QBANK = (0, client_1.gql) `
           totalCorrect
           totalCount
         }
-        monthlyProgress {
+        userProgress {
           marksheetCount
           questionsCount
           daysInCurrentStreak
@@ -179,7 +179,7 @@ exports.DASHBOARD = (0, client_1.gql) `
           totalCorrect
           totalCount
         }
-        monthlyProgress {
+        userProgress {
           marksheetCount
           questionsCount
           daysInCurrentStreak

package/dist/cjs/resolvers/subscription/osce.d.ts

@@ -1,4 +1,4 @@
-import { EClassYearGroup, EOsceMarksheetAction, EOsceRoles, IAccessLevel, IClassYear, Id, IOsceMarksheetMember, IOsceMarksheetTimer, IUser } from '../../models';
+import { EClassYearGroup, EOsceMarksheetAction, EOsceMarksheetState, EOsceRoles, IAccessLevel, IClassYear, Id, IOsceMarksheetMember, IOsceMarksheetTimer, IUser } from '../../models';
 import { RootData } from '../types';
 export declare const OSCE_ROLE_CHANGE_KEY = "OSCE_ROLE_CHANGE";
 export declare const OSCE_MARKSHEET_ACTION_KEY = "OSCE_MARKSHEET_ACTION";
@@ -11,7 +11,7 @@ export interface IOsceGroupMember {
 }
 export interface IOsceGroup {
     osceMarksheetId: Id;
-    agoraId: string;
+    sessionId: string;
     members: IOsceMarksheetMember[];
     users: IUser[];
 }
@@ -27,18 +27,24 @@ export interface IOsceMarksheetActionVar {
 }
 export interface IOsceMarksheetAction {
     osceMarksheetId: Id;
+    osceStationId: Id;
     agoraId: string;
+    sessionId: string;
     userId: Id;
     user: IUser;
+    users: IUser[];
+    members: IOsceMarksheetMember[];
+    activeUsers: IUser[];
     startedAt: Date | null;
     endedAt: Date | null;
+    state: EOsceMarksheetState;
     action: EOsceMarksheetAction;
 }
 export type IOsceMarksheetActionData = RootData<IOsceMarksheetAction, 'osceMarksheetAction'>;
 export declare const OSCE_MATCHMAKING: import("@apollo/client").DocumentNode;
 export interface IOsceMatchmakingAction {
     osceMarksheetId: Id;
-    agoraId: string;
+    sessionId: string;
     matchedUsers: number;
     userId: Id;
     classYear: IClassYear;

package/dist/cjs/resolvers/subscription/osce.js

@@ -52,7 +52,7 @@ exports.OSCE_ROLE_CHANGE = (0, client_1.gql) `
   subscription osceRoleChangeSubscription($osceMarksheetId: Int!) {
     osceRoleChange(osceMarksheetId: $osceMarksheetId) {
       osceMarksheetId
-      agoraId
+      sessionId
       members {
         osceMarksheetId
         userId
@@ -73,6 +73,9 @@ exports.OSCE_MARKSHEET_ACTION = (0, client_1.gql) `
   subscription OsceMarksheetAction($osceMarksheetId: Int!) {
     osceMarksheetAction(osceMarksheetId: $osceMarksheetId) {
       osceMarksheetId
+      osceStationId
+      state
+      sessionId
       agoraId
       userId
       user {
@@ -80,6 +83,15 @@ exports.OSCE_MARKSHEET_ACTION = (0, client_1.gql) `
         displayName
         universityId
       }
+      activeUsers {
+        id
+        displayName
+      }
+      members {
+        id
+        userId
+        role
+      }
       startedAt
       endedAt
       action

package/dist/mjs/models/OsceMarksheet.d.ts

@@ -37,12 +37,15 @@ export declare enum EOsceMarksheetAction {
     DISCONNECT = 6,
     SELECT = 7,
     LEFT = 8,
-    KICK = 9
+    KICK = 9,
+    ROLE_CHANGE = 10
 }
 export declare enum EOsceMarksheetState {
     LOBBY = 0,
-    PRESTART = 1,
-    STATION = 2
+    STATION_BUILDER = 1,
+    PRESTART = 2,
+    STATION = 3,
+    RESULT = 4
 }
 export interface IOsceMarksheet {
     id: Id;
@@ -58,6 +61,7 @@ export interface IOsceMarksheet {
     globalScore: number;
     feedback: string;
     agoraId: string;
+    sessionId: string;
     readingTime: number;
     stationTime: number;
     feedbackTime: number;
@@ -70,12 +74,13 @@ export interface IOsceMarksheet {
     stage: EOsceStage;
     marks: IOsceMarksheetMark[];
     users: IUser[];
+    activeUsers?: IUser[];
     members: IOsceMarksheetMember[];
     state: EOsceMarksheetState;
     completed: boolean;
 }
 export interface IDashboardOsce {
-    lastAgoraId: string;
+    lastSessionId: string;
     types: IOsceType[];
     avgScore: number;
     completed: number;

package/dist/mjs/models/OsceMarksheet.js

@@ -19,12 +19,15 @@ export var EOsceMarksheetAction;
     EOsceMarksheetAction[EOsceMarksheetAction["SELECT"] = 7] = "SELECT";
     EOsceMarksheetAction[EOsceMarksheetAction["LEFT"] = 8] = "LEFT";
     EOsceMarksheetAction[EOsceMarksheetAction["KICK"] = 9] = "KICK";
+    EOsceMarksheetAction[EOsceMarksheetAction["ROLE_CHANGE"] = 10] = "ROLE_CHANGE";
 })(EOsceMarksheetAction || (EOsceMarksheetAction = {}));
 export var EOsceMarksheetState;
 (function (EOsceMarksheetState) {
     EOsceMarksheetState[EOsceMarksheetState["LOBBY"] = 0] = "LOBBY";
-    EOsceMarksheetState[EOsceMarksheetState["PRESTART"] = 1] = "PRESTART";
-    EOsceMarksheetState[EOsceMarksheetState["STATION"] = 2] = "STATION";
+    EOsceMarksheetState[EOsceMarksheetState["STATION_BUILDER"] = 1] = "STATION_BUILDER";
+    EOsceMarksheetState[EOsceMarksheetState["PRESTART"] = 2] = "PRESTART";
+    EOsceMarksheetState[EOsceMarksheetState["STATION"] = 3] = "STATION";
+    EOsceMarksheetState[EOsceMarksheetState["RESULT"] = 4] = "RESULT";
 })(EOsceMarksheetState || (EOsceMarksheetState = {}));
 export var EOsceTimerState;
 (function (EOsceTimerState) {

package/dist/mjs/models/User.d.ts

@@ -56,7 +56,7 @@ export interface IDailyProgressData {
     totalCorrect: number;
     intensity: EPracticeIntensity;
 }
-export interface IMonthlyProgressData {
+export interface IUserProgressData {
     marksheetCount: number;
     questionsCount: number;
     daysInCurrentStreak: number;
@@ -97,7 +97,7 @@ export interface IUser {
     completedRedCardsCount?: number | null;
     dailyFeed: ITodo;
     dailyProgress: IDailyProgressData[];
-    monthlyProgress: IMonthlyProgressData;
+    userProgress: IUserProgressData;
     notifications: INotification[];
     subscriptions: ISubscription[];
     qbankSubscriptionEndDate: number | Date | null;

package/dist/mjs/resolvers/fragments/osce.js

@@ -91,6 +91,7 @@ export const OSCE_MARKSHEET_FIELDS = gql `
     score
     feedback
     agoraId
+    sessionId
     readingTime
     stationTime
     feedbackTime
@@ -118,6 +119,10 @@ export const OSCE_MARKSHEET_FIELDS = gql `
       id
       displayName
     }
+    activeUsers {
+      id
+      displayName
+    }
     state
     completed
   }
@@ -125,7 +130,7 @@ export const OSCE_MARKSHEET_FIELDS = gql `
 export const OSCE_MATCHMAKING_ACTION_FIELDS = gql `
   fragment OsceMatchmakingActionFields on OsceMatchmakingAction {
     osceMarksheetId
-    agoraId
+    sessionId
     matchedUsers
     userId
     classYear

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

@@ -1,14 +1,14 @@
-import { EOsceMarksheetAction, EOsceRoles, Id, IOsceMarksheet, IOsceMarksheetMark } from '../../../models';
+import { EOsceMarksheetAction, EOsceRoles, EStudyAction, 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;
 export interface IStartOsceMatchmakingVar {
-    agoraId: string;
+    sessionId: string;
 }
 export type IStartOsceMatchmakingData = RestrictedData<boolean, 'startOsceMatchmaking'>;
 export declare const ACCEPT_OSCE_MATCHMAKING: import("@apollo/client").DocumentNode;
 export interface IAcceptOsceMatchmakingVar {
-    agoraId: string;
+    sessionId: string;
 }
 export type IAcceptOsceMatchmakingData = RestrictedData<boolean, 'acceptOsceMatchmaking'>;
 export declare const CHECK_OSCE_MATCHMAKING: import("@apollo/client").DocumentNode;
@@ -16,14 +16,19 @@ export type ICheckOsceMatchmakingVar = null;
 export type ICheckOsceMatchmakingData = RestrictedData<graphqlNormalize & IOsceMatchmakingAction, 'checkOsceMatchmaking'>;
 export declare const CANCEL_OSCE_MATCHMAKING: import("@apollo/client").DocumentNode;
 export interface ICancelOsceMatchmakingVar {
-    agoraId: string;
+    sessionId: string;
 }
 export type ICancelOsceMatchmakingData = RestrictedData<boolean, 'cancelOsceMatchmaking'>;
+export declare const CREATE_OR_JOIN_OSCE_MARKSHEET: import("@apollo/client").DocumentNode;
+export interface ICreateOrJoinOsceMarksheetVar {
+    sessionId?: string;
+    action: EStudyAction;
+}
+export type ICreateOrJoinOsceMarksheetData = RestrictedData<graphqlNormalize & IOsceMarksheet, 'createOrJoinOsceMarksheet'>;
 export declare const BUILD_OSCE_MARKSHEET: import("@apollo/client").DocumentNode;
 export interface IBuildOsceMarksheetVar {
     osceStationId?: Id;
-    agoraId?: string;
-    solo?: boolean;
+    osceMarksheetId?: Id;
 }
 export type IBuildOsceMarksheetData = RestrictedData<graphqlNormalize & IOsceMarksheet, 'buildOsceMarksheet'>;
 export declare const CHANGE_OSCE_ROLE: import("@apollo/client").DocumentNode;

package/dist/mjs/resolvers/mutation/restricted/osce.js

@@ -2,16 +2,16 @@ import { gql } from '@apollo/client';
 import { OSCE_MARKSHEET_FIELDS, OSCE_MATCHMAKING_ACTION_FIELDS, } from '../../fragments/osce';
 import { OSCE_STATION_FIELDS } from './../../fragments/osce';
 export const START_OSCE_MATCHMAKING = gql `
-  mutation StartOsceMatchmaking($agoraId: String!) {
+  mutation StartOsceMatchmaking($sessionId: String!) {
     restricted {
-      startOsceMatchmaking(agoraId: $agoraId)
+      startOsceMatchmaking(sessionId: $sessionId)
     }
   }
 `;
 export const ACCEPT_OSCE_MATCHMAKING = gql `
-  mutation AcceptOsceMatchmaking($agoraId: String!) {
+  mutation AcceptOsceMatchmaking($sessionId: String!) {
     restricted {
-      acceptOsceMatchmaking(agoraId: $agoraId)
+      acceptOsceMatchmaking(sessionId: $sessionId)
     }
   }
 `;
@@ -26,9 +26,29 @@ export const CHECK_OSCE_MATCHMAKING = gql `
   }
 `;
 export const CANCEL_OSCE_MATCHMAKING = gql `
-  mutation CancelOsceMatchmaking($agoraId: String!) {
+  mutation CancelOsceMatchmaking($sessionId: String!) {
     restricted {
-      cancelOsceMatchmaking(agoraId: $agoraId)
+      cancelOsceMatchmaking(sessionId: $sessionId)
+    }
+  }
+`;
+export const CREATE_OR_JOIN_OSCE_MARKSHEET = gql `
+  ${OSCE_STATION_FIELDS}
+  ${OSCE_MARKSHEET_FIELDS}
+  mutation CreateOrJoinOsceMarksheet(
+    $sessionId: String!
+    $action: Int!
+  ) {
+    restricted {
+      createOrJoinOsceMarksheet(
+        sessionId: $sessionId
+        action: $action
+      ) {
+        ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
+      }
     }
   }
 `;
@@ -36,15 +56,13 @@ export const BUILD_OSCE_MARKSHEET = gql `
   ${OSCE_STATION_FIELDS}
   ${OSCE_MARKSHEET_FIELDS}
   mutation BuildOsceMarksheet(
-    $osceStationId: Int
-    $agoraId: String
-    $solo: Boolean
+    $osceStationId: Int!
+    $osceMarksheetId: Int
   ) {
     restricted {
       buildOsceMarksheet(
         osceStationId: $osceStationId
-        agoraId: $agoraId
-        solo: $solo
+        osceMarksheetId: $osceMarksheetId
       ) {
         ...OsceMarksheetFields
         osceStation {

package/dist/mjs/resolvers/mutation/restricted/users.js

@@ -185,6 +185,12 @@ export const UPSERT_USER_VIDEO_STATUS = gql `
         id
         status
         videoId
+        video {
+          concepts {
+            id
+            topicId
+          }
+        }
         userId
         createdAt
       }

package/dist/mjs/resolvers/query/restricted/marksheet.d.ts

@@ -29,6 +29,11 @@ export type IMarksheetsData = RestrictedData<{
     total: number;
     score: number;
 }, 'marksheets'>;
+export type IMarksheetsWindowData = RestrictedData<{
+    results: (graphqlNormalize & IMarksheet)[];
+    total: number;
+    score: number;
+}, 'marksheetsWindow'>;
 export interface PaginatedMarksheets {
     results: (graphqlNormalize & IMarksheet)[];
     total: number;

package/dist/mjs/resolvers/query/restricted/marksheet.js

@@ -755,6 +755,7 @@ export const FLAGGED_QUESTIONS = gql `
             concept {
               id
               name
+              status
               topic {
                 name
                 typeId

package/dist/mjs/resolvers/query/restricted/osce.d.ts

@@ -47,6 +47,6 @@ export interface ISearchOsceStationsVar {
 export type ISearchOsceStationsData = RestrictedData<(graphqlNormalize & IOsceStation)[], 'searchOsceStations'>;
 export declare const HEARTBEAT: import("@apollo/client").DocumentNode;
 export interface IHeartbeatVar {
-    agoraId: string;
+    sessionId: string;
 }
 export type IHeartBeatData = RestrictedData<boolean, 'heartbeat'>;

package/dist/mjs/resolvers/query/restricted/osce.js

@@ -23,7 +23,7 @@ export const DASHBOARD_OSCE = gql `
   query DashboardOsce($solo: Boolean!) {
     restricted {
       dashboardOsce(solo: $solo) {
-        lastAgoraId
+        lastSessionId
         types {
           id
           name
@@ -126,9 +126,9 @@ export const SEARCH_OSCE_STATIONS = gql `
   }
 `;
 export const HEARTBEAT = gql `
-  query Heartbeat($agoraId: String!) {
+  query Heartbeat($sessionId: String!) {
     restricted {
-      heartbeat(agoraId: $agoraId)
+      heartbeat(sessionId: $sessionId)
     }
   }
 `;

package/dist/mjs/resolvers/query/restricted/qBank.js

@@ -75,7 +75,7 @@ export const DASHBOARD_QBANK = gql `
           totalCorrect
           totalCount
         }
-        monthlyProgress {
+        userProgress {
           marksheetCount
           questionsCount
           daysInCurrentStreak
@@ -176,7 +176,7 @@ export const DASHBOARD = gql `
           totalCorrect
           totalCount
         }
-        monthlyProgress {
+        userProgress {
           marksheetCount
           questionsCount
           daysInCurrentStreak

package/dist/mjs/resolvers/subscription/osce.d.ts

@@ -1,4 +1,4 @@
-import { EClassYearGroup, EOsceMarksheetAction, EOsceRoles, IAccessLevel, IClassYear, Id, IOsceMarksheetMember, IOsceMarksheetTimer, IUser } from '../../models';
+import { EClassYearGroup, EOsceMarksheetAction, EOsceMarksheetState, EOsceRoles, IAccessLevel, IClassYear, Id, IOsceMarksheetMember, IOsceMarksheetTimer, IUser } from '../../models';
 import { RootData } from '../types';
 export declare const OSCE_ROLE_CHANGE_KEY = "OSCE_ROLE_CHANGE";
 export declare const OSCE_MARKSHEET_ACTION_KEY = "OSCE_MARKSHEET_ACTION";
@@ -11,7 +11,7 @@ export interface IOsceGroupMember {
 }
 export interface IOsceGroup {
     osceMarksheetId: Id;
-    agoraId: string;
+    sessionId: string;
     members: IOsceMarksheetMember[];
     users: IUser[];
 }
@@ -27,18 +27,24 @@ export interface IOsceMarksheetActionVar {
 }
 export interface IOsceMarksheetAction {
     osceMarksheetId: Id;
+    osceStationId: Id;
     agoraId: string;
+    sessionId: string;
     userId: Id;
     user: IUser;
+    users: IUser[];
+    members: IOsceMarksheetMember[];
+    activeUsers: IUser[];
     startedAt: Date | null;
     endedAt: Date | null;
+    state: EOsceMarksheetState;
     action: EOsceMarksheetAction;
 }
 export type IOsceMarksheetActionData = RootData<IOsceMarksheetAction, 'osceMarksheetAction'>;
 export declare const OSCE_MATCHMAKING: import("@apollo/client").DocumentNode;
 export interface IOsceMatchmakingAction {
     osceMarksheetId: Id;
-    agoraId: string;
+    sessionId: string;
     matchedUsers: number;
     userId: Id;
     classYear: IClassYear;

package/dist/mjs/resolvers/subscription/osce.js

@@ -48,7 +48,7 @@ export const OSCE_ROLE_CHANGE = gql `
   subscription osceRoleChangeSubscription($osceMarksheetId: Int!) {
     osceRoleChange(osceMarksheetId: $osceMarksheetId) {
       osceMarksheetId
-      agoraId
+      sessionId
       members {
         osceMarksheetId
         userId
@@ -69,6 +69,9 @@ export const OSCE_MARKSHEET_ACTION = gql `
   subscription OsceMarksheetAction($osceMarksheetId: Int!) {
     osceMarksheetAction(osceMarksheetId: $osceMarksheetId) {
       osceMarksheetId
+      osceStationId
+      state
+      sessionId
       agoraId
       userId
       user {
@@ -76,6 +79,15 @@ export const OSCE_MARKSHEET_ACTION = gql `
         displayName
         universityId
       }
+      activeUsers {
+        id
+        displayName
+      }
+      members {
+        id
+        userId
+        role
+      }
       startedAt
       endedAt
       action

package/package.json

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