@quesmed/types 2.6.215 → 2.6.217

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

@@ -1,5 +1,5 @@
 import { gql } from '@apollo/client';
-import { MARKSHEET_FIELDS } from '../../fragments/marksheet';
+import { MARKSHEET_FIELDS, MARKSHEET_STATS_FIELDS, } from '../../fragments/marksheet';
 export const MARKSHEET = gql `
   ${MARKSHEET_FIELDS}
   query Marksheet($id: Int!) {
@@ -10,47 +10,8 @@ export const MARKSHEET = gql `
     }
   }
 `;
-export const MARKSHEETS = 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
-      }
-    }
-  }
-`;
 export const MARKSHEETS_WINDOW = gql `
+  ${MARKSHEET_STATS_FIELDS}
   query MarksheetsWindow($filter: MarksheetWindowFilterInput!) {
     restricted {
       marksheetsWindow(filter: $filter) {
@@ -73,6 +34,9 @@ export const MARKSHEETS_WINDOW = gql `
             solo
             completed
             updatedAt
+            stats {
+              ...MarksheetStatsFields
+            }
           }
         }
         total
@@ -81,6 +45,62 @@ export const MARKSHEETS_WINDOW = gql `
     }
   }
 `;
+export const MARKSHEETS = gql `
+  ${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
+      }
+    }
+  }
+`;
+export const MARKSHEETS_TRACKER = gql `
+  ${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
+        }
+      }
+    }
+  }
+`;
 export const LATEST_PAST_MARKSHEET_ID = gql `
   query LatestPastMarksheetId {
     restricted {

package/dist/mjs/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/dist/mjs/resolvers/query/restricted/qBank.js

@@ -3,6 +3,7 @@ export const DASHBOARD_QBANK = gql `
   query Dashboard_Qbank {
     restricted {
       latestPastMarksheetId
+      latestSessionId
       user {
         id
         settings {

package/dist/mjs/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/dist/mjs/utils/evaluateMark.js

@@ -41,10 +41,54 @@ function deepParse(data) {
     }
     return parsed;
 }
+export function getQuestionMaxScore(questionType, psaSectionId) {
+    switch (questionType) {
+        case EQuestionType.SINGLE_BEST_ANSWER:
+            if (psaSectionId) {
+                return 2;
+            }
+            return 1;
+        case EQuestionType.QUESTION_ANSWER:
+            if (psaSectionId) {
+                return 2;
+            }
+            return 1;
+        case EQuestionType.MULTIPLE_ANSWERS:
+            return 4;
+        case EQuestionType.PRESCRIPTION_ANSWER:
+            return 10;
+        case EQuestionType.EXTENDED_MATCHING_ANSWER:
+            return 1;
+        case EQuestionType.SELECT_THREE_ANSWER:
+            return 1;
+        case EQuestionType.RANKING_ANSWER:
+            return 1;
+        case EQuestionType.SBA_WITH_MULTIPLE_CHOICES:
+            return 1;
+        case EQuestionType.VERBAL_VERACITY:
+            return 1;
+        case EQuestionType.VERBAL_READING_COMPREHENSION:
+            return 1;
+        case EQuestionType.QUANTITATIVE_REASONING_SBA:
+            return 1;
+        case EQuestionType.DECISION_MAKING_SBA:
+            return 1;
+        case EQuestionType.DECISION_MAKING_YES_NO:
+            return 2;
+        case EQuestionType.SJT_SINGLE_CHOICE:
+            return 1;
+        case EQuestionType.SJT_TWO_ANSWERS:
+            return 1;
+        default:
+            return 1;
+    }
+}
 export function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, }) {
+    const maxScore = getQuestionMaxScore(questionTypeId, psaSectionId);
     const data = {
         score: 0,
         result: EMarkResult.Incorrect,
+        maxScore,
     };
     if (!mark || !answer) {
         return data;
@@ -61,7 +105,7 @@ export function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choic
             case EQuestionType.DECISION_MAKING_SBA:
             case EQuestionType.QUANTITATIVE_REASONING_SBA: {
                 if (flatAnswer === flatAttempt) {
-                    data.score = psaSectionId ? 2 : 1;
+                    data.score = maxScore;
                     data.result = EMarkResult.Correct;
                 }
                 else {
@@ -83,8 +127,7 @@ export function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choic
                     !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 = EMarkResult.Correct;
                 }
                 else {
@@ -107,11 +150,11 @@ export function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choic
                 const isBMatch = answerB.length === attemptB.length &&
                     attemptB.every((x, i) => x === answerB[i]);
                 if (isAMatch && isBMatch) {
-                    data.score = 4;
+                    data.score = maxScore;
                     data.result = EMarkResult.Correct;
                 }
                 else if (isAMatch || isBMatch) {
-                    data.score = 2;
+                    data.score = maxScore / 2;
                     data.result = EMarkResult.Partial;
                 }
                 else {
@@ -138,12 +181,12 @@ export function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choic
                 const totalStatements = answerA.length + answerB.length;
                 if (correctCount === totalStatements) {
                     // 5 / 5
-                    data.score = 2;
+                    data.score = maxScore;
                     data.result = EMarkResult.Correct;
                 }
                 else if (correctCount === totalStatements - 1) {
                     // 4 / 5
-                    data.score = 1;
+                    data.score = maxScore / 2;
                     data.result = EMarkResult.Partial;
                 }
                 else {
@@ -211,7 +254,7 @@ export function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choic
                         }
                     }
                     if (isCorrect) {
-                        data.score = 1;
+                        data.score = maxScore;
                         data.result = EMarkResult.Correct;
                     }
                     else {
@@ -238,7 +281,7 @@ export function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choic
                         }
                     }
                     if (isCorrect) {
-                        data.score = 1;
+                        data.score = maxScore;
                         data.result = EMarkResult.Correct;
                     }
                     else {
@@ -266,7 +309,7 @@ export function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choic
                         }
                     }
                     if (isCorrect) {
-                        data.score = 1;
+                        data.score = maxScore;
                         data.result = EMarkResult.Correct;
                     }
                     else {
@@ -282,7 +325,7 @@ export function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choic
                 if (twoAnswer.length === 2 &&
                     attempt.length === 2 &&
                     twoAnswer.join(',') === attempt.join(',')) {
-                    data.score = 1;
+                    data.score = maxScore;
                     data.result = EMarkResult.Correct;
                 }
                 else {
@@ -309,11 +352,11 @@ export function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choic
                 else {
                     const distance = Math.abs(answerIndex - attemptIndex);
                     if (distance === 0) {
-                        data.score = 1;
+                        data.score = maxScore;
                         data.result = EMarkResult.Correct;
                     }
                     else if (distance === 1) {
-                        data.score = 0.5;
+                        data.score = maxScore / 2;
                         data.result = EMarkResult.Partial;
                     }
                     else {

package/package.json

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