fix: Chart visualization

TrackER-Corporation · May 15, 2023 · afad65f · afad65f
1 parent fdcdd57
commit afad65f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 18 deletions.
diff --git a/src/Consumer/Dashboard.tsx b/src/Consumer/Dashboard.tsx
@@ -27,10 +27,10 @@ const Dashboard = () => {
     gas: { name: "Gas", data: [0] },
     water: { name: "Water", data: [0] },
     electric: { name: "Electric", data: [0] },
-    solar: { name: "Solar", data: 0 },
-    wind: { name: "Wind", data: 0 },
-    hydro: { name: "Hydro", data: 0 },
-    geo: { name: "Geo", data: 0 },
+    solar: { name: "Solar", data: [0] },
+    wind: { name: "Wind", data: [0] },
+    hydro: { name: "Hydro", data: [0] },
+    geo: { name: "Geo", data: [0] },
   });
 
   const navigate = useNavigate();
@@ -68,7 +68,8 @@ const Dashboard = () => {
             <Col lg={8} md={8} xs={8} >
               <StatsCard
                 color={"#ebfafa"}
-                chart={<ReactApexChart options={statebar("Water", "#008ffb").options as ApexOptions}
+                chart={<ReactApexChart
+                  options={statebar("Water", "#008ffb").options as ApexOptions}
                   series={[energy.water] as ApexAxisChartSeries}
                   type="bar" height={150} />}
               />

diff --git a/src/Consumer/DashboardCards/LineCard.tsx b/src/Consumer/DashboardCards/LineCard.tsx
@@ -36,7 +36,6 @@ const options: ApexOptions = {
             },
         },
         toolbar: { show: true, },
-
     },
     stroke: {
         curve: 'smooth',
@@ -75,7 +74,7 @@ const options: ApexOptions = {
 
 }
 const LineCard = ({ data }: any) => {
-
+    
     const filterData = (e: any) => {
         ApexCharts.exec('area-datetime', 'zoomX',
             new Date(e[0]).getTime(),
@@ -92,7 +91,11 @@ const LineCard = ({ data }: any) => {
                     </CardTitle>
                 </Col>
                 <Col>
-                    <DatePicker.RangePicker placeholder={["Start Date", "End Date"]} locale={locale} onChange={(e) => filterData(e)} />
+                    <DatePicker.RangePicker
+                        placeholder={["Start Date", "End Date"]}
+                        locale={locale}
+                        onChange={(e) => filterData(e)}
+                    />
                 </Col>
             </Row>
             <ReactApexChart options={options} series={data} type="area" height={350} />

diff --git a/src/Consumer/Invoices/ElectricInvoices.tsx b/src/Consumer/Invoices/ElectricInvoices.tsx
@@ -3,6 +3,7 @@ import { useEffect, useState } from "react"
 import ReactApexChart from "react-apexcharts"
 import { InvoicesProps, optionsLine, pieOptions } from "./utilsInvoices"
 import InvoicesWrapper from "./InvoicesWrapper"
+import { sortDate } from "../utils"
 
 const ElectricInvoices = ({ bills, cost, aggregated, filtered }: InvoicesProps) => {
     const [metricCubic, setMetric] = useState(true)
@@ -43,12 +44,13 @@ const ElectricInvoices = ({ bills, cost, aggregated, filtered }: InvoicesProps)
         const tmp: Array<any> = []
         if (aggregated === undefined || aggregated === "undefined") {
             filtered?.forEach((el: any) => {
-                tmp.push([el[0], el[1]])
+                tmp.push({ x: el[0], y: el[1] })
             })
+            sortDate(tmp)
             setAllElectricLine([{ data: tmp }])
         } else {
             Object.values(aggregated).map((el: any) => {
-                tmp.push([el.date, el.electric])
+                tmp.push({ x: el.date, y: el.electric })
             })
             setAllElectricLine([{ data: tmp }])
         }

diff --git a/src/Consumer/Invoices/GasInvoices.tsx b/src/Consumer/Invoices/GasInvoices.tsx
@@ -3,6 +3,7 @@ import { useEffect, useState } from "react"
 import ReactApexChart from "react-apexcharts"
 import { InvoicesProps, optionsLine, pieOptions } from "./utilsInvoices"
 import InvoicesWrapper from "./InvoicesWrapper"
+import { sortDate } from "../utils"
 
 const GasInvoices = ({ bills, cost, aggregated, filtered }: InvoicesProps) => {
     const [metricCubic, setMetric] = useState(true)
@@ -41,13 +42,15 @@ const GasInvoices = ({ bills, cost, aggregated, filtered }: InvoicesProps) => {
         const tmp: any = []
         if (aggregated === undefined || aggregated === "undefined") {
             filtered?.forEach((el: any) => {
-                tmp.push([el[0], el[1]])
+                tmp.push({ x: el[0], y: el[1] })
             })
+            sortDate(tmp)
             setAllGasLine([{ data: tmp }])
         } else {
-            Object.values(aggregated)?.map((el: any) => tmp.push([el.date, el.gas]))
+            Object.values(aggregated).map((el: any) => {
+                tmp.push({ x: el.date, y: el.gas })
+            })
             setAllGasLine([{ data: tmp }])
-
         }
     }, [filtered, metricCubic, aggregated, cost, bills])
 

diff --git a/src/Consumer/Invoices/WaterInvoices.tsx b/src/Consumer/Invoices/WaterInvoices.tsx
@@ -3,6 +3,7 @@ import { useEffect, useState } from "react"
 import ReactApexChart from "react-apexcharts"
 import { InvoicesProps, optionsLine, pieOptions } from "./utilsInvoices"
 import InvoicesWrapper from "./InvoicesWrapper"
+import { sortDate } from "../utils"
 
 const WaterInvoices = ({ bills, cost, aggregated, filtered }: InvoicesProps) => {
     const [metricCubic, setMetric] = useState(true)
@@ -51,17 +52,16 @@ const WaterInvoices = ({ bills, cost, aggregated, filtered }: InvoicesProps) =>
         const tmp: Array<any> = []
         if (aggregated === undefined || aggregated === "undefined") {
             filtered?.forEach((el: any) => {
-                tmp.push([el[0], el[1]])
+                tmp.push({ x: el[0], y: el[1] })
             })
+            sortDate(tmp)
             setAllWaterLine([{ data: tmp }])
         } else {
-            Object.values(aggregated)?.map((el: any) => {
-                tmp.push([el.date, el.water])
+            Object.values(aggregated).map((el: any) => {
+                tmp.push({ x: el.date, y: el.gas })
             })
             setAllWaterLine([{ data: tmp }])
-
         }
-
     }, [filtered, aggregated, metricCubic, bills, cost])
 
     return (