c2-clinical 1.0.178 → 1.0.182

package/dist/flow/on-answer/OnAnswerQuestionsFlowTester.js

@@ -3,10 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const enum_1 = require("../../models/enum");
 const GroupFormUnitsFlow_1 = __importDefault(require("../group/GroupFormUnitsFlow"));
 const ConvertRowToFormUnitsFlowItem_1 = __importDefault(require("./item/ConvertRowToFormUnitsFlowItem"));
 const ProcessAnswerFlowTester_1 = __importDefault(require("./ProcessAnswerFlowTester"));
-const enum_1 = require("../../models/enum");
 class OnAnswerQuestionsFlowTester {
     execute(answered, answersBank, metActivitiesPatient = []) {
         const questionAnswered = answersBank.find((q) => q._id.toString() === answered._id.toString());
@@ -30,23 +30,23 @@ class OnAnswerQuestionsFlowTester {
             const ret = this.execute(answered, bankAnswer, metActivitiesPatient);
             bankAnswer = ret.bank;
         }
-        //processar os graficos
+        //processar os ultimos pontos dos graficos
         bankAnswer
             .filter((fu) => fu.type === enum_1.TypeFormUnitEnum.GRAPHIC)
             .forEach((fu) => {
-            if (fu.requestGraphicData?.length) {
-                fu.requestGraphicData?.forEach((request) => {
-                    var currentPointOfGraphic = {};
-                    request.codes?.forEach((code) => {
+            if (fu.graphicData?.datasetPersonal?.length) {
+                fu.graphicData?.datasetPersonal?.forEach((datasetPersonal) => {
+                    var lastPoint = {};
+                    datasetPersonal.codesToData?.forEach((code) => {
                         const answer = bankAnswer.find((fu) => fu.code === code);
                         if (answer) {
-                            currentPointOfGraphic = {
-                                ...currentPointOfGraphic,
+                            lastPoint = {
+                                ...lastPoint,
                                 [answer.description]: answer.answer
                             };
                         }
                     });
-                    request.dataset.data = [...request.dataset.data, currentPointOfGraphic];
+                    datasetPersonal.lastPoint = lastPoint;
                 });
             }
         });

package/dist/flow/on-answer/ProcessAnswerFlowTester.js

@@ -64,9 +64,9 @@ class ProcessAnswerFlowTester {
                         ExecFormulaFlowTester_1.default.execute(option.formulaToEnable, allQuestionsAnswereds, attendanceMetActivities) ?? false;
                 });
             }
-            // formulaToAddDataset para graphicData
-            if (relationed?.graphicData?.formulaToAddDataset) {
-                relationed.graphicData.datasetsToAdd = ExecFormulaFlowTester_1.default.execute(relationed.graphicData.formulaToAddDataset, allQuestionsAnswereds, attendanceMetActivities);
+            // formulaToDatasetsBackground para graphicData
+            if (relationed?.graphicData?.formulaToDatasetsBackground) {
+                relationed.graphicData.datasetsBackground = ExecFormulaFlowTester_1.default.execute(relationed.graphicData.formulaToDatasetsBackground, allQuestionsAnswereds, attendanceMetActivities);
             }
         });
         let questionsRelacionedsAnsweredsRet = [...autoAnswereds];

package/dist/flow/on-answer/item/GetAnswerRelationedsFlowItemTester.js

@@ -14,7 +14,7 @@ class GetAnswerRelationedsFlowItemTester {
                 regex.test(fu.formulaToEnable) ||
                 regex.test(fu.formulaToShow) ||
                 regex.test(fu.formulaToDescription) ||
-                regex.test(fu.graphicData?.formulaToAddDataset) ||
+                regex.test(fu.graphicData?.formulaToDatasetsBackground) ||
                 fu.validations?.some((v) => regex.test(v.formulaToMessage)) ||
                 fu.options?.some((v) => regex.test(v.formulaToEnable)));
         });

package/dist/models/anamnese/AnamneseAnswer.d.ts

@@ -55,34 +55,37 @@ export declare const AnamneseAnswerSchema: Schema<any, import("mongoose").Model<
         formulaToMessage: string;
         message?: string | null | undefined;
     }>;
+    anamnese: {
+        prototype?: Types.ObjectId | null | undefined;
+        cacheHexString?: unknown;
+        generate?: {} | null | undefined;
+        createFromTime?: {} | null | undefined;
+        createFromHexString?: {} | null | undefined;
+        createFromBase64?: {} | null | undefined;
+        isValid?: {} | null | undefined;
+    };
     requestGraphicData: Types.DocumentArray<{
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }, Types.Subdocument<Types.ObjectId, any, {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }> & {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }>;
-    anamnese: {
-        prototype?: Types.ObjectId | null | undefined;
-        cacheHexString?: unknown;
-        generate?: {} | null | undefined;
-        createFromTime?: {} | null | undefined;
-        createFromHexString?: {} | null | undefined;
-        createFromBase64?: {} | null | undefined;
-        isValid?: {} | null | undefined;
-    };
     answer?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{} & {
     account: {
@@ -128,34 +131,37 @@ export declare const AnamneseAnswerSchema: Schema<any, import("mongoose").Model<
         formulaToMessage: string;
         message?: string | null | undefined;
     }>;
+    anamnese: {
+        prototype?: Types.ObjectId | null | undefined;
+        cacheHexString?: unknown;
+        generate?: {} | null | undefined;
+        createFromTime?: {} | null | undefined;
+        createFromHexString?: {} | null | undefined;
+        createFromBase64?: {} | null | undefined;
+        isValid?: {} | null | undefined;
+    };
     requestGraphicData: Types.DocumentArray<{
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }, Types.Subdocument<Types.ObjectId, any, {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }> & {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }>;
-    anamnese: {
-        prototype?: Types.ObjectId | null | undefined;
-        cacheHexString?: unknown;
-        generate?: {} | null | undefined;
-        createFromTime?: {} | null | undefined;
-        createFromHexString?: {} | null | undefined;
-        createFromBase64?: {} | null | undefined;
-        isValid?: {} | null | undefined;
-    };
     answer?: any;
 }>, {}> & import("mongoose").FlatRecord<{} & {
     account: {
@@ -201,34 +207,37 @@ export declare const AnamneseAnswerSchema: Schema<any, import("mongoose").Model<
         formulaToMessage: string;
         message?: string | null | undefined;
     }>;
+    anamnese: {
+        prototype?: Types.ObjectId | null | undefined;
+        cacheHexString?: unknown;
+        generate?: {} | null | undefined;
+        createFromTime?: {} | null | undefined;
+        createFromHexString?: {} | null | undefined;
+        createFromBase64?: {} | null | undefined;
+        isValid?: {} | null | undefined;
+    };
     requestGraphicData: Types.DocumentArray<{
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }, Types.Subdocument<Types.ObjectId, any, {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }> & {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }>;
-    anamnese: {
-        prototype?: Types.ObjectId | null | undefined;
-        cacheHexString?: unknown;
-        generate?: {} | null | undefined;
-        createFromTime?: {} | null | undefined;
-        createFromHexString?: {} | null | undefined;
-        createFromBase64?: {} | null | undefined;
-        isValid?: {} | null | undefined;
-    };
     answer?: any;
 }> & {
     _id: Types.ObjectId;

package/dist/models/anthropometry/AnthropometryAnswer.d.ts

@@ -63,34 +63,37 @@ export declare const AnthropometryAnswerSchema: Schema<any, import("mongoose").M
     }> & {
         _id?: unknown;
     }>;
+    patient: {
+        prototype?: Types.ObjectId | null | undefined;
+        cacheHexString?: unknown;
+        generate?: {} | null | undefined;
+        createFromTime?: {} | null | undefined;
+        createFromHexString?: {} | null | undefined;
+        createFromBase64?: {} | null | undefined;
+        isValid?: {} | null | undefined;
+    };
     requestGraphicData: Types.DocumentArray<{
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }, Types.Subdocument<Types.ObjectId, any, {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }> & {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }>;
-    patient: {
-        prototype?: Types.ObjectId | null | undefined;
-        cacheHexString?: unknown;
-        generate?: {} | null | undefined;
-        createFromTime?: {} | null | undefined;
-        createFromHexString?: {} | null | undefined;
-        createFromBase64?: {} | null | undefined;
-        isValid?: {} | null | undefined;
-    };
     anthropometry: {
         prototype?: Types.ObjectId | null | undefined;
         cacheHexString?: unknown;
@@ -151,34 +154,37 @@ export declare const AnthropometryAnswerSchema: Schema<any, import("mongoose").M
     }> & {
         _id?: unknown;
     }>;
+    patient: {
+        prototype?: Types.ObjectId | null | undefined;
+        cacheHexString?: unknown;
+        generate?: {} | null | undefined;
+        createFromTime?: {} | null | undefined;
+        createFromHexString?: {} | null | undefined;
+        createFromBase64?: {} | null | undefined;
+        isValid?: {} | null | undefined;
+    };
     requestGraphicData: Types.DocumentArray<{
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }, Types.Subdocument<Types.ObjectId, any, {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }> & {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }>;
-    patient: {
-        prototype?: Types.ObjectId | null | undefined;
-        cacheHexString?: unknown;
-        generate?: {} | null | undefined;
-        createFromTime?: {} | null | undefined;
-        createFromHexString?: {} | null | undefined;
-        createFromBase64?: {} | null | undefined;
-        isValid?: {} | null | undefined;
-    };
     anthropometry: {
         prototype?: Types.ObjectId | null | undefined;
         cacheHexString?: unknown;
@@ -239,34 +245,37 @@ export declare const AnthropometryAnswerSchema: Schema<any, import("mongoose").M
     }> & {
         _id?: unknown;
     }>;
+    patient: {
+        prototype?: Types.ObjectId | null | undefined;
+        cacheHexString?: unknown;
+        generate?: {} | null | undefined;
+        createFromTime?: {} | null | undefined;
+        createFromHexString?: {} | null | undefined;
+        createFromBase64?: {} | null | undefined;
+        isValid?: {} | null | undefined;
+    };
     requestGraphicData: Types.DocumentArray<{
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }, Types.Subdocument<Types.ObjectId, any, {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }> & {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }>;
-    patient: {
-        prototype?: Types.ObjectId | null | undefined;
-        cacheHexString?: unknown;
-        generate?: {} | null | undefined;
-        createFromTime?: {} | null | undefined;
-        createFromHexString?: {} | null | undefined;
-        createFromBase64?: {} | null | undefined;
-        isValid?: {} | null | undefined;
-    };
     anthropometry: {
         prototype?: Types.ObjectId | null | undefined;
         cacheHexString?: unknown;

package/dist/models/form/FormUnit.d.ts

@@ -86,7 +86,6 @@ export interface IFormUnit extends IDefault {
     codeEnableFreeText: string;
     labelFreeText: string;
     graphicData: IGraphicData;
-    requestGraphicData: IRequestGraphicData[];
     children?: IFormUnit[];
     lines?: IRow[];
     modalConfig?: IModalConfig;
@@ -116,11 +115,23 @@ export interface IQuestionOption {
     image: string;
     color: string;
 }
-export interface IGraphicData {
+export interface IDataset {
     [key: string]: any;
-    datasets: any[];
-    datasetsToAdd: any[];
-    formulaToAddDataset: string;
+    label: string;
+    data: any[];
+}
+export interface IDatasetsPersonal {
+    codesToData: string[];
+    datasets: IDataset;
+    lastPoint: {
+        [key: string]: any;
+    };
+}
+export interface IGraphicData {
+    config: any;
+    datasetsBackground: IDataset[];
+    formulaToDatasetsBackground: string;
+    datasetPersonal: IDatasetsPersonal[];
 }
 export interface IRequestGraphicData {
     method: string;
@@ -128,6 +139,7 @@ export interface IRequestGraphicData {
     body: any;
     dataset: any;
     codes: string[];
+    datasetsToAdd: any[];
 }
 export declare const RequestGraphicDataSchema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, {
     _id: false;
@@ -135,18 +147,21 @@ export declare const RequestGraphicDataSchema: Schema<any, import("mongoose").Mo
     method: string;
     url: string;
     codes: string[];
+    datasetsToAdd: any[];
     body?: any;
     dataset?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     method: string;
     url: string;
     codes: string[];
+    datasetsToAdd: any[];
     body?: any;
     dataset?: any;
 }>, {}> & import("mongoose").FlatRecord<{
     method: string;
     url: string;
     codes: string[];
+    datasetsToAdd: any[];
     body?: any;
     dataset?: any;
 }> & {
@@ -278,25 +293,6 @@ export declare const FormUnitSchema: Schema<any, import("mongoose").Model<any, a
     show: boolean;
     readOnly: boolean;
     ellegibleForComparison: boolean;
-    requestGraphicData: Types.DocumentArray<{
-        method: string;
-        url: string;
-        codes: string[];
-        body?: any;
-        dataset?: any;
-    }, Types.Subdocument<Types.ObjectId, any, {
-        method: string;
-        url: string;
-        codes: string[];
-        body?: any;
-        dataset?: any;
-    }> & {
-        method: string;
-        url: string;
-        codes: string[];
-        body?: any;
-        dataset?: any;
-    }>;
     tips: Types.DocumentArray<{
         type: string;
         text?: string | null | undefined;
@@ -439,25 +435,6 @@ export declare const FormUnitSchema: Schema<any, import("mongoose").Model<any, a
     show: boolean;
     readOnly: boolean;
     ellegibleForComparison: boolean;
-    requestGraphicData: Types.DocumentArray<{
-        method: string;
-        url: string;
-        codes: string[];
-        body?: any;
-        dataset?: any;
-    }, Types.Subdocument<Types.ObjectId, any, {
-        method: string;
-        url: string;
-        codes: string[];
-        body?: any;
-        dataset?: any;
-    }> & {
-        method: string;
-        url: string;
-        codes: string[];
-        body?: any;
-        dataset?: any;
-    }>;
     tips: Types.DocumentArray<{
         type: string;
         text?: string | null | undefined;
@@ -600,25 +577,6 @@ export declare const FormUnitSchema: Schema<any, import("mongoose").Model<any, a
     show: boolean;
     readOnly: boolean;
     ellegibleForComparison: boolean;
-    requestGraphicData: Types.DocumentArray<{
-        method: string;
-        url: string;
-        codes: string[];
-        body?: any;
-        dataset?: any;
-    }, Types.Subdocument<Types.ObjectId, any, {
-        method: string;
-        url: string;
-        codes: string[];
-        body?: any;
-        dataset?: any;
-    }> & {
-        method: string;
-        url: string;
-        codes: string[];
-        body?: any;
-        dataset?: any;
-    }>;
     tips: Types.DocumentArray<{
         type: string;
         text?: string | null | undefined;

package/dist/models/form/FormUnit.js

@@ -8,7 +8,8 @@ exports.RequestGraphicDataSchema = new mongoose_1.Schema({
     url: { type: String, required: true },
     body: { type: mongoose_1.Schema.Types.Mixed },
     dataset: { type: mongoose_1.Schema.Types.Mixed },
-    codes: { type: [String] }
+    codes: { type: [String] },
+    datasetsToAdd: { type: [mongoose_1.Schema.Types.Mixed] }
 }, { _id: false });
 exports.QuestionOptionSchema = new mongoose_1.Schema({
     sequence: { type: Number, required: true },
@@ -74,7 +75,7 @@ exports.FormUnitSchema = new mongoose_1.Schema({
     labelFreeText: { type: String },
     //DADOS PARA GRAFICOS
     graphicData: { type: mongoose_1.Schema.Types.Mixed },
-    requestGraphicData: { type: [exports.RequestGraphicDataSchema] },
+    // requestGraphicData: { type: [RequestGraphicDataSchema] },
     //DADOS PARA MODAL
     modalConfig: {
         type: {

package/dist/models/qa/QAAnswer.d.ts

@@ -59,18 +59,21 @@ export declare const QAAnswerSchema: Schema<any, import("mongoose").Model<any, a
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }, Types.Subdocument<Types.ObjectId, any, {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }> & {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }>;
@@ -132,18 +135,21 @@ export declare const QAAnswerSchema: Schema<any, import("mongoose").Model<any, a
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }, Types.Subdocument<Types.ObjectId, any, {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }> & {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }>;
@@ -205,18 +211,21 @@ export declare const QAAnswerSchema: Schema<any, import("mongoose").Model<any, a
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }, Types.Subdocument<Types.ObjectId, any, {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }> & {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }>;

package/dist/models/qpc/QPCAnswer.d.ts

@@ -48,18 +48,21 @@ export declare const QPCAnswerSchema: Schema<any, import("mongoose").Model<any,
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }, Types.Subdocument<Types.ObjectId, any, {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }> & {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }>;
@@ -112,18 +115,21 @@ export declare const QPCAnswerSchema: Schema<any, import("mongoose").Model<any,
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }, Types.Subdocument<Types.ObjectId, any, {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }> & {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }>;
@@ -176,18 +182,21 @@ export declare const QPCAnswerSchema: Schema<any, import("mongoose").Model<any,
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }, Types.Subdocument<Types.ObjectId, any, {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }> & {
         method: string;
         url: string;
         codes: string[];
+        datasetsToAdd: any[];
         body?: any;
         dataset?: any;
     }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-clinical",
-  "version": "1.0.178",
+  "version": "1.0.182",
   "description": "Biblioteca Typescript para API NodeJS",
   "repository": {
     "type": "git",