@quesmed/types-rn 2.6.215 → 2.6.217

package/models/Marksheet.d.ts

@@ -56,6 +56,18 @@ export interface IMarksheetMember {
     userId: Id;
     user?: IUser | null;
 }
+export interface IMarksheetStats {
+    correct: number;
+    incorrect: number;
+    partial: number;
+    score: number;
+    maxPossibleScore: number;
+    percentage: number;
+    totalQuestions: number;
+    totalSets: number;
+    attempts: number;
+    timeTaken: number;
+}
 export interface IMarksheet {
     id: Id;
     createdAt: number | Date;
@@ -74,6 +86,7 @@ export interface IMarksheet {
     marks: IMarksheetMark[];
     mockTestId: number | null;
     isTestMarksheet: boolean;
+    stats: IMarksheetStats;
     correct?: number;
     incorrect?: number;
     partial?: number;
@@ -86,10 +99,6 @@ export interface IMarksheet {
     users: IUser[];
     activeUsers?: IUser[];
     state: EMarksheetState;
-    /**
-     * @deprecated Use !!endedAt instead
-     * And for timed tests, check if (parent.endedAt && new Date(parent.endedAt) <= new Date());
-     */
     completed: boolean;
     timeTaken: number;
     currentMarkId?: number;

package/models/MockTest.d.ts

@@ -1,3 +1,4 @@
+import { IMarksheet } from './Marksheet';
 import { EProductType } from './Product';
 import { IQuestion } from './Question';
 import { Id } from './Type';
@@ -47,6 +48,7 @@ export interface IUserMockTest {
     lastMarksheetId?: Id;
     lastMarksheetStartedAt?: number | Date;
     lastMarksheetEndedAt?: number | Date;
+    lastMarksheet?: IMarksheet;
 }
 export interface IMockTestQuestion {
     id: Id;

package/package.json

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

package/resolvers/fragments/marksheet.d.ts

@@ -1,5 +1,9 @@
+export declare const MARKSHEET_STATS_FIELDS: import("@apollo/client").DocumentNode;
 export declare const MARKSHEET_MARK_FIELDS: import("@apollo/client").DocumentNode;
 export declare const BUILDER_CONFIG_FIELDS: import("@apollo/client").DocumentNode;
+/**
+ * TODO:: Remove deperecated fields once mobile app is updated
+ */
 export declare const MARKSHEET_FIELDS: import("@apollo/client").DocumentNode;
 /**
  * All below fragments are used in cache updator
@@ -11,6 +15,9 @@ export declare const MODIFY_MARKSHEET_STATE_FRAGMENT: import("@apollo/client").D
 export declare const MODIFY_TOPIC_SELECTION_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const MODIFY_CURRENT_MARK_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const MARK_FLAGGED_FIELD: import("@apollo/client").DocumentNode;
+/**
+ * TODO:: Remove deperecated fields once mobile app is updated
+ */
 export declare const MODIFY_MARKSHEET_COMPLETED_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const NEW_MARK_FIELDS: import("@apollo/client").DocumentNode;
 export declare const DAILY_STACK_FIELDS: import("@apollo/client").DocumentNode;

package/resolvers/fragments/marksheet.js

@@ -1,8 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DAILY_STACK_FIELDS = exports.NEW_MARK_FIELDS = exports.MODIFY_MARKSHEET_COMPLETED_FRAGMENT = exports.MARK_FLAGGED_FIELD = exports.MODIFY_CURRENT_MARK_FRAGMENT = exports.MODIFY_TOPIC_SELECTION_FRAGMENT = exports.MODIFY_MARKSHEET_STATE_FRAGMENT = exports.MODIFY_MARKSHEET_MARK_STRIKED_FRAGMENT = exports.MODIFY_MARKSHEET_MARK_QUESTIONCHOICEID_FRAGMENT = exports.MODIFY_CURRENT_MARKSHEET_MARK_FRAGMENT = exports.MARKSHEET_FIELDS = exports.BUILDER_CONFIG_FIELDS = exports.MARKSHEET_MARK_FIELDS = void 0;
+exports.DAILY_STACK_FIELDS = exports.NEW_MARK_FIELDS = exports.MODIFY_MARKSHEET_COMPLETED_FRAGMENT = exports.MARK_FLAGGED_FIELD = exports.MODIFY_CURRENT_MARK_FRAGMENT = exports.MODIFY_TOPIC_SELECTION_FRAGMENT = exports.MODIFY_MARKSHEET_STATE_FRAGMENT = exports.MODIFY_MARKSHEET_MARK_STRIKED_FRAGMENT = exports.MODIFY_MARKSHEET_MARK_QUESTIONCHOICEID_FRAGMENT = exports.MODIFY_CURRENT_MARKSHEET_MARK_FRAGMENT = exports.MARKSHEET_FIELDS = exports.BUILDER_CONFIG_FIELDS = exports.MARKSHEET_MARK_FIELDS = exports.MARKSHEET_STATS_FIELDS = void 0;
 const client_1 = require("@apollo/client");
 const question_1 = require("./question");
+exports.MARKSHEET_STATS_FIELDS = (0, client_1.gql) `
+  fragment MarksheetStatsFields on MarksheetStats {
+    correct
+    incorrect
+    partial
+    totalQuestions
+    totalSets
+    score
+    maxPossibleScore
+    percentage
+    attempts
+    timeTaken
+  }
+`;
 exports.MARKSHEET_MARK_FIELDS = (0, client_1.gql) `
   ${question_1.QUESTION_FIELDS}
   fragment MarksheetMarkFields on MarksheetMark {
@@ -35,9 +49,13 @@ exports.BUILDER_CONFIG_FIELDS = (0, client_1.gql) `
     seenIncorrect
   }
 `;
+/**
+ * TODO:: Remove deperecated fields once mobile app is updated
+ */
 exports.MARKSHEET_FIELDS = (0, client_1.gql) `
   ${exports.MARKSHEET_MARK_FIELDS}
   ${exports.BUILDER_CONFIG_FIELDS}
+  ${exports.MARKSHEET_STATS_FIELDS}
   fragment MarksheetFields on Marksheet {
     id
     topicConceptData
@@ -90,6 +108,9 @@ exports.MARKSHEET_FIELDS = (0, client_1.gql) `
     marks {
       ...MarksheetMarkFields
     }
+    stats {
+      ...MarksheetStatsFields
+    }
   }
 `;
 /**
@@ -131,7 +152,11 @@ exports.MARK_FLAGGED_FIELD = (0, client_1.gql) `
     flagged
   }
 `;
+/**
+ * TODO:: Remove deperecated fields once mobile app is updated
+ */
 exports.MODIFY_MARKSHEET_COMPLETED_FRAGMENT = (0, client_1.gql) `
+  ${exports.MARKSHEET_STATS_FIELDS}
   fragment MarksheetCompleted on Marksheet {
     timeTaken
     completed
@@ -139,6 +164,9 @@ exports.MODIFY_MARKSHEET_COMPLETED_FRAGMENT = (0, client_1.gql) `
     incorrect
     duration
     endedAt
+    stats {
+      ...MarksheetStatsFields
+    }
   }
 `;
 exports.NEW_MARK_FIELDS = (0, client_1.gql) `

package/resolvers/fragments/mockTest.d.ts

@@ -1,7 +1,16 @@
+/**
+ * TODO:: Remove deperecated fields once mobile app is updated
+ */
 export declare const MOCK_TEST_FIELDS: import("@apollo/client").DocumentNode;
 /**
  * All below fragments are used in cache updator
  */
 export declare const MARK_FLAGGED_QUESTION: import("@apollo/client").DocumentNode;
+/**
+ * TODO:: Remove deperecated fields once mobile app is updated
+ */
 export declare const COMPLETED_MOCK_TEST_MARKSHEET_FRAGMENT: import("@apollo/client").DocumentNode;
+/**
+ * TODO:: Remove deperecated fields once mobile app is updated
+ */
 export declare const COMPLETED_MOCK_TESTS_FRAGMENT: import("@apollo/client").DocumentNode;

package/resolvers/fragments/mockTest.js

@@ -2,7 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.COMPLETED_MOCK_TESTS_FRAGMENT = exports.COMPLETED_MOCK_TEST_MARKSHEET_FRAGMENT = exports.MARK_FLAGGED_QUESTION = exports.MOCK_TEST_FIELDS = void 0;
 const client_1 = require("@apollo/client");
+const marksheet_1 = require("./marksheet");
+/**
+ * TODO:: Remove deperecated fields once mobile app is updated
+ */
 exports.MOCK_TEST_FIELDS = (0, client_1.gql) `
+  ${marksheet_1.MARKSHEET_STATS_FIELDS}
   fragment MockTestFields on MockTest {
     id
     demo
@@ -16,6 +21,14 @@ exports.MOCK_TEST_FIELDS = (0, client_1.gql) `
     lastMarksheetEndedAt
     lastMarksheetStartedAt
     lastMarksheetId
+    lastMarksheet {
+      id
+      startedAt
+      endedAt
+      stats {
+        ...MarksheetStatsFields
+      }
+    }
     typeId
   }
 `;
@@ -27,7 +40,11 @@ exports.MARK_FLAGGED_QUESTION = (0, client_1.gql) `
     flagged
   }
 `;
+/**
+ * TODO:: Remove deperecated fields once mobile app is updated
+ */
 exports.COMPLETED_MOCK_TEST_MARKSHEET_FRAGMENT = (0, client_1.gql) `
+  ${marksheet_1.MARKSHEET_STATS_FIELDS}
   fragment MockTestCompleted on Marksheet {
     completed
     correct
@@ -35,14 +52,29 @@ exports.COMPLETED_MOCK_TEST_MARKSHEET_FRAGMENT = (0, client_1.gql) `
     incorrect
     duration
     endedAt
+    stats {
+      ...MarksheetStatsFields
+    }
   }
 `;
+/**
+ * TODO:: Remove deperecated fields once mobile app is updated
+ */
 exports.COMPLETED_MOCK_TESTS_FRAGMENT = (0, client_1.gql) `
+  ${marksheet_1.MARKSHEET_STATS_FIELDS}
   fragment CompletedMockTestFragment on MockTest {
     correct
     incorrect
     lastMarksheetEndedAt
     lastMarksheetStartedAt
     lastMarksheetId
+    lastMarksheet {
+      id
+      startedAt
+      endedAt
+      stats {
+        ...MarksheetStatsFields
+      }
+    }
   }
 `;

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

@@ -188,6 +188,7 @@ export declare const optimisticModifyMarksheetBuilderConfig: (marksheetId: numbe
             marks: IMarksheetMark[];
             mockTestId: number | null;
             isTestMarksheet: boolean;
+            stats: import("../../../models").IMarksheetStats;
             correct?: number | undefined;
             incorrect?: number | undefined;
             partial?: number | undefined;
@@ -205,7 +206,7 @@ export declare const optimisticModifyMarksheetBuilderConfig: (marksheetId: numbe
             currentMarkId?: number | undefined;
             topicConceptData?: string | undefined;
             preBuildData?: IPreBuildMarksheet | undefined;
-            entitlementId: import("../../../models").EProductType | EEntitlementType;
+            entitlementId: EEntitlementType | import("../../../models").EProductType;
         };
     };
 };
@@ -282,6 +283,7 @@ export declare const optimisticEndMarksheet: (marksheet: IMarksheet) => {
             marks: IMarksheetMark[];
             mockTestId: number | null;
             isTestMarksheet: boolean;
+            stats: import("../../../models").IMarksheetStats;
             correct?: number | undefined;
             incorrect?: number | undefined;
             partial?: number | undefined;
@@ -299,7 +301,7 @@ export declare const optimisticEndMarksheet: (marksheet: IMarksheet) => {
             topicConceptData?: string | undefined;
             preBuildData?: IPreBuildMarksheet | undefined;
             builderConfig?: IBuildConfigData | undefined;
-            entitlementId: import("../../../models").EProductType | EEntitlementType;
+            entitlementId: EEntitlementType | import("../../../models").EProductType;
             __typename: string;
         };
     };

package/resolvers/mutation/restricted/marksheet.js

@@ -80,8 +80,6 @@ exports.SAVE_MARKSHEET = (0, client_1.gql) `
           flagged
           mark
         }
-        correct
-        incorrect
       }
     }
   }
@@ -406,6 +404,7 @@ exports.LEAVE_MARKSHEET = (0, client_1.gql) `
   }
 `;
 exports.END_MARKSHEET = (0, client_1.gql) `
