From 22c09a7e2621ae850246cc49b7699eb218513d40 Mon Sep 17 00:00:00 2001
From: joseCorte-exe <josecorte-corte@hotmail.com>
Date: Tue, 9 Aug 2022 10:28:16 -0300
Subject: [PATCH] =?UTF-8?q?fix=20telemetry=20and=20resumo=20opera=C3=A7?=
 =?UTF-8?q?=C3=A3o=20header?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/graph/DemRegXDemConChart.tsx         | 13 ++++++++++++-
 src/pages/dashboard/index.tsx                       |  8 ++++----
 src/pages/economy/index.tsx                         |  4 ++--
 src/pages/telemetria/index.tsx                      |  2 +-
 .../layouts/ResumoOperacao/ResumoOperacaoView.ts    |  4 ----
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/components/graph/DemRegXDemConChart.tsx b/src/components/graph/DemRegXDemConChart.tsx
index 9a63332..889d421 100644
--- a/src/components/graph/DemRegXDemConChart.tsx
+++ b/src/components/graph/DemRegXDemConChart.tsx
@@ -138,12 +138,23 @@ export function DemRegXDemConChart({
     datasets: [
       {
         type: 'line' as const,
-        label: 'Demanda Contratada',
+        label: 'Tolerância',
         borderColor: red?
         '#f00' : '#0c9200',
         borderWidth: 2,
         fill: false,
         borderDash: [5, 5],
+        data: data1?.map(value => value.dem_tolerancia),
+        pointBorderColor: 'rgba(255, 145, 0, 0)',
+      },
+      {
+        type: 'line' as const,
+        label: 'Demanda Contratada',
+        borderColor: red?
+        '#000' : '#0c9200',
+        borderWidth: 2,
+        fill: false,
+        borderDash: [5, 5],
         data: data1?.map(value => value.dem_cont),
         pointBorderColor: 'rgba(255, 145, 0, 0)',
       },
diff --git a/src/pages/dashboard/index.tsx b/src/pages/dashboard/index.tsx
index b18dc79..b82823e 100644
--- a/src/pages/dashboard/index.tsx
+++ b/src/pages/dashboard/index.tsx
@@ -44,14 +44,14 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal
           lastDataMensal=grossMensalGraph[index].economia_acumulada
         index++
       }
-      setLastDataBrutaMensal(`economia acumulada: R$ ${parseFloat(lastDataMensal).toFixed(3)}`)
+      setLastDataBrutaMensal(`${parseFloat(lastDataMensal).toFixed(3)}`)
       index=0
       while (index < grossAnualGraph.length) {
         if (!grossAnualGraph[index].dad_estimado)
           lastDataAnual=grossAnualGraph[index].economia_acumulada
         index++
       }
-      setLastDataBrutaAnual(`economia acumulada: R$ ${parseFloat(lastDataAnual).toFixed(3)}`)
+      setLastDataBrutaAnual(`${parseFloat(lastDataAnual).toFixed(3)}`)
   }, [])
 
   return (
@@ -79,7 +79,7 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal
         <>
           <section className='dashboard'>
             <GraphCard title='Economia Bruta Anual' subtitle='Economia Bruta Estimada e Acumulada Anual - Valores em R$ x mil'>
-              <p style={{color: '#254F7F'}}>{lastDataBrutaAnualS}</p>
+              <p style={{color: '#254F7F'}}><b>Economia Acumulada:</b> R${lastDataBrutaAnualS}</p>
               <GrossAnualChart title='' subtitle=''
                 dataset='Consolidada'
                 dataProps={grossAnualGraph}
@@ -87,7 +87,7 @@ export default function Dashboard({grossAnualGraph, grossAnualYears, grossMensal
             </GraphCard>
 
             <GraphCard title='Economia Bruta Mensal' subtitle='Economia Bruta Estimada e Acumulada Mensal - Valores em R$ x mil'>
-              <p style={{color: '#254F7F'}}>{lastDataBrutaMensalS}</p>
+              <p style={{color: '#254F7F'}}><b>Economia Acumulada:</b> R${lastDataBrutaMensalS}</p>
               <GrossMensalChart title='' subtitle=''
                 data1={grossMensalGraph}
                 data2={grossMensalGraph}
diff --git a/src/pages/economy/index.tsx b/src/pages/economy/index.tsx
index 107f645..f7c0795 100644
--- a/src/pages/economy/index.tsx
+++ b/src/pages/economy/index.tsx
@@ -64,7 +64,7 @@ export default function economy({userName, anual, years, brutaMensal, yearsBruta
         index++
       }
     }
-    setLastDataBrutaMensal(`economia acumulada: R$ ${parseFloat(lastData).toFixed(3)}`)
+    setLastDataBrutaMensal(`${parseFloat(lastData).toFixed(3)}`)
   }, [economyMenu])
 
   useEffect(() => {
@@ -115,7 +115,7 @@ export default function economy({userName, anual, years, brutaMensal, yearsBruta
           }
           <p>{
             economyMenu===0 || economyMenu===1?
-              lastDataBrutaMensalS
+              <><b>Economia Acumulada:</b> R${lastDataBrutaMensalS}</>
               :
               null
           }</p>
diff --git a/src/pages/telemetria/index.tsx b/src/pages/telemetria/index.tsx
index b45e76f..9c9bcca 100644
--- a/src/pages/telemetria/index.tsx
+++ b/src/pages/telemetria/index.tsx
@@ -528,7 +528,7 @@ export default function Telemetria({userName, clients}: any) {
               </div>
             </ChartFilters>
             <FatorPotenciaChart title='Fator de Potencia' subtitle='' data1={fatorPotenciaData}
-              data2={fatorPotenciaData} dataset1='Fator de Potencia' dataset2='Fator ref' label={fatorPotenciaData.map(value => parseFloat(value.dia_num))} />
+              data2={fatorPotenciaData} dataset1='Fator de Potencia' dataset2='Fator ref' label={fatorPotenciaData.map(value => (value.day_formatted))} />
           </RenderIf>
 
           <RenderIf isTrue={menu===3}>
diff --git a/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts b/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts
index 63890d3..2d14679 100644
--- a/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts
+++ b/src/styles/layouts/ResumoOperacao/ResumoOperacaoView.ts
@@ -13,10 +13,6 @@ export const TableView = styled.div`
   height: 100%;
 
 
-  img{
-    margin-left:30rem;
-  }
-
   .btn{
     margin-top: 10px;
   }