@quesmed/types 2.2.8 → 2.2.11

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

@@ -1,4 +1,4 @@
-import { IPreBuildMarksheet } from '../resolvers/mutation/restricted/marksheet';
+import { IBuildConfigData, IPreBuildMarksheet } from '../resolvers/mutation/restricted/marksheet';
 import { IPrescribeAnswer, IPrescribeMark, IQuestion, IQuestionChoice, IQuestionQAAnswer } from './Question';
 import { Id } from './Type';
 import { IUser } from './User';
@@ -24,7 +24,8 @@ export declare enum EMarksheetAction {
     QUESTION_CHANGE = 11,
     TOPIC_CONCEPT_SELECTION = 12,
     BUILDER_CONFIG_SELECTION = 13,
-    STATE_CHANGE = 14
+    STATE_CHANGE = 14,
+    ANSWER_SELECTED = 15
 }
 export interface IMarksheetMember {
     id: Id;
@@ -54,13 +55,14 @@ export interface IMarksheet {
     isTestMarksheet?: boolean;
     solo: boolean;
     agoraId: string;
-    users: IMarksheetMember[];
+    users: IUser[];
     state: EMarksheetState;
     completed: boolean;
     timeTaken: number;
     currentMarkId?: number;
     topicConceptData?: string;
     preBuildData?: IPreBuildMarksheet;
+    builderConfig?: IBuildConfigData;
 }
 export declare type IMarksheetMarkJSONB = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | [IPrescribeMark] | IPrescribeAnswer | null;
 export interface IMarksheetMark {
@@ -77,6 +79,7 @@ export interface IMarksheetMark {
     question: IQuestion;
     mark: IMarksheetMarkJSONB;
     marksheet?: IMarksheet;
+    isAnswered: boolean;
 }
 export interface IPreBuildMarksheetRef {
     id: Id;

package/dist/cjs/models/Marksheet.js

@@ -26,4 +26,5 @@ var EMarksheetAction;
     EMarksheetAction[EMarksheetAction["TOPIC_CONCEPT_SELECTION"] = 12] = "TOPIC_CONCEPT_SELECTION";
     EMarksheetAction[EMarksheetAction["BUILDER_CONFIG_SELECTION"] = 13] = "BUILDER_CONFIG_SELECTION";
     EMarksheetAction[EMarksheetAction["STATE_CHANGE"] = 14] = "STATE_CHANGE";
+    EMarksheetAction[EMarksheetAction["ANSWER_SELECTED"] = 15] = "ANSWER_SELECTED";
 })(EMarksheetAction = exports.EMarksheetAction || (exports.EMarksheetAction = {}));

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

@@ -13,6 +13,7 @@ exports.MARKSHEET_MARK_FIELDS = (0, client_1.gql) `
     timeTaken
     flagged
     questionId
+    isAnswered
     question {
       conceptId
       difficulty

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

@@ -78,13 +78,13 @@ export declare const START_OR_JOIN_MARKSHEET: import("@apollo/client").DocumentN
  * modifyMarksheetInfo
  */
 export interface IMarksheetAction {
-    userId: Id;
-    user: IUser;
-    startedAt: Date | null;
-    endedAt: Date | null;
+    userId?: Id;
+    user?: IUser;
+    startedAt?: Date | null;
+    endedAt?: Date | null;
     state: EMarksheetState;
     action: EMarksheetAction;
-    users: IUser[];
+    users?: IUser[];
 }
 export interface IMarkDataInfo {
     markId?: Id;
@@ -93,6 +93,7 @@ export interface IMarkDataInfo {
     questionId?: Id;
     timeTaken?: number;
     mark?: IMarksheetMarkJSONB;
+    isAnswered?: boolean;
 }
 export interface IBuildConfigData {
     numberOfQuestions?: number;
@@ -104,7 +105,7 @@ export interface IBuildConfigData {
     isTest?: boolean;
 }
 export interface IQbankInfoInput {
-    markSheetAction?: IMarksheetAction;
+    marksheetAction?: IMarksheetAction;
     topicConceptData?: string;
     builderConfig?: IBuildConfigData;
     markData?: IMarkDataInfo;

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

@@ -39,10 +39,8 @@ exports.BUILD_MARKSHEET = (0, client_1.gql) `
           id
         }
         users {
-          user {
-            id
-            displayName
-          }
+          id
+          displayName
         }
         marks {
           ...MarksheetMarkFields
@@ -90,10 +88,8 @@ exports.RE_BUILD_MARKSHEET = (0, client_1.gql) `
         }
         source
         users {
-          user {
-            id
-            displayName
-          }
+          id
+          displayName
         }
         user {
           displayName
@@ -245,10 +241,8 @@ exports.START_OR_JOIN_MARKSHEET = (0, client_1.gql) `
         }
         state
         users {
-          user {
-            id
-            displayName
-          }
+          id
+          displayName
         }
         completed
       }
