From 45a9737d84e70c9aeac32651058911d797eb66bb Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 21 Feb 2024 14:32:14 +0200 Subject: [PATCH] [develop]: Add statsProfile in indicatorPath. --- monitor-admin/utils/indicator-utils.ts | 10 +++++++--- monitor/entities/stakeholder.ts | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/monitor-admin/utils/indicator-utils.ts b/monitor-admin/utils/indicator-utils.ts index 7397b837..25de908b 100644 --- a/monitor-admin/utils/indicator-utils.ts +++ b/monitor-admin/utils/indicator-utils.ts @@ -317,7 +317,9 @@ export class IndicatorUtils { public getFullUrl(stakeholder: Stakeholder, indicatorPath: IndicatorPath, fundingL0: string = null, startYear: string = null, endYear: string = null): string { let replacedUrl = indicatorPath.chartObject ? indicatorPath.chartObject : indicatorPath.url; - if (stakeholder.statsProfile) { + if(indicatorPath.statsProfile) { + replacedUrl = replacedUrl.split(ChartHelper.prefix + this.statsProfileParameter + ChartHelper.suffix).join(indicatorPath.statsProfile) + } else if (stakeholder.statsProfile) { replacedUrl = replacedUrl.split(ChartHelper.prefix + this.statsProfileParameter + ChartHelper.suffix).join(stakeholder.statsProfile) } if (indicatorPath.parameters) { @@ -396,8 +398,10 @@ export class IndicatorUtils { let filterSubtitleText = []; indicatorPath.filtersApplied = 0; let replacedUrl = indicatorPath.chartObject ? indicatorPath.chartObject : indicatorPath.url; - if (stakeholder.statsProfile) { - replacedUrl = replacedUrl.split(ChartHelper.prefix + this.statsProfileParameter + ChartHelper.suffix).join(stakeholder.statsProfile); + if(indicatorPath.statsProfile) { + replacedUrl = replacedUrl.split(ChartHelper.prefix + this.statsProfileParameter + ChartHelper.suffix).join(indicatorPath.statsProfile) + } else if (stakeholder.statsProfile) { + replacedUrl = replacedUrl.split(ChartHelper.prefix + this.statsProfileParameter + ChartHelper.suffix).join(stakeholder.statsProfile) } if (fundingL0) { if (indicatorPath.source == "stats-tool" && indicatorPath.chartObject) { diff --git a/monitor/entities/stakeholder.ts b/monitor/entities/stakeholder.ts index 49c8e755..faa7bac8 100644 --- a/monitor/entities/stakeholder.ts +++ b/monitor/entities/stakeholder.ts @@ -210,6 +210,7 @@ export class IndicatorPath { parameters: any; filters: any; filtersApplied: number = 0; + statsProfile: string; format: Format; constructor(type: IndicatorPathType, source: SourceType, url: string, chartObject: string, jsonPath: string[], format: Format = 'NUMBER') {