Merge pull request #52 from stephb9959/feature/32-statistics

Feature/32 statistics

src/containers/TheFooter.js

@@ -3,7 +3,7 @@ import { CFooter } from '@coreui/react';
 
 const TheFooter = () => (
   <CFooter fixed={false}>
-    <div>Version 0.0.6</div>
+    <div>Version 0.0.7</div>
     <div className="mfs-auto">
       <span className="mr-1">Powered by</span>
       <a href="https://coreui.io/react" target="_blank" rel="noopener noreferrer">

src/pages/DevicePage/DeviceStatistics/DeviceStatisticsChart.js

@@ -3,12 +3,12 @@ import PropTypes from 'prop-types';
 import Chart from 'react-apexcharts'
 
 const DeviceStatisticsChart = ({ data, options }) => (
-    <div>
+    <div style={{height: '360px'}}>
         <Chart
             series={data}
             options={options}
             type='line'
-            height={360}
+            height='100%'
         />
     </div>
 );

src/pages/DevicePage/DeviceStatistics/StatisticsChartList.js

@@ -97,28 +97,29 @@ const StatisticsChartList = ({ selectedDeviceId, lastRefresh }) => {
     }
 
     const getStatistics = () => {
-        if (loading) return;
+        if (!loading){
-        setLoading(true);
+            setLoading(true);
 
-        const options = {
+            const options = {
-            headers: {
+                headers: {
-                Accept: 'application/json',
+                    Accept: 'application/json',
-                Authorization: `Bearer ${getToken()}`,
+                    Authorization: `Bearer ${getToken()}`,
-            },
+                },
-            params: {
+                params: {
-                serialNumber: "24f5a207a130"
+                    serialNumber: "24f5a207a130"
-            }
+                }
-        };
+            };
-
+    
-        axiosInstance
+            axiosInstance
-            .get(`/device/${selectedDeviceId}/statistics?newest=true&limit=50`, options)
+                .get(`/device/${selectedDeviceId}/statistics?newest=true&limit=50`, options)
-            .then((response) => {
+                .then((response) => {
-                transformIntoDataset(response.data.data);
+                    transformIntoDataset(response.data.data);
-            })
+                })
-            .catch(() => {})
+                .catch(() => {})
-            .finally(() => {
+                .finally(() => {
-            setLoading(false);
+                setLoading(false);
-        });
+            });
+        }
     };
 
     useEffect(() => {