diff --git a/src/constants/consumptionConstants/electricSpecific.json b/src/constants/consumptionConstants/electricSpecific.json index 17bef6c57f9a2fac40bf69d45a8cb824545f16a5..dafba211eed8568ce1d68db3b5b0450c9311a378 100644 --- a/src/constants/consumptionConstants/electricSpecific.json +++ b/src/constants/consumptionConstants/electricSpecific.json @@ -4,7 +4,7 @@ "between_1948_and_1974": 3130, "between_1975_and_1989": 2900, "between_1990_and_1998": 3230, - "after_1999": 2900, + "after_1998": 2900, "unknown": 2900 }, "appartment": { @@ -12,7 +12,7 @@ "between_1948_and_1974": 1880, "between_1975_and_1989": 1780, "between_1990_and_1998": 1670, - "after_1999": 2060, + "after_1998": 2060, "unknown": 2060 } } diff --git a/src/constants/consumptionConstants/heating.json b/src/constants/consumptionConstants/heating.json index 88435daa11683dd96a5c593087113afdc5ae4c40..4cde7717836d6d7660c229fdf7e303d35d30f043 100644 --- a/src/constants/consumptionConstants/heating.json +++ b/src/constants/consumptionConstants/heating.json @@ -5,7 +5,7 @@ "between_1948_and_1974": 184, "between_1975_and_1989": 140, "between_1990_and_1998": 129, - "after_1999": 106, + "after_1998": 106, "unknown": 106 }, "appartment": { @@ -13,7 +13,7 @@ "between_1948_and_1974": 150, "between_1975_and_1989": 105, "between_1990_and_1998": 73, - "after_1999": 74, + "after_1998": 74, "unknown": 74 } }, @@ -80,7 +80,7 @@ "roof_and_wall_insulation": -0.1, "window_replacement_and_roof_and_wall_insulation": -0.15 }, - "after_1999": { + "after_1998": { "none": 0, "roof_insulation": 0, "window_replacement": 0, diff --git a/src/enum/profileType.enum.ts b/src/enum/profileType.enum.ts index cda8a6325f5ba5fbc7940b99c9c2efd016407e6f..c4134f2a98af8ca6f4af02f9ccbd23e751f85567 100644 --- a/src/enum/profileType.enum.ts +++ b/src/enum/profileType.enum.ts @@ -21,7 +21,7 @@ export enum ConstructionYear { BETWEEN_1948_AND_1974 = 'between_1948_and_1974', BETWEEN_1975_AND_1989 = 'between_1975_and_1989', BETWEEN_1990_AND_1998 = 'between_1990_and_1998', - AFTER_1999 = 'after_1999', + AFTER_1998 = 'after_1998', UNKNOWN = 'unknown', } diff --git a/src/locales/fr.json b/src/locales/fr.json index 8cc940e422afe3871488edaea339aae9e3d19a87..001f6874eef1fa9dec78d204052adfc6503cc6d5 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -569,13 +569,13 @@ "text_between_1948_and_1974": "Construit entre 1948 et 1974", "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", + "text_after_1998": "Construit après 1998", + "text_unknown": "Construit après 1998", "before_1948": "Avant 1948", "between_1948_and_1974": "Entre 1948 et 1974", "between_1975_and_1989": "Entre 1975 et 1989", "between_1990_and_1998": "Entre 1990 et 1998", - "after_1999": "Après 1999", + "after_1998": "Après 1998", "unknown": "Je ne sais pas" }, "occupantsNumber": { diff --git a/src/services/profileType.service.ts b/src/services/profileType.service.ts index 37b42d07bd61bd400f8e6fea7e803a8e2cde4a16..c750cf72338b1ba14a898b1a1d2efb5a8e1255fd 100644 --- a/src/services/profileType.service.ts +++ b/src/services/profileType.service.ts @@ -83,7 +83,7 @@ export default class ProfileTypeService { if ( !individualInsulationWork.includes(IndividualInsulationWork.NONE) && - constructionYear !== ConstructionYear.AFTER_1999 && + constructionYear !== ConstructionYear.AFTER_1998 && heating !== IndividualOrCollective.COLLECTIVE ) { const correctionsInsulation: { [key: string]: number } = @@ -482,7 +482,7 @@ export default class ProfileTypeService { ? ProfileTypeStepForm.WARMING_FLUID : ProfileTypeStepForm.COLD_WATER case ProfileTypeStepForm.WARMING_FLUID: - return this.profileType.constructionYear === ConstructionYear.AFTER_1999 + return this.profileType.constructionYear === ConstructionYear.AFTER_1998 ? ProfileTypeStepForm.VENTILATION : ProfileTypeStepForm.INDIVIDUAL_INSULATION_WORK case ProfileTypeStepForm.INDIVIDUAL_INSULATION_WORK: @@ -536,7 +536,7 @@ export default class ProfileTypeService { case ProfileTypeStepForm.INDIVIDUAL_INSULATION_WORK: return ProfileTypeStepForm.WARMING_FLUID case ProfileTypeStepForm.VENTILATION: - return this.profileType.constructionYear === ConstructionYear.AFTER_1999 + return this.profileType.constructionYear === ConstructionYear.AFTER_1998 ? ProfileTypeStepForm.WARMING_FLUID : ProfileTypeStepForm.INDIVIDUAL_INSULATION_WORK case ProfileTypeStepForm.HEATER_REPLACEMENT: diff --git a/src/store/profile/profile.reducer.ts b/src/store/profile/profile.reducer.ts index 4d8391817135d10be5811438630a9de955b8139e..d21452ad2748c51adfc47670c30fd67f711d2487 100644 --- a/src/store/profile/profile.reducer.ts +++ b/src/store/profile/profile.reducer.ts @@ -33,7 +33,7 @@ const initialState: Profile = { isProfileTypeCompleted: false, profileType: { housingType: HousingType.APPARTMENT, - constructionYear: ConstructionYear.AFTER_1999, + constructionYear: ConstructionYear.AFTER_1998, area: 35, occupantsNumber: 1, outsideFacingWalls: OutsideFacingWalls.ONE, diff --git a/tests/__mocks__/profile.mock.ts b/tests/__mocks__/profile.mock.ts index 701a3f02ec91085e0c697249325f508f4924c877..c10aba0e123af8555367fb238ca5e6e1cb2b044d 100644 --- a/tests/__mocks__/profile.mock.ts +++ b/tests/__mocks__/profile.mock.ts @@ -33,7 +33,7 @@ export const profileData: Profile = { sendAnalysisNotification: false, profileType: { housingType: HousingType.APPARTMENT, - constructionYear: ConstructionYear.AFTER_1999, + constructionYear: ConstructionYear.AFTER_1998, area: 35, occupantsNumber: 1, outsideFacingWalls: OutsideFacingWalls.ONE, diff --git a/tests/__mocks__/profileType.mock.ts b/tests/__mocks__/profileType.mock.ts index 1e14c43d5dcfae26a2a7b64a19d7bec5cdc466b5..2228b79b051fe4fbdeb1e16a3817b302d65a4736 100644 --- a/tests/__mocks__/profileType.mock.ts +++ b/tests/__mocks__/profileType.mock.ts @@ -19,7 +19,7 @@ import { export const mockProfileType: ProfileType = { housingType: HousingType.APPARTMENT, - constructionYear: ConstructionYear.AFTER_1999, + constructionYear: ConstructionYear.AFTER_1998, area: 43, occupantsNumber: 1, outsideFacingWalls: OutsideFacingWalls.TWO, diff --git a/tests/__mocks__/store.ts b/tests/__mocks__/store.ts index d13843c472a5c4d8460a4948f53ceede9901859f..51cb96df120279cf433a0359e7fb82ab8b75aca4 100644 --- a/tests/__mocks__/store.ts +++ b/tests/__mocks__/store.ts @@ -111,7 +111,7 @@ export const mockInitialProfileState: Profile = { isProfileTypeCompleted: false, profileType: { housingType: HousingType.APPARTMENT, - constructionYear: ConstructionYear.AFTER_1999, + constructionYear: ConstructionYear.AFTER_1998, area: 35, occupantsNumber: 1, outsideFacingWalls: OutsideFacingWalls.ONE,