+  ${marksheet_1.MARKSHEET_STATS_FIELDS}
   mutation EndMarksheet($marksheetId: Int!) {
     restricted {
       endMarksheet(marksheetId: $marksheetId) {
@@ -419,6 +418,9 @@ exports.END_MARKSHEET = (0, client_1.gql) `
         correct
         incorrect
         totalQuestions
+        stats {
+          ...MarksheetStatsFields
+        }
       }
     }
   }
@@ -439,7 +441,9 @@ const updateCacheOnEndMarksheet = (cache, result, options) => {
             incorrect: endMarksheet.incorrect,
             duration: endMarksheet.duration,
             endedAt: endMarksheet.endedAt,
+            stats: endMarksheet.stats,
         },
+        fragmentName: 'MarksheetCompleted',
         fragment: marksheet_1.MODIFY_MARKSHEET_COMPLETED_FRAGMENT,
     });
 };

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

@@ -65,6 +65,7 @@ export declare const optimisticEndMockTest: (marksheet: IMarksheet) => {
             marks: IMarksheetMark[];
             mockTestId: number | null;
             isTestMarksheet: boolean;
+            stats: import("../../../models").IMarksheetStats;
             correct?: number | undefined;
             incorrect?: number | undefined;
             partial?: number | undefined;
@@ -82,7 +83,7 @@ export declare const optimisticEndMockTest: (marksheet: IMarksheet) => {
             topicConceptData?: string | undefined;
             preBuildData?: import("./marksheet").IPreBuildMarksheet | undefined;
             builderConfig?: import("./marksheet").IBuildConfigData | undefined;
-            entitlementId: import("../../../models").EProductType | import("../../../models").EEntitlementType;
+            entitlementId: import("../../../models").EEntitlementType | import("../../../models").EProductType;
             __typename: string;
         };
     };

package/resolvers/mutation/restricted/mockTest.js

@@ -56,6 +56,7 @@ const optimisticToggleFlaggedQuestion = (mark, flagged) => ({
 });
 exports.optimisticToggleFlaggedQuestion = optimisticToggleFlaggedQuestion;
 exports.END_MOCK_TEST = (0, client_1.gql) `
+  ${fragments_1.MARKSHEET_STATS_FIELDS}
   mutation EndMockTest($marksheetId: Int!) {
     restricted {
       endMockTest(marksheetId: $marksheetId) {
@@ -64,11 +65,14 @@ exports.END_MOCK_TEST = (0, client_1.gql) `
         startedAt
         endedAt
         mockTestId
+        duration
         completed
         correct
         incorrect
         totalQuestions
-        duration
+        stats {
+          ...MarksheetStatsFields
+        }
       }
     }
   }
@@ -89,7 +93,9 @@ const updateCacheOnEndMockTest = (cache, result, options) => {
             incorrect: endMockTest.incorrect,
             duration: endMockTest.duration,
             endedAt: endMockTest.endedAt,
+            stats: endMockTest.stats,
         },
+        fragmentName: 'MockTestCompleted',
         fragment: fragments_1.COMPLETED_MOCK_TEST_MARKSHEET_FRAGMENT,
     });
     cache.writeFragment({
@@ -100,7 +106,14 @@ const updateCacheOnEndMockTest = (cache, result, options) => {
             lastMarksheetEndedAt: endMockTest.endedAt,
             correct: endMockTest.correct,
             incorrect: endMockTest.incorrect,
+            lastMarksheet: {
+                id: endMockTest.id,
+                startedAt: endMockTest.startedAt,
+                endedAt: endMockTest.endedAt,
+                stats: endMockTest.stats,
+            },
         },
+        fragmentName: 'CompletedMockTestFragment',
         fragment: fragments_1.COMPLETED_MOCK_TESTS_FRAGMENT,
     });
 };

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

@@ -131,7 +131,7 @@ export declare const optimisticEndOsceMarksheet: (marksheet: IOsceMarksheet) =>
             members: import("../../../models").IOsceMarksheetMember[];
             state: EOsceMarksheetState;
             entitlement: import("../../../models").IEntitlement;
-            entitlementId: EProductType | EEntitlementType;
+            entitlementId: EEntitlementType | EProductType;
             isTimed: boolean;
             __typename: string;
         };

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

@@ -7,14 +7,6 @@ export interface IMarksheetVar {
 }
 export type IMarksheetData = RestrictedData<graphqlNormalize & IMarksheet, 'marksheet'>;
 export declare const MARKSHEET: import("@apollo/client").DocumentNode;
-export interface IMarksheetsVar {
-    options: {
-        limit: number;
-        order?: ESortOrder;
-        lastId?: number;
-        solo?: boolean;
-    };
-}
 export interface IMarksheetsWindowVar {
     filter: {
         limit: number;
@@ -24,11 +16,6 @@ export interface IMarksheetsWindowVar {
         period?: number;
     };
 }
-export type IMarksheetsData = RestrictedData<{
-    results: (graphqlNormalize & IMarksheet)[];
-    total: number;
-    score: number;
-}, 'marksheets'>;
 export interface IMarksheetsDashboardData {
     total: number;
     score: number;
@@ -38,13 +25,33 @@ export interface IMarksheetsDashboardData {
     }>;
 }
 export type IMarksheetsWindowData = RestrictedData<graphqlNormalize & IMarksheetsDashboardData, 'marksheetsWindow'>;
-export interface PaginatedMarksheets {
+export declare const MARKSHEETS_WINDOW: import("@apollo/client").DocumentNode;
+export interface IMarksheetsVar {
+    options: {
+        limit: number;
+        order?: ESortOrder;
+        lastId?: number;
+        solo?: boolean;
+    };
+}
+export type IMarksheetsData = RestrictedData<{
     results: (graphqlNormalize & IMarksheet)[];
     total: number;
-    score: number;
-}
+}, 'marksheets'>;
 export declare const MARKSHEETS: import("@apollo/client").DocumentNode;
-export declare const MARKSHEETS_WINDOW: import("@apollo/client").DocumentNode;
+export interface IMarksheetsTrackerVar {
+    options: {
+        order?: ESortOrder;
+        solo?: boolean;
+        period?: number;
+    };
+}
+export interface IMarksheetsTrackerItem {
+    date: Date | number;
+    result: IMarksheet[];
+}
+export type IMarksheetsTrackerData = RestrictedData<graphqlNormalize & IMarksheetsTrackerItem[], 'marksheetsTracker'>;
+export declare const MARKSHEETS_TRACKER: import("@apollo/client").DocumentNode;
 export type ILatestPastMarksheetIdVar = null;
 export type ILatestPastMarksheetIdData = RestrictedData<number, 'latestPastMarksheetId'>;
 export declare const LATEST_PAST_MARKSHEET_ID: import("@apollo/client").DocumentNode;

package/resolvers/query/restricted/marksheet.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PRE_BUILD_MARKSHEET = exports.HEARTBEAT_QBANK = exports.MARKSHEET_FEEDBACK = exports.FLAGGED_QUESTIONS_MARKSHEET = exports.FLAGGED_QUESTIONS = exports.LATEST_PAST_SESSION_ID = exports.LATEST_PAST_MARKSHEET_ID = exports.MARKSHEETS_WINDOW = exports.MARKSHEETS = exports.MARKSHEET = void 0;
+exports.PRE_BUILD_MARKSHEET = exports.HEARTBEAT_QBANK = exports.MARKSHEET_FEEDBACK = exports.FLAGGED_QUESTIONS_MARKSHEET = exports.FLAGGED_QUESTIONS = exports.LATEST_PAST_SESSION_ID = exports.LATEST_PAST_MARKSHEET_ID = exports.MARKSHEETS_TRACKER = exports.MARKSHEETS = exports.MARKSHEETS_WINDOW = exports.MARKSHEET = void 0;
 const client_1 = require("@apollo/client");
 const marksheet_1 = require("../../fragments/marksheet");
 exports.MARKSHEET = (0, client_1.gql) `
@@ -13,47 +13,8 @@ exports.MARKSHEET = (0, client_1.gql) `
     }
   }
 `;
-exports.MARKSHEETS = (0, client_1.gql) `
-  query Marksheets($options: MarksheetOptions!) {
-    restricted {
-      marksheets(options: $options) {
-        results {
-          id
-          source
-          endedAt
-          topicNames
-          entitlement {
-            id
-            name
-          }
-          correct
-          incorrect
-          totalQuestions
-          isTestMarksheet
-          solo
-          completed
-          passingMark
-          duration
-          updatedAt
-          users {
-            id
-            displayName
-          }
-          marks {
-            question {
-              topic {
-                typeId
-                name
-              }
-            }
-          }
-        }
-        total
-      }
-    }
-  }
-`;
 exports.MARKSHEETS_WINDOW = (0, client_1.gql) `
+  ${marksheet_1.MARKSHEET_STATS_FIELDS}
   query MarksheetsWindow($filter: MarksheetWindowFilterInput!) {
     restricted {
       marksheetsWindow(filter: $filter) {
@@ -76,6 +37,9 @@ exports.MARKSHEETS_WINDOW = (0, client_1.gql) `
             solo
             completed
             updatedAt
+            stats {
+              ...MarksheetStatsFields
+            }
           }
         }
         total
@@ -84,6 +48,62 @@ exports.MARKSHEETS_WINDOW = (0, client_1.gql) `
     }
   }
 `;
+exports.MARKSHEETS = (0, client_1.gql) `
+  ${marksheet_1.MARKSHEET_STATS_FIELDS}
+  query Marksheets($options: MarksheetOptions!) {
+    restricted {
+      marksheets(options: $options) {
+        results {
+          id
+          source
+          endedAt
+          topicNames
+          typeId
+          entitlement {
+            id
+            name
+          }
+          stats {
+            ...MarksheetStatsFields
+          }
+          isTestMarksheet
+          solo
+          completed
+          updatedAt
+        }
+        total
+      }
+    }
+  }
+`;
+exports.MARKSHEETS_TRACKER = (0, client_1.gql) `
+  ${marksheet_1.MARKSHEET_STATS_FIELDS}
+  query MarksheetsTracker($options: MarksheetTrackerOptions!) {
+    restricted {
+      marksheetsTracker(options: $options) {
+        date
+        result {
+          id
+          source
+          endedAt
+          topicNames
+          typeId
+          entitlement {
+            id
+            name
+          }
+          stats {
+            ...MarksheetStatsFields
+          }
+          isTestMarksheet
+          solo
+          completed
+          updatedAt
+        }
+      }
+    }
+  }
+`;
 exports.LATEST_PAST_MARKSHEET_ID = (0, client_1.gql) `
   query LatestPastMarksheetId {
     restricted {

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

@@ -1,20 +1,11 @@
-import { IDailyProgressData, ITodo, ITopic, IUser } from '../../../models';
-import { PaginatedMarksheets } from './marksheet';
-import { IUniversitiesRankSpeciality } from './university';
+import { IUser } from '../../../models';
 export interface IDashboardQBank {
     restricted: {
         latestSessionId: string;
         latestPastMarksheetId: number;
         user: IUser;
-        marksheets: PaginatedMarksheets;
-        dailyFeed: ITodo;
-        dailyProgress: IDailyProgressData[];
-        topics: ITopic[];
         totalQuestions: number;
         totalCards: number;
-        universityLeaderboard: {
-            month: IUniversitiesRankSpeciality[];
-        };
     };
 }
 export declare const DASHBOARD_QBANK: import("@apollo/client").DocumentNode;

package/resolvers/query/restricted/qBank.js

@@ -6,6 +6,7 @@ exports.DASHBOARD_QBANK = (0, client_1.gql) `
   query Dashboard_Qbank {
     restricted {
       latestPastMarksheetId
+      latestSessionId
       user {
         id
         settings {

package/utils/evaluateMark.d.ts

@@ -2,7 +2,9 @@ import { EMarkResult, EPsaSectionType, EQuestionType, IMarksheetMarkJSONB, IQues
 export interface IEvaluateMarkData {
     score: number;
     result: EMarkResult;
+    maxScore: number;
 }
+export declare function getQuestionMaxScore(questionType: EQuestionType, psaSectionId: number | null): number;
 export declare function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, }: {
     mark: IMarksheetMarkJSONB;
     answer: IQuestionAnswer;

package/utils/evaluateMark.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.evaluateMark = void 0;
+exports.evaluateMark = exports.getQuestionMaxScore = void 0;
 const models_1 = require("../models");
 function isPrescribeAnswer(data) {
     return Object(data).hasOwnProperty('dose');
@@ -44,10 +44,55 @@ function deepParse(data) {
     }
     return parsed;
 }
+function getQuestionMaxScore(questionType, psaSectionId) {
+    switch (questionType) {
+        case models_1.EQuestionType.SINGLE_BEST_ANSWER:
+            if (psaSectionId) {
+                return 2;
+            }
+            return 1;
+        case models_1.EQuestionType.QUESTION_ANSWER:
+            if (psaSectionId) {
+                return 2;
+            }
+            return 1;
+        case models_1.EQuestionType.MULTIPLE_ANSWERS:
+            return 4;
+        case models_1.EQuestionType.PRESCRIPTION_ANSWER:
+            return 10;
+        case models_1.EQuestionType.EXTENDED_MATCHING_ANSWER:
+            return 1;
+        case models_1.EQuestionType.SELECT_THREE_ANSWER:
+            return 1;
+        case models_1.EQuestionType.RANKING_ANSWER:
+            return 1;
+        case models_1.EQuestionType.SBA_WITH_MULTIPLE_CHOICES:
+            return 1;
+        case models_1.EQuestionType.VERBAL_VERACITY:
+            return 1;
+        case models_1.EQuestionType.VERBAL_READING_COMPREHENSION:
+            return 1;
+        case models_1.EQuestionType.QUANTITATIVE_REASONING_SBA:
+            return 1;
+        case models_1.EQuestionType.DECISION_MAKING_SBA:
+            return 1;
+        case models_1.EQuestionType.DECISION_MAKING_YES_NO:
+            return 2;
+        case models_1.EQuestionType.SJT_SINGLE_CHOICE:
+            return 1;
+        case models_1.EQuestionType.SJT_TWO_ANSWERS:
+            return 1;
+        default:
+            return 1;
+    }
+}
+exports.getQuestionMaxScore = getQuestionMaxScore;
 function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, }) {
+    const maxScore = getQuestionMaxScore(questionTypeId, psaSectionId);
     const data = {
         score: 0,
         result: models_1.EMarkResult.Incorrect,
+        maxScore,
     };
     if (!mark || !answer) {
         return data;
@@ -64,7 +109,7 @@ function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, })
             case models_1.EQuestionType.DECISION_MAKING_SBA:
             case models_1.EQuestionType.QUANTITATIVE_REASONING_SBA: {
                 if (flatAnswer === flatAttempt) {
-                    data.score = psaSectionId ? 2 : 1;
+                    data.score = maxScore;
                     data.result = models_1.EMarkResult.Correct;
                 }
                 else {
@@ -86,8 +131,7 @@ function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, })
                     !Number.isNaN(attemptNum) &&
                     answerNum === attemptNum;
                 if (isNumericMatch || normalizedAnswer === normalizedAttempt) {
-                    // for psa section, we give 2 marks for correct answer
-                    data.score = psaSectionId ? 2 : 1;
+                    data.score = maxScore;
                     data.result = models_1.EMarkResult.Correct;
                 }
                 else {
@@ -110,11 +154,11 @@ function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, })
                 const isBMatch = answerB.length === attemptB.length &&
                     attemptB.every((x, i) => x === answerB[i]);
                 if (isAMatch && isBMatch) {
-                    data.score = 4;
+                    data.score = maxScore;
                     data.result = models_1.EMarkResult.Correct;
                 }
                 else if (isAMatch || isBMatch) {
-                    data.score = 2;
+                    data.score = maxScore / 2;
                     data.result = models_1.EMarkResult.Partial;
                 }
                 else {
@@ -141,12 +185,12 @@ function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, })
                 const totalStatements = answerA.length + answerB.length;
                 if (correctCount === totalStatements) {
                     // 5 / 5
-                    data.score = 2;
+                    data.score = maxScore;
                     data.result = models_1.EMarkResult.Correct;
                 }
                 else if (correctCount === totalStatements - 1) {
                     // 4 / 5
-                    data.score = 1;
+                    data.score = maxScore / 2;
                     data.result = models_1.EMarkResult.Partial;
                 }
                 else {
@@ -214,7 +258,7 @@ function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, })
                         }
                     }
                     if (isCorrect) {
-                        data.score = 1;
+                        data.score = maxScore;
                         data.result = models_1.EMarkResult.Correct;
                     }
                     else {
@@ -241,7 +285,7 @@ function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, })
                         }
                     }
                     if (isCorrect) {
-                        data.score = 1;
+                        data.score = maxScore;
                         data.result = models_1.EMarkResult.Correct;
                     }
                     else {
@@ -269,7 +313,7 @@ function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, })
                         }
                     }
                     if (isCorrect) {
-                        data.score = 1;
+                        data.score = maxScore;
                         data.result = models_1.EMarkResult.Correct;
                     }
                     else {
@@ -285,7 +329,7 @@ function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, })
                 if (twoAnswer.length === 2 &&
                     attempt.length === 2 &&
                     twoAnswer.join(',') === attempt.join(',')) {
-                    data.score = 1;
+                    data.score = maxScore;
                     data.result = models_1.EMarkResult.Correct;
                 }
                 else {
@@ -312,11 +356,11 @@ function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, })
                 else {
                     const distance = Math.abs(answerIndex - attemptIndex);
                     if (distance === 0) {
-                        data.score = 1;
+                        data.score = maxScore;
                         data.result = models_1.EMarkResult.Correct;
                     }
                     else if (distance === 1) {
-                        data.score = 0.5;
+                        data.score = maxScore / 2;
                         data.result = models_1.EMarkResult.Partial;
                     }
                     else {