@quesmed/types 1.4.6 → 1.4.10

package/models/Author.d.ts

@@ -1,8 +1,8 @@
 import { Id } from './Type';
 export interface IAuthor {
     id: Id;
-    createdAt: number;
-    updatedAt: number;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     name: string;
     qualifications: string | null;
     title: string;

package/models/Book.d.ts

@@ -2,11 +2,11 @@ import { IAuthor } from './Author';
 import { Id } from './Type';
 export interface IBook {
     id: Id;
-    createdAt: number;
-    updatedAt: number;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     name: string;
     publisher: string;
-    publishDate: number;
+    publishDate: number | Date;
     pages: number;
     format: string;
     language: string;

package/models/Card.d.ts

@@ -4,8 +4,8 @@ import { ITopic } from './Topic';
 import { Id } from './Type';
 export interface ICard {
     id: Id;
-    createdAt: Date | string;
-    updatedAt: Date | string;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     topic: ITopic;
     conceptId: Id;
     concept: IConcept;

package/models/Chapter.d.ts

@@ -4,8 +4,8 @@ import { ETopicType } from './Topic';
 import { Id } from './Type';
 export interface IChapter {
     id: Id;
-    createdAt: number;
-    updatedAt: number;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     explanation: string | null;
     typeId: ETopicType | null;
     pictures: IChapterPicture[];

package/models/Concept.d.ts

@@ -4,8 +4,8 @@ import { Id } from './Type';
 import { IVideo } from './Video';
 export interface IConcept {
     id: Id;
-    createdAt: number;
-    updatedAt: number;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     name: string;
     chapterId: Id;
     chapter: IChapter;

package/models/Feedback.d.ts

@@ -1,7 +1,7 @@
 import { Id } from './Type';
 export interface IFeedback {
     id: Id;
-    createdAt: number;
+    createdAt: number | Date;
     name: string;
     feedback: string;
     university: string;

package/models/File.d.ts

@@ -1,8 +1,8 @@
 import { Id } from './Type';
 export interface IFile {
     id: Id;
-    createdAt: number;
-    updatedAt: number;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     title: string;
     url: string;
     videoId?: number;

package/models/Marksheet.d.ts

@@ -2,8 +2,8 @@ import { IPrescribeMark, IQuestion, IQuestionQAAnswer } from './Question';
 import { Id } from './Type';
 export interface IMarksheet {
     id: Id;
-    createdAt: Date | string;
-    endedAt: Date | string;
+    createdAt: number | Date;
+    endedAt: number | Date;
     source: string;
     marks: IMarksheetMark[];
     mockTestId: number | null;
@@ -32,7 +32,7 @@ export interface IMarksheetMark {
 export interface IDiscussion {
     username: string;
     userId: Id;
-    createdAt: Date | string;
+    createdAt: number | Date;
     comment: string;
     like: number;
     dislike: number;

package/models/MockTest.d.ts

@@ -16,6 +16,6 @@ export interface IUserMockTest {
     incorrect: number;
     totalQuestions: number;
     lastMarksheetId?: Id;
-    lastMarksheetStartedAt?: Date | string;
-    lastMarksheetEndedAt?: Date | string;
+    lastMarksheetStartedAt?: number | Date;
+    lastMarksheetEndedAt?: number | Date;
 }

package/models/OsceMarksheet.d.ts

@@ -3,7 +3,7 @@ import { Id } from './Type';
 import { IUser } from './User';
 export interface IOsceMarksheetUser {
     id: Id | null;
-    createdAt: Date | string | null;
+    createdAt: number | Date | null;
     osceMarksheetId: Id;
     userId: Id | null;
     user: IUser | null;
@@ -38,8 +38,8 @@ export declare enum EOsceMarksheetAction {
 }
 export interface IOsceMarksheet {
     id: Id;
-    createdAt: Date | string;
-    updatedAt: Date | string;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     timeTaken: number;
     osceStationId: Id;
     osceStation?: IOsceStation;
@@ -53,8 +53,8 @@ export interface IOsceMarksheet {
     readingTime: number;
     stationTime: number;
     feedbackTime: number;
-    startedAt: Date | string;
-    endedAt: Date | string;
+    startedAt: number | Date;
+    endedAt: number | Date;
     timeRemaining: number;
     marks: IOsceMarksheetMark[];
     users: IOsceMarksheetUser[];

package/models/OsceStation.d.ts

@@ -24,8 +24,8 @@ export declare enum EOsceType {
 }
 export interface IOsceStation {
     id: Id;
-    createdAt: Date | string;
-    updatedAt: Date | string;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     name: string;
     osceTypeId: Id;
     osceType?: IOsceType;

package/models/Picture.d.ts

@@ -2,8 +2,8 @@ import { ITopic } from './Topic';
 import { Id } from './Type';
 export interface IPicture {
     id: Id;
-    createdAt: number;
-    updatedAt: number;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     name: string;
     caption: string;
     path: string;

package/models/Promo.d.ts

@@ -1,13 +1,13 @@
 import { Id } from './Type';
 export interface ICoupon {
     id: Id;
-    createdAt: number;
+    createdAt: number | Date;
     name: string;
     affiliateId: Id;
 }
 export interface IPromoReport {
     id: Id;
-    date: number;
+    date: number | Date;
     couponId: Id;
     userId: Id;
     subscriptionId: Id;

package/models/Subscription.d.ts

@@ -1,7 +1,7 @@
 import { Id } from './Type';
 export interface ISubscription {
     id: Id;
-    createdAt: number;
+    createdAt: number | Date;
     name: string;
     description: string | null;
     price: number;

package/models/Todo.d.ts

@@ -2,8 +2,8 @@ import { ICard } from './Card';
 import { Id } from './Type';
 export interface ITodo {
     id: Id;
-    createdAt: Date | string;
-    updatedAt: Date | string;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     userId: Id;
     dailyTask: boolean;
     marks: ITodoMark[];

package/models/User.d.ts

@@ -26,26 +26,26 @@ export interface IUser {
     classYear: IClassYear;
     graduationYear: number;
     universityId: number;
-    examDate: Date | string | null;
+    examDate: number | Date | null;
     stripeCustomerId: string;
     qBankSubscriptionId: Id | null;
     qBankSubscription: ISubscription | null;
-    stripeQBankSubscriptionEndDate: Date | string | null;
+    stripeQBankSubscriptionEndDate: number | Date | null;
     osceSubscriptionId: Id | null;
     osceSubscription: ISubscription | null;
-    stripeOsceSubscriptionEndDate: Date | string | null;
+    stripeOsceSubscriptionEndDate: number | Date | null;
     bundleSubscriptionId: Id | null;
     bundleSubscription: ISubscription | null;
-    stripeBundleSubscriptionEndDate: Date | string | null;
+    stripeBundleSubscriptionEndDate: number | Date | null;
     subscriptionId: Id | null;
     subscription?: ISubscription | null;
-    stripeSubscriptionEndDate: Date | string | null;
+    stripeSubscriptionEndDate: number | Date | null;
     stripePriceNickname: string | null;
 }
 export interface IUserCompletedQuestions {
     id: Id;
-    createdAt: Date | string;
-    updatedAt: Date | string;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     questionId: Id;
     userId: Id;
     correct: boolean;
@@ -55,22 +55,22 @@ export interface IUserCompletedQuestions {
 }
 export interface IUserCompletedCards {
     id: Id;
-    createdAt: Date | string;
-    updatedAt: Date | string;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     cardId: Id;
     card: ICard;
     userId: Id;
     topic: ITopic;
     concept: IConcept;
-    lastSeen: Date | string;
+    lastSeen: number | Date;
     score: number;
     iteration: number;
     optimalFactor: number;
 }
 export interface IUserFlaggedQuestions {
     id: Id;
-    createdAt: Date | string;
-    updatedAt: Date | string;
+    createdAt: number | Date;
+    updatedAt: number | Date;
     questionId: Id;
     question: IQuestion;
     userId: Id;
@@ -79,7 +79,7 @@ export interface IUserFlaggedQuestions {
 }
 export interface IUserProgress {
     id: Id;
-    date: Date | string;
+    date: number | Date;
     userId: Id;
     topicId: Id;
     count: number;

package/models/Video.d.ts

@@ -3,10 +3,10 @@ import { IFile } from './File';
 import { Id } from './Type';
 export interface IVideo {
     id: Id;
-    createdAt: number;
-    updatedAt: number;
-    startTime: number;
-    endTime: number;
+    createdAt: number | Date;
+    updatedAt: number | Date;
+    startTime: number | Date;
+    endTime: number | Date;
     title: string;
     museId: string;
     thumbnail: string;
@@ -16,8 +16,8 @@ export interface IVideo {
     duration: number;
     concepts: IConcept[];
     files: IFile[];
-    send1hrPushAt: number | null;
-    sent1hrPushAt: number | null;
-    send24hrPushAt: number | null;
-    sent24hrPushAt: number | null;
+    send1hrPushAt: number | Date | null;
+    sent1hrPushAt: number | Date | null;
+    send24hrPushAt: number | Date | null;
+    sent24hrPushAt: number | Date | null;
 }

package/package.json

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

package/resolvers/fragments/osce.js

@@ -75,7 +75,7 @@ exports.OSCE_STATION_FIELDS = (0, client_1.gql) `
 exports.OSCE_MARKSHEET_USER_FIELDS = (0, client_1.gql) `
   ${user_1.USER_FIELDS}
   fragment OsceMarksheetUserFields on OsceMarksheetUser {
-    id
+    # id - do not pass otherwise all unassigned roles = candidate
     osceMarksheetId
     userId
     user {
@@ -98,7 +98,6 @@ exports.OSCE_MARKSHEET_MARK_FIELDS = (0, client_1.gql) `
   }
 `;
 exports.OSCE_MARKSHEET_FIELDS = (0, client_1.gql) `
-  ${exports.OSCE_STATION_FIELDS}
   ${exports.OSCE_MARKSHEET_MARK_FIELDS}
   ${exports.OSCE_MARKSHEET_USER_FIELDS}
   fragment OsceMarksheetFields on OsceMarksheet {
@@ -107,9 +106,6 @@ exports.OSCE_MARKSHEET_FIELDS = (0, client_1.gql) `
     updatedAt
     timeTaken
     osceStationId
-    osceStation {
-      ...OsceStationFields
-    }
     userId
     solo
     role

package/resolvers/fragments/osce.mjs

@@ -72,7 +72,7 @@ export const OSCE_STATION_FIELDS = gql `
 export const OSCE_MARKSHEET_USER_FIELDS = gql `
   ${USER_FIELDS}
   fragment OsceMarksheetUserFields on OsceMarksheetUser {
-    id
+    # id - do not pass otherwise all unassigned roles = candidate
     osceMarksheetId
     userId
     user {
@@ -95,7 +95,6 @@ export const OSCE_MARKSHEET_MARK_FIELDS = gql `
   }
 `;
 export const OSCE_MARKSHEET_FIELDS = gql `
-  ${OSCE_STATION_FIELDS}
   ${OSCE_MARKSHEET_MARK_FIELDS}
   ${OSCE_MARKSHEET_USER_FIELDS}
   fragment OsceMarksheetFields on OsceMarksheet {
@@ -104,9 +103,6 @@ export const OSCE_MARKSHEET_FIELDS = gql `
     updatedAt
     timeTaken
     osceStationId
-    osceStation {
-      ...OsceStationFields
-    }
     userId
     solo
     role

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

@@ -34,7 +34,7 @@ export interface IChangeOsceRoleVar {
 export declare type IChangeOsceRoleData = RestrictedData<graphqlNormalize & IOsceMarksheet, 'changeOsceRole'>;
 export declare const MARK_OSCE_MARKSHEET_MARK: import("@apollo/client").DocumentNode;
 export interface IMarkOsceMarksheetMarkVar {
-    osceStationMarkId: Id;
+    osceMarksheetMarkId: Id;
     mark: boolean;
 }
 export declare type IMarkOsceMarksheetMarkData = RestrictedData<graphqlNormalize & Partial<IOsceMarksheetMark>, 'markOsceMarksheetMark'>;

package/resolvers/mutation/restricted/osce.js

@@ -3,6 +3,7 @@ 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_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;
 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!) {
     restricted {
@@ -35,6 +36,7 @@ exports.CANCEL_OSCE_MATCHMAKING = (0, client_1.gql) `
   }
 `;
 exports.BUILD_OSCE_MARKSHEET = (0, client_1.gql) `
+  ${osce_2.OSCE_STATION_FIELDS}
   ${osce_1.OSCE_MARKSHEET_FIELDS}
   mutation BuildOsceMarksheet(
     $osceStationId: Int
@@ -48,6 +50,9 @@ exports.BUILD_OSCE_MARKSHEET = (0, client_1.gql) `
         solo: $solo
       ) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
@@ -63,14 +68,14 @@ exports.CHANGE_OSCE_ROLE = (0, client_1.gql) `
   }
 `;
 exports.MARK_OSCE_MARKSHEET_MARK = (0, client_1.gql) `
-  ${osce_1.OSCE_MARKSHEET_MARK_FIELDS}
-  mutation MarkOsceMarksheetMark($osceStationMarkId: Int!, $mark: Boolean!) {
+  mutation MarkOsceMarksheetMark($osceMarksheetMarkId: Int!, $mark: Boolean!) {
     restricted {
       markOsceMarksheetMark(
-        osceStationMarkId: $osceStationMarkId
+        osceMarksheetMarkId: $osceMarksheetMarkId
         mark: $mark
       ) {
-        ...OsceMarksheetMarkFields
+        id
+        mark
       }
     }
   }
@@ -79,7 +84,7 @@ const optimisticMarkOsceMarksheetMark = (variables) => {
     return {
         restricted: {
             markOsceMarksheetMark: {
-                id: variables.osceStationMarkId,
+                id: variables.osceMarksheetMarkId,
                 mark: variables.mark,
                 __typename: 'OsceMarksheetMark',
             },
@@ -88,6 +93,7 @@ const optimisticMarkOsceMarksheetMark = (variables) => {
 };
 exports.optimisticMarkOsceMarksheetMark = optimisticMarkOsceMarksheetMark;
 exports.SELECT_OSCE_STATION = (0, client_1.gql) `
+  ${osce_2.OSCE_STATION_FIELDS}
   ${osce_1.OSCE_MARKSHEET_FIELDS}
   mutation SelectOsceMarksheetStation(
     $osceMarksheetId: Int!
@@ -99,21 +105,29 @@ exports.SELECT_OSCE_STATION = (0, client_1.gql) `
         osceStationId: $osceStationId
       ) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
 `;
 exports.START_OSCE_MARKSHEET = (0, client_1.gql) `
+  ${osce_2.OSCE_STATION_FIELDS}
   ${osce_1.OSCE_MARKSHEET_FIELDS}
   mutation StartOsceMarksheet($osceMarksheetId: Int!) {
     restricted {
       startOsceMarksheet(osceMarksheetId: $osceMarksheetId) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
 `;
 exports.PRESTART_OSCE_MARKSHEET = (0, client_1.gql) `
+  ${osce_2.OSCE_STATION_FIELDS}
   ${osce_1.OSCE_MARKSHEET_FIELDS}
   mutation PrestartOsceMarksheet(
     $osceMarksheetId: Int!
@@ -129,6 +143,9 @@ exports.PRESTART_OSCE_MARKSHEET = (0, client_1.gql) `
         feedbackTime: $feedbackTime
       ) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }

package/resolvers/mutation/restricted/osce.mjs

@@ -1,5 +1,6 @@
 import { gql } from '@apollo/client';
-import { OSCE_MARKSHEET_FIELDS, OSCE_MARKSHEET_MARK_FIELDS, OSCE_MATCHMAKING_ACTION_FIELDS, } from '../../fragments/osce';
+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!) {
     restricted {
@@ -32,6 +33,7 @@ export const CANCEL_OSCE_MATCHMAKING = gql `
   }
 `;
 export const BUILD_OSCE_MARKSHEET = gql `
+  ${OSCE_STATION_FIELDS}
   ${OSCE_MARKSHEET_FIELDS}
   mutation BuildOsceMarksheet(
     $osceStationId: Int
@@ -45,6 +47,9 @@ export const BUILD_OSCE_MARKSHEET = gql `
         solo: $solo
       ) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
@@ -60,14 +65,14 @@ export const CHANGE_OSCE_ROLE = gql `
   }
 `;
 export const MARK_OSCE_MARKSHEET_MARK = gql `
-  ${OSCE_MARKSHEET_MARK_FIELDS}
-  mutation MarkOsceMarksheetMark($osceStationMarkId: Int!, $mark: Boolean!) {
+  mutation MarkOsceMarksheetMark($osceMarksheetMarkId: Int!, $mark: Boolean!) {
     restricted {
       markOsceMarksheetMark(
-        osceStationMarkId: $osceStationMarkId
+        osceMarksheetMarkId: $osceMarksheetMarkId
         mark: $mark
       ) {
-        ...OsceMarksheetMarkFields
+        id
+        mark
       }
     }
   }
@@ -76,7 +81,7 @@ export const optimisticMarkOsceMarksheetMark = (variables) => {
     return {
         restricted: {
             markOsceMarksheetMark: {
-                id: variables.osceStationMarkId,
+                id: variables.osceMarksheetMarkId,
                 mark: variables.mark,
                 __typename: 'OsceMarksheetMark',
             },
@@ -84,6 +89,7 @@ export const optimisticMarkOsceMarksheetMark = (variables) => {
     };
 };
 export const SELECT_OSCE_STATION = gql `
+  ${OSCE_STATION_FIELDS}
   ${OSCE_MARKSHEET_FIELDS}
   mutation SelectOsceMarksheetStation(
     $osceMarksheetId: Int!
@@ -95,21 +101,29 @@ export const SELECT_OSCE_STATION = gql `
         osceStationId: $osceStationId
       ) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
 `;
 export const START_OSCE_MARKSHEET = gql `
+  ${OSCE_STATION_FIELDS}
   ${OSCE_MARKSHEET_FIELDS}
   mutation StartOsceMarksheet($osceMarksheetId: Int!) {
     restricted {
       startOsceMarksheet(osceMarksheetId: $osceMarksheetId) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
 `;
 export const PRESTART_OSCE_MARKSHEET = gql `
+  ${OSCE_STATION_FIELDS}
   ${OSCE_MARKSHEET_FIELDS}
   mutation PrestartOsceMarksheet(
     $osceMarksheetId: Int!
@@ -125,6 +139,9 @@ export const PRESTART_OSCE_MARKSHEET = gql `
         feedbackTime: $feedbackTime
       ) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }

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

@@ -12,7 +12,7 @@ export interface IUserInput {
     graduationYear?: number;
     password?: string;
     oldPassword?: string;
-    examDate?: Date | string;
+    examDate?: number | Date;
 }
 export interface IUpdateUserVar {
     id?: number;

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

@@ -31,8 +31,8 @@ export interface IDashboardPastQuizzesInfoRes {
     totalQuestions: number;
     totalMarksheet: number;
     isTestMarksheet: boolean;
-    startedAt: Date | string;
-    endedAt: Date | string;
+    startedAt: number | Date;
+    endedAt: number | Date;
 }
 export declare type IDashboardPastQuizzesInfoData = IDashboardPastQuizzesInfoRes[];
 export declare type ILatestPastMarksheetIdVar = null;

package/resolvers/query/restricted/osce.js

@@ -25,21 +25,29 @@ exports.DASHBOARD_OSCE = (0, client_1.gql) `
   }
 `;
 exports.OSCE_MARKSHEETS = (0, client_1.gql) `
+  ${osce_2.OSCE_STATION_FIELDS}
   ${osce_1.OSCE_MARKSHEET_FIELDS}
   query OsceMarksheets($solo: Boolean!) {
     restricted {
       osceMarksheets(solo: $solo) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
 `;
 exports.OSCE_MARKSHEET = (0, client_1.gql) `
+  ${osce_2.OSCE_STATION_FIELDS}
   ${osce_1.OSCE_MARKSHEET_FIELDS}
   query OsceMarksheet($id: Int!) {
     restricted {
       osceMarksheet(id: $id) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }

package/resolvers/query/restricted/osce.mjs

@@ -22,21 +22,29 @@ export const DASHBOARD_OSCE = gql `
   }
 `;
 export const OSCE_MARKSHEETS = gql `
+  ${OSCE_STATION_FIELDS}
   ${OSCE_MARKSHEET_FIELDS}
   query OsceMarksheets($solo: Boolean!) {
     restricted {
       osceMarksheets(solo: $solo) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
 `;
 export const OSCE_MARKSHEET = gql `
+  ${OSCE_STATION_FIELDS}
   ${OSCE_MARKSHEET_FIELDS}
   query OsceMarksheet($id: Int!) {
     restricted {
       osceMarksheet(id: $id) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }

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

@@ -7,7 +7,7 @@ export interface IUniversitiesRankSpeciality {
     rank: number;
 }
 export interface IUniversityLeaderboard {
-    updatedAt: Date | string | null;
+    updatedAt: number | Date | null;
     month: IUniversitiesRankSpeciality[];
     quarter: IUniversitiesRankSpeciality[];
 }

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

@@ -1,7 +1,7 @@
 import { ISubscription, IUser } from '../../../models';
 export declare type IDashboardUserVar = null;
 export interface IDashboardUserData {
-    examDate: Date | string;
+    examDate: number | Date;
     totalQuestions: number;
     completedQuestionsCount: number;
     completedCorrectQuestionsCount: number;

package/utils/commonFunctions.d.ts

@@ -1,6 +1,6 @@
 import { IMarksheetMark, IPrescribeAnswer, IPrescribeMark } from '../models';
 export declare function mapPrescribeMarkToAnswer(obj: IPrescribeMark): IPrescribeAnswer;
-export declare function formatPrescribeAnswer(obj: IPrescribeAnswer): IPrescribeAnswer;
+export declare function formatPrescribeAnswer(baseAnswer: IPrescribeAnswer): IPrescribeAnswer;
 export interface ICorrectMarkData {
     correct: boolean;
     incorrect: boolean;

package/utils/commonFunctions.js

@@ -34,9 +34,13 @@ function mapPrescribeMarkToAnswer(obj) {
     };
 }
 exports.mapPrescribeMarkToAnswer = mapPrescribeMarkToAnswer;
-function formatPrescribeAnswer(obj) {
+function formatPrescribeAnswer(baseAnswer) {
+    const obj = Object.assign(Object.assign({}, baseAnswer), { drug: Object.assign({}, baseAnswer.drug), dose: Object.assign({}, baseAnswer.dose), units: Object.assign({}, baseAnswer.units), route: Object.assign({}, baseAnswer.route), frequency: Object.assign({}, baseAnswer.frequency), duration: Object.assign({}, baseAnswer.duration) });
     obj.drug.value = obj.drug.value.toLowerCase().replace(/\s/g, '');
-    obj.route.value = obj.route.value.toLowerCase().replace(/\s/g, '');
+    obj.route.value = obj.route.value
+        .toLowerCase()
+        .replace(/\s/g, '')
+        .replace(/\//g, '');
     if (obj.route.value === 'oral') {
         obj.route.value = 'po';
     }
@@ -62,7 +66,8 @@ function formatPrescribeAnswer(obj) {
     if (obj.units.value === 'milligram' || obj.units.value === 'milligrams') {
         obj.units.value = 'mg';
     }
-    else if (obj.units.value === 'microgram' || obj.units.value === 'micrograms') {
+    else if (obj.units.value === 'microgram' ||
+        obj.units.value === 'micrograms') {
         obj.units.value = 'mcg';
     }
     else if (obj.units.value === 'gram' || obj.units.value === 'grams') {
@@ -91,17 +96,20 @@ function formatPrescribeAnswer(obj) {
     if (obj.frequency.value === 'once-off') {
         obj.frequency.value = 'stat';
     }
-    else if (obj.frequency.value.includes('once') || (frequencyIncHourly && hourlyFreqInt === 24)) {
+    else if (obj.frequency.value.includes('once') ||
+        (frequencyIncHourly && hourlyFreqInt === 24)) {
         obj.frequency.value = 'od';
     }
-    else if (obj.frequency.value.includes('nightly') || obj.frequency.value === 'on') {
+    else if (obj.frequency.value.includes('nightly') ||
+        obj.frequency.value === 'on') {
         obj.frequency.value = 'od';
     }
     else if (obj.frequency.value.includes('twice') ||
         (frequencyIncHourly && hourlyFreqInt === 12)) {
         obj.frequency.value = 'bd';
     }
-    else if (obj.frequency.value.includes('trice') || (frequencyIncHourly && hourlyFreqInt === 8)) {
+    else if (obj.frequency.value.includes('trice') ||
+        (frequencyIncHourly && hourlyFreqInt === 8)) {
         obj.frequency.value = 'tds';
     }
     else if (frequencyIncHourly && hourlyFreqInt === 6) {
@@ -140,7 +148,9 @@ function correctMark(mark) {
             }
         }
         else if (models_1.EQuestionType.QUESTION_ANSWER === mark.question.typeId) {
-            const answer = flatAnswer.dose.toLowerCase().replace(/\s/g, '');
+            const answer = flatAnswer.dose
+                .toLowerCase()
+                .replace(/\s/g, '');
             let attempt = '';
             if (flatAttempt) {
                 attempt = flatAttempt.toLowerCase().replace(/\s/g, '');
@@ -161,7 +171,8 @@ function correctMark(mark) {
                 Array.isArray(mark.mark[1])) {
                 [attemptA, attemptB] = mark.mark.map((x) => x.sort());
             }
-            if (answerA.length !== attemptA.length || answerB.length !== attemptB.length) {
+            if (answerA.length !== attemptA.length ||
+                answerB.length !== attemptB.length) {
                 data.incorrect = true;
             }
             else if (attemptA.every((x, i) => x === answerA[i]) &&
@@ -182,7 +193,8 @@ function correctMark(mark) {
                 frequency: '',
                 duration: '',
             }));
-            if (typeof flatAttempt === 'object' && Object.keys(flatAttempt).length === 6) {
+            if (typeof flatAttempt === 'object' &&
+                Object.keys(flatAttempt).length === 6) {
                 attempt = formatPrescribeAnswer(mapPrescribeMarkToAnswer(flatAttempt));
             }
             let foundCorrect = false;
@@ -192,7 +204,8 @@ function correctMark(mark) {
                 const drugCorrect = answer.drug.display || answer.drug.value === attempt.drug.value;
                 const durationCorrect = answer.duration.display ||
                     answer.duration.value.split(',').includes(attempt.duration.value);
-                const frequencyCorrect = answer.frequency.display || answer.frequency.value === attempt.frequency.value;
+                const frequencyCorrect = answer.frequency.display ||
+                    answer.frequency.value === attempt.frequency.value;
                 const routeCorrect = answer.route.display || answer.route.value === attempt.route.value;
                 const unitsCorrect = answer.units.display || answer.units.value === attempt.units.value;
                 if (doseCorrect &&

package/utils/commonFunctions.mjs

@@ -30,9 +30,13 @@ export function mapPrescribeMarkToAnswer(obj) {
         },
     };
 }
-export function formatPrescribeAnswer(obj) {
+export function formatPrescribeAnswer(baseAnswer) {
+    const obj = Object.assign(Object.assign({}, baseAnswer), { drug: Object.assign({}, baseAnswer.drug), dose: Object.assign({}, baseAnswer.dose), units: Object.assign({}, baseAnswer.units), route: Object.assign({}, baseAnswer.route), frequency: Object.assign({}, baseAnswer.frequency), duration: Object.assign({}, baseAnswer.duration) });
     obj.drug.value = obj.drug.value.toLowerCase().replace(/\s/g, '');
-    obj.route.value = obj.route.value.toLowerCase().replace(/\s/g, '');
+    obj.route.value = obj.route.value
+        .toLowerCase()
+        .replace(/\s/g, '')
+        .replace(/\//g, '');
     if (obj.route.value === 'oral') {
         obj.route.value = 'po';
     }
@@ -58,7 +62,8 @@ export function formatPrescribeAnswer(obj) {
     if (obj.units.value === 'milligram' || obj.units.value === 'milligrams') {
         obj.units.value = 'mg';
     }
-    else if (obj.units.value === 'microgram' || obj.units.value === 'micrograms') {
+    else if (obj.units.value === 'microgram' ||
+        obj.units.value === 'micrograms') {
         obj.units.value = 'mcg';
     }
     else if (obj.units.value === 'gram' || obj.units.value === 'grams') {
@@ -87,17 +92,20 @@ export function formatPrescribeAnswer(obj) {
     if (obj.frequency.value === 'once-off') {
         obj.frequency.value = 'stat';
     }
-    else if (obj.frequency.value.includes('once') || (frequencyIncHourly && hourlyFreqInt === 24)) {
+    else if (obj.frequency.value.includes('once') ||
+        (frequencyIncHourly && hourlyFreqInt === 24)) {
         obj.frequency.value = 'od';
     }
-    else if (obj.frequency.value.includes('nightly') || obj.frequency.value === 'on') {
+    else if (obj.frequency.value.includes('nightly') ||
+        obj.frequency.value === 'on') {
         obj.frequency.value = 'od';
     }
     else if (obj.frequency.value.includes('twice') ||
         (frequencyIncHourly && hourlyFreqInt === 12)) {
         obj.frequency.value = 'bd';
     }
-    else if (obj.frequency.value.includes('trice') || (frequencyIncHourly && hourlyFreqInt === 8)) {
+    else if (obj.frequency.value.includes('trice') ||
+        (frequencyIncHourly && hourlyFreqInt === 8)) {
         obj.frequency.value = 'tds';
     }
     else if (frequencyIncHourly && hourlyFreqInt === 6) {
@@ -135,7 +143,9 @@ export function correctMark(mark) {
             }
         }
         else if (EQuestionType.QUESTION_ANSWER === mark.question.typeId) {
-            const answer = flatAnswer.dose.toLowerCase().replace(/\s/g, '');
+            const answer = flatAnswer.dose
+                .toLowerCase()
+                .replace(/\s/g, '');
             let attempt = '';
             if (flatAttempt) {
                 attempt = flatAttempt.toLowerCase().replace(/\s/g, '');
@@ -156,7 +166,8 @@ export function correctMark(mark) {
                 Array.isArray(mark.mark[1])) {
                 [attemptA, attemptB] = mark.mark.map((x) => x.sort());
             }
-            if (answerA.length !== attemptA.length || answerB.length !== attemptB.length) {
+            if (answerA.length !== attemptA.length ||
+                answerB.length !== attemptB.length) {
                 data.incorrect = true;
             }
             else if (attemptA.every((x, i) => x === answerA[i]) &&
@@ -177,7 +188,8 @@ export function correctMark(mark) {
                 frequency: '',
                 duration: '',
             }));
-            if (typeof flatAttempt === 'object' && Object.keys(flatAttempt).length === 6) {
+            if (typeof flatAttempt === 'object' &&
+                Object.keys(flatAttempt).length === 6) {
                 attempt = formatPrescribeAnswer(mapPrescribeMarkToAnswer(flatAttempt));
             }
             let foundCorrect = false;
@@ -187,7 +199,8 @@ export function correctMark(mark) {
                 const drugCorrect = answer.drug.display || answer.drug.value === attempt.drug.value;
                 const durationCorrect = answer.duration.display ||
                     answer.duration.value.split(',').includes(attempt.duration.value);
-                const frequencyCorrect = answer.frequency.display || answer.frequency.value === attempt.frequency.value;
+                const frequencyCorrect = answer.frequency.display ||
+                    answer.frequency.value === attempt.frequency.value;
                 const routeCorrect = answer.route.display || answer.route.value === attempt.route.value;
                 const unitsCorrect = answer.units.display || answer.units.value === attempt.units.value;
                 if (doseCorrect &&