fix(core/reports): IF_THEN_ELSE renamed to IF

gnucoop · Mar 21, 2023 · 4dd3ef4 · 4dd3ef4
1 parent fe805a1
commit 4dd3ef4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/projects/core/models/src/utils/expression-utils.md b/projects/core/models/src/utils/expression-utils.md
@@ -9,9 +9,9 @@ lists all the functions that are available in the language.
 Logs val to the console.
 
 `EVALUATE(condition, then, otherwise)`  
-Renamed to IF_THEN_ELSE.
+Renamed to IF.
 
-`IF_THEN_ELSE(condition, then, otherwise)`  
+`IF(condition, then, otherwise)`  
 If the condition is true, evaluates and returns then, otherwise otherwise.
 
 ## Forms manipulation functions

diff --git a/projects/core/models/src/utils/expression-utils.ts b/projects/core/models/src/utils/expression-utils.ts
@@ -1391,7 +1391,7 @@ export function ROUND(num: number | string, digits?: number): number {
 }
 
 /**
- * Deprecated. Use IF_THEN_ELSE
+ * Deprecated. Use IF
  */
 export function EVALUATE(condition: string, branch1: any, branch2: any): any {
   if (evaluateExpression(condition)) {

diff --git a/projects/core/reports/src/xls-report/hindikit-parser.spec.ts b/projects/core/reports/src/xls-report/hindikit-parser.spec.ts
@@ -13,7 +13,7 @@ describe('indicatorToJs', () => {
     expect(result).toBe("SUM(forms, 'pippo')");
   });
 
-  const indicator3 = '[forms[0], 4+(5), IF_THEN_ELSE(foo, pippo, pluto)]';
+  const indicator3 = '[forms[0], 4+(5), IF(foo, pippo, pluto)]';
   it(indicator3, () => {
     const result = indicatorToJs(indicator3);
     expect(result).toBe("[forms[0], 4 + (5), (foo ? pippo : pluto)]");

diff --git a/projects/core/reports/src/xls-report/hindikit-parser.ts b/projects/core/reports/src/xls-report/hindikit-parser.ts
@@ -336,7 +336,7 @@ function parseFunctionCall(name: string, revToks: Token[]): string {
   if (args) {
     return parseFunctionWithArgs(name, revToks, args);
   }
-  if (name === 'IF_THEN_ELSE') {
+  if (name === 'IF') {
     consume(revToks, TokenType.LParen);
     let js = '(' + parseExpression(revToks, TokenType.Comma) + ' ? ';
     consume(revToks, TokenType.Comma);