浏览代码

🐛 compare also scenario when searching disc data

resolves #2
jmacura 3 年之前
父节点
当前提交
d3a49f9a7c

+ 4 - 1
src/app/discs-chart/discs-chart-base.service.ts

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

+ 1 - 1
src/app/discs-chart/scenario-factor-year-graph/scenario-factor-year-graph.component.html

@@ -36,8 +36,8 @@
 
     <div class="d-flex">
       <div class="discs-caption">
-        <h4>business as usual</h4>
         <p>scenario</p>
+        <h4>business as usual</h4>
         <p>
           of region {{selectedRegion}} in {{yearGraphService.selectedYear}}
         </p>