@eclipse-scout/chart 22.0.41 → 23.1.1

package/src/table/controls/ChartTableControlAdapter.ts

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2010, 2023 BSI Business Systems Integration AG
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+import {TableControlAdapter} from '@eclipse-scout/core';
+
+export class ChartTableControlAdapter extends TableControlAdapter {
+
+  constructor() {
+    super();
+    this._addRemoteProperties(['chartType', 'chartAggregation', 'chartGroup1', 'chartGroup2']);
+  }
+}

package/src/table/controls/ChartTableControlEventMap.ts

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2010, 2023 BSI Business Systems Integration AG
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+import {ActionEventMap, PropertyChangeEvent} from '@eclipse-scout/core';
+import {TableControlChartAggregation, TableControlChartGroup, TableControlChartType} from './ChartTableControl';
+
+export interface ChartTableControlEventMap extends ActionEventMap {
+  'propertyChange:chartAggregation': PropertyChangeEvent<TableControlChartAggregation>;
+  'propertyChange:chartGroup1': PropertyChangeEvent<TableControlChartGroup>;
+  'propertyChange:chartGroup2': PropertyChangeEvent<TableControlChartGroup>;
+  'propertyChange:chartType': PropertyChangeEvent<TableControlChartType>;
+}

package/src/table/controls/ChartTableControlLayout.ts

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2010, 2023 BSI Business Systems Integration AG
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+import {AbstractLayout, scrollbars} from '@eclipse-scout/core';
+import {ChartTableControl} from '../../index';
+
+export class ChartTableControlLayout extends AbstractLayout {
+  control: ChartTableControl;
+
+  constructor(control: ChartTableControl) {
+    super();
+    this.control = control;
+  }
+
+  override layout($container: JQuery) {
+    if (!this.control.contentRendered) {
+      return;
+    }
+    scrollbars.update(this.control.$contentContainer);
+    scrollbars.update(this.control.$xAxisSelect);
+    scrollbars.update(this.control.$yAxisSelect);
+    scrollbars.update(this.control.$dataSelect);
+  }
+}

package/src/table/controls/ChartTableControlModel.ts

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2010, 2023 BSI Business Systems Integration AG
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+import {TableControlModel} from '@eclipse-scout/core';
+import {TableControlChartAggregation, TableControlChartGroup, TableControlChartType} from './ChartTableControl';
+
+export interface ChartTableControlModel extends TableControlModel {
+  chartAggregation?: TableControlChartAggregation;
+  chartGroup1?: TableControlChartGroup;
+  chartGroup2?: TableControlChartGroup;
+  chartType?: TableControlChartType;
+}

package/src/table/controls/ChartTableUserFilter.ts

@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2010, 2023 BSI Business Systems Integration AG
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+import {arrays, TableMatrix, TableMatrixKeyAxis, TableRow, TableUserFilter, TableUserFilterAddedEventData} from '@eclipse-scout/core';
+import {ChartTableUserFilterModel} from '../../index';
+import {TableControlDeterministicKey} from './ChartTableControl';
+
+export class ChartTableUserFilter extends TableUserFilter implements ChartTableUserFilterModel {
+  declare model: ChartTableUserFilterModel;
+
+  text: string;
+  xAxis: TableMatrixKeyAxis;
+  yAxis: TableMatrixKeyAxis;
+  filters: { deterministicKey: TableControlDeterministicKey }[];
+  columnIdX: string;
+  columnIdY: string;
+
+  constructor() {
+    super();
+    this.filterType = ChartTableUserFilter.TYPE;
+    this.text = null;
+    this.xAxis = null;
+    this.yAxis = null;
+    this.filters = [];
+    this.columnIdX = null;
+    this.columnIdY = null;
+  }
+
+  static TYPE = 'CHART';
+
+  createLabel() {
+    return this.text;
+  }
+
+  override createFilterAddedEventData(): ChartTableUserFilterAddedEventData {
+    let data: ChartTableUserFilterAddedEventData = super.createFilterAddedEventData();
+    data.text = this.text;
+    data.filters = this.filters;
+    data.columnIdX = (this.xAxis && this.xAxis.column) ? this.xAxis.column.id : null;
+    data.columnIdY = (this.yAxis && this.yAxis.column) ? this.yAxis.column.id : null;
+    return data;
+  }
+
+  calculate() {
+    let matrix = new TableMatrix(this.table, this.session);
+    let columnX = this.table.columnById(this.columnIdX);
+    let axisGroupX = columnX.createFilter().axisGroup();
+    this.xAxis = matrix.addAxis(columnX, axisGroupX);
+    if (this.columnIdY) {
+      let columnY = this.table.columnById(this.columnIdY);
+      let axisGroupY = columnY.createFilter().axisGroup();
+      this.yAxis = matrix.addAxis(columnY, axisGroupY);
+    }
+    matrix.calculate();
+  }
+
+  accept(row: TableRow): boolean {
+    if (!this.xAxis) {
+      // Lazy calculation. It is not possible on init, because the table is not rendered yet.
+      this.calculate();
+    }
+    let value = this.xAxis.column.cellValueOrTextForCalculation(row);
+    let deterministicKeyX = this.xAxis.normDeterministic(value);
+
+    if (!this.yAxis) {
+      return this.filters.filter(filter => filter.deterministicKey === deterministicKeyX).length > 0;
+    }
+    value = this.yAxis.column.cellValueOrTextForCalculation(row);
+    let deterministicKeyY = this.yAxis.normDeterministic(value);
+    return this.filters.filter(filter => arrays.equals(filter.deterministicKey as (number | string)[], [deterministicKeyX, deterministicKeyY])).length > 0;
+  }
+}
+
+export type ChartTableUserFilterAddedEventData = TableUserFilterAddedEventData & {
+  filters?: { deterministicKey: TableControlDeterministicKey }[];
+  columnIdX?: string;
+  columnIdY?: string;
+};

