@zac-apps/helium 1.3.0-beta.3 → 1.3.0-beta.5

package/dist/index.js

@@ -33,7 +33,6 @@ import { LineChart, Line, CartesianGrid, XAxis, Label, YAxis, ReferenceLine, Ref
 import ButtonGroup from '@mui/material/ButtonGroup';
 import Switch from '@mui/material/Switch';
 import regression from 'regression';
-import 'next/app.js';
 
 function NumField(_ref) {
   var input = _ref.input,
@@ -1334,30 +1333,47 @@ function EstimateConsumption() {
 
 function EstimateSlope(_ref) {
   var data = _ref.data;
+    _ref.spec;
   // define slope and intercept
 
   var slope = 0;
   var intercept = 0;
 
-  // find last time when spectrometer was filled - for this start from last point and go back until a minimum is found
+  // Define firstMax and firstMaxIndex
 
-  var lastLevel = Number(data[data.length - 1].level);
-  var minLevel = lastLevel;
-  var minLevelIndex = data.length - 1;
+  var firstMax = Number(data[data.length - 1].level);
+  var firstMaxIndex = data.length - 1;
+
+  // Check if the last time when the spectrometer was filled is more than 45 days ago
+
+  var lastMaxIndex = data.length - 1;
+  var lastMax = Number(data[lastMaxIndex].level);
   for (var i = data.length - 2; i >= 0; i--) {
     var level = Number(data[i].level);
-    if (level < minLevel) {
-      minLevel = level;
-      minLevelIndex = i;
+    if (level > firstMax) {
+      lastMax = level;
+      lastMaxIndex = i;
     }
 
-    // stop if level is increases from minimum
+    // stop if level decreases from maximum
 
-    if (level > minLevel + 1) {
+    if (level < lastMax) {
       break;
     }
   }
 
+  // if the last maximum is less than 45 days ago, use the last maximum as the first maximum
+  // otherwise, the initial firstMaxIndex is the last maximum index
+
+  if (lastMaxIndex >= data.length - 45) {
+    firstMaxIndex = lastMaxIndex - 1;
+    firstMax = Number(data[firstMaxIndex].level);
+  }
+
+  // minimum level is the level at firstMaxIndex
+
+  var minLevelIndex = firstMaxIndex - 1;
+
   // find previous time when spectrometer was filled - for this start from lastMinimumIndex and go back until a maximum is found or until level reaches 90%
 
   var maxLevel = Number(data[minLevelIndex].level);
@@ -1429,12 +1445,14 @@ function ShowEstimate(_ref) {
     }), /*#__PURE__*/jsx(Grid, {
       container: true,
       children: /*#__PURE__*/jsxs(AppTable, {
-        children: [/*#__PURE__*/jsxs(TableHead, {
-          children: [/*#__PURE__*/jsx(TableHeadCell, {
-            children: "Estimated"
-          }), /*#__PURE__*/jsx(TableHeadCell, {
-            children: "Stored"
-          })]
+        children: [/*#__PURE__*/jsx(TableHead, {
+          children: /*#__PURE__*/jsxs(TableRow, {
+            children: [/*#__PURE__*/jsx(TableHeadCell, {
+              children: "Estimated"
+            }), /*#__PURE__*/jsx(TableHeadCell, {
+              children: "Stored"
+            })]
+          })
         }), /*#__PURE__*/jsx(TableBody, {
           children: /*#__PURE__*/jsxs(TableRow, {
             children: [/*#__PURE__*/jsx(TableCell, {
@@ -1551,7 +1569,7 @@ function RenderGraph(_ref) {
 
   // Get last n elements of array
 
-  data = data.slice(Math.max(data.length - days, 0));
+  var slicedData = data.slice(Math.max(data.length - days, 0));
 
   // Improve visibility of estimate
 
@@ -1560,7 +1578,7 @@ function RenderGraph(_ref) {
     children: [/*#__PURE__*/jsxs(LineChart, {
       height: height,
       width: width,
-      data: data,
+      data: slicedData,
       margin: {
         top: 5,
         right: 20,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zac-apps/helium",
-    "version": "1.3.0-beta.3",
+    "version": "1.3.0-beta.5",
     "scripts": {
         "rollup": "node_modules/rollup/dist/rollup.js",
         "dev": "next dev",
@@ -32,7 +32,7 @@
         "@mui/material": "^5.17.1",
         "@zac-apps/commons": "^1",
         "moment": "^2.30.1",
-        "recharts": "^2.15.1",
+        "recharts": "^2.15.2",
         "regression": "^2.0.1",
         "use-immer": "^0.11.0"
     },
@@ -47,21 +47,21 @@
         "@semantic-release/git": "^10.0.1",
         "@semantic-release/gitlab": "^13.2.4",
         "@semantic-release/npm": "^12.0.1",
-        "@storybook/addon-essentials": "^8.6.10",
-        "@storybook/addon-interactions": "^8.6.10",
-        "@storybook/addon-links": "^8.6.10",
-        "@storybook/addon-onboarding": "^8.6.10",
-        "@storybook/blocks": "^8.6.10",
-        "@storybook/nextjs": "^8.6.10",
-        "@storybook/react": "^8.6.10",
-        "@storybook/test": "^8.6.10",
+        "@storybook/addon-essentials": "^8.6.12",
+        "@storybook/addon-interactions": "^8.6.12",
+        "@storybook/addon-links": "^8.6.12",
+        "@storybook/addon-onboarding": "^8.6.12",
+        "@storybook/blocks": "^8.6.12",
+        "@storybook/nextjs": "^8.6.12",
+        "@storybook/react": "^8.6.12",
+        "@storybook/test": "^8.6.12",
         "babel-loader": "^10.0.0",
         "eslint": "^9",
-        "eslint-config-next": "15.2.4",
+        "eslint-config-next": "15.3.0",
         "eslint-plugin-storybook": "^0.12.0",
-        "rollup": "^4.37.0",
+        "rollup": "^4.40.0",
         "semantic-release": "^24.2.3",
-        "storybook": "^8.6.10"
+        "storybook": "^8.6.12"
     },
     "peerDependencies": {
         "@zac-apps/commons": "^1",