Skip to content

Commit

Permalink
feat(core/reports): CONSOLE_LOG returns the value to be logged
Browse files Browse the repository at this point in the history
  • Loading branch information
@robzan8
robzan8 committed Jun 13, 2023
1 parent f591308 commit c37c974
Show file tree
Hide file tree
Showing 3 changed files with 82 additions and 81 deletions.
2 changes: 1 addition & 1 deletion projects/core/models/src/utils/expression-utils.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ lists all the functions that are available in the language.
## Utilities

`CONSOLE_LOG(val)`
Logs val to the console.
Logs val to the console and returns it.

`EVALUATE(condition, then, otherwise)`
Renamed to IF.
Expand Down
109 changes: 55 additions & 54 deletions projects/core/models/src/utils/expression-utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,79 +98,79 @@ export class AjfExpressionUtils {
* It is a key-value dictionary, that mapping all Ajf validation functions.
*/
static utils: {[name: string]: AjfValidationFn} = {
digitCount: {fn: digitCount},
decimalCount: {fn: decimalCount},
isInt: {fn: isInt},
notEmpty: {fn: notEmpty},
valueInChoice: {fn: valueInChoice},
scanGroupField: {fn: scanGroupField},
sum: {fn: sum},
alert: {fn: alert},
buildAlignedDataset: {fn: buildAlignedDataset},
buildAlignedFormDataset: {fn: buildAlignedFormDataset},
buildDataset: {fn: buildDataset},
buildFormDataset: {fn: buildFormDataset},
buildWidgetDataset: {fn: buildWidgetDataset},
buildWidgetDatasetWithDialog: {fn: buildWidgetDatasetWithDialog},
calculateAvgProperty: {fn: calculateAvgProperty},
calculateAvgPropertyArray: {fn: calculateAvgPropertyArray},
calculateTrendByProperties: {fn: calculateTrendByProperties},
calculateTrendProperty: {fn: calculateTrendProperty},
dateOperations: {fn: dateOperations},
round: {fn: round},
decimalCount: {fn: decimalCount},
digitCount: {fn: digitCount},
drawThreshold: {fn: drawThreshold},
extractArray: {fn: extractArray},
extractSum: {fn: extractSum},
extractArraySum: {fn: extractArraySum},
drawThreshold: {fn: drawThreshold},
extractDates: {fn: extractDates},
lastProperty: {fn: lastProperty},
sumLastProperties: {fn: sumLastProperties},
calculateTrendProperty: {fn: calculateTrendProperty},
calculateTrendByProperties: {fn: calculateTrendByProperties},
calculateAvgProperty: {fn: calculateAvgProperty},
calculateAvgPropertyArray: {fn: calculateAvgPropertyArray},
alert: {fn: alert},
formatNumber: {fn: formatNumber},
extractSum: {fn: extractSum},
formatDate: {fn: formatDate},
isoMonth: {fn: isoMonth},
formatNumber: {fn: formatNumber},
getCoordinate: {fn: getCoordinate},
isInt: {fn: isInt},
isoMonth: {fn: isoMonth},
lastProperty: {fn: lastProperty},
notEmpty: {fn: notEmpty},
parseDate: {fn: dateUtils.parse},
plainArray: {fn: plainArray},
COUNT_FORMS: {fn: COUNT_FORMS},
round: {fn: round},
scanGroupField: {fn: scanGroupField},
sum: {fn: sum},
sumLastProperties: {fn: sumLastProperties},
valueInChoice: {fn: valueInChoice},
ADD_DAYS: {fn: ADD_DAYS},
ALL_VALUES_OF: {fn: ALL_VALUES_OF},
APPLY_LABELS: {fn: APPLY_LABELS},
APPLY: {fn: APPLY},
BUILD_DATASET: {fn: BUILD_DATASET},
COMPARE_DATE: {fn: COMPARE_DATE},
CONCAT: {fn: CONCAT},
CONSOLE_LOG: {fn: CONSOLE_LOG},
COUNT_FORMS_UNIQUE: {fn: COUNT_FORMS_UNIQUE},
COUNT_FORMS: {fn: COUNT_FORMS},
COUNT_REPS: {fn: COUNT_REPS},
SUM: {fn: SUM},
MEAN: {fn: MEAN},
PERCENT: {fn: PERCENT},
LAST: {fn: LAST},
FIRST: {fn: FIRST},
MAX: {fn: MAX},
MEDIAN: {fn: MEDIAN},
MODE: {fn: MODE},
ALL_VALUES_OF: {fn: ALL_VALUES_OF},
REPEAT: {fn: REPEAT},
DAYS_DIFF: {fn: DAYS_DIFF},
EVALUATE: {fn: EVALUATE},
INCLUDES: {fn: INCLUDES},
buildDataset: {fn: buildDataset},
buildAlignedDataset: {fn: buildAlignedDataset},
buildFormDataset: {fn: buildFormDataset},
buildAlignedFormDataset: {fn: buildAlignedFormDataset},
buildWidgetDataset: {fn: buildWidgetDataset},
buildWidgetDatasetWithDialog: {fn: buildWidgetDatasetWithDialog},
FILTER_BY_VARS: {fn: FILTER_BY_VARS},
FILTER_BY: {fn: FILTER_BY},
ADD_DAYS: {fn: ADD_DAYS},
DAYS_DIFF: {fn: DAYS_DIFF},
IS_BEFORE: {fn: IS_BEFORE},
FIRST: {fn: FIRST},
FROM_REPS: {fn: FROM_REPS},
GET_AGE: {fn: GET_AGE},
GET_LABELS: {fn: GET_LABELS},
INCLUDES: {fn: INCLUDES},
IS_AFTER: {fn: IS_AFTER},
IS_BEFORE: {fn: IS_BEFORE},
IS_WITHIN_INTERVAL: {fn: IS_WITHIN_INTERVAL},
COMPARE_DATE: {fn: COMPARE_DATE},
APPLY: {fn: APPLY},
TODAY: {fn: TODAY},
GET_AGE: {fn: GET_AGE},
BUILD_DATASET: {fn: BUILD_DATASET},
ISIN: {fn: ISIN},
JOIN_FORMS: {fn: JOIN_FORMS},
LEN: {fn: LEN},
CONCAT: {fn: CONCAT},
REMOVE_DUPLICATES: {fn: REMOVE_DUPLICATES},
JOIN_REPEATING_SLIDES: {fn: JOIN_REPEATING_SLIDES},
FROM_REPS: {fn: FROM_REPS},
ISIN: {fn: ISIN},
LAST: {fn: LAST},
LEN: {fn: LEN},
MAP: {fn: MAP},
MAX: {fn: MAX},
MEAN: {fn: MEAN},
MEDIAN: {fn: MEDIAN},
MODE: {fn: MODE},
OP: {fn: OP},
GET_LABELS: {fn: GET_LABELS},
APPLY_LABELS: {fn: APPLY_LABELS},
PERCENT: {fn: PERCENT},
REMOVE_DUPLICATES: {fn: REMOVE_DUPLICATES},
REPEAT: {fn: REPEAT},
ROUND: {fn: ROUND},
CONSOLE_LOG: {fn: CONSOLE_LOG},
SUM: {fn: SUM},
TODAY: {fn: TODAY},
};
}

