@quesmed/types 2.6.209 → 2.6.211

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

@@ -76,6 +76,7 @@ export interface IMarksheet {
     isTestMarksheet: boolean;
     correct?: number;
     incorrect?: number;
+    partial?: number;
     totalQuestions?: number;
     sessionId: string;
     passingMark: number;
@@ -93,7 +94,12 @@ export interface IMarksheet {
     builderConfig?: IBuildConfigData;
     entitlementId: EProductType | EEntitlementType;
 }
-export type IMarksheetMarkJSONB = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | [IPrescribeMark] | null;
+export type IMarksheetMarkJSONB = string | [string] | string[] | [IQuestionQAAnswer] | [string[], string[]] | [IPrescribeMark] | [string, string, string] | [string, string] | [string, string][] | null;
+export declare enum EMarkResult {
+    Incorrect = 0,
+    Correct = 1,
+    Partial = 2
+}
 export interface IMarksheetMark {
     id: Id;
     createdAt: number | Date;
@@ -110,6 +116,8 @@ export interface IMarksheetMark {
     marksheet?: IMarksheet;
     isAnswered: boolean;
     striked: number[];
+    score: number;
+    result: EMarkResult;
 }
 export interface IPreBuildMarksheetRef {
     createdAt: number | Date;

package/dist/mjs/models/Marksheet.js

@@ -47,3 +47,9 @@ export var EMarksheetAction;
     EMarksheetAction[EMarksheetAction["ANSWER_SELECTED"] = 15] = "ANSWER_SELECTED";
     EMarksheetAction[EMarksheetAction["MARK_CHECK_UNCHECK"] = 16] = "MARK_CHECK_UNCHECK";
 })(EMarksheetAction || (EMarksheetAction = {}));
+export var EMarkResult;
+(function (EMarkResult) {
+    EMarkResult[EMarkResult["Incorrect"] = 0] = "Incorrect";
+    EMarkResult[EMarkResult["Correct"] = 1] = "Correct";
+    EMarkResult[EMarkResult["Partial"] = 2] = "Partial";
+})(EMarkResult || (EMarkResult = {}));

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

@@ -77,7 +77,7 @@ export interface IQuestionCommentLike {
     comment: IQuestionComment;
     likeTrueDislikeFalse: boolean;
 }
-export type IQuestionAnswer = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | IPrescribeMark[] | [string, string][] | [string, string, string] | string[] | [string, string];
+export type IQuestionAnswer = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | IPrescribeAnswer[] | [string, string][] | [string, string, string] | string[] | [string, string];
 export type IQuestionAll = IQuestion | IQuestionSBA | IQuestionQA | IQuestionMultiQ | IQuestionPrescribe | IQuestionEMQ | IQuestionSelect3 | IQuestionRanking | IQuestionSjtTwoAnswer;
 export interface IQuestion {
     id: Id;
@@ -207,7 +207,7 @@ export interface IQuestionSjtTwoAnswer extends IQuestion {
     sjtTwoAnswer: [string, string];
 }
 export interface IQuestionPrescribe extends IQuestion {
-    answer: IPrescribeMark[];
+    answer: IPrescribeAnswer[];
     prescribeAnswer: IPrescribeAnswer[];
 }
 export type IPrescribeAnswerData = {

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

@@ -12,6 +12,8 @@ export const MARKSHEET_MARK_FIELDS = gql `
     isAnswered
     striked
     mark
+    result
+    score
     questionId
     question {
       ...QuestionFields
@@ -141,5 +143,7 @@ export const NEW_MARK_FIELDS = gql `
     questionChoiceId
     mark
     isAnswered
+    result
+    score
   }
 `;

package/dist/mjs/resolvers/fragments/record.d.ts

@@ -3,7 +3,6 @@ export declare const JOB_REMARK_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const JOB_ASSET_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const JOB_RECORD_METRICS_SUMMARY_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const JOB_RECORD_CHOICE_SUMMARY_FRAGMENT: import("@apollo/client").DocumentNode;
-export declare const JOB_RECORD_STATISTICS_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const JOB_RECORD_QUESTION_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const JOB_RECORD_CHAPTER_FRAGMENT: import("@apollo/client").DocumentNode;
 export declare const JOB_RECORD_STATION_FRAGMENT: import("@apollo/client").DocumentNode;

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

@@ -60,10 +60,6 @@ export const JOB_RECORD_METRICS_SUMMARY_FRAGMENT = gql `
     correct
     incorrect
     percentage
-    commentCount
-    likes
-    dislikes
-    public
   }
 `;
 export const JOB_RECORD_CHOICE_SUMMARY_FRAGMENT = gql `
@@ -75,18 +71,18 @@ export const JOB_RECORD_CHOICE_SUMMARY_FRAGMENT = gql `
     questionId
   }
 `;
-export const JOB_RECORD_STATISTICS_FRAGMENT = gql `
-  ${JOB_RECORD_METRICS_SUMMARY_FRAGMENT}
-  ${JOB_RECORD_CHOICE_SUMMARY_FRAGMENT}
-  fragment JobRecordStatistics on JobRecord {
-    metricsSummary {
-      ...JobRecordMetricsSummary
-    }
-    choiceSummary {
-      ...JobRecordChoiceSummary
-    }
-  }
-`;
+// export const JOB_RECORD_STATISTICS_FRAGMENT = gql`
+//   ${JOB_RECORD_METRICS_SUMMARY_FRAGMENT}
+//   ${JOB_RECORD_CHOICE_SUMMARY_FRAGMENT}
+//   fragment JobRecordStatistics on JobRecord {
+//     metricsSummary {
+//       ...JobRecordMetricsSummary
+//     }
+//     choiceSummary {
+//       ...JobRecordChoiceSummary
+//     }
+//   }
+// `;
 export const JOB_RECORD_QUESTION_FRAGMENT = gql `
   fragment JobRecordQuestion on JobRecordQuestion {
     question
@@ -167,7 +163,6 @@ export const JOB_RECORD_FRAGMENT = gql `
   ${JOB_RECORD_CHAPTER_FRAGMENT}
   ${JOB_RECORD_STATION_FRAGMENT}
   ${JOB_RECORD_MOCK_TEST_FRAGMENT}
-  ${JOB_RECORD_STATISTICS_FRAGMENT}
   ${JOB_ASSET_FRAGMENT}
   fragment JobRecord on JobRecord {
     id
@@ -205,6 +200,6 @@ export const JOB_RECORD_FRAGMENT = gql `
     updatedAt
     publishedAt
     ...JobRecordStatus
-    ...JobRecordStatistics
+    # ...JobRecordStatistics
   }
 `;

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

@@ -190,6 +190,7 @@ export declare const optimisticModifyMarksheetBuilderConfig: (marksheetId: numbe
             isTestMarksheet: boolean;
             correct?: number | undefined;
             incorrect?: number | undefined;
+            partial?: number | undefined;
             totalQuestions?: number | undefined;
             sessionId: string;
             passingMark: number;
@@ -283,6 +284,7 @@ export declare const optimisticEndMarksheet: (marksheet: IMarksheet) => {
             isTestMarksheet: boolean;
             correct?: number | undefined;
             incorrect?: number | undefined;
+            partial?: number | undefined;
             totalQuestions?: number | undefined;
             sessionId: string;
             passingMark: number;

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

@@ -67,6 +67,8 @@ export const SAVE_MARKSHEET = gql `
         state
         marks {
           isAnswered
+          result
+          score
           id
           marksheetId
           questionChoiceId
@@ -89,17 +91,21 @@ export const updateMarksheets = (cache, result, options) => {
     try {
         const { input } = variables;
         for (let i = 0; i < input.length; i++) {
-            const marksheet = input[i];
+            const inputData = input[i];
+            const savedMarks = saveMarksheets.find((m) => m.id === inputData.marksheetId)?.marks;
+            const savedData = savedMarks?.find((m) => m.id === inputData.markId);
             cache.writeFragment({
                 id: cache.identify({
-                    id: marksheet.markId,
+                    id: inputData.markId,
                     __typename: 'MarksheetMark',
                 }),
                 data: {
-                    timeTaken: marksheet.timeTaken || 0,
-                    mark: marksheet.mark,
-                    questionChoiceId: marksheet.choiceId,
+                    timeTaken: savedData?.timeTaken || 0,
+                    mark: savedData?.mark,
+                    questionChoiceId: savedData?.questionChoiceId,
                     isAnswered: true,
+                    result: savedData?.result,
+                    score: savedData?.score,
                 },
                 fragment: NEW_MARK_FIELDS,
             });
@@ -119,6 +125,8 @@ export const optimisticSaveMarksheets = (marksheet, marksheetInput, questionInde
         questionChoiceId: choiceId ?? null,
         isAnswered: true,
         mark: mark || null,
+        result: 0,
+        score: 0,
     };
     const updatedMarks = [
         ...marks.slice(0, questionIndex),
@@ -335,6 +343,8 @@ export const MODIFY_MARKSHEET_MARK = gql `
         questionChoiceId
         timeTaken
         mark
+        result
+        score
         isAnswered
         striked
       }
@@ -441,6 +451,8 @@ export const TOGGLE_STRIKE_OPTIONS = gql `
         index
         isAnswered
         mark
+        result
+        score
         marksheetId
         question {
           id

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

@@ -29,6 +29,8 @@ export declare const optimisticToggleFlaggedQuestion: (mark: IMarksheetMark, fla
             marksheet?: IMarksheet | undefined;
             isAnswered: boolean;
             striked: number[];
+            score: number;
+            result: import("../../../models").EMarkResult;
         };
     };
 };
@@ -64,6 +66,7 @@ export declare const optimisticEndMockTest: (marksheet: IMarksheet) => {
             isTestMarksheet: boolean;
             correct?: number | undefined;
             incorrect?: number | undefined;
+            partial?: number | undefined;
             totalQuestions?: number | undefined;
             sessionId: string;
             passingMark: number;

package/dist/mjs/resolvers/query/admin/record.js

@@ -2,9 +2,9 @@ import { gql } from '@apollo/client';
 import { JOB_RECORD_FRAGMENT } from '../../fragments';
 export const GET_JOB_RECORDS = gql `
   ${JOB_RECORD_FRAGMENT}
-  query GetJobRecords($jobId: ID!, $filter: JobRecordsFilterInput!) {
+  query GetJobRecords($jobId: ID!) {
     admin {
-      getJobRecords(jobId: $jobId, filter: $filter) {
+      getJobRecords(jobId: $jobId) {
         ...JobRecord
       }
     }

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

@@ -76,6 +76,8 @@ export const UCAT_THEME_ANALYTICS = gql `
         correct
         incorrect
         marks {
+          id
+          index
           questionId
           updatedAt
           mark

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

@@ -1,4 +1,4 @@
-import { EMarksheetAction, EMarksheetState, Id, IMarksheetMarkJSONB, IUser } from '../../models';
+import { EMarksheetAction, EMarksheetState, Id, IMarksheetMark, IUser } from '../../models';
 import { IBuildConfigData, IPreBuildMarksheet } from '../mutation/restricted';
 import { RootData } from '../types';
 export interface IMarksheetGroupMember {
@@ -58,12 +58,14 @@ export interface IMarksheetMarkData {
     newMarkId?: Id;
     markIndex?: number;
     questionChoiceId?: Id;
-    mark?: IMarksheetMarkJSONB;
+    mark?: IMarksheetMark['mark'];
     isAnswered?: boolean;
-    timeTaken?: number;
+    score?: IMarksheetMark['score'];
+    result?: IMarksheetMark['result'];
+    timeTaken?: IMarksheetMark['timeTaken'];
     updatedAt?: Date;
     user: IUser;
-    striked?: number[];
+    striked?: IMarksheetMark['striked'];
 }
 export type IOnMarksheetMarkChangeData = RootData<IMarksheetMarkData, 'onMarksheetMarkChange'>;
 export declare const ON_MARKSHEET_MARK_CHANGE_KEY = "ON_MARKSHEET_CHANGE_KEY";

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

@@ -76,6 +76,8 @@ export const ON_MARKSHEET_MARK_CHANGE = gql `
         displayName
       }
       striked
+      score
+      result
     }
   }
 `;

package/dist/mjs/utils/evaluateMark.d.ts

@@ -0,0 +1,14 @@
+import { EMarkResult, EPsaSectionType, EQuestionType, IMarksheetMarkJSONB, IQuestionAnswer } from '../models';
+export interface IEvaluateMarkData {
+    score: number;
+    result: EMarkResult;
+}
+export declare function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, }: {
+    mark: IMarksheetMarkJSONB;
+    answer: IQuestionAnswer;
+    questionTypeId: EQuestionType;
+    psaSectionId: EPsaSectionType | null;
+    choices?: Array<{
+        label: string;
+    }>;
+}): IEvaluateMarkData;

package/dist/mjs/utils/evaluateMark.js

@@ -0,0 +1,306 @@
+import { EMarkResult, EQuestionType, } from '../models';
+import { compareObjects } from './object';
+function isPrescribeAnswer(data) {
+    return Object(data).hasOwnProperty('dose');
+}
+function mapPrescribeMarkToAnswer(obj) {
+    if (isPrescribeAnswer(obj)) {
+        return {
+            drugId: obj.drug.value,
+            doseId: obj.dose.value,
+            durationId: obj.duration.value,
+            frequencyId: obj.frequency.value,
+            routeId: obj.route.value,
+        };
+    }
+    return {
+        drugId: obj.drugId,
+        doseId: obj.doseId,
+        durationId: obj.durationId,
+        frequencyId: obj.frequencyId,
+        routeId: obj.routeId,
+    };
+}
+function createHashMap(arr) {
+    const map = new Map();
+    for (const innerArr of arr) {
+        const sortedInnerArr = innerArr.slice().sort();
+        const key = sortedInnerArr.join('|');
+        map.set(key, (map.get(key) || 0) + 1);
+    }
+    return map;
+}
+function deepParse(data) {
+    let parsed = data;
+    while (typeof parsed === 'string') {
+        try {
+            parsed = JSON.parse(parsed);
+        }
+        catch (e) {
+            break;
+        }
+    }
+    return parsed;
+}
+export function evaluateMark({ mark, answer, questionTypeId, psaSectionId, choices, }) {
+    const data = {
+        score: 0,
+        result: EMarkResult.Incorrect,
+    };
+    if (!mark || !answer) {
+        return data;
+    }
+    try {
+        const flatAnswer = answer[0];
+        const jsonAnswer = deepParse(mark);
+        const flatAttempt = jsonAnswer[0];
+        switch (questionTypeId) {
+            case EQuestionType.SINGLE_BEST_ANSWER:
+            case EQuestionType.SBA_WITH_MULTIPLE_CHOICES:
+            case EQuestionType.VERBAL_VERACITY:
+            case EQuestionType.VERBAL_READING_COMPREHENSION:
+            case EQuestionType.DECISION_MAKING_SBA:
+            case EQuestionType.QUANTITATIVE_REASONING_SBA: {
+                if (flatAnswer === flatAttempt) {
+                    data.score = psaSectionId ? 2 : 1;
+                    data.result = EMarkResult.Correct;
+                }
+                else {
+                    data.score = 0;
+                    data.result = EMarkResult.Incorrect;
+                }
+                break;
+            }
+            case EQuestionType.QUESTION_ANSWER: {
+                const normalizedAnswer = flatAnswer.dose
+                    .toLowerCase()
+                    .replace(/\s/g, '');
+                const normalizedAttempt = flatAttempt
+                    ? flatAttempt.toLowerCase().replace(/\s/g, '')
+                    : '';
+                if (normalizedAnswer === normalizedAttempt) {
+                    // for psa section, we give 2 marks for correct answer
+                    data.score = psaSectionId ? 2 : 1;
+                    data.result = EMarkResult.Correct;
+                }
+                else {
+                    data.score = 0;
+                    data.result = EMarkResult.Incorrect;
+                }
+                break;
+            }
+            case EQuestionType.MULTIPLE_ANSWERS: {
+                const [answerA, answerB] = answer.map((x) => x.sort());
+                let [attemptA, attemptB] = [[], []];
+                if (Array.isArray(jsonAnswer) &&
+                    jsonAnswer.length === 2 &&
+                    Array.isArray(jsonAnswer[0]) &&
+                    Array.isArray(jsonAnswer[1])) {
+                    [attemptA, attemptB] = jsonAnswer.map((x) => x.sort());
+                }
+                const isAMatch = answerA.length === attemptA.length &&
+                    attemptA.every((x, i) => x === answerA[i]);
+                const isBMatch = answerB.length === attemptB.length &&
+                    attemptB.every((x, i) => x === answerB[i]);
+                if (isAMatch && isBMatch) {
+                    data.score = 4;
+                    data.result = EMarkResult.Correct;
+                }
+                else if (isAMatch || isBMatch) {
+                    data.score = 2;
+                    data.result = EMarkResult.Partial;
+                }
+                else {
+                    data.score = 0;
+                    data.result = EMarkResult.Incorrect;
+                }
+                break;
+            }
+            case EQuestionType.DECISION_MAKING_YES_NO: {
+                const [answerA, answerB] = answer.map((x) => [...x].sort());
+                let [attemptA, attemptB] = [[], []];
+                if (Array.isArray(jsonAnswer) &&
+                    jsonAnswer.length === 2 &&
+                    Array.isArray(jsonAnswer[0]) &&
+                    Array.isArray(jsonAnswer[1])) {
+                    [attemptA, attemptB] = jsonAnswer.map((x) => [...x].sort());
+                }
+                // Count correct matches
+                let correctCount = 0;
+                // Count matches in A
+                correctCount += attemptA.filter((x) => answerA.includes(x)).length;
+                // Count matches in B
+                correctCount += attemptB.filter((x) => answerB.includes(x)).length;
+                const totalStatements = answerA.length + answerB.length;
+                if (correctCount === totalStatements) {
+                    // 5 / 5
+                    data.score = 2;
+                    data.result = EMarkResult.Correct;
+                }
+                else if (correctCount === totalStatements - 1) {
+                    // 4 / 5
+                    data.score = 1;
+                    data.result = EMarkResult.Partial;
+                }
+                else {
+                    // 3 or fewer
+                    data.score = 0;
+                    data.result = EMarkResult.Incorrect;
+                }
+                break;
+            }
+            case EQuestionType.PRESCRIPTION_ANSWER: {
+                let foundCorrect = false;
+                if (typeof flatAttempt === 'object' &&
+                    Object.keys(flatAttempt).length > 0) {
+                    const answers = answer.map(mapPrescribeMarkToAnswer);
+                    const attempt = mapPrescribeMarkToAnswer(flatAttempt);
+                    foundCorrect = answers.some((ans) => compareObjects(ans, attempt));
+                }
+                if (foundCorrect) {
+                    data.score = 1;
+                    data.result = EMarkResult.Correct;
+                }
+                else {
+                    data.score = 0;
+                    data.result = EMarkResult.Incorrect;
+                }
+                break;
+            }
+            case EQuestionType.EXTENDED_MATCHING_ANSWER: {
+                const extendedAnswer = answer;
+                const attempt = jsonAnswer;
+                if (extendedAnswer.length !== attempt.length) {
+                    data.score = 0;
+                    data.result = EMarkResult.Incorrect;
+                }
+                else {
+                    const map1 = createHashMap(extendedAnswer);
+                    const map2 = createHashMap(attempt);
+                    let isCorrect = true;
+                    for (const [key, value] of map1) {
+                        if (map2.get(key) !== value) {
+                            isCorrect = false;
+                            break;
+                        }
+                    }
+                    if (isCorrect) {
+                        data.score = 1;
+                        data.result = EMarkResult.Correct;
+                    }
+                    else {
+                        data.score = 0;
+                        data.result = EMarkResult.Incorrect;
+                    }
+                }
+                break;
+            }
+            case EQuestionType.SELECT_THREE_ANSWER: {
+                const threeAnswer = answer;
+                const attempt = jsonAnswer;
+                if (threeAnswer.length !== 3) {
+                    data.score = 0;
+                    data.result = EMarkResult.Incorrect;
+                }
+                else {
+                    const answerSet = new Set(threeAnswer);
+                    let isCorrect = true;
+                    for (const attemptLabel of attempt) {
+                        if (!answerSet.has(attemptLabel)) {
+                            isCorrect = false;
+                            break;
+                        }
+                    }
+                    if (isCorrect) {
+                        data.score = 1;
+                        data.result = EMarkResult.Correct;
+                    }
+                    else {
+                        data.score = 0;
+                        data.result = EMarkResult.Incorrect;
+                    }
+                }
+                break;
+            }
+            case EQuestionType.RANKING_ANSWER: {
+                // Duplicate logic to Extended Matching, but they have different scoring systems
+                // which we may add at a later point
+                const rankAnswer = answer;
+                const attempt = jsonAnswer;
+                if (rankAnswer.length !== attempt.length) {
+                    data.score = 0;
+                    data.result = EMarkResult.Incorrect;
+                }
+                else {
+                    let isCorrect = true;
+                    for (let i = 0; i < rankAnswer.length; i++) {
+                        if (rankAnswer[i] !== attempt[i]) {
+                            isCorrect = false;
+                            break;
+                        }
+                    }
+                    if (isCorrect) {
+                        data.score = 1;
+                        data.result = EMarkResult.Correct;
+                    }
+                    else {
+                        data.score = 0;
+                        data.result = EMarkResult.Incorrect;
+                    }
+                }
+                break;
+            }
+            case EQuestionType.SJT_TWO_ANSWERS: {
+                const twoAnswer = answer;
+                const attempt = jsonAnswer;
+                if (twoAnswer.length === 2 &&
+                    attempt.length === 2 &&
+                    twoAnswer.join(',') === attempt.join(',')) {
+                    data.score = 1;
+                    data.result = EMarkResult.Correct;
+                }
+                else {
+                    data.score = 0;
+                    data.result = EMarkResult.Incorrect;
+                }
+                break;
+            }
+            case EQuestionType.SJT_SINGLE_CHOICE: {
+                const answer = flatAnswer;
+                const attempt = flatAttempt;
+                if (!choices) {
+                    data.score = 0;
+                    data.result = EMarkResult.Incorrect;
+                    break;
+                }
+                const options = choices.map((o) => o.label);
+                const answerIndex = options.indexOf(answer);
+                const attemptIndex = options.indexOf(attempt);
+                if (answerIndex === -1 || attemptIndex === -1) {
+                    data.score = 0;
+                    data.result = EMarkResult.Incorrect;
+                }
+                else {
+                    const distance = Math.abs(answerIndex - attemptIndex);
+                    if (distance === 0) {
+                        data.score = 1;
+                        data.result = EMarkResult.Correct;
+                    }
+                    else if (distance === 1) {
+                        data.score = 0.5;
+                        data.result = EMarkResult.Partial;
+                    }
+                    else {
+                        data.score = 0;
+                        data.result = EMarkResult.Incorrect;
+                    }
+                }
+                break;
+            }
+        }
+    }
+    catch (e) {
+        console.error(e);
+    }
+    return data;
+}

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

@@ -1,4 +1,5 @@
 export * from './commonFunctions';
+export * from './evaluateMark';
 export * from './lightgallery';
 export * from './object';
 export * from './offlineLink';

package/dist/mjs/utils/index.js

@@ -1,4 +1,5 @@
 export * from './commonFunctions';
+export * from './evaluateMark';
 export * from './lightgallery';
 export * from './object';
 export * from './offlineLink';

package/package.json

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