|
|
@@ -164,12 +164,13 @@ export class YearGraphComponent {
|
|
|
|
|
|
getRegionProgress(regionData): -1 | 0 | 1 {
|
|
|
//TODO: parametrize the PARAM_TO_COMPARE
|
|
|
+ //TODO: use i-2, i-1 comparison based on 2 previous steps
|
|
|
const PARAM_TO_COMPARE = 'aggregated';
|
|
|
const region = regionData['MODEL'];
|
|
|
const year = regionData['TIME_STEP'];
|
|
|
- const thisYearValue = Number.parseFloat(
|
|
|
+ const thisYearValue = +Number.parseFloat(
|
|
|
regionData[PARAM_TO_COMPARE]
|
|
|
- ).toFixed(2);
|
|
|
+ ).toFixed(3);
|
|
|
let pastYear = Number.parseFloat(year) - 0.25 + '';
|
|
|
pastYear = pastYear.includes('.') ? pastYear : pastYear + '.0';
|
|
|
const pastYearData = this.sdmDihService.sdmData[pastYear];
|
|
|
@@ -180,7 +181,7 @@ export class YearGraphComponent {
|
|
|
let pastYearValue = pastYearData.find(
|
|
|
(regionPastYear) => regionPastYear['MODEL'] === region
|
|
|
)?.[PARAM_TO_COMPARE];
|
|
|
- pastYearValue = Number.parseFloat(pastYearValue).toFixed(2);
|
|
|
+ pastYearValue = +Number.parseFloat(pastYearValue).toFixed(3);
|
|
|
if (pastYearValue < thisYearValue) {
|
|
|
return 1;
|
|
|
}
|