From 5b46ef7360f4f15879494ded6a5e78a9d871a393 Mon Sep 17 00:00:00 2001 From: Bernt Andersen Date: Tue, 24 Sep 2024 10:01:01 +0200 Subject: [PATCH 1/5] Fix so table don't break if flagged data (#702) Also rename and improve implementation of the number test in the template. --- package-lock.json | 2 +- .../src/lib/fhi-angular-highcharts.component.html | 2 +- .../src/lib/fhi-angular-highcharts.component.ts | 7 ++----- .../src/lib/services/table.service.ts | 13 ++++++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 67500f92..9f67117d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@angular/platform-browser": "17.3.3", "@angular/platform-browser-dynamic": "17.3.3", "@angular/router": "17.3.3", - "@folkehelseinstituttet/style": "6.2.2", + "@folkehelseinstituttet/style": "^6.0.0", "@ng-bootstrap/ng-bootstrap": "^16.0.0", "@ng-select/ng-select": "^12.0.6", "@popperjs/core": "^2.11.8", diff --git a/projects/fhi-angular-highcharts/src/lib/fhi-angular-highcharts.component.html b/projects/fhi-angular-highcharts/src/lib/fhi-angular-highcharts.component.html index 1ed41798..c1ad2618 100644 --- a/projects/fhi-angular-highcharts/src/lib/fhi-angular-highcharts.component.html +++ b/projects/fhi-angular-highcharts/src/lib/fhi-angular-highcharts.component.html @@ -151,7 +151,7 @@

{{ diagramOptions.title }}

