From 3f9923bd1f8b4759c75c1d51673cdc7b71eca9bb Mon Sep 17 00:00:00 2001
From: Hugo SUBTIL <ext.sopra.husubtil@grandlyon.com>
Date: Wed, 17 Nov 2021 10:10:48 +0100
Subject: [PATCH] fix(Analysis): fix total consumption card display
---
src/components/Analysis/MonthlyAnalysis.tsx | 18 +++++++-----------
src/components/Analysis/TotalAnalysisChart.tsx | 6 ++----
2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/src/components/Analysis/MonthlyAnalysis.tsx b/src/components/Analysis/MonthlyAnalysis.tsx
index eed2bb13d..56640f42e 100644
--- a/src/components/Analysis/MonthlyAnalysis.tsx
+++ b/src/components/Analysis/MonthlyAnalysis.tsx
@@ -134,18 +134,14 @@ const MonthlyAnalysis: React.FC<MonthlyAnalysisProps> = ({
})}
</div>
</div>
- {fluidTypes.length <= 1 ? (
- <></>
- ) : (
- <div className="analysis-content">
- <div className="card rich-card">
- <TotalAnalysisChart
- analysisDate={analysisDate}
- fluidTypes={fluidTypes}
- />
- </div>
+ <div className="analysis-content">
+ <div className="card rich-card">
+ <TotalAnalysisChart
+ analysisDate={analysisDate}
+ fluidTypes={fluidTypes}
+ />
</div>
- )}
+ </div>
<div className="analysis-content">
<div className="card rich-card">
<MaxConsumptionCard analysisDate={analysisDate} />
diff --git a/src/components/Analysis/TotalAnalysisChart.tsx b/src/components/Analysis/TotalAnalysisChart.tsx
index 7b5c73ee1..817670e0e 100644
--- a/src/components/Analysis/TotalAnalysisChart.tsx
+++ b/src/components/Analysis/TotalAnalysisChart.tsx
@@ -66,9 +66,7 @@ const TotalAnalysisChart: React.FC<TotalAnalysisChartProps> = ({
minHeight: radius + 100,
}}
>
- {fluidTypes.length >= 2 && (
- <div className="text-24-normal title">{t('analysis_pie.total')}</div>
- )}
+ <div className="text-24-normal title">{t('analysis_pie.total')}</div>
{dataLoadArray && (
<PieChart
dataArray={dataLoadArray}
@@ -82,7 +80,7 @@ const TotalAnalysisChart: React.FC<TotalAnalysisChartProps> = ({
.startOf('month')}
/>
)}
- {dataLoadArray && (
+ {dataLoadArray && fluidTypes.length > 1 && (
<div className="total-card-container">
{dataLoadArray.map((load, index) => {
return (
--
GitLab