From 368da450bb12872b6b20c8f51db7d0f5edab79f5 Mon Sep 17 00:00:00 2001
From: Bastien DUMONT <bdumont@grandlyon.com>
Date: Tue, 5 Nov 2024 14:11:28 +0100
Subject: [PATCH] chore(ui): fix few mistakes
---
.../Analysis/ProfileComparator/ProfileComparator.tsx | 8 ++++++--
.../__snapshots__/ProfileComparator.spec.tsx.snap | 6 +++---
.../Consumption/ChartCompare/ChartCompare.tsx | 3 ++-
.../__snapshots__/ConsumptionDetails.spec.tsx.snap | 2 +-
src/locales/fr.json | 4 +++-
src/utils/date.spec.ts | 8 ++++----
src/utils/date.ts | 10 ++++------
7 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/src/components/Analysis/ProfileComparator/ProfileComparator.tsx b/src/components/Analysis/ProfileComparator/ProfileComparator.tsx
index 9d822f720..a5839fe43 100644
--- a/src/components/Analysis/ProfileComparator/ProfileComparator.tsx
+++ b/src/components/Analysis/ProfileComparator/ProfileComparator.tsx
@@ -33,7 +33,9 @@ const ProfileComparatorLayout = ({
const { t } = useI18n()
return (
<div className="profileComparator">
- <div className="text-20-normal title">{t('analysis.average')}</div>
+ <div className="text-20-normal title">
+ {t('analysis.comparison_title')}
+ </div>
{children}
</div>
)
@@ -175,7 +177,9 @@ const ProfileComparator = ({
<div className="analysis-graph">
<div className="consumption-title text-14">
<div className="user-title">{t('analysis.user_consumption')}</div>
- <div className="average-title">{t(`analysis.comparison`)}</div>
+ <div className="average-title">
+ {t(`analysis.comparison_consumption`)}
+ </div>
</div>
<ProfileComparatorRow
fluidType={FluidType.MULTIFLUID}
diff --git a/src/components/Analysis/ProfileComparator/__snapshots__/ProfileComparator.spec.tsx.snap b/src/components/Analysis/ProfileComparator/__snapshots__/ProfileComparator.spec.tsx.snap
index 22df67133..cbd52102d 100644
--- a/src/components/Analysis/ProfileComparator/__snapshots__/ProfileComparator.spec.tsx.snap
+++ b/src/components/Analysis/ProfileComparator/__snapshots__/ProfileComparator.spec.tsx.snap
@@ -8,7 +8,7 @@ exports[`AnalysisConsumption component should be rendered correctly with profile
<div
class="text-20-normal title"
>
- analysis.average
+ analysis.comparison_title
</div>
<div
class="no-profile"
@@ -56,7 +56,7 @@ exports[`AnalysisConsumption component should be rendered correctly with profile
<div
class="text-20-normal title"
>
- analysis.average
+ analysis.comparison_title
</div>
<div
class="analysis-graph"
@@ -72,7 +72,7 @@ exports[`AnalysisConsumption component should be rendered correctly with profile
<div
class="average-title"
>
- analysis.comparison
+ analysis.comparison_consumption
</div>
</div>
<mock-profilecomparatorrow
diff --git a/src/components/Consumption/ChartCompare/ChartCompare.tsx b/src/components/Consumption/ChartCompare/ChartCompare.tsx
index e4fe439ad..cdbd5f702 100644
--- a/src/components/Consumption/ChartCompare/ChartCompare.tsx
+++ b/src/components/Consumption/ChartCompare/ChartCompare.tsx
@@ -153,10 +153,11 @@ export const ChartCompare = ({ fluidType }: { fluidType: FluidType }) => {
</div>
<div>
+ {t('consumption.comparison')}{' '}
{convertDateToShortDateString(
currentDatachart.actualData,
currentTimeStep
- )}
+ ).toLocaleLowerCase()}
</div>
<div className="compareDetails">
diff --git a/src/components/Consumption/ConsumptionDetails/__snapshots__/ConsumptionDetails.spec.tsx.snap b/src/components/Consumption/ConsumptionDetails/__snapshots__/ConsumptionDetails.spec.tsx.snap
index 8e15714ac..cad365551 100644
--- a/src/components/Consumption/ConsumptionDetails/__snapshots__/ConsumptionDetails.spec.tsx.snap
+++ b/src/components/Consumption/ConsumptionDetails/__snapshots__/ConsumptionDetails.spec.tsx.snap
@@ -53,7 +53,7 @@ exports[`ConsumptionDetails component should be rendered correctly and render eu
<div
class="text-18-normal"
>
- Comparaison du bilan du 01/10 au 03/10
+ Bilan du 01/10 au 03/10
</div>
<div
class="icon-line"
diff --git a/src/locales/fr.json b/src/locales/fr.json
index d763af1c9..75f24dc1f 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -94,9 +94,10 @@
"viewTitle": "Analyse",
"warning_title": "Analyse incomplète",
"warning_text": "Ecolyo n'a pas encore reçu toutes les données %{fluidList} pour ce mois",
- "comparison": "Comparatif",
+ "comparison_title": "Comparateur",
"analysis_date": "Conso totale",
"challenge": "Défis terminés en",
+ "comparison_consumption": "Comparatif",
"user_consumption": "Votre conso",
"average": "Comparaison moyenne d’un jour de :",
"average_edit_profile": "Modifier mon profil",
@@ -370,6 +371,7 @@
"ok": "Ok"
},
"compared": "Comparé",
+ "comparison": "Comparaison du",
"water_pricing": {
"year": "Année %{year}",
"consumption": "Consommation : <span>%{consumption}m³</span>",
diff --git a/src/utils/date.spec.ts b/src/utils/date.spec.ts
index 52bb83db3..df72bc57c 100644
--- a/src/utils/date.spec.ts
+++ b/src/utils/date.spec.ts
@@ -383,22 +383,22 @@ describe('date utils', () => {
actualData,
TimeStep.HALF_AN_HOUR
)
- expect(result).toBe('Comparaison du bilan du jeudi 01 octobre')
+ expect(result).toBe('Bilan du jeudi 01 octobre')
})
it('case WEEK', () => {
const result = convertDateToShortDateString(actualData, TimeStep.WEEK)
- expect(result).toBe('Comparaison du bilan du 01/10 au 03/10')
+ expect(result).toBe('Bilan du 01/10 au 03/10')
})
it('case DAY', () => {
const result = convertDateToShortDateString(actualData, TimeStep.DAY)
- expect(result).toBe('Comparaison du bilan d’octobre')
+ expect(result).toBe('Bilan d’octobre')
})
it('case MONTH', () => {
const result = convertDateToShortDateString(actualData, TimeStep.MONTH)
- expect(result).toBe('Comparaison du bilan de l’année 2020')
+ expect(result).toBe('Bilan de l’année 2020')
})
})
})
diff --git a/src/utils/date.ts b/src/utils/date.ts
index bbef6bf4b..1a6d379df 100644
--- a/src/utils/date.ts
+++ b/src/utils/date.ts
@@ -119,17 +119,15 @@ export const convertDateToShortDateString = (
const date = actualData[0].date
switch (timeStep) {
case TimeStep.HALF_AN_HOUR:
- return `Comparaison du bilan du ${date
- .setLocale('fr')
- .toFormat('cccc dd LLLL')}`
+ return `Bilan du ${date.setLocale('fr').toFormat('cccc dd LLLL')}`
case TimeStep.DAY:
- return `Comparaison du bilan ${getMonthNameWithPrep(date)}`
+ return `Bilan ${getMonthNameWithPrep(date)}`
case TimeStep.WEEK:
- return `Comparaison du bilan du ${date.toFormat('dd/MM')} au ${actualData[
+ return `Bilan du ${date.toFormat('dd/MM')} au ${actualData[
actualData.length - 1
].date.toFormat('dd/MM')}`
case TimeStep.MONTH:
- return `Comparaison du bilan de l’année ${date.toFormat('y')}`
+ return `Bilan de l’année ${date.toFormat('y')}`
case TimeStep.YEAR:
return `de ${date.toFormat('y')} Ã ${actualData[
actualData.length - 1
--
GitLab