@@ -257,7 +251,7 @@ exports.START_OR_JOIN_MARKSHEET = (0, client_1.gql) `
 `;
 exports.MODIFY_MARKSHEET_INFO = (0, client_1.gql) `
   ${marksheet_1.MARKSHEET_MARK_FIELDS}
-  mutation ModifyMarksheetInfo($input: input) {
+  mutation ModifyMarksheetInfo($input: ModifyMarksheetInfoInput) {
     restricted {
       modifyMarksheetInfo(input: $input) {
         id
@@ -290,10 +284,8 @@ exports.MODIFY_MARKSHEET_INFO = (0, client_1.gql) `
           id
         }
         users {
-          user {
-            id
-            displayName
-          }
+          id
+          displayName
         }
         marks {
           ...MarksheetMarkFields

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

@@ -11,10 +11,8 @@ exports.MARKSHEET = (0, client_1.gql) `
         currentMarkId
         state
         users {
-          user {
-            id
-            displayName
-          }
+          id
+          displayName
         }
         builderConfig {
           difficulty
@@ -45,6 +43,7 @@ exports.MARKSHEET = (0, client_1.gql) `
           questionChoiceId
           marksheetId
           timeTaken
+          isAnswered
           mark
           question {
             ... on QuestionSBA {
@@ -1224,9 +1223,23 @@ exports.HEARTBEAT_QBANK = (0, client_1.gql) `
   }
 `;
 exports.PRE_BUILD_MARKSHEET = (0, client_1.gql) `
-  query PreBuildMarksheet($preBuildMarksheet: PreBuildMarksheetInput) {
+  query PreBuildMarksheet(
+    $topicIds: [Int!]
+    $conceptIds: [Int!]
+    $source: String!
+    $search: String
+    $marksheetId: Int
+    $difficulty: [Int!]
+  ) {
     restricted {
-      preBuildMarksheet(preBuildMarksheet: $preBuildMarksheet) {
+      preBuildMarksheet(
+        topicIds: $topicIds
+        conceptIds: $conceptIds
+        source: $source
+        search: $search
+        marksheetId: $marksheetId
+        difficulty: $difficulty
+      ) {
         unseen
         seenCorrect
         seenIncorrect

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

@@ -27,7 +27,7 @@ export interface IMarksheetActionInfo {
     action: EMarksheetAction;
     users: IUser[];
 }
-export declare type IOnMarksheetActionChangeData = RootData<IMarksheetActionInfo, 'payload'>;
+export declare type IOnMarksheetActionChangeData = RootData<IMarksheetActionInfo, 'onMarksheetActionInfoChange'>;
 export declare const ON_MARKSHEET_ACTION_INFO_CHANGE_KEY = "ON_MARKSHEET_ACTION_INFO_CHANGE";
 export declare const ON_MARKSHEET_ACTION_INFO_CHANGE: import("@apollo/client").DocumentNode;
 /**
@@ -41,8 +41,9 @@ export interface IPreStartMarksheetData {
     action: EMarksheetAction;
     builderConfig?: IBuildConfigData;
     marksheetId: Id;
+    user: IUser;
 }
-export declare type IOnPreStartMarksheetModificationData = RootData<IPreStartMarksheetData, 'payload'>;
+export declare type IOnPreStartMarksheetModificationData = RootData<IPreStartMarksheetData, 'onPreStartMarksheetModification'>;
 export declare const ON_PRESTART_MARKSHEET_MODIFICATION_KEY = "ON_PRESTART_MARKSHEET_MODIFICATION";
 export declare const ON_PRESTART_MARKSHEET_MODIFICATION: import("@apollo/client").DocumentNode;
 /**
@@ -60,7 +61,9 @@ export interface IMarksheetDataModification {
     timeTaken?: number;
     mark?: IMarksheetMarkJSONB;
     action?: EMarksheetAction;
+    user: IUser;
+    isAnswered?: boolean;
 }
-export declare type IOnMarksheetDataModificationData = RootData<IMarksheetDataModification, 'payload'>;
+export declare type IOnMarksheetDataModificationData = RootData<IMarksheetDataModification, 'onMarksheetDataModification'>;
 export declare const ON_MARKSHEET_DATA_MODIFICATION_KEY = "ON_MARKSHEET_DATA_MODIFICATION";
 export declare const ON_MARKSHEET_DATA_MODIFICATION: import("@apollo/client").DocumentNode;

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

@@ -13,6 +13,10 @@ exports.ON_MARKSHEET_ACTION_INFO_CHANGE = (0, client_1.gql) `
         id
         displayName
       }
+      users {
+        id
+        displayName
+      }
       startedAt
       endedAt
       state
@@ -27,6 +31,10 @@ exports.ON_PRESTART_MARKSHEET_MODIFICATION = (0, client_1.gql) `
       marksheetId
       topicConceptData
       action
+      user {
+        id
+        displayName
+      }
       builderConfig {
         difficulty
         isTest
@@ -48,8 +56,13 @@ exports.ON_MARKSHEET_DATA_MODIFICATION = (0, client_1.gql) `
       marksheetId
       questionId
       questionChoiceId
+      isAnswered
       timeTaken
       action
+      user {
+        id
+        displayName
+      }
     }
   }
 `;

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

@@ -1,4 +1,4 @@
-import { IPreBuildMarksheet } from '../resolvers/mutation/restricted/marksheet';
+import { IBuildConfigData, IPreBuildMarksheet } from '../resolvers/mutation/restricted/marksheet';
 import { IPrescribeAnswer, IPrescribeMark, IQuestion, IQuestionChoice, IQuestionQAAnswer } from './Question';
 import { Id } from './Type';
 import { IUser } from './User';
@@ -24,7 +24,8 @@ export declare enum EMarksheetAction {
     QUESTION_CHANGE = 11,
     TOPIC_CONCEPT_SELECTION = 12,
     BUILDER_CONFIG_SELECTION = 13,
-    STATE_CHANGE = 14
+    STATE_CHANGE = 14,
+    ANSWER_SELECTED = 15
 }
 export interface IMarksheetMember {
     id: Id;
@@ -54,13 +55,14 @@ export interface IMarksheet {
     isTestMarksheet?: boolean;
     solo: boolean;
     agoraId: string;
-    users: IMarksheetMember[];
+    users: IUser[];
     state: EMarksheetState;
     completed: boolean;
     timeTaken: number;
     currentMarkId?: number;
     topicConceptData?: string;
     preBuildData?: IPreBuildMarksheet;
+    builderConfig?: IBuildConfigData;
 }
 export declare type IMarksheetMarkJSONB = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | [IPrescribeMark] | IPrescribeAnswer | null;
 export interface IMarksheetMark {
@@ -77,6 +79,7 @@ export interface IMarksheetMark {
     question: IQuestion;
     mark: IMarksheetMarkJSONB;
     marksheet?: IMarksheet;
+    isAnswered: boolean;
 }
 export interface IPreBuildMarksheetRef {
     id: Id;

package/dist/mjs/models/Marksheet.js

@@ -23,4 +23,5 @@ export var EMarksheetAction;
     EMarksheetAction[EMarksheetAction["TOPIC_CONCEPT_SELECTION"] = 12] = "TOPIC_CONCEPT_SELECTION";
     EMarksheetAction[EMarksheetAction["BUILDER_CONFIG_SELECTION"] = 13] = "BUILDER_CONFIG_SELECTION";
     EMarksheetAction[EMarksheetAction["STATE_CHANGE"] = 14] = "STATE_CHANGE";
+    EMarksheetAction[EMarksheetAction["ANSWER_SELECTED"] = 15] = "ANSWER_SELECTED";
 })(EMarksheetAction || (EMarksheetAction = {}));

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

@@ -10,6 +10,7 @@ export const MARKSHEET_MARK_FIELDS = gql `
     timeTaken
     flagged
     questionId
