feat(core/reports): xlsreport improvements for social balance

Author: robzan8

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

@@ -121,6 +121,10 @@ An optional expression can be added to filter which forms to consider in the com
 Computes the mean of the values of the specified field.
 An optional expression can be added to filter which forms to consider in the computation.
 
+`MIN(forms, $field, expression?)`  
+Computes the min value of the field.
+An optional expression can be added to filter which forms to consider in the computation.
+
 `MAX(forms, $field, expression?)`  
 Computes the max value of the field.
 An optional expression can be added to filter which forms to consider in the computation.

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

@@ -162,6 +162,7 @@ export class AjfExpressionUtils {
     LAST: {fn: LAST},
     LEN: {fn: LEN},
     MAP: {fn: MAP},
+    MIN: {fn: MIN},
     MAX: {fn: MAX},
     MEAN: {fn: MEAN},
     MEDIAN: {fn: MEDIAN},
@@ -1007,6 +1008,24 @@ export function LAST(
   return expression(form);
 }
 
+/**
+ * Computes the min value of the field.
+ */
+export function MIN(
+  forms: (Form | MainForm)[],
+  field: string,
+  filter: Func | string = 'true',
+): number {
+  const values = getNumericValues(forms, field, filter);
+  let min = +Infinity;
+  for (const val of values) {
+    if (val < min) {
+      min = val;
+    }
+  }
+  return min;
+}
+
 /**
  * Computes the max value of the field.
  */

projects/core/reports/src/widget-export.ts

@@ -49,6 +49,19 @@ export function exportReportXlsx(
   return exportAllWidgets(widgetInstances, iconsMap);
 }
 
+/**
+ * Checks if p is a {x, y, r?} point and eventually formats it as string.
+ */
+function formatPointData(p: any): any {
+  if (typeof p === 'object' && p !== null && p.x !== undefined && p.y !== undefined) {
+    if (p.r === undefined) {
+      return `(${p.x}, ${p.y})`;
+    }
+    return `(${p.x}, ${p.y}, ${p.r})`;
+  }
+  return p;
+}
+
 /**
  * Build xlsx data for export
  * @param widgetType
@@ -74,7 +87,7 @@ function buildXlsxData(
         const data = datasets[i].data || [];
         row.push(datasets[i].label);
         for (let j = 0; j < data.length; j++) {
-          row.push(data[j]);
+          row.push(formatPointData(data[j]));
         }
         xlsxData.push(row);
       }

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

@@ -417,6 +417,7 @@ const functionArgs: {[name: string]: string[]} = {
   LAST: ["arg", "func(form)", "field?"],
   LEN: ["arg"],
   MAP: ["arg", "func(elem)"],
+  MIN: ["arg", "field", "func(form)?"],
   MAX: ["arg", "field", "func(form)?"],
   MEAN: ["arg", "field", "func(form)?"],
   MEDIAN: ["arg", "field", "func(form)?"],

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

@@ -192,14 +192,6 @@ function alertAndThrow(err: string) {
   throw new Error(err);
 }
 
-// converts to true|undefined an option from an excel cell
-function boolOption(cell: undefined | null | string | boolean): true | undefined {
-  if (!cell || cell === 'false') {
-    return undefined;
-  }
-  return true;
-}
-
 function _buildChart(name: string, sheet: {[key: string]: string}[]): AjfWidget {
   if (sheet == null || sheet.length === 0) {
     alertAndThrow('Empty sheet for chart ' + name);
@@ -211,6 +203,12 @@ function _buildChart(name: string, sheet: {[key: string]: string}[]): AjfWidget
     'stacked',
     'beginAtZeroX',
     'beginAtZeroY',
+    'axisLabelX',
+    'axisLabelY',
+    'axisMinX',
+    'axisMinY',
+    'axisMaxX',
+    'axisMaxY',
     'removeZeroValues',
     'mainDataNumberThreshold',
   ];
@@ -247,9 +245,15 @@ function _buildChart(name: string, sheet: {[key: string]: string}[]): AjfWidget
     labelsFormula = {formula: labelsJs};
   }
 
-  const stacked = boolOption(options['stacked']);
-  const beginAtZeroX = boolOption(options['beginAtZeroX']);
-  const beginAtZeroY = boolOption(options['beginAtZeroY']);
+  const stacked = Boolean(options['stacked']);
+  const beginAtZeroX = Boolean(options['beginAtZeroX']);
+  const beginAtZeroY = Boolean(options['beginAtZeroY']);
+  const axisLabelX = options['axisLabelX'];
+  const axisLabelY = options['axisLabelY'];
+  const axisMinX = options['axisMinX'];
+  const axisMinY = options['axisMinY'];
+  const axisMaxX = options['axisMaxX'];
+  const axisMaxY = options['axisMaxY'];
   const removeZeroValues =
     options['removeZeroValues'] != null ? Boolean(options['removeZeroValues']) : true;
   const mainDataNumberThreshold =
@@ -310,11 +314,37 @@ function _buildChart(name: string, sheet: {[key: string]: string}[]): AjfWidget
   });
 
   const scales: Chart.ChartScales = {};
-  if (stacked || beginAtZeroX) {
-    scales.xAxes = [{stacked, ticks: beginAtZeroX ? {beginAtZero: true} : undefined}];
+  if (stacked || beginAtZeroX || axisMinX != null || axisMaxX != null || axisLabelX) {
+    const axisX: Chart.ChartXAxe = {
+      stacked,
+      ticks: {beginAtZero: beginAtZeroX},
+    };
+    if (axisMinX != null) {
+      axisX.ticks!.suggestedMin = Number(axisMinX);
+    }
+    if (axisMaxX != null) {
+      axisX.ticks!.suggestedMax = Number(axisMaxX);
+    }
+    if (axisLabelX) {
+      axisX.scaleLabel = {display: true, labelString: axisLabelX};
+    }
+    scales.xAxes =[axisX];
   }
-  if (stacked || beginAtZeroY) {
-    scales.yAxes = [{stacked, ticks: {beginAtZero: true}}];
+  if (stacked || beginAtZeroY || axisMinY != null || axisMaxY != null || axisLabelY) {
+    const axisY: Chart.ChartYAxe = {
+      stacked,
+      ticks: {beginAtZero: stacked || beginAtZeroY},
+    };
+    if (axisMinY != null) {
+      axisY.ticks!.suggestedMin = Number(axisMinY);
+    }
+    if (axisMaxY != null) {
+      axisY.ticks!.suggestedMax = Number(axisMaxY);
+    }
+    if (axisLabelY) {
+      axisY.scaleLabel = {display: true, labelString: axisLabelY};
+    }
+    scales.yAxes = [axisY];
   }
   return createWidget({
     name,