package/src/table/controls/ChartTableUserFilterModel.ts

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2010, 2023 BSI Business Systems Integration AG
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+import {TableMatrixKeyAxis, TableUserFilterModel} from '@eclipse-scout/core';
+import {TableControlDeterministicKey} from './ChartTableControl';
+
+export interface ChartTableUserFilterModel extends TableUserFilterModel {
+  text?: string;
+  xAxis?: TableMatrixKeyAxis;
+  yAxis?: TableMatrixKeyAxis;
+  filters?: { deterministicKey: TableControlDeterministicKey }[];
+}

package/src/tile/ChartFieldTile.less

@@ -1,12 +1,11 @@
 /*
- * Copyright (c) 2010-2020 BSI Business Systems Integration AG.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2010, 2023 BSI Business Systems Integration AG
  *
- * Contributors:
- *     BSI Business Systems Integration AG - initial API and implementation
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
  */
 .tile.dashboard > .chart-field {
   .compact& {

package/src/tile/ChartFieldTile.ts

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2010, 2023 BSI Business Systems Integration AG
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+import {FormFieldTile, PropertyChangeEvent} from '@eclipse-scout/core';
+import {Chart, ChartField, ChartFieldTileModel} from '../index';
+import {ChartConfig} from '../chart/Chart';
+
+export class ChartFieldTile extends FormFieldTile implements ChartFieldTileModel {
+  declare model: ChartFieldTileModel;
+  declare tileWidget: ChartField;
+
+  protected _chartConfigChangeHandler: (event: PropertyChangeEvent<ChartConfig, Chart>) => void;
+
+  constructor() {
+    super();
+    this._chartConfigChangeHandler = this._onChartConfigChange.bind(this);
+  }
+
+  protected override _renderColorScheme() {
+    super._renderColorScheme();
+    this._updateChartColorScheme();
+  }
+
+  protected _updateChartColorScheme() {
+    let config = $.extend(true, {}, this.tileWidget.chart.config, {
+      options: {
+        colorScheme: this.colorScheme
+      }
+    });
+
+    this.tileWidget.chart.setConfig(config);
+  }
+
+  protected _onChartConfigChange(event: PropertyChangeEvent<ChartConfig, Chart>) {
+    this._updateChartColorScheme();
+  }
+
+  protected override _setTileWidget(tileWidget: ChartField) {
+    if (this.tileWidget) {
+      this.tileWidget.chart.off('propertyChange:config', this._chartConfigChangeHandler);
+    }
+    super._setTileWidget(tileWidget);
+    this.tileWidget.chart.on('propertyChange:config', this._chartConfigChangeHandler);
+  }
+}

package/src/tile/ChartFieldTileAdapter.ts

@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2010, 2023 BSI Business Systems Integration AG
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+import {FormFieldTileAdapter} from '@eclipse-scout/core';
+
+export class ChartFieldTileAdapter extends FormFieldTileAdapter {
+}

package/src/tile/ChartFieldTileModel.ts

@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2010, 2023 BSI Business Systems Integration AG
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+import {ChartField} from '../index';
+import {WidgetTileModel} from '@eclipse-scout/core';
+
+export interface ChartFieldTileModel extends WidgetTileModel {
+  tileWidget?: ChartField;
+}