+    isAnswered
     question {
       conceptId
       difficulty

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

@@ -78,13 +78,13 @@ export declare const START_OR_JOIN_MARKSHEET: import("@apollo/client").DocumentN
  * modifyMarksheetInfo
  */
 export interface IMarksheetAction {
-    userId: Id;
-    user: IUser;
-    startedAt: Date | null;
-    endedAt: Date | null;
+    userId?: Id;
+    user?: IUser;
+    startedAt?: Date | null;
+    endedAt?: Date | null;
     state: EMarksheetState;
     action: EMarksheetAction;
-    users: IUser[];
+    users?: IUser[];
 }
 export interface IMarkDataInfo {
     markId?: Id;
@@ -93,6 +93,7 @@ export interface IMarkDataInfo {
     questionId?: Id;
     timeTaken?: number;
     mark?: IMarksheetMarkJSONB;
+    isAnswered?: boolean;
 }
 export interface IBuildConfigData {
     numberOfQuestions?: number;
@@ -104,7 +105,7 @@ export interface IBuildConfigData {
     isTest?: boolean;
 }
 export interface IQbankInfoInput {
-    markSheetAction?: IMarksheetAction;
+    marksheetAction?: IMarksheetAction;
     topicConceptData?: string;
     builderConfig?: IBuildConfigData;
     markData?: IMarkDataInfo;

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

@@ -36,10 +36,8 @@ export const BUILD_MARKSHEET = gql `
           id
         }
         users {
-          user {
-            id
-            displayName
-          }
+          id
+          displayName
         }
         marks {
           ...MarksheetMarkFields
@@ -87,10 +85,8 @@ export const RE_BUILD_MARKSHEET = gql `
         }
         source
         users {
-          user {
-            id
-            displayName
-          }
+          id
+          displayName
         }
         user {
           displayName
@@ -240,10 +236,8 @@ export const START_OR_JOIN_MARKSHEET = gql `
         }
         state
         users {
-          user {
-            id
-            displayName
-          }
+          id
+          displayName
         }
         completed
       }
@@ -252,7 +246,7 @@ export const START_OR_JOIN_MARKSHEET = gql `
 `;
 export const MODIFY_MARKSHEET_INFO = gql `
   ${MARKSHEET_MARK_FIELDS}
-  mutation ModifyMarksheetInfo($input: input) {
+  mutation ModifyMarksheetInfo($input: ModifyMarksheetInfoInput) {
     restricted {
       modifyMarksheetInfo(input: $input) {
         id
@@ -285,10 +279,8 @@ export const MODIFY_MARKSHEET_INFO = gql `
           id
         }
         users {
-          user {
-            id
-            displayName
-          }
+          id
+          displayName
         }
         marks {
           ...MarksheetMarkFields

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

@@ -8,10 +8,8 @@ export const MARKSHEET = gql `
         currentMarkId
         state
         users {
-          user {
-            id
-            displayName
-          }
+          id
+          displayName
         }
         builderConfig {
           difficulty
@@ -42,6 +40,7 @@ export const MARKSHEET = gql `
           questionChoiceId
           marksheetId
           timeTaken
+          isAnswered
           mark
           question {
             ... on QuestionSBA {
@@ -1221,9 +1220,23 @@ export const HEARTBEAT_QBANK = gql `
   }
 `;
 export const PRE_BUILD_MARKSHEET = gql `
-  query PreBuildMarksheet($preBuildMarksheet: PreBuildMarksheetInput) {
+  query PreBuildMarksheet(
+    $topicIds: [Int!]
+    $conceptIds: [Int!]
+    $source: String!
+    $search: String
+    $marksheetId: Int
+    $difficulty: [Int!]
+  ) {
     restricted {
-      preBuildMarksheet(preBuildMarksheet: $preBuildMarksheet) {
+      preBuildMarksheet(
+        topicIds: $topicIds
+        conceptIds: $conceptIds
+        source: $source
+        search: $search
+        marksheetId: $marksheetId
+        difficulty: $difficulty
+      ) {
         unseen
         seenCorrect
         seenIncorrect

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

@@ -27,7 +27,7 @@ export interface IMarksheetActionInfo {
     action: EMarksheetAction;
     users: IUser[];
 }
-export declare type IOnMarksheetActionChangeData = RootData<IMarksheetActionInfo, 'payload'>;
+export declare type IOnMarksheetActionChangeData = RootData<IMarksheetActionInfo, 'onMarksheetActionInfoChange'>;
 export declare const ON_MARKSHEET_ACTION_INFO_CHANGE_KEY = "ON_MARKSHEET_ACTION_INFO_CHANGE";
 export declare const ON_MARKSHEET_ACTION_INFO_CHANGE: import("@apollo/client").DocumentNode;
 /**
@@ -41,8 +41,9 @@ export interface IPreStartMarksheetData {
     action: EMarksheetAction;
     builderConfig?: IBuildConfigData;
     marksheetId: Id;
+    user: IUser;
 }
-export declare type IOnPreStartMarksheetModificationData = RootData<IPreStartMarksheetData, 'payload'>;
+export declare type IOnPreStartMarksheetModificationData = RootData<IPreStartMarksheetData, 'onPreStartMarksheetModification'>;
 export declare const ON_PRESTART_MARKSHEET_MODIFICATION_KEY = "ON_PRESTART_MARKSHEET_MODIFICATION";
 export declare const ON_PRESTART_MARKSHEET_MODIFICATION: import("@apollo/client").DocumentNode;
 /**
@@ -60,7 +61,9 @@ export interface IMarksheetDataModification {
     timeTaken?: number;
     mark?: IMarksheetMarkJSONB;
     action?: EMarksheetAction;
+    user: IUser;
+    isAnswered?: boolean;
 }
-export declare type IOnMarksheetDataModificationData = RootData<IMarksheetDataModification, 'payload'>;
+export declare type IOnMarksheetDataModificationData = RootData<IMarksheetDataModification, 'onMarksheetDataModification'>;
 export declare const ON_MARKSHEET_DATA_MODIFICATION_KEY = "ON_MARKSHEET_DATA_MODIFICATION";
 export declare const ON_MARKSHEET_DATA_MODIFICATION: import("@apollo/client").DocumentNode;

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

@@ -10,6 +10,10 @@ export const ON_MARKSHEET_ACTION_INFO_CHANGE = gql `
         id
         displayName
       }
+      users {
+        id
+        displayName
+      }
       startedAt
       endedAt
       state
@@ -24,6 +28,10 @@ export const ON_PRESTART_MARKSHEET_MODIFICATION = gql `
       marksheetId
       topicConceptData
       action
+      user {
+        id
+        displayName
+      }
       builderConfig {
         difficulty
         isTest
@@ -45,8 +53,13 @@ export const ON_MARKSHEET_DATA_MODIFICATION = gql `
       marksheetId
       questionId
       questionChoiceId
+      isAnswered
       timeTaken
       action
+      user {
+        id
+        displayName
+      }
     }
   }
 `;

package/package.json

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