Skip to content
Snippets Groups Projects
Commit 368da450 authored by Bastien DUMONT's avatar Bastien DUMONT :angel:
Browse files

chore(ui): fix few mistakes

parent f593858e
No related branches found
No related tags found
1 merge request!1263feat(ui)!: new design
...@@ -33,7 +33,9 @@ const ProfileComparatorLayout = ({ ...@@ -33,7 +33,9 @@ const ProfileComparatorLayout = ({
const { t } = useI18n() const { t } = useI18n()
return ( return (
<div className="profileComparator"> <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} {children}
</div> </div>
) )
...@@ -175,7 +177,9 @@ const ProfileComparator = ({ ...@@ -175,7 +177,9 @@ const ProfileComparator = ({
<div className="analysis-graph"> <div className="analysis-graph">
<div className="consumption-title text-14"> <div className="consumption-title text-14">
<div className="user-title">{t('analysis.user_consumption')}</div> <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> </div>
<ProfileComparatorRow <ProfileComparatorRow
fluidType={FluidType.MULTIFLUID} fluidType={FluidType.MULTIFLUID}
......
...@@ -8,7 +8,7 @@ exports[`AnalysisConsumption component should be rendered correctly with profile ...@@ -8,7 +8,7 @@ exports[`AnalysisConsumption component should be rendered correctly with profile
<div <div
class="text-20-normal title" class="text-20-normal title"
> >
analysis.average analysis.comparison_title
</div> </div>
<div <div
class="no-profile" class="no-profile"
...@@ -56,7 +56,7 @@ exports[`AnalysisConsumption component should be rendered correctly with profile ...@@ -56,7 +56,7 @@ exports[`AnalysisConsumption component should be rendered correctly with profile
<div <div
class="text-20-normal title" class="text-20-normal title"
> >
analysis.average analysis.comparison_title
</div> </div>
<div <div
class="analysis-graph" class="analysis-graph"
...@@ -72,7 +72,7 @@ exports[`AnalysisConsumption component should be rendered correctly with profile ...@@ -72,7 +72,7 @@ exports[`AnalysisConsumption component should be rendered correctly with profile
<div <div
class="average-title" class="average-title"
> >
analysis.comparison analysis.comparison_consumption
</div> </div>
</div> </div>
<mock-profilecomparatorrow <mock-profilecomparatorrow
......
...@@ -153,10 +153,11 @@ export const ChartCompare = ({ fluidType }: { fluidType: FluidType }) => { ...@@ -153,10 +153,11 @@ export const ChartCompare = ({ fluidType }: { fluidType: FluidType }) => {
</div> </div>
<div> <div>
{t('consumption.comparison')}{' '}
{convertDateToShortDateString( {convertDateToShortDateString(
currentDatachart.actualData, currentDatachart.actualData,
currentTimeStep currentTimeStep
)} ).toLocaleLowerCase()}
</div> </div>
<div className="compareDetails"> <div className="compareDetails">
......
...@@ -53,7 +53,7 @@ exports[`ConsumptionDetails component should be rendered correctly and render eu ...@@ -53,7 +53,7 @@ exports[`ConsumptionDetails component should be rendered correctly and render eu
<div <div
class="text-18-normal" class="text-18-normal"
> >
Comparaison du bilan du 01/10 au 03/10 Bilan du 01/10 au 03/10
</div> </div>
<div <div
class="icon-line" class="icon-line"
......
...@@ -94,9 +94,10 @@ ...@@ -94,9 +94,10 @@
"viewTitle": "Analyse", "viewTitle": "Analyse",
"warning_title": "Analyse incomplète", "warning_title": "Analyse incomplète",
"warning_text": "Ecolyo n'a pas encore reçu toutes les données %{fluidList} pour ce mois", "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", "analysis_date": "Conso totale",
"challenge": "Défis terminés en", "challenge": "Défis terminés en",
"comparison_consumption": "Comparatif",
"user_consumption": "Votre conso", "user_consumption": "Votre conso",
"average": "Comparaison moyenne d’un jour de :", "average": "Comparaison moyenne d’un jour de :",
"average_edit_profile": "Modifier mon profil", "average_edit_profile": "Modifier mon profil",
...@@ -370,6 +371,7 @@ ...@@ -370,6 +371,7 @@
"ok": "Ok" "ok": "Ok"
}, },
"compared": "Comparé", "compared": "Comparé",
"comparison": "Comparaison du",
"water_pricing": { "water_pricing": {
"year": "Année %{year}", "year": "Année %{year}",
"consumption": "Consommation : <span>%{consumption}m³</span>", "consumption": "Consommation : <span>%{consumption}m³</span>",
......
...@@ -383,22 +383,22 @@ describe('date utils', () => { ...@@ -383,22 +383,22 @@ describe('date utils', () => {
actualData, actualData,
TimeStep.HALF_AN_HOUR 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', () => { it('case WEEK', () => {
const result = convertDateToShortDateString(actualData, TimeStep.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', () => { it('case DAY', () => {
const result = convertDateToShortDateString(actualData, TimeStep.DAY) const result = convertDateToShortDateString(actualData, TimeStep.DAY)
expect(result).toBe('Comparaison du bilan d’octobre') expect(result).toBe('Bilan d’octobre')
}) })
it('case MONTH', () => { it('case MONTH', () => {
const result = convertDateToShortDateString(actualData, TimeStep.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')
}) })
}) })
}) })
......
...@@ -119,17 +119,15 @@ export const convertDateToShortDateString = ( ...@@ -119,17 +119,15 @@ export const convertDateToShortDateString = (
const date = actualData[0].date const date = actualData[0].date
switch (timeStep) { switch (timeStep) {
case TimeStep.HALF_AN_HOUR: case TimeStep.HALF_AN_HOUR:
return `Comparaison du bilan du ${date return `Bilan du ${date.setLocale('fr').toFormat('cccc dd LLLL')}`
.setLocale('fr')
.toFormat('cccc dd LLLL')}`
case TimeStep.DAY: case TimeStep.DAY:
return `Comparaison du bilan ${getMonthNameWithPrep(date)}` return `Bilan ${getMonthNameWithPrep(date)}`
case TimeStep.WEEK: 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 actualData.length - 1
].date.toFormat('dd/MM')}` ].date.toFormat('dd/MM')}`
case TimeStep.MONTH: 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: case TimeStep.YEAR:
return `de ${date.toFormat('y')} à ${actualData[ return `de ${date.toFormat('y')} à ${actualData[
actualData.length - 1 actualData.length - 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment