|
@@ -22,6 +22,7 @@ export class DiscsChartBaseService {
|
|
|
const PARAM_TO_COMPARE = factor;
|
|
const PARAM_TO_COMPARE = factor;
|
|
|
const region = regionData['MODEL'];
|
|
const region = regionData['MODEL'];
|
|
|
const year = regionData['TIME_STEP'];
|
|
const year = regionData['TIME_STEP'];
|
|
|
|
|
+ const scenario = regionData['SCENARIO'];
|
|
|
const factorValue =
|
|
const factorValue =
|
|
|
regionData[PARAM_TO_COMPARE]?.index ?? regionData[PARAM_TO_COMPARE];
|
|
regionData[PARAM_TO_COMPARE]?.index ?? regionData[PARAM_TO_COMPARE];
|
|
|
const thisYearValue = +Number.parseFloat(factorValue).toFixed(3);
|
|
const thisYearValue = +Number.parseFloat(factorValue).toFixed(3);
|
|
@@ -33,7 +34,9 @@ export class DiscsChartBaseService {
|
|
|
return 0;
|
|
return 0;
|
|
|
}
|
|
}
|
|
|
const pastYearDataRegion = pastYearData.find(
|
|
const pastYearDataRegion = pastYearData.find(
|
|
|
- (regionPastYear) => regionPastYear['MODEL'] === region
|
|
|
|
|
|
|
+ (regionPastYear) =>
|
|
|
|
|
+ regionPastYear['MODEL'] === region &&
|
|
|
|
|
+ regionPastYear['SCENARIO'] === scenario
|
|
|
);
|
|
);
|
|
|
let pastYearValue =
|
|
let pastYearValue =
|
|
|
pastYearDataRegion?.[PARAM_TO_COMPARE]?.index ??
|
|
pastYearDataRegion?.[PARAM_TO_COMPARE]?.index ??
|