@agorapulse/ui-charts 17.0.1 → 17.1.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/agorapulse-ui-charts-17.1.1.tgz +0 -0
- package/esm2022/src/lib/chart-bar/chart-bar-options.model.mjs +23 -8
- package/esm2022/src/lib/chart-bar/chart-bar.component.mjs +11 -3
- package/esm2022/src/lib/chart-column/chart-column-options.model.mjs +5 -32
- package/esm2022/src/lib/chart-column/chart-column.component.mjs +3 -2
- package/esm2022/src/lib/chart-mixed/chart-mixed-options.model.mjs +3 -4
- package/esm2022/src/lib/chart-mixed/chart-mixed.component.mjs +3 -3
- package/esm2022/src/lib/chart-options.mjs +56 -3
- package/fesm2022/agorapulse-ui-charts.mjs +94 -46
- package/fesm2022/agorapulse-ui-charts.mjs.map +1 -1
- package/package.json +1 -1
- package/src/lib/chart-bar/chart-bar-options.model.d.ts +1 -1
- package/src/lib/chart-bar/chart-bar.component.d.ts +2 -1
- package/src/lib/chart-column/chart-column-options.model.d.ts +1 -4
- package/src/lib/chart-options.d.ts +6 -1
- package/agorapulse-ui-charts-17.0.1.tgz +0 -0
|
Binary file
|
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
import { ChartOptions, mergeDeep } from '../chart-options';
|
|
2
2
|
export class ChartBarOptions extends ChartOptions {
|
|
3
|
-
static
|
|
4
|
-
const seriesOptions = {
|
|
5
|
-
borderRadiusTopLeft: 100,
|
|
6
|
-
borderRadiusTopRight: 100,
|
|
7
|
-
borderWidth: 0,
|
|
8
|
-
};
|
|
3
|
+
static buildBars(options, selectiveRoundingEnabled) {
|
|
9
4
|
const defaultColumnOptions = {
|
|
10
5
|
chart: {
|
|
11
6
|
type: 'bar',
|
|
@@ -39,9 +34,29 @@ export class ChartBarOptions extends ChartOptions {
|
|
|
39
34
|
maxPointWidth: 18,
|
|
40
35
|
pointWidth: 20,
|
|
41
36
|
},
|
|
42
|
-
series: seriesOptions,
|
|
43
37
|
},
|
|
44
38
|
};
|
|
39
|
+
defaultColumnOptions.plotOptions ??= {};
|
|
40
|
+
if (selectiveRoundingEnabled) {
|
|
41
|
+
defaultColumnOptions.plotOptions.bar ??= {};
|
|
42
|
+
defaultColumnOptions.plotOptions.bar.stacking = 'normal';
|
|
43
|
+
defaultColumnOptions.plotOptions.bar.events = {
|
|
44
|
+
hide() {
|
|
45
|
+
ChartOptions.redrawWithHighestEdgesRoundedForStackedBarChart(this.chart);
|
|
46
|
+
},
|
|
47
|
+
show() {
|
|
48
|
+
ChartOptions.redrawWithHighestEdgesRoundedForStackedBarChart(this.chart);
|
|
49
|
+
},
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
const seriesOptions = {
|
|
54
|
+
borderRadiusTopLeft: 100,
|
|
55
|
+
borderRadiusTopRight: 100,
|
|
56
|
+
borderWidth: 0,
|
|
57
|
+
};
|
|
58
|
+
defaultColumnOptions.plotOptions.series = seriesOptions;
|
|
59
|
+
}
|
|
45
60
|
return super.build(mergeDeep(defaultColumnOptions, options));
|
|
46
61
|
}
|
|
47
62
|
static configureBar(series, categories, options, opposite, color, labelDateFormat) {
|
|
@@ -84,4 +99,4 @@ export class ChartBarOptions extends ChartOptions {
|
|
|
84
99
|
}
|
|
85
100
|
}
|
|
86
101
|
}
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart-bar-options.model.js","sourceRoot":"","sources":["../../../../../../libs/ui-charts/src/lib/chart-bar/chart-bar-options.model.ts"],"names":[],"mappings":"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","sourcesContent":["import { Options, SeriesBarOptions, XAxisOptions, YAxisOptions } from 'highcharts';\nimport { ChartOptions, mergeDeep } from '../chart-options';\nimport { ChartColor } from './../chart-colors';\nimport { PlotRoundedSeriesOptions, SeriesRoundedBarOptions } from './../highchart-series.model';\n\nexport class ChartBarOptions extends ChartOptions {\n    static override build(options: Options): Options {\n        const seriesOptions: PlotRoundedSeriesOptions = {\n            borderRadiusTopLeft: 100,\n            borderRadiusTopRight: 100,\n            borderWidth: 0,\n        };\n        const defaultColumnOptions: Options = {\n            chart: {\n                type: 'bar',\n            },\n            xAxis: {\n                categories: undefined,\n                gridLineWidth: 0,\n                lineWidth: 0,\n                reversed: false,\n                tickWidth: 0,\n                labels: {\n                    align: 'center',\n                    formatter(): string {\n                        if (this.value && this.value.toString().length > 16) {\n                            return this.value.toString().substring(0, 15) + '...';\n                        }\n                        return this.value.toString();\n                    },\n                    style: {\n                        width: 100,\n                    },\n                },\n                type: 'category',\n            },\n            yAxis: {\n                type: 'linear',\n                minTickInterval: 1,\n            },\n            plotOptions: {\n                bar: {\n                    maxPointWidth: 18,\n                    pointWidth: 20,\n                },\n                series: seriesOptions,\n            },\n        };\n        return super.build(mergeDeep(defaultColumnOptions, options));\n    }\n\n    static configureBar(\n        series: SeriesBarOptions[],\n        categories: string[],\n        options: Options,\n        opposite: boolean,\n        color: ChartColor,\n        labelDateFormat?: string\n    ): void {\n        ChartOptions.configure(series, options, color, labelDateFormat);\n        if (categories && categories.length) {\n            (options.xAxis as XAxisOptions).categories = categories;\n        }\n        if (opposite && series.length === 2) {\n            const negativeSerie = series[0] as SeriesRoundedBarOptions;\n            negativeSerie.borderRadiusBottomLeft = 100;\n            negativeSerie.borderRadiusBottomRight = 100;\n            negativeSerie.borderRadiusTopLeft = 0;\n            negativeSerie.borderRadiusTopRight = 0;\n            negativeSerie.data = negativeSerie.data?.map((point: any) => {\n                if (point && isNaN(point)) {\n                    return {\n                        ...point,\n                        y: -Math.abs(point.y),\n                    };\n                } else if (!isNaN(point)) {\n                    return -Math.abs(point);\n                }\n                return point;\n            });\n            if (options.plotOptions?.series) {\n                options.plotOptions.series.stacking = 'normal';\n            }\n            const yAxisLabels = (options.yAxis as YAxisOptions).labels;\n            if (yAxisLabels) {\n                yAxisLabels.formatter = function (): string {\n                    return Math.abs(+this.value) + '%';\n                };\n            }\n            if (options.tooltip) {\n                options.tooltip.pointFormatter = function (): string {\n                    return `<div style=\"font-size: 14px; color: #344563; margin: 6px 8px 0 8px;\"><span style=\"color:${\n                        this.color\n                    };\">\\u25CF</span> ${this.series.name}: <b>${Math.abs(this.y ?? 0) + '%'}</b></div>`;\n                };\n            }\n        }\n    }\n}\n"]}
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart-bar-options.model.js","sourceRoot":"","sources":["../../../../../../libs/ui-charts/src/lib/chart-bar/chart-bar-options.model.ts"],"names":[],"mappings":"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","sourcesContent":["import { Options, SeriesBarOptions, XAxisOptions, YAxisOptions } from 'highcharts';\nimport { ChartOptions, mergeDeep } from '../chart-options';\nimport { ChartColor } from './../chart-colors';\nimport { PlotRoundedSeriesOptions, SeriesRoundedBarOptions } from './../highchart-series.model';\n\nexport class ChartBarOptions extends ChartOptions {\n    static buildBars(options: Options, selectiveRoundingEnabled: boolean): Options {\n        const defaultColumnOptions: Options = {\n            chart: {\n                type: 'bar',\n            },\n            xAxis: {\n                categories: undefined,\n                gridLineWidth: 0,\n                lineWidth: 0,\n                reversed: false,\n                tickWidth: 0,\n                labels: {\n                    align: 'center',\n                    formatter(): string {\n                        if (this.value && this.value.toString().length > 16) {\n                            return this.value.toString().substring(0, 15) + '...';\n                        }\n                        return this.value.toString();\n                    },\n                    style: {\n                        width: 100,\n                    },\n                },\n                type: 'category',\n            },\n            yAxis: {\n                type: 'linear',\n                minTickInterval: 1,\n            },\n            plotOptions: {\n                bar: {\n                    maxPointWidth: 18,\n                    pointWidth: 20,\n                },\n            },\n        };\n        defaultColumnOptions.plotOptions ??= {};\n        if (selectiveRoundingEnabled) {\n            defaultColumnOptions.plotOptions.bar ??= {};\n            defaultColumnOptions.plotOptions.bar.stacking = 'normal';\n            defaultColumnOptions.plotOptions.bar.events = {\n                hide(): void {\n                    ChartOptions.redrawWithHighestEdgesRoundedForStackedBarChart(this.chart);\n                },\n                show(): void {\n                    ChartOptions.redrawWithHighestEdgesRoundedForStackedBarChart(this.chart);\n                },\n            };\n        } else {\n            const seriesOptions: PlotRoundedSeriesOptions = {\n                borderRadiusTopLeft: 100,\n                borderRadiusTopRight: 100,\n                borderWidth: 0,\n            };\n            defaultColumnOptions.plotOptions.series = seriesOptions;\n        }\n        return super.build(mergeDeep(defaultColumnOptions, options));\n    }\n\n    static configureBar(\n        series: SeriesBarOptions[],\n        categories: string[],\n        options: Options,\n        opposite: boolean,\n        color: ChartColor,\n        labelDateFormat?: string\n    ): void {\n        ChartOptions.configure(series, options, color, labelDateFormat);\n        if (categories && categories.length) {\n            (options.xAxis as XAxisOptions).categories = categories;\n        }\n        if (opposite && series.length === 2) {\n            const negativeSerie = series[0] as SeriesRoundedBarOptions;\n            negativeSerie.borderRadiusBottomLeft = 100;\n            negativeSerie.borderRadiusBottomRight = 100;\n            negativeSerie.borderRadiusTopLeft = 0;\n            negativeSerie.borderRadiusTopRight = 0;\n            negativeSerie.data = negativeSerie.data?.map((point: any) => {\n                if (point && isNaN(point)) {\n                    return {\n                        ...point,\n                        y: -Math.abs(point.y),\n                    };\n                } else if (!isNaN(point)) {\n                    return -Math.abs(point);\n                }\n                return point;\n            });\n            if (options.plotOptions?.series) {\n                options.plotOptions.series.stacking = 'normal';\n            }\n            const yAxisLabels = (options.yAxis as YAxisOptions).labels;\n            if (yAxisLabels) {\n                yAxisLabels.formatter = function (): string {\n                    return Math.abs(+this.value) + '%';\n                };\n            }\n            if (options.tooltip) {\n                options.tooltip.pointFormatter = function (): string {\n                    return `<div style=\"font-size: 14px; color: #344563; margin: 6px 8px 0 8px;\"><span style=\"color:${\n                        this.color\n                    };\">\\u25CF</span> ${this.series.name}: <b>${Math.abs(this.y ?? 0) + '%'}</b></div>`;\n                };\n            }\n        }\n    }\n}\n"]}
|
|
@@ -1,21 +1,27 @@
|
|
|
1
1
|
import { Component, Input } from '@angular/core';
|
|
2
2
|
import { Chart } from 'highcharts';
|
|
3
|
+
import { ChartOptions } from '../../..';
|
|
3
4
|
import { AbstractChartComponent } from '../abstract-chart.component';
|
|
4
5
|
import { ChartBarOptions } from './chart-bar-options.model';
|
|
5
6
|
import * as i0 from "@angular/core";
|
|
6
7
|
export class ChartBarComponent extends AbstractChartComponent {
|
|
7
8
|
categories = [];
|
|
8
9
|
opposite = false;
|
|
10
|
+
stacked = false;
|
|
9
11
|
series = [];
|
|
10
12
|
initChart() {
|
|
11
13
|
if (this.series) {
|
|
12
|
-
const
|
|
14
|
+
const selectiveRoundingEnabled = this.stacked && !this.opposite;
|
|
15
|
+
const chartOptions = ChartBarOptions.buildBars(this.chartOptions, selectiveRoundingEnabled);
|
|
13
16
|
ChartBarOptions.configureBar(this.series, this.categories, chartOptions, this.opposite, this.color, this.labelDateFormat);
|
|
14
17
|
this.chart = new Chart(this.chartRef.nativeElement, chartOptions);
|
|
18
|
+
if (this.chart && selectiveRoundingEnabled) {
|
|
19
|
+
ChartOptions.redrawWithHighestEdgesRoundedForStackedBarChart(this.chart);
|
|
20
|
+
}
|
|
15
21
|
}
|
|
16
22
|
}
|
|
17
23
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ChartBarComponent, deps: null, target: i0.ɵɵFactoryTarget.Component });
|
|
18
|
-
static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.3.3", type: ChartBarComponent, isStandalone: true, selector: "ap-chart-bar", inputs: { categories: "categories", opposite: "opposite", series: "series" }, usesInheritance: true, ngImport: i0, template: "<div #chart></div>\n" });
|
|
24
|
+
static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.3.3", type: ChartBarComponent, isStandalone: true, selector: "ap-chart-bar", inputs: { categories: "categories", opposite: "opposite", stacked: "stacked", series: "series" }, usesInheritance: true, ngImport: i0, template: "<div #chart></div>\n" });
|
|
19
25
|
}
|
|
20
26
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImport: i0, type: ChartBarComponent, decorators: [{
|
|
21
27
|
type: Component,
|
|
@@ -24,7 +30,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
|
|
|
24
30
|
type: Input
|
|
25
31
|
}], opposite: [{
|
|
26
32
|
type: Input
|
|
33
|
+
}], stacked: [{
|
|
34
|
+
type: Input
|
|
27
35
|
}], series: [{
|
|
28
36
|
type: Input
|
|
29
37
|
}] } });
|
|
30
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
38
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhcnQtYmFyLmNvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL2xpYnMvdWktY2hhcnRzL3NyYy9saWIvY2hhcnQtYmFyL2NoYXJ0LWJhci5jb21wb25lbnQudHMiLCIuLi8uLi8uLi8uLi8uLi8uLi9saWJzL3VpLWNoYXJ0cy9zcmMvbGliL2NoYXJ0LWJhci9jaGFydC1iYXIuY29tcG9uZW50Lmh0bWwiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxLQUFLLEVBQUUsTUFBTSxlQUFlLENBQUM7QUFDakQsT0FBTyxFQUFFLEtBQUssRUFBb0IsTUFBTSxZQUFZLENBQUM7QUFDckQsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLFVBQVUsQ0FBQztBQUN4QyxPQUFPLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSw2QkFBNkIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sMkJBQTJCLENBQUM7O0FBTzVELE1BQU0sT0FBTyxpQkFBa0IsU0FBUSxzQkFBc0I7SUFDaEQsVUFBVSxHQUFhLEVBQUUsQ0FBQztJQUMxQixRQUFRLEdBQVksS0FBSyxDQUFDO0lBQzFCLE9BQU8sR0FBWSxLQUFLLENBQUM7SUFDaEIsTUFBTSxHQUF1QixFQUFFLENBQUM7SUFFbEQsU0FBUztRQUNMLElBQUksSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ2QsTUFBTSx3QkFBd0IsR0FBRyxJQUFJLENBQUMsT0FBTyxJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQztZQUNoRSxNQUFNLFlBQVksR0FBRyxlQUFlLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxZQUFZLEVBQUUsd0JBQXdCLENBQUMsQ0FBQztZQUM1RixlQUFlLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxDQUFDLFVBQVUsRUFBRSxZQUFZLEVBQUUsSUFBSSxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsS0FBSyxFQUFFLElBQUksQ0FBQyxlQUFlLENBQUMsQ0FBQztZQUMxSCxJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksS0FBSyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsYUFBYSxFQUFFLFlBQVksQ0FBQyxDQUFDO1lBQ2xFLElBQUksSUFBSSxDQUFDLEtBQUssSUFBSSx3QkFBd0IsRUFBRSxDQUFDO2dCQUN6QyxZQUFZLENBQUMsK0NBQStDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1lBQzdFLENBQUM7UUFDTCxDQUFDO0lBQ0wsQ0FBQzt1R0FoQlEsaUJBQWlCOzJGQUFqQixpQkFBaUIsaU1DWDlCLHNCQUNBOzsyRkRVYSxpQkFBaUI7a0JBTDdCLFNBQVM7K0JBQ0ksY0FBYyxjQUVaLElBQUk7OEJBR1AsVUFBVTtzQkFBbEIsS0FBSztnQkFDRyxRQUFRO3NCQUFoQixLQUFLO2dCQUNHLE9BQU87c0JBQWYsS0FBSztnQkFDWSxNQUFNO3NCQUF2QixLQUFLIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29tcG9uZW50LCBJbnB1dCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQ2hhcnQsIFNlcmllc0Jhck9wdGlvbnMgfSBmcm9tICdoaWdoY2hhcnRzJztcbmltcG9ydCB7IENoYXJ0T3B0aW9ucyB9IGZyb20gJy4uLy4uLy4uJztcbmltcG9ydCB7IEFic3RyYWN0Q2hhcnRDb21wb25lbnQgfSBmcm9tICcuLi9hYnN0cmFjdC1jaGFydC5jb21wb25lbnQnO1xuaW1wb3J0IHsgQ2hhcnRCYXJPcHRpb25zIH0gZnJvbSAnLi9jaGFydC1iYXItb3B0aW9ucy5tb2RlbCc7XG5cbkBDb21wb25lbnQoe1xuICAgIHNlbGVjdG9yOiAnYXAtY2hhcnQtYmFyJyxcbiAgICB0ZW1wbGF0ZVVybDogJy4vY2hhcnQtYmFyLmNvbXBvbmVudC5odG1sJyxcbiAgICBzdGFuZGFsb25lOiB0cnVlLFxufSlcbmV4cG9ydCBjbGFzcyBDaGFydEJhckNvbXBvbmVudCBleHRlbmRzIEFic3RyYWN0Q2hhcnRDb21wb25lbnQge1xuICAgIEBJbnB1dCgpIGNhdGVnb3JpZXM6IHN0cmluZ1tdID0gW107XG4gICAgQElucHV0KCkgb3Bwb3NpdGU6IGJvb2xlYW4gPSBmYWxzZTtcbiAgICBASW5wdXQoKSBzdGFja2VkOiBib29sZWFuID0gZmFsc2U7XG4gICAgQElucHV0KCkgb3ZlcnJpZGUgc2VyaWVzOiBTZXJpZXNCYXJPcHRpb25zW10gPSBbXTtcblxuICAgIGluaXRDaGFydCgpOiB2b2lkIHtcbiAgICAgICAgaWYgKHRoaXMuc2VyaWVzKSB7XG4gICAgICAgICAgICBjb25zdCBzZWxlY3RpdmVSb3VuZGluZ0VuYWJsZWQgPSB0aGlzLnN0YWNrZWQgJiYgIXRoaXMub3Bwb3NpdGU7XG4gICAgICAgICAgICBjb25zdCBjaGFydE9wdGlvbnMgPSBDaGFydEJhck9wdGlvbnMuYnVpbGRCYXJzKHRoaXMuY2hhcnRPcHRpb25zLCBzZWxlY3RpdmVSb3VuZGluZ0VuYWJsZWQpO1xuICAgICAgICAgICAgQ2hhcnRCYXJPcHRpb25zLmNvbmZpZ3VyZUJhcih0aGlzLnNlcmllcywgdGhpcy5jYXRlZ29yaWVzLCBjaGFydE9wdGlvbnMsIHRoaXMub3Bwb3NpdGUsIHRoaXMuY29sb3IsIHRoaXMubGFiZWxEYXRlRm9ybWF0KTtcbiAgICAgICAgICAgIHRoaXMuY2hhcnQgPSBuZXcgQ2hhcnQodGhpcy5jaGFydFJlZi5uYXRpdmVFbGVtZW50LCBjaGFydE9wdGlvbnMpO1xuICAgICAgICAgICAgaWYgKHRoaXMuY2hhcnQgJiYgc2VsZWN0aXZlUm91bmRpbmdFbmFibGVkKSB7XG4gICAgICAgICAgICAgICAgQ2hhcnRPcHRpb25zLnJlZHJhd1dpdGhIaWdoZXN0RWRnZXNSb3VuZGVkRm9yU3RhY2tlZEJhckNoYXJ0KHRoaXMuY2hhcnQpO1xuICAgICAgICAgICAgfVxuICAgICAgICB9XG4gICAgfVxufVxuIiwiPGRpdiAjY2hhcnQ+PC9kaXY+XG4iXX0=
|
|
@@ -16,10 +16,10 @@ export class ChartColumnOptions extends ChartOptions {
|
|
|
16
16
|
maxPointWidth: 20,
|
|
17
17
|
events: {
|
|
18
18
|
hide() {
|
|
19
|
-
|
|
19
|
+
ChartOptions.redrawWithHighestEdgesRounded(this.chart);
|
|
20
20
|
},
|
|
21
21
|
show() {
|
|
22
|
-
|
|
22
|
+
ChartOptions.redrawWithHighestEdgesRounded(this.chart);
|
|
23
23
|
},
|
|
24
24
|
},
|
|
25
25
|
},
|
|
@@ -40,10 +40,10 @@ export class ChartColumnOptions extends ChartOptions {
|
|
|
40
40
|
column: {
|
|
41
41
|
events: {
|
|
42
42
|
hide() {
|
|
43
|
-
|
|
43
|
+
ChartOptions.redrawWithHighestEdgesRounded(this.chart);
|
|
44
44
|
},
|
|
45
45
|
show() {
|
|
46
|
-
|
|
46
|
+
ChartOptions.redrawWithHighestEdgesRounded(this.chart);
|
|
47
47
|
},
|
|
48
48
|
},
|
|
49
49
|
},
|
|
@@ -71,32 +71,5 @@ export class ChartColumnOptions extends ChartOptions {
|
|
|
71
71
|
};
|
|
72
72
|
return super.build(mergeDeep(simple ? simpleColumnOptions : defaultColumnOptions, options));
|
|
73
73
|
}
|
|
74
|
-
static redrawWithRoundedColumns(chart) {
|
|
75
|
-
chart.series.forEach((serie, serieIndex, arr) => {
|
|
76
|
-
ChartColumnOptions.roundSerie(arr, serie.options, serieIndex);
|
|
77
|
-
});
|
|
78
|
-
chart.redraw(true);
|
|
79
|
-
}
|
|
80
|
-
static roundSerie(series, serie, serieIndex) {
|
|
81
|
-
const roundedOptionMap = [];
|
|
82
|
-
let borderRadius = 0;
|
|
83
|
-
if (serie.data) {
|
|
84
|
-
serie.data.forEach((point, columnIndex) => {
|
|
85
|
-
// Check if all previous stacked data at the same abscissa (located higher on the graph) are missing or have a value of 0
|
|
86
|
-
// if so, it means that this point is the visual top of the column, so we should round it
|
|
87
|
-
const roundedColumnEnabled = series.slice(0, serieIndex).every(otherSerie => {
|
|
88
|
-
if (otherSerie.visible === false) {
|
|
89
|
-
return true;
|
|
90
|
-
}
|
|
91
|
-
const pointAtSameAbscissa = otherSerie.options.data?.find(otherPoint => otherPoint[0] === point[0]);
|
|
92
|
-
return !pointAtSameAbscissa || pointAtSameAbscissa[1] === 0;
|
|
93
|
-
});
|
|
94
|
-
borderRadius = roundedColumnEnabled ? 100 : 0;
|
|
95
|
-
roundedOptionMap[columnIndex] = borderRadius;
|
|
96
|
-
});
|
|
97
|
-
serie.borderRadiusTopLeft = roundedOptionMap;
|
|
98
|
-
serie.borderRadiusTopRight = roundedOptionMap;
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
74
|
}
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
75
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhcnQtY29sdW1uLW9wdGlvbnMubW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9saWJzL3VpLWNoYXJ0cy9zcmMvbGliL2NoYXJ0LWNvbHVtbi9jaGFydC1jb2x1bW4tb3B0aW9ucy5tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFXLE1BQU0sWUFBWSxDQUFDO0FBQ2pELE9BQU8sRUFBRSxZQUFZLEVBQUUsU0FBUyxFQUFFLE1BQU0sa0JBQWtCLENBQUM7QUFFM0QsTUFBTSxPQUFPLGtCQUFtQixTQUFRLFlBQVk7SUFDaEQsTUFBTSxDQUFDLFdBQVcsQ0FBQyxPQUFnQixFQUFFLE1BQWU7UUFDaEQsTUFBTSxvQkFBb0IsR0FBWTtZQUNsQyxLQUFLLEVBQUU7Z0JBQ0gsSUFBSSxFQUFFLFFBQVE7YUFDakI7WUFDRCxNQUFNLEVBQUU7Z0JBQ0osWUFBWSxFQUFFLEVBQUU7YUFDbkI7WUFDRCxXQUFXLEVBQUU7Z0JBQ1QsTUFBTSxFQUFFO29CQUNKLFFBQVEsRUFBRSxRQUFRO29CQUNsQixXQUFXLEVBQUUsQ0FBQztvQkFDZCxhQUFhLEVBQUUsRUFBRTtvQkFDakIsTUFBTSxFQUFFO3dCQUNKLElBQUk7NEJBQ0EsWUFBWSxDQUFDLDZCQUE2QixDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQzt3QkFDM0QsQ0FBQzt3QkFDRCxJQUFJOzRCQUNBLFlBQVksQ0FBQyw2QkFBNkIsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7d0JBQzNELENBQUM7cUJBQ0o7aUJBQ0o7YUFDSjtZQUNELEtBQUssRUFBRTtnQkFDSCxJQUFJLEVBQUUsVUFBVTthQUNuQjtTQUNKLENBQUM7UUFDRixNQUFNLG1CQUFtQixHQUFZO1lBQ2pDLEtBQUssRUFBRTtnQkFDSCxJQUFJLEVBQUUsUUFBUTtnQkFDZCxNQUFNLEVBQUUsTUFBTTthQUNqQjtZQUNELE9BQU8sRUFBRTtnQkFDTCxPQUFPLEVBQUUsS0FBSzthQUNqQjtZQUNELFdBQVcsRUFBRTtnQkFDVCxNQUFNLEVBQUU7b0JBQ0osTUFBTSxFQUFFO3dCQUNKLElBQUk7NEJBQ0EsWUFBWSxDQUFDLDZCQUE2QixDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQzt3QkFDM0QsQ0FBQzt3QkFDRCxJQUFJOzRCQUNBLFlBQVksQ0FBQyw2QkFBNkIsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7d0JBQzNELENBQUM7cUJBQ0o7aUJBQ0o7YUFDSjtZQUNELEtBQUssRUFBRTtnQkFDSCxJQUFJLEVBQUUsVUFBVTtnQkFDaEIsU0FBUyxFQUFFLElBQUk7Z0JBQ2YsTUFBTSxFQUFFO29CQUNKLE9BQU8sRUFBRSxLQUFLO29CQUNkLFNBQVM7d0JBQ0wsT0FBTyxVQUFVLENBQUMsT0FBTyxFQUFFLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO29CQUM1QyxDQUFDO2lCQUNKO2dCQUNELFNBQVMsRUFBRSxDQUFDO2dCQUNaLFNBQVMsRUFBRSxDQUFDO2dCQUNaLGFBQWEsRUFBRSxDQUFDO2FBQ25CO1lBQ0QsS0FBSyxFQUFFO2dCQUNILEdBQUcsRUFBRSxDQUFDO2dCQUNOLE1BQU0sRUFBRTtvQkFDSixPQUFPLEVBQUUsS0FBSztpQkFDakI7Z0JBQ0QsYUFBYSxFQUFFLENBQUM7YUFDbkI7U0FDSixDQUFDO1FBQ0YsT0FBTyxLQUFLLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLG1CQUFtQixDQUFDLENBQUMsQ0FBQyxvQkFBb0IsRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDO0lBQ2hHLENBQUM7Q0FDSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGRhdGVGb3JtYXQsIE9wdGlvbnMgfSBmcm9tICdoaWdoY2hhcnRzJztcbmltcG9ydCB7IENoYXJ0T3B0aW9ucywgbWVyZ2VEZWVwIH0gZnJvbSAnLi4vY2hhcnQtb3B0aW9ucyc7XG5cbmV4cG9ydCBjbGFzcyBDaGFydENvbHVtbk9wdGlvbnMgZXh0ZW5kcyBDaGFydE9wdGlvbnMge1xuICAgIHN0YXRpYyBidWlsZENvbHVtbihvcHRpb25zOiBPcHRpb25zLCBzaW1wbGU6IGJvb2xlYW4pOiBPcHRpb25zIHtcbiAgICAgICAgY29uc3QgZGVmYXVsdENvbHVtbk9wdGlvbnM6IE9wdGlvbnMgPSB7XG4gICAgICAgICAgICBjaGFydDoge1xuICAgICAgICAgICAgICAgIHR5cGU6ICdjb2x1bW4nLFxuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIGxlZ2VuZDoge1xuICAgICAgICAgICAgICAgIHN5bWJvbEhlaWdodDogMTAsXG4gICAgICAgICAgICB9LFxuICAgICAgICAgICAgcGxvdE9wdGlvbnM6IHtcbiAgICAgICAgICAgICAgICBjb2x1bW46IHtcbiAgICAgICAgICAgICAgICAgICAgc3RhY2tpbmc6ICdub3JtYWwnLFxuICAgICAgICAgICAgICAgICAgICBib3JkZXJXaWR0aDogMCxcbiAgICAgICAgICAgICAgICAgICAgbWF4UG9pbnRXaWR0aDogMjAsXG4gICAgICAgICAgICAgICAgICAgIGV2ZW50czoge1xuICAgICAgICAgICAgICAgICAgICAgICAgaGlkZSgpOiB2b2lkIHtcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICBDaGFydE9wdGlvbnMucmVkcmF3V2l0aEhpZ2hlc3RFZGdlc1JvdW5kZWQodGhpcy5jaGFydCk7XG4gICAgICAgICAgICAgICAgICAgICAgICB9LFxuICAgICAgICAgICAgICAgICAgICAgICAgc2hvdygpOiB2b2lkIHtcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICBDaGFydE9wdGlvbnMucmVkcmF3V2l0aEhpZ2hlc3RFZGdlc1JvdW5kZWQodGhpcy5jaGFydCk7XG4gICAgICAgICAgICAgICAgICAgICAgICB9LFxuICAgICAgICAgICAgICAgICAgICB9LFxuICAgICAgICAgICAgICAgIH0sXG4gICAgICAgICAgICB9LFxuICAgICAgICAgICAgeEF4aXM6IHtcbiAgICAgICAgICAgICAgICB0eXBlOiAnZGF0ZXRpbWUnLFxuICAgICAgICAgICAgfSxcbiAgICAgICAgfTtcbiAgICAgICAgY29uc3Qgc2ltcGxlQ29sdW1uT3B0aW9uczogT3B0aW9ucyA9IHtcbiAgICAgICAgICAgIGNoYXJ0OiB7XG4gICAgICAgICAgICAgICAgdHlwZTogJ2NvbHVtbicsXG4gICAgICAgICAgICAgICAgaGVpZ2h0OiAnODBweCcsXG4gICAgICAgICAgICB9LFxuICAgICAgICAgICAgY3JlZGl0czoge1xuICAgICAgICAgICAgICAgIGVuYWJsZWQ6IGZhbHNlLFxuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIHBsb3RPcHRpb25zOiB7XG4gICAgICAgICAgICAgICAgY29sdW1uOiB7XG4gICAgICAgICAgICAgICAgICAgIGV2ZW50czoge1xuICAgICAgICAgICAgICAgICAgICAgICAgaGlkZSgpOiB2b2lkIHtcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICBDaGFydE9wdGlvbnMucmVkcmF3V2l0aEhpZ2hlc3RFZGdlc1JvdW5kZWQodGhpcy5jaGFydCk7XG4gICAgICAgICAgICAgICAgICAgICAgICB9LFxuICAgICAgICAgICAgICAgICAgICAgICAgc2hvdygpOiB2b2lkIHtcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICBDaGFydE9wdGlvbnMucmVkcmF3V2l0aEhpZ2hlc3RFZGdlc1JvdW5kZWQodGhpcy5jaGFydCk7XG4gICAgICAgICAgICAgICAgICAgICAgICB9LFxuICAgICAgICAgICAgICAgICAgICB9LFxuICAgICAgICAgICAgICAgIH0sXG4gICAgICAgICAgICB9LFxuICAgICAgICAgICAgeEF4aXM6IHtcbiAgICAgICAgICAgICAgICB0eXBlOiAnZGF0ZXRpbWUnLFxuICAgICAgICAgICAgICAgIGNyb3NzaGFpcjogdHJ1ZSxcbiAgICAgICAgICAgICAgICBsYWJlbHM6IHtcbiAgICAgICAgICAgICAgICAgICAgZW5hYmxlZDogZmFsc2UsXG4gICAgICAgICAgICAgICAgICAgIGZvcm1hdHRlcigpOiBzdHJpbmcge1xuICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGRhdGVGb3JtYXQoJyVtLyVkJywgK3RoaXMudmFsdWUpO1xuICAgICAgICAgICAgICAgICAgICB9LFxuICAgICAgICAgICAgICAgIH0sXG4gICAgICAgICAgICAgICAgbGluZVdpZHRoOiAwLFxuICAgICAgICAgICAgICAgIHRpY2tXaWR0aDogMCxcbiAgICAgICAgICAgICAgICBncmlkTGluZVdpZHRoOiAwLFxuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIHlBeGlzOiB7XG4gICAgICAgICAgICAgICAgbWluOiAwLFxuICAgICAgICAgICAgICAgIGxhYmVsczoge1xuICAgICAgICAgICAgICAgICAgICBlbmFibGVkOiBmYWxzZSxcbiAgICAgICAgICAgICAgICB9LFxuICAgICAgICAgICAgICAgIGdyaWRMaW5lV2lkdGg6IDAsXG4gICAgICAgICAgICB9LFxuICAgICAgICB9O1xuICAgICAgICByZXR1cm4gc3VwZXIuYnVpbGQobWVyZ2VEZWVwKHNpbXBsZSA/IHNpbXBsZUNvbHVtbk9wdGlvbnMgOiBkZWZhdWx0Q29sdW1uT3B0aW9ucywgb3B0aW9ucykpO1xuICAgIH1cbn1cbiJdfQ==
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Component, EventEmitter, Input, Output } from '@angular/core';
|
|
2
2
|
import { Chart } from 'highcharts';
|
|
3
|
+
import { ChartOptions } from '../../..';
|
|
3
4
|
import { AbstractChartComponent } from '../abstract-chart.component';
|
|
4
5
|
import { ChartColumnOptions } from './chart-column-options.model';
|
|
5
6
|
import * as i0 from "@angular/core";
|
|
@@ -13,7 +14,7 @@ export class ChartColumnComponent extends AbstractChartComponent {
|
|
|
13
14
|
ChartColumnOptions.configure(this.series, chartOptions, this.color, this.labelDateFormat);
|
|
14
15
|
this.chart = new Chart(this.chartRef.nativeElement, chartOptions);
|
|
15
16
|
if (this.chart) {
|
|
16
|
-
|
|
17
|
+
ChartOptions.redrawWithHighestEdgesRounded(this.chart);
|
|
17
18
|
}
|
|
18
19
|
this.chartInitialized.emit(this.chart);
|
|
19
20
|
}
|
|
@@ -31,4 +32,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
|
|
|
31
32
|
}], chartInitialized: [{
|
|
32
33
|
type: Output
|
|
33
34
|
}] } });
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
35
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhcnQtY29sdW1uLmNvbXBvbmVudC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL2xpYnMvdWktY2hhcnRzL3NyYy9saWIvY2hhcnQtY29sdW1uL2NoYXJ0LWNvbHVtbi5jb21wb25lbnQudHMiLCIuLi8uLi8uLi8uLi8uLi8uLi9saWJzL3VpLWNoYXJ0cy9zcmMvbGliL2NoYXJ0LWNvbHVtbi9jaGFydC1jb2x1bW4uY29tcG9uZW50Lmh0bWwiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFNBQVMsRUFBRSxZQUFZLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLGVBQWUsQ0FBQztBQUN2RSxPQUFPLEVBQUUsS0FBSyxFQUF1QixNQUFNLFlBQVksQ0FBQztBQUN4RCxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sVUFBVSxDQUFDO0FBQ3hDLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDZCQUE2QixDQUFDO0FBQ3JFLE9BQU8sRUFBRSxrQkFBa0IsRUFBRSxNQUFNLDhCQUE4QixDQUFDOztBQU9sRSxNQUFNLE9BQU8sb0JBQXFCLFNBQVEsc0JBQXNCO0lBQzFDLE1BQU0sR0FBMEIsRUFBRSxDQUFDO0lBQzVDLE1BQU0sR0FBRyxLQUFLLENBQUM7SUFDZCxnQkFBZ0IsR0FBd0IsSUFBSSxZQUFZLEVBQUUsQ0FBQztJQUVyRSxTQUFTO1FBQ0wsSUFBSSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUM7WUFDZCxNQUFNLFlBQVksR0FBRyxrQkFBa0IsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLFlBQVksRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDcEYsa0JBQWtCLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsWUFBWSxFQUFFLElBQUksQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLGVBQWUsQ0FBQyxDQUFDO1lBQzFGLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxLQUFLLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsWUFBWSxDQUFDLENBQUM7WUFDbEUsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ2IsWUFBWSxDQUFDLDZCQUE2QixDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUMzRCxDQUFDO1lBQ0QsSUFBSSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDM0MsQ0FBQztJQUNMLENBQUM7dUdBZlEsb0JBQW9COzJGQUFwQixvQkFBb0IscU1DWGpDLHNCQUNBOzsyRkRVYSxvQkFBb0I7a0JBTGhDLFNBQVM7K0JBQ0ksaUJBQWlCLGNBRWYsSUFBSTs4QkFHRSxNQUFNO3NCQUF2QixLQUFLO2dCQUNHLE1BQU07c0JBQWQsS0FBSztnQkFDSSxnQkFBZ0I7c0JBQXpCLE1BQU0iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDb21wb25lbnQsIEV2ZW50RW1pdHRlciwgSW5wdXQsIE91dHB1dCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQ2hhcnQsIFNlcmllc0NvbHVtbk9wdGlvbnMgfSBmcm9tICdoaWdoY2hhcnRzJztcbmltcG9ydCB7IENoYXJ0T3B0aW9ucyB9IGZyb20gJy4uLy4uLy4uJztcbmltcG9ydCB7IEFic3RyYWN0Q2hhcnRDb21wb25lbnQgfSBmcm9tICcuLi9hYnN0cmFjdC1jaGFydC5jb21wb25lbnQnO1xuaW1wb3J0IHsgQ2hhcnRDb2x1bW5PcHRpb25zIH0gZnJvbSAnLi9jaGFydC1jb2x1bW4tb3B0aW9ucy5tb2RlbCc7XG5cbkBDb21wb25lbnQoe1xuICAgIHNlbGVjdG9yOiAnYXAtY2hhcnQtY29sdW1uJyxcbiAgICB0ZW1wbGF0ZVVybDogJy4vY2hhcnQtY29sdW1uLmNvbXBvbmVudC5odG1sJyxcbiAgICBzdGFuZGFsb25lOiB0cnVlLFxufSlcbmV4cG9ydCBjbGFzcyBDaGFydENvbHVtbkNvbXBvbmVudCBleHRlbmRzIEFic3RyYWN0Q2hhcnRDb21wb25lbnQge1xuICAgIEBJbnB1dCgpIG92ZXJyaWRlIHNlcmllczogU2VyaWVzQ29sdW1uT3B0aW9uc1tdID0gW107XG4gICAgQElucHV0KCkgc2ltcGxlID0gZmFsc2U7XG4gICAgQE91dHB1dCgpIGNoYXJ0SW5pdGlhbGl6ZWQ6IEV2ZW50RW1pdHRlcjxDaGFydD4gPSBuZXcgRXZlbnRFbWl0dGVyKCk7XG5cbiAgICBpbml0Q2hhcnQoKTogdm9pZCB7XG4gICAgICAgIGlmICh0aGlzLnNlcmllcykge1xuICAgICAgICAgICAgY29uc3QgY2hhcnRPcHRpb25zID0gQ2hhcnRDb2x1bW5PcHRpb25zLmJ1aWxkQ29sdW1uKHRoaXMuY2hhcnRPcHRpb25zLCB0aGlzLnNpbXBsZSk7XG4gICAgICAgICAgICBDaGFydENvbHVtbk9wdGlvbnMuY29uZmlndXJlKHRoaXMuc2VyaWVzLCBjaGFydE9wdGlvbnMsIHRoaXMuY29sb3IsIHRoaXMubGFiZWxEYXRlRm9ybWF0KTtcbiAgICAgICAgICAgIHRoaXMuY2hhcnQgPSBuZXcgQ2hhcnQodGhpcy5jaGFydFJlZi5uYXRpdmVFbGVtZW50LCBjaGFydE9wdGlvbnMpO1xuICAgICAgICAgICAgaWYgKHRoaXMuY2hhcnQpIHtcbiAgICAgICAgICAgICAgICBDaGFydE9wdGlvbnMucmVkcmF3V2l0aEhpZ2hlc3RFZGdlc1JvdW5kZWQodGhpcy5jaGFydCk7XG4gICAgICAgICAgICB9XG4gICAgICAgICAgICB0aGlzLmNoYXJ0SW5pdGlhbGl6ZWQuZW1pdCh0aGlzLmNoYXJ0KTtcbiAgICAgICAgfVxuICAgIH1cbn1cbiIsIjxkaXYgI2NoYXJ0PjwvZGl2PlxuIl19
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { ChartColumnOptions } from '../chart-column/chart-column-options.model';
|
|
2
1
|
import { ChartOptions, mergeDeep } from '../chart-options';
|
|
3
2
|
export class ChartMixedOptions extends ChartOptions {
|
|
4
3
|
static buildMixed(options, singleDayEnabled) {
|
|
@@ -23,10 +22,10 @@ export class ChartMixedOptions extends ChartOptions {
|
|
|
23
22
|
maxPointWidth: 20,
|
|
24
23
|
events: {
|
|
25
24
|
hide() {
|
|
26
|
-
|
|
25
|
+
ChartOptions.redrawWithHighestEdgesRounded(this.chart);
|
|
27
26
|
},
|
|
28
27
|
show() {
|
|
29
|
-
|
|
28
|
+
ChartOptions.redrawWithHighestEdgesRounded(this.chart);
|
|
30
29
|
},
|
|
31
30
|
},
|
|
32
31
|
},
|
|
@@ -38,4 +37,4 @@ export class ChartMixedOptions extends ChartOptions {
|
|
|
38
37
|
return super.build(mergeDeep(defaultOptions, options));
|
|
39
38
|
}
|
|
40
39
|
}
|
|
41
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhcnQtbWl4ZWQtb3B0aW9ucy5tb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL2xpYnMvdWktY2hhcnRzL3NyYy9saWIvY2hhcnQtbWl4ZWQvY2hhcnQtbWl4ZWQtb3B0aW9ucy5tb2RlbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFDQSxPQUFPLEVBQUUsWUFBWSxFQUFFLFNBQVMsRUFBRSxNQUFNLGtCQUFrQixDQUFDO0FBRTNELE1BQU0sT0FBTyxpQkFBa0IsU0FBUSxZQUFZO0lBQy9DLE1BQU0sQ0FBQyxVQUFVLENBQUMsT0FBZ0IsRUFBRSxnQkFBeUI7UUFDekQsTUFBTSxjQUFjLEdBQVk7WUFDNUIsS0FBSyxFQUFFO2dCQUNILElBQUksRUFBRSxRQUFRO2FBQ2pCO1lBQ0QsTUFBTSxFQUFFO2dCQUNKLFlBQVksRUFBRSxFQUFFO2FBQ25CO1lBQ0QsV0FBVyxFQUFFO2dCQUNULE1BQU0sRUFBRTtvQkFDSixNQUFNLEVBQUU7d0JBQ0osT0FBTyxFQUFFLGdCQUFnQjt3QkFDekIsTUFBTSxFQUFFLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7d0JBQ2hDLE1BQU0sRUFBRSxRQUFRO3FCQUNuQjtpQkFDSjtnQkFDRCxNQUFNLEVBQUU7b0JBQ0osUUFBUSxFQUFFLFFBQVE7b0JBQ2xCLFdBQVcsRUFBRSxDQUFDO29CQUNkLGFBQWEsRUFBRSxFQUFFO29CQUNqQixNQUFNLEVBQUU7d0JBQ0osSUFBSTs0QkFDQSxZQUFZLENBQUMsNkJBQTZCLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO3dCQUMzRCxDQUFDO3dCQUNELElBQUk7NEJBQ0EsWUFBWSxDQUFDLDZCQUE2QixDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQzt3QkFDM0QsQ0FBQztxQkFDSjtpQkFDSjthQUNKO1lBQ0QsS0FBSyxFQUFFO2dCQUNILElBQUksRUFBRSxVQUFVO2FBQ25CO1NBQ0osQ0FBQztRQUNGLE9BQU8sS0FBSyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsY0FBYyxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7SUFDM0QsQ0FBQztDQUNKIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgT3B0aW9ucyB9IGZyb20gJ2hpZ2hjaGFydHMnO1xuaW1wb3J0IHsgQ2hhcnRPcHRpb25zLCBtZXJnZURlZXAgfSBmcm9tICcuLi9jaGFydC1vcHRpb25zJztcblxuZXhwb3J0IGNsYXNzIENoYXJ0TWl4ZWRPcHRpb25zIGV4dGVuZHMgQ2hhcnRPcHRpb25zIHtcbiAgICBzdGF0aWMgYnVpbGRNaXhlZChvcHRpb25zOiBPcHRpb25zLCBzaW5nbGVEYXlFbmFibGVkOiBib29sZWFuKTogT3B0aW9ucyB7XG4gICAgICAgIGNvbnN0IGRlZmF1bHRPcHRpb25zOiBPcHRpb25zID0ge1xuICAgICAgICAgICAgY2hhcnQ6IHtcbiAgICAgICAgICAgICAgICB0eXBlOiAnY29sdW1uJyxcbiAgICAgICAgICAgIH0sXG4gICAgICAgICAgICBsZWdlbmQ6IHtcbiAgICAgICAgICAgICAgICBzeW1ib2xIZWlnaHQ6IDEwLFxuICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIHBsb3RPcHRpb25zOiB7XG4gICAgICAgICAgICAgICAgc2VyaWVzOiB7XG4gICAgICAgICAgICAgICAgICAgIG1hcmtlcjoge1xuICAgICAgICAgICAgICAgICAgICAgICAgZW5hYmxlZDogc2luZ2xlRGF5RW5hYmxlZCxcbiAgICAgICAgICAgICAgICAgICAgICAgIHJhZGl1czogc2luZ2xlRGF5RW5hYmxlZCA/IDUgOiAyLFxuICAgICAgICAgICAgICAgICAgICAgICAgc3ltYm9sOiAnY2lyY2xlJyxcbiAgICAgICAgICAgICAgICAgICAgfSxcbiAgICAgICAgICAgICAgICB9LFxuICAgICAgICAgICAgICAgIGNvbHVtbjoge1xuICAgICAgICAgICAgICAgICAgICBzdGFja2luZzogJ25vcm1hbCcsXG4gICAgICAgICAgICAgICAgICAgIGJvcmRlcldpZHRoOiAwLFxuICAgICAgICAgICAgICAgICAgICBtYXhQb2ludFdpZHRoOiAyMCxcbiAgICAgICAgICAgICAgICAgICAgZXZlbnRzOiB7XG4gICAgICAgICAgICAgICAgICAgICAgICBoaWRlKCk6IHZvaWQge1xuICAgICAgICAgICAgICAgICAgICAgICAgICAgIENoYXJ0T3B0aW9ucy5yZWRyYXdXaXRoSGlnaGVzdEVkZ2VzUm91bmRlZCh0aGlzLmNoYXJ0KTtcbiAgICAgICAgICAgICAgICAgICAgICAgIH0sXG4gICAgICAgICAgICAgICAgICAgICAgICBzaG93KCk6IHZvaWQge1xuICAgICAgICAgICAgICAgICAgICAgICAgICAgIENoYXJ0T3B0aW9ucy5yZWRyYXdXaXRoSGlnaGVzdEVkZ2VzUm91bmRlZCh0aGlzLmNoYXJ0KTtcbiAgICAgICAgICAgICAgICAgICAgICAgIH0sXG4gICAgICAgICAgICAgICAgICAgIH0sXG4gICAgICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIH0sXG4gICAgICAgICAgICB4QXhpczoge1xuICAgICAgICAgICAgICAgIHR5cGU6ICdkYXRldGltZScsXG4gICAgICAgICAgICB9LFxuICAgICAgICB9O1xuICAgICAgICByZXR1cm4gc3VwZXIuYnVpbGQobWVyZ2VEZWVwKGRlZmF1bHRPcHRpb25zLCBvcHRpb25zKSk7XG4gICAgfVxufVxuIl19
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Component, Input } from '@angular/core';
|
|
2
2
|
import { Chart } from 'highcharts';
|
|
3
|
+
import { ChartOptions } from '../../..';
|
|
3
4
|
import { AbstractChartComponent } from '../abstract-chart.component';
|
|
4
|
-
import { ChartColumnOptions } from '../chart-column/chart-column-options.model';
|
|
5
5
|
import { ChartMixedOptions } from './chart-mixed-options.model';
|
|
6
6
|
import * as i0 from "@angular/core";
|
|
7
7
|
export class ChartMixedComponent extends AbstractChartComponent {
|
|
@@ -13,7 +13,7 @@ export class ChartMixedComponent extends AbstractChartComponent {
|
|
|
13
13
|
ChartMixedOptions.configure(this.series, chartOptions, this.color, this.labelDateFormat);
|
|
14
14
|
this.chart = new Chart(this.chartRef.nativeElement, chartOptions);
|
|
15
15
|
if (this.chart) {
|
|
16
|
-
|
|
16
|
+
ChartOptions.redrawWithHighestEdgesRounded(this.chart);
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
}
|
|
@@ -26,4 +26,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.3.3", ngImpor
|
|
|
26
26
|
}], propDecorators: { series: [{
|
|
27
27
|
type: Input
|
|
28
28
|
}] } });
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hhcnQtbWl4ZWQuY29tcG9uZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vbGlicy91aS1jaGFydHMvc3JjL2xpYi9jaGFydC1taXhlZC9jaGFydC1taXhlZC5jb21wb25lbnQudHMiLCIuLi8uLi8uLi8uLi8uLi8uLi9saWJzL3VpLWNoYXJ0cy9zcmMvbGliL2NoYXJ0LW1peGVkL2NoYXJ0LW1peGVkLmNvbXBvbmVudC5odG1sIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsS0FBSyxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBQ2pELE9BQU8sRUFBRSxLQUFLLEVBQTBDLE1BQU0sWUFBWSxDQUFDO0FBQzNFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxVQUFVLENBQUM7QUFDeEMsT0FBTyxFQUFFLHNCQUFzQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7QUFDckUsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sNkJBQTZCLENBQUM7O0FBT2hFLE1BQU0sT0FBTyxtQkFBb0IsU0FBUSxzQkFBc0I7SUFDekMsTUFBTSxHQUF3QixFQUFFLENBQUM7SUFFbkQsU0FBUztRQUNMLElBQUksSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDO1lBQ2QsTUFBTSxnQkFBZ0IsR0FBSSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLEtBQUssQ0FBQyxJQUFJLEtBQUssUUFBUSxDQUF5QixFQUFFLElBQUksRUFBRSxNQUFNLEtBQUssQ0FBQyxDQUFDO1lBQ3pILE1BQU0sWUFBWSxHQUFHLGlCQUFpQixDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsWUFBWSxFQUFFLGdCQUFnQixDQUFDLENBQUM7WUFDdkYsaUJBQWlCLENBQUMsU0FBUyxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUUsWUFBWSxFQUFFLElBQUksQ0FBQyxLQUFLLEVBQUUsSUFBSSxDQUFDLGVBQWUsQ0FBQyxDQUFDO1lBQ3pGLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxLQUFLLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxhQUFhLEVBQUUsWUFBWSxDQUFDLENBQUM7WUFDbEUsSUFBSSxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ2IsWUFBWSxDQUFDLDZCQUE2QixDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUMzRCxDQUFDO1FBQ0wsQ0FBQztJQUNMLENBQUM7dUdBYlEsbUJBQW1COzJGQUFuQixtQkFBbUIsK0hDWGhDLHNCQUNBOzsyRkRVYSxtQkFBbUI7a0JBTC9CLFNBQVM7K0JBQ0ksZ0JBQWdCLGNBRWQsSUFBSTs4QkFHRSxNQUFNO3NCQUF2QixLQUFLIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29tcG9uZW50LCBJbnB1dCB9IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuaW1wb3J0IHsgQ2hhcnQsIFNlcmllc09wdGlvbnNUeXBlLCBTZXJpZXNTcGxpbmVPcHRpb25zIH0gZnJvbSAnaGlnaGNoYXJ0cyc7XG5pbXBvcnQgeyBDaGFydE9wdGlvbnMgfSBmcm9tICcuLi8uLi8uLic7XG5pbXBvcnQgeyBBYnN0cmFjdENoYXJ0Q29tcG9uZW50IH0gZnJvbSAnLi4vYWJzdHJhY3QtY2hhcnQuY29tcG9uZW50JztcbmltcG9ydCB7IENoYXJ0TWl4ZWRPcHRpb25zIH0gZnJvbSAnLi9jaGFydC1taXhlZC1vcHRpb25zLm1vZGVsJztcblxuQENvbXBvbmVudCh7XG4gICAgc2VsZWN0b3I6ICdhcC1jaGFydC1taXhlZCcsXG4gICAgdGVtcGxhdGVVcmw6ICcuL2NoYXJ0LW1peGVkLmNvbXBvbmVudC5odG1sJyxcbiAgICBzdGFuZGFsb25lOiB0cnVlLFxufSlcbmV4cG9ydCBjbGFzcyBDaGFydE1peGVkQ29tcG9uZW50IGV4dGVuZHMgQWJzdHJhY3RDaGFydENvbXBvbmVudCB7XG4gICAgQElucHV0KCkgb3ZlcnJpZGUgc2VyaWVzOiBTZXJpZXNPcHRpb25zVHlwZVtdID0gW107XG5cbiAgICBpbml0Q2hhcnQoKTogdm9pZCB7XG4gICAgICAgIGlmICh0aGlzLnNlcmllcykge1xuICAgICAgICAgICAgY29uc3Qgc2luZ2xlRGF5RW5hYmxlZCA9ICh0aGlzLnNlcmllcy5maW5kKHNlcmllID0+IHNlcmllLnR5cGUgPT09ICdzcGxpbmUnKSBhcyBTZXJpZXNTcGxpbmVPcHRpb25zKT8uZGF0YT8ubGVuZ3RoID09PSAxO1xuICAgICAgICAgICAgY29uc3QgY2hhcnRPcHRpb25zID0gQ2hhcnRNaXhlZE9wdGlvbnMuYnVpbGRNaXhlZCh0aGlzLmNoYXJ0T3B0aW9ucywgc2luZ2xlRGF5RW5hYmxlZCk7XG4gICAgICAgICAgICBDaGFydE1peGVkT3B0aW9ucy5jb25maWd1cmUodGhpcy5zZXJpZXMsIGNoYXJ0T3B0aW9ucywgdGhpcy5jb2xvciwgdGhpcy5sYWJlbERhdGVGb3JtYXQpO1xuICAgICAgICAgICAgdGhpcy5jaGFydCA9IG5ldyBDaGFydCh0aGlzLmNoYXJ0UmVmLm5hdGl2ZUVsZW1lbnQsIGNoYXJ0T3B0aW9ucyk7XG4gICAgICAgICAgICBpZiAodGhpcy5jaGFydCkge1xuICAgICAgICAgICAgICAgIENoYXJ0T3B0aW9ucy5yZWRyYXdXaXRoSGlnaGVzdEVkZ2VzUm91bmRlZCh0aGlzLmNoYXJ0KTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgfVxuICAgIH1cbn1cbiIsIjxkaXYgI2NoYXJ0PjwvZGl2PlxuIl19
|
|
@@ -149,13 +149,13 @@ export class ChartOptions {
|
|
|
149
149
|
formatter: function () {
|
|
150
150
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
151
151
|
// @ts-ignore
|
|
152
|
-
return dateFormat(labelDateFormat
|
|
152
|
+
return dateFormat(labelDateFormat ?? '%m/%d', this.value);
|
|
153
153
|
},
|
|
154
154
|
},
|
|
155
155
|
//minTickInterval: 24 * 60 * 60 * 1000 // One day
|
|
156
156
|
}, options.xAxis);
|
|
157
157
|
// Configure series
|
|
158
|
-
if (series
|
|
158
|
+
if (series?.length) {
|
|
159
159
|
options.series = series;
|
|
160
160
|
if (options.legend) {
|
|
161
161
|
options.legend.enabled = series.length >= 2;
|
|
@@ -163,6 +163,59 @@ export class ChartOptions {
|
|
|
163
163
|
options.colors = ChartColors.getColors(series.length, color);
|
|
164
164
|
}
|
|
165
165
|
}
|
|
166
|
+
static redrawWithHighestEdgesRounded(chart) {
|
|
167
|
+
chart.series.forEach((serie, serieIndex, arr) => {
|
|
168
|
+
ChartOptions.roundHighestSerie(arr, serie.options, serieIndex);
|
|
169
|
+
});
|
|
170
|
+
chart.redraw(true);
|
|
171
|
+
}
|
|
172
|
+
static roundHighestSerie(series, serie, serieIndex) {
|
|
173
|
+
const roundedOptionMap = [];
|
|
174
|
+
let borderRadius = 0;
|
|
175
|
+
if (serie.data) {
|
|
176
|
+
serie.data.forEach((point, columnIndex) => {
|
|
177
|
+
// Check if all previous stacked data at the same abscissa (located higher on the graph) are missing or have a value of 0
|
|
178
|
+
// if so, it means that this point is the visual top of the column, so we should round it
|
|
179
|
+
const roundedColumnEnabled = series.slice(0, serieIndex).every(otherSerie => {
|
|
180
|
+
if (!otherSerie.visible) {
|
|
181
|
+
return true;
|
|
182
|
+
}
|
|
183
|
+
const pointAtSameAbscissa = otherSerie.options.data?.find(otherPoint => otherPoint[0] === point[0]);
|
|
184
|
+
return !pointAtSameAbscissa || pointAtSameAbscissa[1] === 0;
|
|
185
|
+
});
|
|
186
|
+
borderRadius = roundedColumnEnabled ? 100 : 0;
|
|
187
|
+
roundedOptionMap[columnIndex] = borderRadius;
|
|
188
|
+
});
|
|
189
|
+
serie.borderRadiusTopLeft = roundedOptionMap;
|
|
190
|
+
serie.borderRadiusTopRight = roundedOptionMap;
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
static redrawWithHighestEdgesRoundedForStackedBarChart(chart) {
|
|
194
|
+
const seriesOptions = chart.series[0]?.options;
|
|
195
|
+
if (seriesOptions.data) {
|
|
196
|
+
const globalRoundedMap = Array(seriesOptions.data.length).fill(false);
|
|
197
|
+
chart.series.forEach(serie => ChartOptions.roundHighestSeriesForStackedBarChart(serie, globalRoundedMap));
|
|
198
|
+
chart.redraw(true);
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
static roundHighestSeriesForStackedBarChart(serie, globalRoundedMap) {
|
|
202
|
+
if (globalRoundedMap.every(rounded => rounded)) {
|
|
203
|
+
return;
|
|
204
|
+
}
|
|
205
|
+
const serieOptions = serie.options;
|
|
206
|
+
if (serieOptions.data && serie.visible) {
|
|
207
|
+
const borderRadiusMap = Array(serieOptions.data.length).fill(0);
|
|
208
|
+
serieOptions.data.forEach((point, columnIndex) => {
|
|
209
|
+
const value = point;
|
|
210
|
+
if (!globalRoundedMap[columnIndex] && value != null && value > 0) {
|
|
211
|
+
globalRoundedMap[columnIndex] = true;
|
|
212
|
+
borderRadiusMap[columnIndex] = 100;
|
|
213
|
+
}
|
|
214
|
+
});
|
|
215
|
+
serieOptions.borderRadiusTopLeft = borderRadiusMap;
|
|
216
|
+
serieOptions.borderRadiusTopRight = borderRadiusMap;
|
|
217
|
+
}
|
|
218
|
+
}
|
|
166
219
|
}
|
|
167
220
|
export function isObject(item) {
|
|
168
221
|
return item && typeof item === 'object' && !Array.isArray(item);
|
|
@@ -198,4 +251,4 @@ function deepCopy(source) {
|
|
|
198
251
|
}
|
|
199
252
|
return newObject;
|
|
200
253
|
}
|
|
201
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart-options.js","sourceRoot":"","sources":["../../../../../libs/ui-charts/src/lib/chart-options.ts"],"names":[],"mappings":"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","sourcesContent":["import { dateFormat, Options, SeriesOptionsType } from 'highcharts';\nimport { ChartColor, ChartColors } from './chart-colors';\n\nexport class ChartOptions {\n    static readonly DEFAULT_DATE_FORMAT: string = '%A, %b %e, %Y';\n    static readonly DEFAULT_OPTIONS: Options = {\n        /*lang: {\n            decimalPoint: (manager && manager.locale !== 'en') ? ',' : '.',\n            resetZoom: resetZoomLabel,\n            resetZoomTitle: resetZoomHtmlTitle,\n            shortMonths: [\n                shortJanuary, shortFebruary, shortMarch, shortApril, shortMay, shortJune,\n                shortJuly, shortAugust, shortSeptember, shortOctober, shortNovember, shortDecember\n            ],\n            thousandsSep: (manager && manager.locale !== 'en') ? ' ' : ',',\n            weekdays: this.weekDays,\n            zoomIn: zoomInHtmlTitle,\n            zoomOut: zoomOutHtmlTitle\n        },*/\n        chart: {\n            spacingRight: 20,\n            zooming: {\n                type: 'xy',\n                resetButton: {\n                    theme: {\n                        fill: ChartColors.WHITE_COLOR,\n                        r: 4,\n                        style: {\n                            color: ChartColors.GREY_COLORS[100],\n                            fontSize: '12px',\n                        },\n                        states: {\n                            hover: {\n                                fill: ChartColors.GREY_COLORS[5],\n                            },\n                        },\n                    },\n                },\n            },\n            panning: {\n                enabled: true,\n            },\n            panKey: 'shift',\n            style: {\n                fontFamily: \"Averta, 'Open Sans', Helvetica, sans-serif\",\n            },\n        },\n        colorAxis: {\n            labels: {\n                style: {\n                    color: ChartColors.GREY_COLORS[60],\n                },\n            },\n        },\n        credits: {\n            enabled: false,\n        },\n        legend: {\n            borderWidth: 0,\n            itemStyle: {\n                color: ChartColors.GREY_COLORS[60],\n                fontSize: '14px',\n                fontWeight: 'normal',\n            },\n            itemHoverStyle: {\n                color: ChartColors.GREY_COLORS[100],\n                fontWeight: 'bold',\n            },\n        },\n        plotOptions: {\n            series: {\n                states: {\n                    hover: {\n                        brightness: 0,\n                    },\n                },\n                connectNulls: true,\n                lineWidth: 4,\n            },\n        },\n        navigation: {\n            buttonOptions: {\n                y: 0,\n            },\n        },\n        title: {\n            text: undefined,\n        },\n        tooltip: {\n            backgroundColor: ChartColors.WHITE_COLOR,\n            borderRadius: 4,\n            borderWidth: 0,\n            dateTimeLabelFormats: {\n                day: ChartOptions.DEFAULT_DATE_FORMAT,\n                week: ChartOptions.DEFAULT_DATE_FORMAT,\n            },\n            shadow: {\n                color: ChartColors.BLACK_COLOR,\n                offsetX: 0,\n                offsetY: 2,\n                opacity: 0.02,\n                width: 6,\n            },\n            split: false,\n            shared: true,\n            useHTML: true,\n            headerFormat:\n                `<div style=\"border-bottom: 1px solid ${ChartColors.GREY_COLORS[10]}; padding: 0 8px 7px\">` +\n                `<span style=\"font-size: 12px; color: ${ChartColors.GREY_COLORS[60]}\">{point.key}</span></div>`,\n            pointFormat:\n                `<div style=\"font-size: 14px; color: ${ChartColors.GREY_COLORS[100]}; margin: 6px 8px 0 8px;\">` +\n                '<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b></div>',\n        },\n        xAxis: {\n            gridLineColor: ChartColors.GREY_COLORS[10],\n            lineColor: ChartColors.GREY_COLORS[10],\n            tickColor: ChartColors.GREY_COLORS[10],\n            gridLineWidth: 1,\n            title: {\n                text: null,\n            },\n            labels: {\n                style: {\n                    color: ChartColors.GREY_COLORS[40],\n                    fontSize: '12px',\n                },\n            },\n        },\n        yAxis: {\n            allowDecimals: false,\n            gridLineColor: ChartColors.GREY_COLORS[10],\n            lineColor: ChartColors.GREY_COLORS[10],\n            gridLineWidth: 1,\n            title: {\n                text: null,\n            },\n            labels: {\n                style: {\n                    color: ChartColors.GREY_COLORS[40],\n                    fontSize: '12px',\n                },\n            },\n        },\n    };\n\n    static build(options: Options): Options {\n        return mergeDeep(ChartOptions.DEFAULT_OPTIONS, options);\n    }\n\n    static configure(series: SeriesOptionsType[], options: Options, color: ChartColor | undefined, labelDateFormat?: string) {\n        // Configure axis\n        options.xAxis = mergeDeep(\n            {\n                labels: {\n                    formatter: function (): string {\n                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n                        // @ts-ignore\n                        return dateFormat(labelDateFormat ? labelDateFormat : '%m/%d', this.value);\n                    },\n                },\n                //minTickInterval: 24 * 60 * 60 * 1000 // One day\n            },\n            options.xAxis\n        );\n        // Configure series\n        if (series && series.length) {\n            options.series = series;\n            if (options.legend) {\n                options.legend.enabled = series.length >= 2;\n            }\n            options.colors = ChartColors.getColors(series.length, color);\n        }\n    }\n}\n\nexport function isObject(item: any) {\n    return item && typeof item === 'object' && !Array.isArray(item);\n}\n\nexport function mergeDeep(target: any, source: any) {\n    const output = deepCopy(target);\n    if (isObject(target) && isObject(source)) {\n        Object.keys(source).forEach(key => {\n            if (isObject(source[key])) {\n                if (!(key in target)) Object.assign(output, { [key]: source[key] });\n                else output[key] = mergeDeep(target[key], source[key]);\n            } else {\n                Object.assign(output, { [key]: source[key] });\n            }\n        });\n    }\n    return output;\n}\n\nfunction deepCopy(source: any) {\n    if (typeof source !== 'object' || source === null) {\n        return source; // Return the value if source is not an object\n    }\n    // Create an array or object to hold the values\n    const newObject = Array.isArray(source) ? [] : {};\n    for (const key in source) {\n        if (source.hasOwnProperty(key)) {\n            // Recursively (deep) copy for nested objects, including arrays\n            (newObject as any)[key] = deepCopy(source[key]);\n        }\n    }\n    return newObject;\n}\n"]}
|
|
254
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"chart-options.js","sourceRoot":"","sources":["../../../../../libs/ui-charts/src/lib/chart-options.ts"],"names":[],"mappings":"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","sourcesContent":["import { Chart, dateFormat, Options, Series, SeriesOptionsType } from 'highcharts';\nimport { ChartColor, ChartColors } from './chart-colors';\nimport { SeriesRoundedColumnOptions } from './highchart-series.model';\n\nexport class ChartOptions {\n    static readonly DEFAULT_DATE_FORMAT: string = '%A, %b %e, %Y';\n    static readonly DEFAULT_OPTIONS: Options = {\n        /*lang: {\n            decimalPoint: (manager && manager.locale !== 'en') ? ',' : '.',\n            resetZoom: resetZoomLabel,\n            resetZoomTitle: resetZoomHtmlTitle,\n            shortMonths: [\n                shortJanuary, shortFebruary, shortMarch, shortApril, shortMay, shortJune,\n                shortJuly, shortAugust, shortSeptember, shortOctober, shortNovember, shortDecember\n            ],\n            thousandsSep: (manager && manager.locale !== 'en') ? ' ' : ',',\n            weekdays: this.weekDays,\n            zoomIn: zoomInHtmlTitle,\n            zoomOut: zoomOutHtmlTitle\n        },*/\n        chart: {\n            spacingRight: 20,\n            zooming: {\n                type: 'xy',\n                resetButton: {\n                    theme: {\n                        fill: ChartColors.WHITE_COLOR,\n                        r: 4,\n                        style: {\n                            color: ChartColors.GREY_COLORS[100],\n                            fontSize: '12px',\n                        },\n                        states: {\n                            hover: {\n                                fill: ChartColors.GREY_COLORS[5],\n                            },\n                        },\n                    },\n                },\n            },\n            panning: {\n                enabled: true,\n            },\n            panKey: 'shift',\n            style: {\n                fontFamily: \"Averta, 'Open Sans', Helvetica, sans-serif\",\n            },\n        },\n        colorAxis: {\n            labels: {\n                style: {\n                    color: ChartColors.GREY_COLORS[60],\n                },\n            },\n        },\n        credits: {\n            enabled: false,\n        },\n        legend: {\n            borderWidth: 0,\n            itemStyle: {\n                color: ChartColors.GREY_COLORS[60],\n                fontSize: '14px',\n                fontWeight: 'normal',\n            },\n            itemHoverStyle: {\n                color: ChartColors.GREY_COLORS[100],\n                fontWeight: 'bold',\n            },\n        },\n        plotOptions: {\n            series: {\n                states: {\n                    hover: {\n                        brightness: 0,\n                    },\n                },\n                connectNulls: true,\n                lineWidth: 4,\n            },\n        },\n        navigation: {\n            buttonOptions: {\n                y: 0,\n            },\n        },\n        title: {\n            text: undefined,\n        },\n        tooltip: {\n            backgroundColor: ChartColors.WHITE_COLOR,\n            borderRadius: 4,\n            borderWidth: 0,\n            dateTimeLabelFormats: {\n                day: ChartOptions.DEFAULT_DATE_FORMAT,\n                week: ChartOptions.DEFAULT_DATE_FORMAT,\n            },\n            shadow: {\n                color: ChartColors.BLACK_COLOR,\n                offsetX: 0,\n                offsetY: 2,\n                opacity: 0.02,\n                width: 6,\n            },\n            split: false,\n            shared: true,\n            useHTML: true,\n            headerFormat:\n                `<div style=\"border-bottom: 1px solid ${ChartColors.GREY_COLORS[10]}; padding: 0 8px 7px\">` +\n                `<span style=\"font-size: 12px; color: ${ChartColors.GREY_COLORS[60]}\">{point.key}</span></div>`,\n            pointFormat:\n                `<div style=\"font-size: 14px; color: ${ChartColors.GREY_COLORS[100]}; margin: 6px 8px 0 8px;\">` +\n                '<span style=\"color:{point.color}\">\\u25CF</span> {series.name}: <b>{point.y}</b></div>',\n        },\n        xAxis: {\n            gridLineColor: ChartColors.GREY_COLORS[10],\n            lineColor: ChartColors.GREY_COLORS[10],\n            tickColor: ChartColors.GREY_COLORS[10],\n            gridLineWidth: 1,\n            title: {\n                text: null,\n            },\n            labels: {\n                style: {\n                    color: ChartColors.GREY_COLORS[40],\n                    fontSize: '12px',\n                },\n            },\n        },\n        yAxis: {\n            allowDecimals: false,\n            gridLineColor: ChartColors.GREY_COLORS[10],\n            lineColor: ChartColors.GREY_COLORS[10],\n            gridLineWidth: 1,\n            title: {\n                text: null,\n            },\n            labels: {\n                style: {\n                    color: ChartColors.GREY_COLORS[40],\n                    fontSize: '12px',\n                },\n            },\n        },\n    };\n\n    static build(options: Options): Options {\n        return mergeDeep(ChartOptions.DEFAULT_OPTIONS, options);\n    }\n\n    static configure(series: SeriesOptionsType[], options: Options, color: ChartColor | undefined, labelDateFormat?: string) {\n        // Configure axis\n        options.xAxis = mergeDeep(\n            {\n                labels: {\n                    formatter: function (): string {\n                        // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n                        // @ts-ignore\n                        return dateFormat(labelDateFormat ?? '%m/%d', this.value);\n                    },\n                },\n                //minTickInterval: 24 * 60 * 60 * 1000 // One day\n            },\n            options.xAxis\n        );\n        // Configure series\n        if (series?.length) {\n            options.series = series;\n            if (options.legend) {\n                options.legend.enabled = series.length >= 2;\n            }\n            options.colors = ChartColors.getColors(series.length, color);\n        }\n    }\n\n    static redrawWithHighestEdgesRounded(chart: Chart): void {\n        chart.series.forEach((serie, serieIndex: number, arr) => {\n            ChartOptions.roundHighestSerie(arr, serie.options as SeriesRoundedColumnOptions, serieIndex);\n        });\n        chart.redraw(true);\n    }\n\n    static roundHighestSerie(series: Series[], serie: SeriesRoundedColumnOptions, serieIndex: number): void {\n        const roundedOptionMap: number[] = [];\n        let borderRadius = 0;\n        if (serie.data) {\n            serie.data.forEach((point, columnIndex) => {\n                // Check if all previous stacked data at the same abscissa (located higher on the graph) are missing or have a value of 0\n                // if so, it means that this point is the visual top of the column, so we should round it\n                const roundedColumnEnabled = series.slice(0, serieIndex).every(otherSerie => {\n                    if (!otherSerie.visible) {\n                        return true;\n                    }\n                    const pointAtSameAbscissa = (otherSerie.options as SeriesRoundedColumnOptions).data?.find(\n                        otherPoint => (otherPoint as [number | string, number | null])[0] === (point as [number | string, number | null])[0]\n                    );\n                    return !pointAtSameAbscissa || (pointAtSameAbscissa as [number | string, number | null])[1] === 0;\n                });\n                borderRadius = roundedColumnEnabled ? 100 : 0;\n                roundedOptionMap[columnIndex] = borderRadius;\n            });\n            serie.borderRadiusTopLeft = roundedOptionMap;\n            serie.borderRadiusTopRight = roundedOptionMap;\n        }\n    }\n\n    static redrawWithHighestEdgesRoundedForStackedBarChart(chart: Chart): void {\n        const seriesOptions = chart.series[0]?.options as SeriesRoundedColumnOptions;\n        if (seriesOptions.data) {\n            const globalRoundedMap: boolean[] = Array(seriesOptions.data.length).fill(false);\n            chart.series.forEach(serie => ChartOptions.roundHighestSeriesForStackedBarChart(serie, globalRoundedMap));\n            chart.redraw(true);\n        }\n    }\n\n    static roundHighestSeriesForStackedBarChart(serie: Series, globalRoundedMap: boolean[]): void {\n        if (globalRoundedMap.every(rounded => rounded)) {\n            return;\n        }\n        const serieOptions = (serie.options as SeriesRoundedColumnOptions);\n        if (serieOptions.data && serie.visible) {\n            const borderRadiusMap: number[] = Array(serieOptions.data.length).fill(0);\n            serieOptions.data.forEach((point, columnIndex) => {\n                const value = point as number;\n                if (!globalRoundedMap[columnIndex] && value != null && value > 0) {\n                    globalRoundedMap[columnIndex] = true;\n                    borderRadiusMap[columnIndex] = 100;\n                }\n            });\n            serieOptions.borderRadiusTopLeft = borderRadiusMap;\n            serieOptions.borderRadiusTopRight = borderRadiusMap;\n        }\n    }\n}\n\nexport function isObject(item: any) {\n    return item && typeof item === 'object' && !Array.isArray(item);\n}\n\nexport function mergeDeep(target: any, source: any) {\n    const output = deepCopy(target);\n    if (isObject(target) && isObject(source)) {\n        Object.keys(source).forEach(key => {\n            if (isObject(source[key])) {\n                if (!(key in target)) Object.assign(output, { [key]: source[key] });\n                else output[key] = mergeDeep(target[key], source[key]);\n            } else {\n                Object.assign(output, { [key]: source[key] });\n            }\n        });\n    }\n    return output;\n}\n\nfunction deepCopy(source: any) {\n    if (typeof source !== 'object' || source === null) {\n        return source; // Return the value if source is not an object\n    }\n    // Create an array or object to hold the values\n    const newObject = Array.isArray(source) ? [] : {};\n    for (const key in source) {\n        if (source.hasOwnProperty(key)) {\n            // Recursively (deep) copy for nested objects, including arrays\n            (newObject as any)[key] = deepCopy(source[key]);\n        }\n    }\n    return newObject;\n}\n"]}
|