fix(core/reports): improve expression utils API and performance

gnucoop · Mar 16, 2023 · fe3e277 · fe3e277
1 parent 3209b56
commit fe3e277
Show file tree

Hide file tree

Showing 5 changed files with 215 additions and 213 deletions.
diff --git a/projects/core/models/src/utils/expression-utils.md b/projects/core/models/src/utils/expression-utils.md
@@ -25,6 +25,9 @@ Returns an array containing all the values that the specified field takes in the
 The values are converted to strings.
 An optional expression can be added to filter which forms to consider in the computation.
 
+`FIRST(forms, expression, dateField = "created_at")`  
+Evaluates the expression in the first form by date.
+
 `LAST(forms, expression, dateField = "created_at")`  
 Evaluates the expression in the last form by date.
 

diff --git a/projects/core/models/src/utils/expression-utils.spec.ts b/projects/core/models/src/utils/expression-utils.spec.ts
@@ -36,13 +36,13 @@ describe('ALL_VALUES_OF', () => {
 
 describe('SUM', () => {
   it('should sum the values of one field in dataset', () => {
-    const result = SUM(forms, 'dog_puppies', 'to_check === true');
+    const result = SUM(forms, 'dog_puppies', (form: any) => form.to_check === true);
     const dog_puppies = 5;
     expect(result).toBe(dog_puppies);
   });
 
   it('should sum the values of one field in repeating slide', () => {
-    const result = SUM(forms, 'score', 'to_check === true');
+    const result = SUM(forms, 'score', (form: any) => form.to_check === true);
     const score = 18;
     expect(result).toBe(score);
   });