From d53b3b99523bc6d17388071d69bea798f79258cb Mon Sep 17 00:00:00 2001 From: Edi Cziszter Date: Wed, 9 Feb 2022 14:55:25 +0200 Subject: [PATCH] added states chart --- .../dossier-states-listing-screen.component.html | 12 +++++++++++- .../dossier-states-listing-screen.component.scss | 4 ++++ .../dossier-states-listing-screen.component.ts | 12 ++++++++++++ .../entity-services/dossier-state.service.ts | 5 ----- apps/red-ui/src/assets/i18n/en.json | 3 +++ 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html index 045a9d075..84a706e27 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html @@ -31,6 +31,16 @@ noDataIcon="red:attribute" > + +
+ +
@@ -55,7 +65,7 @@
-
+
{{ state.name }}
diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss index 1df526cd4..ef7a2530e 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss @@ -12,3 +12,7 @@ line-height: 20px; color: variables.$grey-1; } + +.right-container { + padding: 50px 26px 0; +} diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts index f6ee28661..1fe749dfe 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts @@ -18,6 +18,7 @@ import { AdminDialogService } from '../../services/admin-dialog.service'; import { UserService } from '../../../../services/user.service'; import { AppStateService } from '../../../../state/app-state.service'; import { HttpStatusCode } from '@angular/common/http'; +import { DoughnutChartConfig } from '../../../shared/components/simple-doughnut-chart/simple-doughnut-chart.component'; @Component({ templateUrl: './dossier-states-listing-screen.component.html', @@ -37,6 +38,7 @@ export class DossierStatesListingScreenComponent extends ListingComponent (state.dossierCount = dossiers.filter(dossier => dossier.dossierStatusId === state.dossierStatusId).length), ); + this.chartData = this._loadChartData(); this.entitiesService.setEntities(dossierStates || []); } catch (e) {} this._loadingService.stop(); } + + private _loadChartData(): DoughnutChartConfig[] { + const config: DoughnutChartConfig[] = []; + this._dossierStateService.all.forEach(state => { + config.push({ value: state.dossierCount, label: state.name, key: state.name, color: state.description }); + }); + + return config; + } } diff --git a/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts index 34adf0566..44a82f9ee 100644 --- a/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts +++ b/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts @@ -38,9 +38,4 @@ export class DossierStateService extends EntitiesService { - return this._getOne([id]); - } } diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index d7c7a9173..f2bb02254 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -639,6 +639,9 @@ "delete": "Delete Status", "edit": "Edit Status" }, + "chart": { + "dossier-states": "Dossier States" + }, "error": { "conflict": "Dossier State with this name already exists!", "generic": "Failed to add Dossier State"