{{ tableCell.name }} - + {{ tableCell.data | number: '1.' + tableCell.decimals + '-' + tableCell.decimals }} diff --git a/projects/fhi-angular-highcharts/src/lib/fhi-angular-highcharts.component.ts b/projects/fhi-angular-highcharts/src/lib/fhi-angular-highcharts.component.ts index 37daef8c..8ae88a38 100644 --- a/projects/fhi-angular-highcharts/src/lib/fhi-angular-highcharts.component.ts +++ b/projects/fhi-angular-highcharts/src/lib/fhi-angular-highcharts.component.ts @@ -143,11 +143,8 @@ export class FhiAngularHighchartsComponent implements OnChanges { this.diagramTypeNavigation.emit(DiagramTypeIds.table as FhiDiagramTypeIds); } - tableCellDataOK(data: number | string): boolean { - if (typeof data === 'number') { - return true; - } - return false; + isNumber(data: number | string): boolean { + return typeof data === 'number'; } getFlaggedDataPoints(): Array { diff --git a/projects/fhi-angular-highcharts/src/lib/services/table.service.ts b/projects/fhi-angular-highcharts/src/lib/services/table.service.ts index 9d696e34..0b8ae891 100644 --- a/projects/fhi-angular-highcharts/src/lib/services/table.service.ts +++ b/projects/fhi-angular-highcharts/src/lib/services/table.service.ts @@ -73,10 +73,11 @@ export class TableService { }; } else { // Table row data - const decimals = this.decimalsCount(series[j - 1].data[i].y as number); + const data = series[j - 1].data[i].y; + const decimals = this.decimalCount(data); tbodyRows[i][j] = { isHeading: false, - data: series[j - 1].data[i].y, + data: data, decimals: decimals < metadataForSeries[j - 1].decimals ? decimals @@ -141,10 +142,11 @@ export class TableService { }; } else { // Table row data - const decimals = this.decimalsCount(series[i].data[j - dimentionsCount].y as number); + const data = series[i].data[j - dimentionsCount].y; + const decimals = this.decimalCount(data); tbodyRows[i][j] = { isHeading: false, - data: series[i].data[j - dimentionsCount].y, + data: data, decimals: decimals < metadataForSeries[i].decimals ? decimals : metadataForSeries[i].decimals, }; @@ -208,7 +210,8 @@ export class TableService { return counts; } - private decimalsCount(value: number) { + private decimalCount(value: number | string): number { + if (typeof value !== 'number') return 0; if (Math.floor(value) === value) return 0; return value.toString().split('.')[1].length || 0; } From 2046bae3f49a922e4c6dc99bdb768e87b3b61443 Mon Sep 17 00:00:00 2001 From: Bernt Andersen Date: Tue, 24 Sep 2024 10:32:58 +0200 Subject: [PATCH 2/5] Release/fhi-angular-highcharts/4.4.1 (#703) --- projects/fhi-angular-highcharts/CHANGELOG.md | 8 +++++++- projects/fhi-angular-highcharts/package.json | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/projects/fhi-angular-highcharts/CHANGELOG.md b/projects/fhi-angular-highcharts/CHANGELOG.md index 0228e5da..4dce5fb9 100644 --- a/projects/fhi-angular-highcharts/CHANGELOG.md +++ b/projects/fhi-angular-highcharts/CHANGELOG.md @@ -1,4 +1,10 @@ -# 4.4.0 +# 4.4.1 + +> Sep 24, 2024 + +* :bug: **Bugfix** Fix so that table don't break if flagged data in the data set. [(#702)](https://github.com/folkehelseinstituttet/Fhi.Frontend.Demo/pull/702) + +## 4.4.0 > Sep 13, 2024 diff --git a/projects/fhi-angular-highcharts/package.json b/projects/fhi-angular-highcharts/package.json index c63efd28..2a760f51 100644 --- a/projects/fhi-angular-highcharts/package.json +++ b/projects/fhi-angular-highcharts/package.json @@ -1,8 +1,8 @@ { "name": "@folkehelseinstituttet/angular-highcharts", - "version": "4.4.0", + "version": "4.4.1", "publishConfig": { - "tag": "latest" + "tag": "v4" }, "repository": { "type": "git", From f0500fd25f4ad5deb9fd1c11b51bc29580c2b12e Mon Sep 17 00:00:00 2001 From: Bernt Andersen Date: Fri, 11 Oct 2024 15:42:37 +0200 Subject: [PATCH 3/5] Enhancement/highcharts update api surface (v4) (#720) * Add a custom version of the diagram type class to the public API Surface --- projects/fhi-angular-highcharts/CHANGELOG.md | 8 +++- .../constants-and-enums/fhi-diagram-types.ts | 48 +++++++++++++++++++ .../fhi-angular-highcharts/src/public-api.ts | 2 + 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/projects/fhi-angular-highcharts/CHANGELOG.md b/projects/fhi-angular-highcharts/CHANGELOG.md index 4dce5fb9..01e4e767 100644 --- a/projects/fhi-angular-highcharts/CHANGELOG.md +++ b/projects/fhi-angular-highcharts/CHANGELOG.md @@ -1,4 +1,10 @@ -# 4.4.1 +# Unreleased + +> Oct 11, 2024 + +* :tada: **Enhancement** Add a custom version of the diagram type class and expose it in the public API Surface + +## 4.4.1 > Sep 24, 2024 diff --git a/projects/fhi-angular-highcharts/src/lib/constants-and-enums/fhi-diagram-types.ts b/projects/fhi-angular-highcharts/src/lib/constants-and-enums/fhi-diagram-types.ts index bbe057a6..da03c779 100644 --- a/projects/fhi-angular-highcharts/src/lib/constants-and-enums/fhi-diagram-types.ts +++ b/projects/fhi-angular-highcharts/src/lib/constants-and-enums/fhi-diagram-types.ts @@ -129,3 +129,51 @@ export const AllDiagramTypes = [ // Diagram types used in diagram-type-navs by default. Overwritten if defined in diagramOptions. export const ChartTypes = [line, column, bar, columnStacked, barStacked, pie, columnAndLine]; export const MapTypes = [mapFylker, mapFylker2019, mapFylker2023]; + +// For the public API Surface +export class FhiDiagramTypes { + static bar = { + id: bar.id, + name: bar.name, + }; + static barStacked = { + id: barStacked.id, + name: barStacked.name, + }; + static column = { + id: column.id, + name: column.name, + }; + static columnAndLine = { + id: columnAndLine.id, + name: columnAndLine.name, + }; + static columnStacked = { + id: columnStacked.id, + name: columnStacked.name, + }; + static line = { + id: line.id, + name: line.name, + }; + static mapFylker = { + id: mapFylker.id, + name: mapFylker.name, + }; + static mapFylker2019 = { + id: mapFylker2019.id, + name: mapFylker2019.name, + }; + static mapFylker2023 = { + id: mapFylker2023.id, + name: mapFylker2023.name, + }; + static pie = { + id: pie.id, + name: pie.name, + }; + static table = { + id: table.id, + name: table.name, + }; +} diff --git a/projects/fhi-angular-highcharts/src/public-api.ts b/projects/fhi-angular-highcharts/src/public-api.ts index 86cf1344..1a30c662 100644 --- a/projects/fhi-angular-highcharts/src/public-api.ts +++ b/projects/fhi-angular-highcharts/src/public-api.ts @@ -9,3 +9,5 @@ export * from './lib/models/fhi-diagram-flag.model'; export * from './lib/models/fhi-diagram-options.model'; export * from './lib/models/fhi-diagram-serie.model'; export * from './lib/models/fhi-diagram-serie-data.model'; + +export { FhiDiagramTypes } from './lib/constants-and-enums/fhi-diagram-types'; From 35be4435d9a2493a27a79e789ace05cbf326f2f6 Mon Sep 17 00:00:00 2001 From: Bernt Andersen Date: Mon, 14 Oct 2024 13:40:29 +0200 Subject: [PATCH 4/5] Release/fhi-angular-highcharts/4.4.2 (#723) --- projects/fhi-angular-highcharts/CHANGELOG.md | 6 +++--- projects/fhi-angular-highcharts/package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/fhi-angular-highcharts/CHANGELOG.md b/projects/fhi-angular-highcharts/CHANGELOG.md index 01e4e767..74775f6c 100644 --- a/projects/fhi-angular-highcharts/CHANGELOG.md +++ b/projects/fhi-angular-highcharts/CHANGELOG.md @@ -1,8 +1,8 @@ -# Unreleased +# 4.4.2 -> Oct 11, 2024 +> Oct 14, 2024 -* :tada: **Enhancement** Add a custom version of the diagram type class and expose it in the public API Surface +* :tada: **Enhancement** Add a custom version of the diagram type class and expose it in the public API Surface [(#720)](https://github.com/folkehelseinstituttet/Fhi.Frontend.Demo/pull/720) ## 4.4.1 diff --git a/projects/fhi-angular-highcharts/package.json b/projects/fhi-angular-highcharts/package.json index 2a760f51..c772e39e 100644 --- a/projects/fhi-angular-highcharts/package.json +++ b/projects/fhi-angular-highcharts/package.json @@ -1,6 +1,6 @@ { "name": "@folkehelseinstituttet/angular-highcharts", - "version": "4.4.1", + "version": "4.4.2", "publishConfig": { "tag": "v4" }, From e311fc165a3ee7065c9e6481bb2a7f0d590f6539 Mon Sep 17 00:00:00 2001 From: Bernt Andersen Date: Mon, 14 Oct 2024 14:21:56 +0200 Subject: [PATCH 5/5] Release/fhi-angular-highcharts/4.5.0 (#725) --- projects/fhi-angular-highcharts/CHANGELOG.md | 2 +- projects/fhi-angular-highcharts/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/fhi-angular-highcharts/CHANGELOG.md b/projects/fhi-angular-highcharts/CHANGELOG.md index 74775f6c..704fdabc 100644 --- a/projects/fhi-angular-highcharts/CHANGELOG.md +++ b/projects/fhi-angular-highcharts/CHANGELOG.md @@ -1,4 +1,4 @@ -# 4.4.2 +# 4.5.0 > Oct 14, 2024 diff --git a/projects/fhi-angular-highcharts/package.json b/projects/fhi-angular-highcharts/package.json index c772e39e..dee52402 100644 --- a/projects/fhi-angular-highcharts/package.json +++ b/projects/fhi-angular-highcharts/package.json @@ -1,6 +1,6 @@ { "name": "@folkehelseinstituttet/angular-highcharts", - "version": "4.4.2", + "version": "4.5.0", "publishConfig": { "tag": "v4" },