c2-clinical 1.0.121 → 1.0.123

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

@@ -18,7 +18,9 @@ class OnAnswerQuestionsFlowTester {
     }
     executeByRows(answered, lines, metActivitiesPatient) {
         const bankAnswer = ConvertRowToFormUnitsFlowItem_1.default.execute(lines);
+        console.log("bankAnswerConverted", bankAnswer);
         const { bank } = this.execute(answered, bankAnswer, metActivitiesPatient);
+        console.log("bankAnswerReturned", bankAnswer);
         return {
             bank,
             lines: GroupFormUnitsFlow_1.default.execute(bank, [])

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

@@ -12,24 +12,38 @@ class ProcessAnswerFlowTester {
         const allQuestionsAnswereds = bankAnswer?.filter((q) => q.answer !== "" && q.answer !== undefined);
         answerRelacioneds.forEach((relationed) => {
             //executa fórmula para answer
-            const answerCalculated = ExecFormulaFlowTester_1.default.execute(relationed.formulaToAnswer, allQuestionsAnswereds, attendanceMetActivities);
-            if (relationed.answer !== answerCalculated) {
-                relationed.answer = answerCalculated;
-                allQuestionsAnswereds.push(relationed);
-                autoAnswereds.push(relationed);
+            if (relationed.code !== questionAnswered.code) {
+                const answerCalculated = ExecFormulaFlowTester_1.default.execute(relationed.formulaToAnswer, allQuestionsAnswereds, attendanceMetActivities);
+                if (relationed.answer !== answerCalculated) {
+                    relationed.answer = answerCalculated;
+                    allQuestionsAnswereds.push(relationed);
+                    autoAnswereds.push(relationed);
+                }
+            }
+            // formulaToDescription
+            if (relationed.formulaToDescription) {
+                relationed.description = ExecFormulaFlowTester_1.default.execute(relationed.formulaToDescription, allQuestionsAnswereds, attendanceMetActivities);
             }
             // formulaToReferenceValue
             if (relationed?.formulaToReferenceValue) {
                 relationed.referenceValue = ExecFormulaFlowTester_1.default.execute(relationed.formulaToReferenceValue, allQuestionsAnswereds, attendanceMetActivities);
             }
-            // formulaToClassificationLabel: string;
+            // formulaToClassificationLabel
             if (relationed?.formulaToClassificationLabel) {
                 relationed.classificationLabel = ExecFormulaFlowTester_1.default.execute(relationed.formulaToClassificationLabel, allQuestionsAnswereds, attendanceMetActivities);
             }
-            // formulaToClassificationColor: string;
+            // formulaToClassificationColor
             if (relationed?.formulaToClassificationColor) {
                 relationed.classificationColor = ExecFormulaFlowTester_1.default.execute(relationed.formulaToClassificationColor, allQuestionsAnswereds, attendanceMetActivities);
             }
+            // formulaToMessage para validations
+            if (relationed?.validations?.length) {
+                relationed.validations
+                    .filter((v) => v.formulaToMessage)
+                    .forEach((v) => {
+                    v.message = ExecFormulaFlowTester_1.default.execute(v.formulaToMessage, allQuestionsAnswereds, attendanceMetActivities);
+                });
+            }
             // check options is enables
             if (relationed?.options?.length) {
                 relationed.options

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

@@ -9,6 +9,7 @@ class GetAnswerRelationedsFlowItemTester {
                 regex.test(fu.formulaToClassificationLabel) ||
                 regex.test(fu.formulaToClassificationColor) ||
                 regex.test(fu.formulaToEnable) ||
+                regex.test(fu.formulaToDescription) ||
                 fu.validations?.some((v) => regex.test(v.formulaToMessage)) ||
                 fu.options?.some((v) => regex.test(v.formulaToEnable)));
         });

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

@@ -43,14 +43,17 @@ export declare const AnamneseAnswerSchema: Schema<any, import("mongoose").Model<
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }, Types.Subdocument<Types.ObjectId, any, {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }> & {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }>;
     requestGraphicData: Types.DocumentArray<{
         method: string;
@@ -110,14 +113,17 @@ export declare const AnamneseAnswerSchema: Schema<any, import("mongoose").Model<
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }, Types.Subdocument<Types.ObjectId, any, {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }> & {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }>;
     requestGraphicData: Types.DocumentArray<{
         method: string;
@@ -177,14 +183,17 @@ export declare const AnamneseAnswerSchema: Schema<any, import("mongoose").Model<
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }, Types.Subdocument<Types.ObjectId, any, {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }> & {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }>;
     requestGraphicData: Types.DocumentArray<{
         method: string;

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

@@ -41,14 +41,17 @@ export declare const AnthropometryAnswerSchema: Schema<any, import("mongoose").M
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }, Types.Subdocument<Types.ObjectId, any, {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }> & {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }>;
     requestGraphicData: Types.DocumentArray<{
         method: string;
@@ -99,14 +102,17 @@ export declare const AnthropometryAnswerSchema: Schema<any, import("mongoose").M
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }, Types.Subdocument<Types.ObjectId, any, {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }> & {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }>;
     requestGraphicData: Types.DocumentArray<{
         method: string;
@@ -157,14 +163,17 @@ export declare const AnthropometryAnswerSchema: Schema<any, import("mongoose").M
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }, Types.Subdocument<Types.ObjectId, any, {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }> & {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }>;
     requestGraphicData: Types.DocumentArray<{
         method: string;

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

@@ -37,6 +37,7 @@ export interface IValidationQuestion {
     type: TypeValidationEnum;
     typeOutput: TypeOutputValidationEnum;
     formulaToMessage: string;
+    message?: string;
 }
 export interface IRow {
     id: string;
@@ -49,6 +50,7 @@ export interface IFormUnit extends IDefault {
     sequence: number;
     code: string;
     description: string;
+    formulaToDescription: string;
     example: string;
     parent: Types.ObjectId | IFormUnit;
     line: number;
@@ -180,14 +182,17 @@ export declare const ValidationSchema: Schema<any, import("mongoose").Model<any,
     type: string;
     typeOutput: string;
     formulaToMessage: string;
+    message?: string | null | undefined;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     type: string;
     typeOutput: string;
     formulaToMessage: string;
+    message?: string | null | undefined;
 }>, {}> & import("mongoose").FlatRecord<{
     type: string;
     typeOutput: string;
     formulaToMessage: string;
+    message?: string | null | undefined;
 }> & {
     _id: Types.ObjectId;
 } & {
@@ -242,14 +247,17 @@ export declare const FormUnitSchema: Schema<any, import("mongoose").Model<any, a
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }, Types.Subdocument<Types.ObjectId, any, {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }> & {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }>;
     show: boolean;
     readOnly: boolean;
@@ -295,6 +303,7 @@ export declare const FormUnitSchema: Schema<any, import("mongoose").Model<any, a
     account?: Types.ObjectId | null | undefined;
     description?: string | null | undefined;
     reference?: Types.ObjectId | null | undefined;
+    formulaToDescription?: string | null | undefined;
     example?: string | null | undefined;
     parent?: Types.ObjectId | null | undefined;
     line?: number | null | undefined;
@@ -389,14 +398,17 @@ export declare const FormUnitSchema: Schema<any, import("mongoose").Model<any, a
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }, Types.Subdocument<Types.ObjectId, any, {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }> & {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }>;
     show: boolean;
     readOnly: boolean;
@@ -442,6 +454,7 @@ export declare const FormUnitSchema: Schema<any, import("mongoose").Model<any, a
     account?: Types.ObjectId | null | undefined;
     description?: string | null | undefined;
     reference?: Types.ObjectId | null | undefined;
+    formulaToDescription?: string | null | undefined;
     example?: string | null | undefined;
     parent?: Types.ObjectId | null | undefined;
     line?: number | null | undefined;
@@ -536,14 +549,17 @@ export declare const FormUnitSchema: Schema<any, import("mongoose").Model<any, a
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }, Types.Subdocument<Types.ObjectId, any, {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }> & {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }>;
     show: boolean;
     readOnly: boolean;
@@ -589,6 +605,7 @@ export declare const FormUnitSchema: Schema<any, import("mongoose").Model<any, a
     account?: Types.ObjectId | null | undefined;
     description?: string | null | undefined;
     reference?: Types.ObjectId | null | undefined;
+    formulaToDescription?: string | null | undefined;
     example?: string | null | undefined;
     parent?: Types.ObjectId | null | undefined;
     line?: number | null | undefined;

package/dist/models/form/FormUnit.js

@@ -27,7 +27,8 @@ exports.ValidationSchema = new mongoose_1.Schema({
         enum: enum_1.TypeOutputValidationEnum,
         default: enum_1.TypeOutputValidationEnum.TEXT
     },
-    formulaToMessage: { type: String, required: true }
+    formulaToMessage: { type: String, required: true },
+    message: { type: String }
 }, { _id: false });
 exports.FormUnitSchema = new mongoose_1.Schema({
     //account só é usado quando for montado por uma conta, quando for modelo disponível a todos ele deve estar sem preenchimento
@@ -36,6 +37,7 @@ exports.FormUnitSchema = new mongoose_1.Schema({
     form: { type: mongoose_1.Schema.Types.ObjectId, ref: "form", required: true },
     sequence: { type: Number, required: true },
     code: { type: String, required: true },
+    formulaToDescription: { type: String },
     description: { type: String },
     example: { type: String },
     parent: { type: mongoose_1.Schema.Types.ObjectId, ref: "form-unit" },

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

@@ -43,14 +43,17 @@ export declare const QAAnswerSchema: Schema<any, import("mongoose").Model<any, a
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }, Types.Subdocument<Types.ObjectId, any, {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }> & {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }>;
     requestGraphicData: Types.DocumentArray<{
         method: string;
@@ -110,14 +113,17 @@ export declare const QAAnswerSchema: Schema<any, import("mongoose").Model<any, a
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }, Types.Subdocument<Types.ObjectId, any, {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }> & {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }>;
     requestGraphicData: Types.DocumentArray<{
         method: string;
@@ -177,14 +183,17 @@ export declare const QAAnswerSchema: Schema<any, import("mongoose").Model<any, a
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }, Types.Subdocument<Types.ObjectId, any, {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }> & {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }>;
     requestGraphicData: Types.DocumentArray<{
         method: string;

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

@@ -32,14 +32,17 @@ export declare const QPCAnswerSchema: Schema<any, import("mongoose").Model<any,
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }, Types.Subdocument<Types.ObjectId, any, {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }> & {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }>;
     requestGraphicData: Types.DocumentArray<{
         method: string;
@@ -90,14 +93,17 @@ export declare const QPCAnswerSchema: Schema<any, import("mongoose").Model<any,
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }, Types.Subdocument<Types.ObjectId, any, {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }> & {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }>;
     requestGraphicData: Types.DocumentArray<{
         method: string;
@@ -148,14 +154,17 @@ export declare const QPCAnswerSchema: Schema<any, import("mongoose").Model<any,
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }, Types.Subdocument<Types.ObjectId, any, {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }> & {
         type: string;
         typeOutput: string;
         formulaToMessage: string;
+        message?: string | null | undefined;
     }>;
     requestGraphicData: Types.DocumentArray<{
         method: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c2-clinical",
-  "version": "1.0.121",
+  "version": "1.0.123",
   "description": "Biblioteca Typescript para API NodeJS",
   "repository": "https://github.com/cabralsilva/c2-clinical.git",
   "author": "Daniel Cabral <cabralconsultoriaemsoftware@gmail.com>",