@quesmed/types 2.5.74 → 2.5.75

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

@@ -9,7 +9,13 @@ import { ITodo } from './Todo';
 import { Id } from './Type';
 import { IUniversity } from './University';
 import { IVideo } from './Video';
-export type IAccessLevel = 'subscriber' | 'administrator' | 'tutor';
+export declare enum IAccessLevel {
+    SUBSCRIBER = "subscriber",
+    ADMINISTRATOR = "administrator",
+    TUTOR = "tutor",
+    DEMO = "demo",
+    EXPIRED = "expired"
+}
 export type IClassYear = 'Year 1' | 'Year 2' | 'Year 3' | 'Year 4' | 'Year 5' | 'Graduated' | 'PhD' | 'BSc' | 'MSc' | 'Beta Tester';
 export declare const classYears: IClassYear[];
 export declare enum EClassYearGroup {

package/dist/cjs/models/User.js

@@ -1,7 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.currentClassGroup = exports.currentClassYear = exports.EPracticeIntensity = exports.classYearGroup = exports.EUserLearningStatus = exports.EClassYearGroup = exports.classYears = void 0;
+exports.currentClassGroup = exports.currentClassYear = exports.EPracticeIntensity = exports.classYearGroup = exports.EUserLearningStatus = exports.EClassYearGroup = exports.classYears = exports.IAccessLevel = void 0;
 const luxon_1 = require("luxon");
+var IAccessLevel;
+(function (IAccessLevel) {
+    IAccessLevel["SUBSCRIBER"] = "subscriber";
+    IAccessLevel["ADMINISTRATOR"] = "administrator";
+    IAccessLevel["TUTOR"] = "tutor";
+    IAccessLevel["DEMO"] = "demo";
+    IAccessLevel["EXPIRED"] = "expired";
+})(IAccessLevel = exports.IAccessLevel || (exports.IAccessLevel = {}));
 exports.classYears = [
     'Year 1',
     'Year 2',

package/dist/cjs/resolvers/enums.d.ts

@@ -0,0 +1,4 @@
+export declare enum ESortOrder {
+    ASC = 1,
+    DESC = 0
+}

package/dist/cjs/resolvers/enums.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ESortOrder = void 0;
+var ESortOrder;
+(function (ESortOrder) {
+    ESortOrder[ESortOrder["ASC"] = 1] = "ASC";
+    ESortOrder[ESortOrder["DESC"] = 0] = "DESC";
+})(ESortOrder = exports.ESortOrder || (exports.ESortOrder = {}));

package/dist/cjs/resolvers/index.d.ts

@@ -4,6 +4,7 @@ import * as query from './query';
 import * as subscription from './subscription';
 export * from './apollo';
 export * from './types';
+export * from './enums';
 export declare namespace Resolvers {
     export import Fragment = fragment;
     export import Muation = mutation;

package/dist/cjs/resolvers/index.js

@@ -33,6 +33,7 @@ const query = __importStar(require("./query"));
 const subscription = __importStar(require("./subscription"));
 __exportStar(require("./apollo"), exports);
 __exportStar(require("./types"), exports);
+__exportStar(require("./enums"), exports);
 var Resolvers;
 (function (Resolvers) {
     Resolvers.Fragment = fragment;

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

@@ -1,6 +1,7 @@
 import { EDifficultyType, Id, IMarksheet, IUserFlaggedQuestion } from '../../../models';
 import { IPreBuildMarksheet } from '../../mutation/restricted';
 import { graphqlNormalize, RestrictedData } from '../../types';
+import { ESortOrder } from '../../enums';
 export interface IMarksheetVar {
     id: Id;
 }
@@ -9,7 +10,7 @@ export declare const MARKSHEET: import("@apollo/client").DocumentNode;
 export interface IMarksheetsVar {
     filter: {
         limit: number;
-        date?: string;
+        order?: ESortOrder;
         offset?: number;
         solo?: boolean;
         period?: number;
@@ -18,7 +19,7 @@ export interface IMarksheetsVar {
 export interface IMarksheetsWindowVar {
     filter: {
         limit: number;
-        order?: string;
+        order?: ESortOrder;
         updatedAt?: Date | number;
         solo?: boolean;
         period?: number;
@@ -29,11 +30,15 @@ export type IMarksheetsData = RestrictedData<{
     total: number;
     score: number;
 }, 'marksheets'>;
-export type IMarksheetsWindowData = RestrictedData<{
-    results: (graphqlNormalize & IMarksheet)[];
+export interface IMarksheetsDashboardData {
     total: number;
     score: number;
-}, 'marksheetsWindow'>;
+    results: Array<{
+        date: Date | number;
+        result: IMarksheet[];
+    }>;
+}
+export type IMarksheetsWindowData = RestrictedData<graphqlNormalize & IMarksheetsDashboardData, 'marksheetsWindow'>;
 export interface PaginatedMarksheets {
     results: (graphqlNormalize & IMarksheet)[];
     total: number;

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

@@ -1022,17 +1022,20 @@ exports.MARKSHEETS_WINDOW = (0, client_1.gql) `
     restricted {
       marksheetsWindow(filter: $filter) {
         results {
-          id
-          endedAt
-          topicNames
-          correct
-          incorrect
-          totalQuestions
-          typeId
-          isTestMarksheet
-          solo
-          completed
-          updatedAt
+          date
+          result {
+            id
+            endedAt
+            topicNames
+            correct
+            incorrect
+            totalQuestions
+            typeId
+            isTestMarksheet
+            solo
+            completed
+            updatedAt
+          }
         }
         total
         score

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

@@ -1,6 +1,7 @@
 import { EDifficultyType, EOsceType, Id, IDashboardOsce, IOsceMarksheet, IOsceStation, IOsceStats } from '../../../models';
 import { graphqlNormalize, RestrictedData } from '../../types';
 import { ITopic } from './../../../models/Topic';
+import { ESortOrder } from '../../enums';
 export interface IOsceStatsVar {
     typeId?: EOsceType[];
     solo: boolean;
@@ -10,6 +11,7 @@ export declare const OSCE_STATS: import("@apollo/client").DocumentNode;
 export declare const DASHBOARD_OSCE: import("@apollo/client").DocumentNode;
 export interface IDashboardOsceVar {
     solo: boolean;
+    order?: ESortOrder;
 }
 export type IDashboardOsceData = RestrictedData<graphqlNormalize & IDashboardOsce, 'dashboardOsce'>;
 export declare const OSCE_MARKSHEETS: import("@apollo/client").DocumentNode;
@@ -21,7 +23,7 @@ export type IOsceMarksheetsData = RestrictedData<(graphqlNormalize & IOsceMarksh
 export interface IOsceMarksheetsWindowVar {
     filter: {
         limit: number;
-        order?: string;
+        order?: ESortOrder;
         updatedAt?: Date | number;
         solo?: boolean;
         period?: number;
@@ -31,7 +33,10 @@ export declare const OSCE_MARKSHEET_WINDOW: import("@apollo/client").DocumentNod
 export interface IOsceMarksheetsDashboardData {
     total: number;
     score: number;
-    results: IOsceMarksheet[];
+    results: Array<{
+        date: Date | number;
+        result: IOsceMarksheet[];
+    }>;
 }
 export type IOsceMarksheetsWindowData = RestrictedData<graphqlNormalize & IOsceMarksheetsDashboardData, 'osceMarksheetsWindow'>;
 export declare const OSCE_MARKSHEET: import("@apollo/client").DocumentNode;

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

@@ -23,9 +23,9 @@ exports.OSCE_STATS = (0, client_1.gql) `
   }
 `;
 exports.DASHBOARD_OSCE = (0, client_1.gql) `
-  query DashboardOsce($solo: Boolean!) {
+  query DashboardOsce($solo: Boolean!, $order: Int) {
     restricted {
-      dashboardOsce(solo: $solo) {
+      dashboardOsce(solo: $solo, order: $order) {
         lastSessionId
         types {
           id
@@ -63,12 +63,15 @@ exports.OSCE_MARKSHEET_WINDOW = (0, client_1.gql) `
     restricted {
       osceMarksheetsWindow(filter: $filter) {
         results {
-          ...OsceMarksheetFields
-          correct
-          total
-          osceStation {
-            ...OsceStationFields
-            __typename
+          date
+          result {
+            ...OsceMarksheetFields
+            correct
+            total
+            osceStation {
+              ...OsceStationFields
+              __typename
+            }  
           }
         }
         score

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

@@ -125,7 +125,7 @@ exports.DASHBOARD_QBANK = (0, client_1.gql) `
 `;
 exports.DASHBOARD = (0, client_1.gql) `
   ${fragments_1.PICTURE_FIELDS}
-  query Dashboard($filter: MarksheetFilterInput!) {
+  query Dashboard($filter: MarksheetFilterInput!, $order: Int) {
     restricted {
       latestPastMarksheetId
       latestSessionId
@@ -200,7 +200,7 @@ exports.DASHBOARD = (0, client_1.gql) `
         }
         total
       }
-      topics(filter: 0) {
+      topics(filter: 0, order: $order) {
         id
         name
         totalQuestions

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

@@ -1,5 +1,6 @@
 import { ETopicType, Id, ITopic, ITopicStats } from '../../../models';
 import { graphqlNormalize, RestrictedData } from '../../types';
+import { ESortOrder } from '../../enums';
 export interface ITopicStatsVar {
     typeId?: ETopicType[];
 }
@@ -12,6 +13,7 @@ export type ITopicData = RestrictedData<graphqlNormalize & ITopic, 'topic'>;
 export declare const TOPIC: import("@apollo/client").DocumentNode;
 export interface ITopicsVar {
     filter: ETopicType;
+    order?: ESortOrder;
 }
 export type ITopicsData = RestrictedData<(graphqlNormalize & ITopic)[], 'topics'>;
 export declare const TOPICS: import("@apollo/client").DocumentNode;

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

@@ -54,10 +54,11 @@ exports.TOPIC = (0, client_1.gql) `
     }
   }
 `;
+// TODO: rename filter->typeId
 exports.TOPICS = (0, client_1.gql) `
-  query Topics($filter: Int!) {
+  query Topics($filter: Int!, $order: Int) {
     restricted {
-      topics(filter: $filter) {
+      topics(filter: $filter, order: $order) {
         id
         name
         totalQuestions

package/dist/cjs/resolvers/query/university.d.ts

@@ -1,8 +1,9 @@
 import { Id, IUniversity } from '../../models';
 import { graphqlNormalize, RootData } from '../types';
+import { ESortOrder } from '../enums';
 export interface IUniversitiesVar {
     id?: Id;
-    order?: string;
+    order?: ESortOrder;
 }
 export type IUniversitiesData = RootData<graphqlNormalize & IUniversity[], 'universities'>;
 export declare const UNIVERSITIES: import("@apollo/client").DocumentNode;

package/dist/cjs/resolvers/query/university.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UNIVERSITIES = void 0;
 const client_1 = require("@apollo/client");
 exports.UNIVERSITIES = (0, client_1.gql) `
-  query universities($id: Int, $order: String) {
+  query universities($id: Int, $order: Int) {
     universities(id: $id, order: $order) {
       name
       id

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

@@ -9,7 +9,13 @@ import { ITodo } from './Todo';
 import { Id } from './Type';
 import { IUniversity } from './University';
 import { IVideo } from './Video';
-export type IAccessLevel = 'subscriber' | 'administrator' | 'tutor';
+export declare enum IAccessLevel {
+    SUBSCRIBER = "subscriber",
+    ADMINISTRATOR = "administrator",
+    TUTOR = "tutor",
+    DEMO = "demo",
+    EXPIRED = "expired"
+}
 export type IClassYear = 'Year 1' | 'Year 2' | 'Year 3' | 'Year 4' | 'Year 5' | 'Graduated' | 'PhD' | 'BSc' | 'MSc' | 'Beta Tester';
 export declare const classYears: IClassYear[];
 export declare enum EClassYearGroup {

package/dist/mjs/models/User.js

@@ -1,4 +1,12 @@
 import { DateTime } from 'luxon';
+export var IAccessLevel;
+(function (IAccessLevel) {
+    IAccessLevel["SUBSCRIBER"] = "subscriber";
+    IAccessLevel["ADMINISTRATOR"] = "administrator";
+    IAccessLevel["TUTOR"] = "tutor";
+    IAccessLevel["DEMO"] = "demo";
+    IAccessLevel["EXPIRED"] = "expired";
+})(IAccessLevel || (IAccessLevel = {}));
 export const classYears = [
     'Year 1',
     'Year 2',

package/dist/mjs/resolvers/enums.d.ts

@@ -0,0 +1,4 @@
+export declare enum ESortOrder {
+    ASC = 1,
+    DESC = 0
+}

package/dist/mjs/resolvers/enums.js

@@ -0,0 +1,5 @@
+export var ESortOrder;
+(function (ESortOrder) {
+    ESortOrder[ESortOrder["ASC"] = 1] = "ASC";
+    ESortOrder[ESortOrder["DESC"] = 0] = "DESC";
+})(ESortOrder || (ESortOrder = {}));

package/dist/mjs/resolvers/index.d.ts

@@ -4,6 +4,7 @@ import * as query from './query';
 import * as subscription from './subscription';
 export * from './apollo';
 export * from './types';
+export * from './enums';
 export declare namespace Resolvers {
     export import Fragment = fragment;
     export import Muation = mutation;

package/dist/mjs/resolvers/index.js

@@ -4,6 +4,7 @@ import * as query from './query';
 import * as subscription from './subscription';
 export * from './apollo';
 export * from './types';
+export * from './enums';
 export var Resolvers;
 (function (Resolvers) {
     Resolvers.Fragment = fragment;

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

@@ -1,6 +1,7 @@
 import { EDifficultyType, Id, IMarksheet, IUserFlaggedQuestion } from '../../../models';
 import { IPreBuildMarksheet } from '../../mutation/restricted';
 import { graphqlNormalize, RestrictedData } from '../../types';
+import { ESortOrder } from '../../enums';
 export interface IMarksheetVar {
     id: Id;
 }
@@ -9,7 +10,7 @@ export declare const MARKSHEET: import("@apollo/client").DocumentNode;
 export interface IMarksheetsVar {
     filter: {
         limit: number;
-        date?: string;
+        order?: ESortOrder;
         offset?: number;
         solo?: boolean;
         period?: number;
@@ -18,7 +19,7 @@ export interface IMarksheetsVar {
 export interface IMarksheetsWindowVar {
     filter: {
         limit: number;
-        order?: string;
+        order?: ESortOrder;
         updatedAt?: Date | number;
         solo?: boolean;
         period?: number;
@@ -29,11 +30,15 @@ export type IMarksheetsData = RestrictedData<{
     total: number;
     score: number;
 }, 'marksheets'>;
-export type IMarksheetsWindowData = RestrictedData<{
-    results: (graphqlNormalize & IMarksheet)[];
+export interface IMarksheetsDashboardData {
     total: number;
     score: number;
-}, 'marksheetsWindow'>;
+    results: Array<{
+        date: Date | number;
+        result: IMarksheet[];
+    }>;
+}
+export type IMarksheetsWindowData = RestrictedData<graphqlNormalize & IMarksheetsDashboardData, 'marksheetsWindow'>;
 export interface PaginatedMarksheets {
     results: (graphqlNormalize & IMarksheet)[];
     total: number;

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

@@ -1019,17 +1019,20 @@ export const MARKSHEETS_WINDOW = gql `
     restricted {
       marksheetsWindow(filter: $filter) {
         results {
-          id
-          endedAt
-          topicNames
-          correct
-          incorrect
-          totalQuestions
-          typeId
-          isTestMarksheet
-          solo
-          completed
-          updatedAt
+          date
+          result {
+            id
+            endedAt
+            topicNames
+            correct
+            incorrect
+            totalQuestions
+            typeId
+            isTestMarksheet
+            solo
+            completed
+            updatedAt
+          }
         }
         total
         score

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

@@ -1,6 +1,7 @@
 import { EDifficultyType, EOsceType, Id, IDashboardOsce, IOsceMarksheet, IOsceStation, IOsceStats } from '../../../models';
 import { graphqlNormalize, RestrictedData } from '../../types';
 import { ITopic } from './../../../models/Topic';
+import { ESortOrder } from '../../enums';
 export interface IOsceStatsVar {
     typeId?: EOsceType[];
     solo: boolean;
@@ -10,6 +11,7 @@ export declare const OSCE_STATS: import("@apollo/client").DocumentNode;
 export declare const DASHBOARD_OSCE: import("@apollo/client").DocumentNode;
 export interface IDashboardOsceVar {
     solo: boolean;
+    order?: ESortOrder;
 }
 export type IDashboardOsceData = RestrictedData<graphqlNormalize & IDashboardOsce, 'dashboardOsce'>;
 export declare const OSCE_MARKSHEETS: import("@apollo/client").DocumentNode;
@@ -21,7 +23,7 @@ export type IOsceMarksheetsData = RestrictedData<(graphqlNormalize & IOsceMarksh
 export interface IOsceMarksheetsWindowVar {
     filter: {
         limit: number;
-        order?: string;
+        order?: ESortOrder;
         updatedAt?: Date | number;
         solo?: boolean;
         period?: number;
@@ -31,7 +33,10 @@ export declare const OSCE_MARKSHEET_WINDOW: import("@apollo/client").DocumentNod
 export interface IOsceMarksheetsDashboardData {
     total: number;
     score: number;
-    results: IOsceMarksheet[];
+    results: Array<{
+        date: Date | number;
+        result: IOsceMarksheet[];
+    }>;
 }
 export type IOsceMarksheetsWindowData = RestrictedData<graphqlNormalize & IOsceMarksheetsDashboardData, 'osceMarksheetsWindow'>;
 export declare const OSCE_MARKSHEET: import("@apollo/client").DocumentNode;

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

@@ -20,9 +20,9 @@ export const OSCE_STATS = gql `
   }
 `;
 export const DASHBOARD_OSCE = gql `
-  query DashboardOsce($solo: Boolean!) {
+  query DashboardOsce($solo: Boolean!, $order: Int) {
     restricted {
-      dashboardOsce(solo: $solo) {
+      dashboardOsce(solo: $solo, order: $order) {
         lastSessionId
         types {
           id
@@ -60,12 +60,15 @@ export const OSCE_MARKSHEET_WINDOW = gql `
     restricted {
       osceMarksheetsWindow(filter: $filter) {
         results {
-          ...OsceMarksheetFields
-          correct
-          total
-          osceStation {
-            ...OsceStationFields
-            __typename
+          date
+          result {
+            ...OsceMarksheetFields
+            correct
+            total
+            osceStation {
+              ...OsceStationFields
+              __typename
+            }  
           }
         }
         score

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

@@ -122,7 +122,7 @@ export const DASHBOARD_QBANK = gql `
 `;
 export const DASHBOARD = gql `
   ${PICTURE_FIELDS}
-  query Dashboard($filter: MarksheetFilterInput!) {
+  query Dashboard($filter: MarksheetFilterInput!, $order: Int) {
     restricted {
       latestPastMarksheetId
       latestSessionId
@@ -197,7 +197,7 @@ export const DASHBOARD = gql `
         }
         total
       }
-      topics(filter: 0) {
+      topics(filter: 0, order: $order) {
         id
         name
         totalQuestions

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

@@ -1,5 +1,6 @@
 import { ETopicType, Id, ITopic, ITopicStats } from '../../../models';
 import { graphqlNormalize, RestrictedData } from '../../types';
+import { ESortOrder } from '../../enums';
 export interface ITopicStatsVar {
     typeId?: ETopicType[];
 }
@@ -12,6 +13,7 @@ export type ITopicData = RestrictedData<graphqlNormalize & ITopic, 'topic'>;
 export declare const TOPIC: import("@apollo/client").DocumentNode;
 export interface ITopicsVar {
     filter: ETopicType;
+    order?: ESortOrder;
 }
 export type ITopicsData = RestrictedData<(graphqlNormalize & ITopic)[], 'topics'>;
 export declare const TOPICS: import("@apollo/client").DocumentNode;

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

@@ -51,10 +51,11 @@ export const TOPIC = gql `
     }
   }
 `;
+// TODO: rename filter->typeId
 export const TOPICS = gql `
-  query Topics($filter: Int!) {
+  query Topics($filter: Int!, $order: Int) {
     restricted {
-      topics(filter: $filter) {
+      topics(filter: $filter, order: $order) {
         id
         name
         totalQuestions

package/dist/mjs/resolvers/query/university.d.ts

@@ -1,8 +1,9 @@
 import { Id, IUniversity } from '../../models';
 import { graphqlNormalize, RootData } from '../types';
+import { ESortOrder } from '../enums';
 export interface IUniversitiesVar {
     id?: Id;
-    order?: string;
+    order?: ESortOrder;
 }
 export type IUniversitiesData = RootData<graphqlNormalize & IUniversity[], 'universities'>;
 export declare const UNIVERSITIES: import("@apollo/client").DocumentNode;

package/dist/mjs/resolvers/query/university.js

@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client';
 export const UNIVERSITIES = gql `
-  query universities($id: Int, $order: String) {
+  query universities($id: Int, $order: Int) {
     universities(id: $id, order: $order) {
       name
       id

package/package.json

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