Expand Down Expand Up @@ -1753,8 +1753,9 @@ export function TODAY(format = 'yyyy-MM-dd'): string {
* @export
* @param {*} val
*/
export function CONSOLE_LOG(val: any): void {
export function CONSOLE_LOG(val: any): any {
console.log(val);
return val;
}

/**
Expand Down
52 changes: 26 additions & 26 deletions projects/core/reports/src/xls-report/hindikit-parser.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,39 +391,39 @@ function isField(js: string): boolean {
}

const functionArgs: {[name: string]: string[]} = {
SUM: ["arg", "field", "func(form)?"],
MEAN: ["arg", "field", "func(form)?"],
MAX: ["arg", "field", "func(form)?"],
MEDIAN: ["arg", "field", "func(form)?"],
MODE: ["arg", "field", "func(form)?"],
COUNT_FORMS: ["arg", "func(form)?"],
COUNT_REPS: ["arg", "func(form)?"],
ADD_DAYS: ["arg", "arg"],
ALL_VALUES_OF: ["arg", "field", "func(form)?"],
PERCENT: ["arg", "arg"],
FIRST: ["arg", "func(form)", "field?"],
LAST: ["arg", "func(form)", "field?"],
MAP: ["arg", "func(elem)"],
INCLUDES: ["arg", "arg"],
FILTER_BY: ["arg", "func(form)"],
APPLY_LABELS: ["arg", "arg", "arg"],
APPLY: ["arg", "field", "func(form)"],
GET_AGE: ["arg"],
LEN: ["arg"],
BUILD_DATASET: ["arg", "arg?"],
COMPARE_DATE: ["arg", "arg", "arg", "arg?"],
CONCAT: ["arg", "arg"],
REMOVE_DUPLICATES: ["arg"],
CONSOLE_LOG: ["arg"],
JOIN_FORMS: ["arg", "arg", "field", "field?"],
JOIN_REPEATING_SLIDES: ["arg", "arg", "field", "field", "field", "field?"],
COUNT_FORMS: ["arg", "func(form)?"],
COUNT_REPS: ["arg", "func(form)?"],
DAYS_DIFF: ["arg", "arg"],
FILTER_BY: ["arg", "func(form)"],
FIRST: ["arg", "func(form)", "field?"],
FROM_REPS: ["arg", "func(form)"],
OP: ["arg", "arg", "func(elemA, elemB)"],
GET_AGE: ["arg"],
GET_LABELS: ["arg", "arg"],
APPLY_LABELS: ["arg", "arg", "arg"],
BUILD_DATASET: ["arg", "arg?"],
ROUND: ["arg", "arg?"],
ADD_DAYS: ["arg", "arg"],
DAYS_DIFF: ["arg", "arg"],
IS_BEFORE: ["arg", "arg"],
INCLUDES: ["arg", "arg"],
IS_AFTER: ["arg", "arg"],
IS_BEFORE: ["arg", "arg"],
IS_WITHIN_INTERVAL: ["arg", "arg", "arg"],
COMPARE_DATE: ["arg", "arg", "arg", "arg?"],
JOIN_FORMS: ["arg", "arg", "field", "field?"],
JOIN_REPEATING_SLIDES: ["arg", "arg", "field", "field", "field", "field?"],
LAST: ["arg", "func(form)", "field?"],
LEN: ["arg"],
MAP: ["arg", "func(elem)"],
MAX: ["arg", "field", "func(form)?"],
MEAN: ["arg", "field", "func(form)?"],
MEDIAN: ["arg", "field", "func(form)?"],
MODE: ["arg", "field", "func(form)?"],
OP: ["arg", "arg", "func(elemA, elemB)"],
PERCENT: ["arg", "arg"],
REMOVE_DUPLICATES: ["arg"],
ROUND: ["arg", "arg?"],
SUM: ["arg", "field", "func(form)?"],
TODAY: [],
};

0 comments on commit c37c974

Please sign in to comment.