web: format tooltip label batter discharge and charge

hoang-rio · Nov 27, 2024 · 5601036 · 5601036
1 parent 8318ced
commit 5601036
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 11 deletions.
diff --git a/web_viewer/fe_src/src/components/HourlyChart.tsx b/web_viewer/fe_src/src/components/HourlyChart.tsx
@@ -13,6 +13,8 @@ import "./HourlyChart.css";
 import Chart from "react-apexcharts";
 import { IClassNameProps, IUpdateChart, SeriesItem } from "../Intefaces";
 
+const BATTERY_SERIE_NAME = "Battery";
+
 const HourlyChart = forwardRef(({ className }: IClassNameProps, ref: ForwardedRef<IUpdateChart>) => {
   const [chartData, setChartData] = useState<never[][]>([]);
   const [isDark, setIsDark] = useState(false);
@@ -39,7 +41,7 @@ const HourlyChart = forwardRef(({ className }: IClassNameProps, ref: ForwardedRe
         data: pvSeries,
       },
       {
-        name: "Battery",
+        name: BATTERY_SERIE_NAME,
         data: batterySeries,
       },
       {
@@ -169,8 +171,22 @@ const HourlyChart = forwardRef(({ className }: IClassNameProps, ref: ForwardedRe
                   if (opts.seriesIndex === 4) {
                     return `${val}%`;
                   }
-                  return `${val} W`;
+                  return `${Math.abs(val)} W`;
                 },
+                title: {
+                  formatter(seriesName, opts) {
+                    console.log(opts);
+                      if (seriesName === BATTERY_SERIE_NAME) {
+                        const batteryValue =
+                          opts.series[1][opts.dataPointIndex];
+                        if (batteryValue < 0) {
+                          return `${seriesName} charge:`;
+                        }
+                        return `${seriesName} discharge:`;
+                      }
+                      return `${seriesName}:`;
+                  },
+                }
               },
             },
           }}

diff --git a/...ewer/public/assets/DailyChart-CvVjVTKN.js → ...ewer/public/assets/DailyChart-CIQ-JLy-.js b/...ewer/public/assets/DailyChart-CvVjVTKN.js → ...ewer/public/assets/DailyChart-CIQ-JLy-.js
diff --git a/...er/public/assets/GeneralValue-CHGmdxOT.js → ...er/public/assets/GeneralValue-BVt4iJIZ.js b/...er/public/assets/GeneralValue-CHGmdxOT.js → ...er/public/assets/GeneralValue-BVt4iJIZ.js
@@ -1 +1 @@
-import{j as e}from"./index-Ck0kjt3K.js";function l({value:r,unit:s,className:n}){return e.jsxs("div",{className:`${n||""} general-value`,children:[e.jsx("strong",{children:r}),s]})}export{l as G};
+import{j as e}from"./index-BMg5kuNt.js";function l({value:r,unit:s,className:n}){return e.jsxs("div",{className:`${n||""} general-value`,children:[e.jsx("strong",{children:r}),s]})}export{l as G};
diff --git a/web_viewer/public/assets/HourlyChart-CtYj-DJz.js b/web_viewer/public/assets/HourlyChart-CtYj-DJz.js
diff --git a/web_viewer/public/assets/HourlyChart-DaorG-El.js b/web_viewer/public/assets/HourlyChart-DaorG-El.js
diff --git a/web_viewer/public/assets/Summary-vEExqXM1.js → web_viewer/public/assets/Summary-CQC1jgWk.js b/web_viewer/public/assets/Summary-vEExqXM1.js → web_viewer/public/assets/Summary-CQC1jgWk.js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		import{j as e}from"./index-Ck0kjt3K.js";function l({value:r,unit:s,className:n}){return e.jsxs("div",{className:`${n\|\|""} general-value`,children:[e.jsx("strong",{children:r}),s]})}export{l as G};
		import{j as e}from"./index-BMg5kuNt.js";function l({value:r,unit:s,className:n}){return e.jsxs("div",{className:`${n\|\|""} general-value`,children:[e.jsx("strong",{children:r}),s]})}export{l as G};