From a41b167152f894e1fb8b3ae0a53e8f00288a8a08 Mon Sep 17 00:00:00 2001
From: gcarron <gcarron@grandlyon.com>
Date: Mon, 22 Feb 2021 11:15:53 +0100
Subject: [PATCH] Replace unknown default values by 1999 value
---
src/components/Options/ProfileTypeOptions.tsx | 3 +--
.../consumptionConstants/electricSpecific.json | 2 +-
src/constants/consumptionConstants/heating.json | 16 ++++++++--------
src/locales/fr.json | 1 +
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/components/Options/ProfileTypeOptions.tsx b/src/components/Options/ProfileTypeOptions.tsx
index 93494d40d..6047ab563 100644
--- a/src/components/Options/ProfileTypeOptions.tsx
+++ b/src/components/Options/ProfileTypeOptions.tsx
@@ -82,8 +82,7 @@ const ProfileTypeOptions: React.FC = () => {
`profile_type.housing_type.${profile.profileType.housingType}`
)}
</div>
- {profile.profileType.constructionYear !==
- ConstructionYear.UNKNOWN && (
+ {profile.profileType.constructionYear && (
<div className="value">
{t(
`profile_type.construction_year.${'text_' +
diff --git a/src/constants/consumptionConstants/electricSpecific.json b/src/constants/consumptionConstants/electricSpecific.json
index 86968545b..17bef6c57 100644
--- a/src/constants/consumptionConstants/electricSpecific.json
+++ b/src/constants/consumptionConstants/electricSpecific.json
@@ -13,6 +13,6 @@
"between_1975_and_1989": 1780,
"between_1990_and_1998": 1670,
"after_1999": 2060,
- "unknown": 1780
+ "unknown": 2060
}
}
diff --git a/src/constants/consumptionConstants/heating.json b/src/constants/consumptionConstants/heating.json
index a4c49b014..88435daa1 100644
--- a/src/constants/consumptionConstants/heating.json
+++ b/src/constants/consumptionConstants/heating.json
@@ -6,7 +6,7 @@
"between_1975_and_1989": 140,
"between_1990_and_1998": 129,
"after_1999": 106,
- "unknown": 140
+ "unknown": 106
},
"appartment": {
"before_1948": 119,
@@ -14,7 +14,7 @@
"between_1975_and_1989": 105,
"between_1990_and_1998": 73,
"after_1999": 74,
- "unknown": 105
+ "unknown": 74
}
},
"adjustment_outisde_facing_walls": {
@@ -93,12 +93,12 @@
"unknown": {
"none": 0,
"roof_insulation": 0,
- "window_replacement": -0.06,
- "wall_insulation": -0.2,
- "window_replacement_and_wall_insulation": -0.25,
- "window_replacement_and_roof_insulation": -0.07,
- "roof_and_wall_insulation": -0.2,
- "window_replacement_and_roof_and_wall_insulation": -0.25
+ "window_replacement": 0,
+ "wall_insulation": 0,
+ "window_replacement_and_wall_insulation": 0,
+ "window_replacement_and_roof_insulation": 0,
+ "roof_and_wall_insulation": 0,
+ "window_replacement_and_roof_and_wall_insulation": 0
}
},
"adjustment_facilities": {
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 9a0b1fa52..5f5132366 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -451,6 +451,7 @@
"text_between_1975_and_1989": "Construit entre 1975 et 1989",
"text_between_1990_and_1998": "Construit entre 1990 et 1998",
"text_after_1999": "Construit après 1999",
+ "text_unknown": "Construit après 1999",
"before_1948": "Avant 1948",
"between_1948_and_1974": "Entre 1975 et 1989",
"between_1975_and_1989": "Entre 1975 et 1989",
--
GitLab