From 0baf43c3194f2ed483c493f2ab9b347650acb3ac Mon Sep 17 00:00:00 2001
From: joseCorte-exe <josecorte-corte@hotmail.com>
Date: Tue, 5 Jul 2022 09:50:35 -0300
Subject: [PATCH] preparando para release

---
 src/components/graph/Chart.tsx                  | 10 +++++-----
 src/components/graph/graphCard/ChartCardView.ts |  1 -
 src/pages/aboutUs/index.tsx                     |  2 +-
 src/pages/pld/index.tsx                         |  8 ++++++++
 src/pages/resumoOperacao/index.tsx              |  2 +-
 src/styles/layouts/aboutUs/AboutUsView.ts       |  4 ++--
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/components/graph/Chart.tsx b/src/components/graph/Chart.tsx
index fcb137d..83413eb 100644
--- a/src/components/graph/Chart.tsx
+++ b/src/components/graph/Chart.tsx
@@ -89,11 +89,11 @@ export default function Chart({ title, data1, data2, label, subtitle, dataset1,
     datasets: [
       {
         label: dataset1? dataset1 : '2021',
-        data: data1.map(value => value.custo_unit>0? value.custo_unit : ''),
-        // backgroundColor: '#255488'
-        backgroundColor: (value, ctx) => {
-          return data1[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#C2d5fb');
-        },
+        data: data1.map(value => value.custo_unit>0? value.custo_unit : null),
+        backgroundColor: '#255488'
+        // backgroundColor: (value, ctx) => {
+        //   return data1[value.dataIndex]?.dad_estimado == false ? '#255488' : draw('diagonal-right-left', '#255488');
+        // },
       },
       {
         label: dataset2? dataset2 : '2022',
diff --git a/src/components/graph/graphCard/ChartCardView.ts b/src/components/graph/graphCard/ChartCardView.ts
index 0a9af85..ebff2d3 100644
--- a/src/components/graph/graphCard/ChartCardView.ts
+++ b/src/components/graph/graphCard/ChartCardView.ts
@@ -8,7 +8,6 @@ export const ChartCardView = styled.article`
   flex-direction: column;
 
   width: 100%;
-  max-height: 2rem;
 
   background: #F8F8F8;
 	box-shadow: 0 0 11px rgba(0, 0, 0, 0.2)  ;
diff --git a/src/pages/aboutUs/index.tsx b/src/pages/aboutUs/index.tsx
index 8e2a17b..914f1b0 100644
--- a/src/pages/aboutUs/index.tsx
+++ b/src/pages/aboutUs/index.tsx
@@ -18,7 +18,7 @@ export default function aboutUs({userName, text}) {
       <Header name={userName}/>
       <Banner title='Quem Somos' subtitle='Soluções inteligentes em Gestão de Energia' imgSource='/assets/banners/aboutUsBanner.png' />
 
-      <section dangerouslySetInnerHTML={{__html: text[0].about}}/>
+      <section dangerouslySetInnerHTML={{__html: text[0]?.about}}/>
       <article>
         <aside>
           <h2>Apoio a projetos sociais</h2>
diff --git a/src/pages/pld/index.tsx b/src/pages/pld/index.tsx
index 7efafc4..1ea6db7 100644
--- a/src/pages/pld/index.tsx
+++ b/src/pages/pld/index.tsx
@@ -202,6 +202,14 @@ export default function pld({tableData, userName, clientMonth}: pldInterface) {
                   if (parseFloat(a.year_month_formatted.slice(0,2)) > parseFloat(b.year_month_formatted.slice(1,2))) return 1
                   if (parseFloat(a.year_month_formatted.slice(0,2)) < parseFloat(b.year_month_formatted.slice(1,2))) return -1
 
+                  return 0
+                }).sort((a, b) => {
+                  if (parseFloat(a.year_month_formatted.slice(3,7)) > parseFloat(b.year_month_formatted.slice(3,7))) return 1
+                  if (parseFloat(a.year_month_formatted.slice(3,7)) < parseFloat(b.year_month_formatted.slice(3,7))) return -1
+
+                  console.log(a.year_month_formatted.slice(3,7))
+                  console.log(b.year_month_formatted.slice(3,7))
+
                   return 0
                 }).map(data => {
                   return <>
diff --git a/src/pages/resumoOperacao/index.tsx b/src/pages/resumoOperacao/index.tsx
index 3b94deb..c72ce19 100644
--- a/src/pages/resumoOperacao/index.tsx
+++ b/src/pages/resumoOperacao/index.tsx
@@ -127,7 +127,7 @@ export default function ResumoOperacao({tableData, clientsData, userName, client
             <MenuItem value={''}>Todos</MenuItem>
             {
               clientMonth.map((value) => {
-                return <MenuItem key={1} value={value.mes}>{monthLabels[parseFloat(value.mes.slice(3, 4))-1]}</MenuItem>
+                return <MenuItem key={1} value={value.mes}>{value.mes}</MenuItem>
               })
             }
           </Select>
diff --git a/src/styles/layouts/aboutUs/AboutUsView.ts b/src/styles/layouts/aboutUs/AboutUsView.ts
index 0f244f7..7e18de1 100644
--- a/src/styles/layouts/aboutUs/AboutUsView.ts
+++ b/src/styles/layouts/aboutUs/AboutUsView.ts
@@ -11,8 +11,8 @@ export const AboutUsView = styled.main`
     align-items: center;
 
     aside {
-      position: absolute;
-      margin-bottom: 150px;
+      position: relative;
+      /* margin-bottom: 150px; */
 
       display: flex;
       justify-content: center;