From 448c1069725fab95b751b80eaffab20b9e78a762 Mon Sep 17 00:00:00 2001
From: Bastien DUMONT <bdumont@grandlyon.com>
Date: Mon, 10 Jul 2023 12:34:09 +0000
Subject: [PATCH] fix(ecogestures): fix small profile
---
.../EcogestureForm/EcogestureFormSingleChoice.tsx | 2 +-
.../EcogestureForm/EcogestureFormView.tsx | 1 +
.../ProfileType/ProfileTypeFormSingleChoice.tsx | 2 +-
src/enum/ecogestureForm.enum.ts | 2 +-
src/locales/fr.json | 13 ++++++++++---
src/services/profileEcogestureForm.service.ts | 13 +++++++------
6 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx b/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
index 5f1299666..0e7b45b25 100644
--- a/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
+++ b/src/components/EcogestureForm/EcogestureFormSingleChoice.tsx
@@ -56,7 +56,7 @@ const EcogestureFormSingleChoice = ({
)}
</div>
{answerType.choices.map(value => {
- if (!value) return null
+ if (value === null) return null
return (
<label
key={value.toString()}
diff --git a/src/components/EcogestureForm/EcogestureFormView.tsx b/src/components/EcogestureForm/EcogestureFormView.tsx
index b3faea70e..56ff6d5ec 100644
--- a/src/components/EcogestureForm/EcogestureFormView.tsx
+++ b/src/components/EcogestureForm/EcogestureFormView.tsx
@@ -101,6 +101,7 @@ const EcogestureFormView = () => {
</Content>
)
}
+
return (
<>
<CozyBar titleKey={'common.title_ecogestures'} />
diff --git a/src/components/ProfileType/ProfileTypeFormSingleChoice.tsx b/src/components/ProfileType/ProfileTypeFormSingleChoice.tsx
index 85f3a0e17..b9033471d 100644
--- a/src/components/ProfileType/ProfileTypeFormSingleChoice.tsx
+++ b/src/components/ProfileType/ProfileTypeFormSingleChoice.tsx
@@ -78,7 +78,7 @@ const ProfileTypeFormSingleChoice = ({
)}
</div>
{answerType.choices.map((value, index) => {
- if (!value && value !== 0) return null
+ if (value === null) return null
return (
<label
diff --git a/src/enum/ecogestureForm.enum.ts b/src/enum/ecogestureForm.enum.ts
index 3e847a325..4caa98b55 100644
--- a/src/enum/ecogestureForm.enum.ts
+++ b/src/enum/ecogestureForm.enum.ts
@@ -1,7 +1,7 @@
export enum EcogestureStepForm {
HEATING_TYPE = 0,
WARMING_FLUID = 1,
- HOT_WATER_TYPE = 2,
+ HOT_WATER = 2,
EQUIPMENTS = 3,
END,
}
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 823bb73b4..4d3cf9be3 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -523,13 +523,20 @@
},
"warming_fluid": {
"title": "Source chauffage",
- "question": "Quelle source d’énergie principale utilisez-vous pour votre chauffage\u00a0?",
+ "question": "Quelle source d’énergie principale utilisez-vous pour vous chauffer\u00a0?",
"0": "Électricité",
"2": "Gaz",
"3": "Bois",
- "4": "Fioul"
+ "4": "Fioul",
+ "5": "Autre",
+ "no_fluid_text": "Produit ni par de l'électricité, ni par du gaz, ni par du bois ou du fuel",
+ "0_text": "Produit grâce à de l'électricité",
+ "2_text": "Produit grâce au gaz",
+ "3_text": "Produit grâce au bois",
+ "4_text": "Produit grâce au fioul",
+ "5_text": "Produit grâce à un autre moyen"
},
- "hot_water_type": {
+ "hot_water": {
"title": "Eau chaude",
"question": "Quel est votre type de production d’eau chaude\u00a0?",
"individual": "Individuelle",
diff --git a/src/services/profileEcogestureForm.service.ts b/src/services/profileEcogestureForm.service.ts
index 0da0d9ead..0e3aae75a 100644
--- a/src/services/profileEcogestureForm.service.ts
+++ b/src/services/profileEcogestureForm.service.ts
@@ -28,10 +28,10 @@ export default class ProfileEcogestureFormService {
return this.profileEcogesture.heating ===
IndividualOrCollective.INDIVIDUAL
? EcogestureStepForm.WARMING_FLUID
- : EcogestureStepForm.HOT_WATER_TYPE
+ : EcogestureStepForm.HOT_WATER
case EcogestureStepForm.WARMING_FLUID:
- return EcogestureStepForm.HOT_WATER_TYPE
- case EcogestureStepForm.HOT_WATER_TYPE:
+ return EcogestureStepForm.HOT_WATER
+ case EcogestureStepForm.HOT_WATER:
return EcogestureStepForm.EQUIPMENTS
case EcogestureStepForm.EQUIPMENTS:
return EcogestureStepForm.END
@@ -48,8 +48,8 @@ export default class ProfileEcogestureFormService {
public getPreviousFormStep(step: EcogestureStepForm): EcogestureStepForm {
switch (step) {
case EcogestureStepForm.EQUIPMENTS:
- return EcogestureStepForm.HOT_WATER_TYPE
- case EcogestureStepForm.HOT_WATER_TYPE:
+ return EcogestureStepForm.HOT_WATER
+ case EcogestureStepForm.HOT_WATER:
return this.profileEcogesture.heating ===
IndividualOrCollective.INDIVIDUAL
? EcogestureStepForm.WARMING_FLUID
@@ -77,9 +77,10 @@ export default class ProfileEcogestureFormService {
WarmingType.GAS,
WarmingType.WOOD,
WarmingType.FUEL,
+ WarmingType.OTHER,
],
}
- case EcogestureStepForm.HOT_WATER_TYPE:
+ case EcogestureStepForm.HOT_WATER:
return {
type: ProfileEcogestureAnswerType.SINGLE_CHOICE,
attribute: 'hotWater',
--
GitLab