feat(core/reports): FLATTEN_REPS function

projects/core/models/src/utils/expression-utils.md

@@ -66,6 +66,10 @@ Evaluates the expression in the last form by date.
 `FILTER_BY(forms, expression)`  
 Returns a copy of forms and its repetitions, keeping only the ones for which expression evaluates to true.
 
+`FLATTEN_REPS(forms, slideName)`  
+Returns a copy of forms, modified as follows: if a form has n repeating slides, it is duplicated as n forms,
+in which the fields of the repeating slides appear as regular fields.
+
 `JOIN_FORMS(formsA, formsB, $fieldA, $fieldB?)`  
 Performs a left join of formsA and formsB.  
 For example, `JOIN_FORMS(anagraphic, medical, $personId)` returns a copy the anagraphic data forms,

projects/core/models/src/utils/expression-utils.ts

@@ -152,6 +152,7 @@ export class AjfExpressionUtils {
     EVALUATE: {fn: EVALUATE},
     FILTER_BY_VARS: {fn: FILTER_BY_VARS},
     FILTER_BY: {fn: FILTER_BY},
+    FLATTEN_REPS: {fn: FLATTEN_REPS},
     FIRST: {fn: FIRST},
     FROM_REPS: {fn: FROM_REPS},
     GET_AGE: {fn: GET_AGE},
@@ -1877,6 +1878,30 @@ export function FILTER_BY(forms: MainForm[], expression: Func | string): MainFor
   return res;
 }
 
+/**
+ * Returns a copy of forms, modified as follows: if a form has n repeating slides,
+ * it is duplicated as n forms, in which the fields of the repeating slides appear as regular fields.
+ */
+export function FLATTEN_REPS(forms: MainForm[], slideName: string): MainForm[] {
+  const res: MainForm[] = [];
+  for (const form of forms) {
+    if (form == null) {
+      continue;
+    }
+    const reps = {...form.reps};
+    const slides = reps[slideName];
+    delete reps[slideName];
+    if (slides == null || slides.length === 0) {
+      res.push({...form, reps});
+      continue;
+    }
+    for (const slide of slides) {
+      res.push({...form, ...slide, reps});
+    }
+  }
+  return res;
+}
+
 /**
  * Returns today's date.
  *

projects/core/reports/src/xls-report/hindikit-parser.ts

@@ -396,6 +396,7 @@ const functionArgs: {[name: string]: string[]} = {
   APPLY_LABELS: ["arg", "arg", "arg"],
   APPLY: ["arg", "field", "func(form)"],
   BUILD_DATASET: ["arg", "arg?"],
+  CHART_TO_DATA: ["arg", "arg"],
   COMPARE_DATE: ["arg", "arg", "arg", "arg?"],
   CONCAT: ["arg", "arg"],
   CONSOLE_LOG: ["arg"],
@@ -404,10 +405,13 @@ const functionArgs: {[name: string]: string[]} = {
   DAYS_DIFF: ["arg", "arg"],
   FILTER_BY: ["arg", "func(form)"],
   FIRST: ["arg", "func(form)", "field?"],
+  FLATTEN_REPS: ["arg", "arg"],
+  FORMAT_TABLE_ROWS: ["arg"],
+  FORMAT_TABLE_COLS: ["arg"],
+  FORMAT_TABLE_FIELDS: ["arg", "arg"],
   FROM_REPS: ["arg", "func(form)"],
   GET_AGE: ["arg", "arg?"],
   GET_LABELS: ["arg", "arg"],
-  PROMPT_RESULT: ["arg", "arg"],
   INCLUDES: ["arg", "arg"],
   IS_AFTER: ["arg", "arg"],
   IS_BEFORE: ["arg", "arg"],
@@ -425,12 +429,9 @@ const functionArgs: {[name: string]: string[]} = {
   OP: ["arg", "arg", "func(elemA, elemB)"],
   PERCENT: ["arg", "arg"],
   PERCENTAGE_CHANGE: ["arg", "arg"],
+  PROMPT_RESULT: ["arg", "arg"],
   REMOVE_DUPLICATES: ["arg"],
   ROUND: ["arg", "arg?"],
   SUM: ["arg", "field", "func(form)?"],
   TODAY: [],
-  CHART_TO_DATA: ["arg", "arg"],
-  FORMAT_TABLE_ROWS: ["arg"],
-  FORMAT_TABLE_COLS: ["arg"],
-  FORMAT_TABLE_FIELDS: ["arg", "arg"],
 };

projects/material/forms/src/form.html

@@ -114,6 +114,7 @@ <h2>
                               (centeredFieldsContent ? ' ajf-centered-field' : '')"
                               class="ajf-field-entry"
                               *ngIf="fieldInstance.visible"
+                              [ngStyle]="fieldStyle(fieldInstance|ajfAsFieldInstance)"
                             >
                               <i
                                 [class]="(fieldInstance|ajfAsFieldInstance).node.fieldType | ajfFieldIcon"
@@ -231,6 +232,7 @@ <h2>
                               (centeredFieldsContent ? ' ajf-centered-field' : '')"
                               class="ajf-field-entry"
                               *ngIf="fieldInstance.visible"
+                              [ngStyle]="fieldStyle(fieldInstance|ajfAsFieldInstance)"
                             >
                               <i
                                 [class]="(fieldInstance|ajfAsFieldInstance).node.fieldType | ajfFieldIcon"

projects/material/forms/src/form.ts

@@ -20,7 +20,12 @@
  *
  */
 
-import {AjfFormRenderer as CoreFormRenderer, AjfFormRendererService} from '@ajf/core/forms';
+import {
+  AjfFormRenderer as CoreFormRenderer,
+  AjfFormRendererService,
+  AjfFieldInstance,
+  AjfFieldType,
+} from '@ajf/core/forms';
 import {BooleanInput} from '@angular/cdk/coercion';
 import {
   ChangeDetectionStrategy,
@@ -46,6 +51,13 @@ export class AjfFormRenderer extends CoreFormRenderer {
     super(rendererService, changeDetectorRef);
   }
 
+  fieldStyle(field: AjfFieldInstance): any {
+    if (field.node.fieldType === AjfFieldType.Formula && field.node.label === '') {
+      return {display: 'none'};
+    }
+    return {};
+  }
+
   static ngAcceptInputType_fixedOrientation: BooleanInput;
   static ngAcceptInputType_hasEndMessage: BooleanInput;
   static ngAcceptInputType_hasStartMessage: BooleanInput;