Chart and Table Updated

Nauman3S · Nov 24, 2021 · 5dcc980 · 5dcc980
1 parent 5ddcaab
commit 5dcc980
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Web App/Frontend/Frontend.tar b/Web App/Frontend/Frontend.tar
diff --git a/Web App/Frontend/package.json b/Web App/Frontend/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "muse-ant-design-dashboard",
+  "name": "smart-agri",
   "version": "1.0.0",
   "private": true,
   "dependencies": {

diff --git a/Web App/Frontend/src/components/chart/LineChart.js b/Web App/Frontend/src/components/chart/LineChart.js
@@ -17,6 +17,7 @@ const LineChart = ({ enData, soilData, data }) => {
   let pH = [];
   let nitrogen = [];
   let phosphorus = [];
+  let potassium = [];
 
   let enTime = [];
 
@@ -41,6 +42,7 @@ const LineChart = ({ enData, soilData, data }) => {
     pH.push(d.pH);
     nitrogen.push(d.Nitrogen);
     phosphorus.push(d.Phosphorus);
+    potassium.push(d.Potassium);
 
     return 0;
   });
@@ -165,6 +167,11 @@ const LineChart = ({ enData, soilData, data }) => {
         data: phosphorus,
         offsetY: 0,
       },
+      {
+        name: "Potassium",
+        data: potassium,
+        offsetY: 0,
+      },
     ],
 
     options: {

diff --git a/Web App/Frontend/src/pages/Data.js b/Web App/Frontend/src/pages/Data.js
@@ -66,15 +66,14 @@ const Data = () => {
         .then((res) => {
           console.log("Sucess");
           console.log(res.data.macAddress);
-          setData(res.data);
+          setData(res.data.reverse());
         })
         .catch((err) => {
           console.log(err);
         });
     };
     agriData();
   }, [macAddress]);
-
   useEffect(() => {}, [data]);
   useInterval(() => {
     // Make the request here
@@ -125,12 +124,6 @@ const Data = () => {
   ];
 
   const soilCol = [
-    // {
-    //   title: "Date",
-    //   dataIndex: "Date",
-    //   key: "Date",
-    //   defaultSortOrder: "descend",
-    // },
     {
       title: "Date/Time",
       dataIndex: "Time",