myio-js-library 0.1.70 → 0.1.72

package/dist/index.cjs

@@ -11401,7 +11401,7 @@ async function fetchTelemetryData(token, deviceId, startDate, endDate, queryPara
   const data = await response.json();
   return data;
 }
-function processMultiSeriesChartData(rawData, keys, correctionFactor, locale) {
+function processMultiSeriesChartData(rawData, keys, correctionFactor, locale, aggregation) {
   const seriesKeys = keys.split(",").map((k) => k.trim());
   const seriesData = [];
   let globalPeak = null;
@@ -11416,25 +11416,38 @@ function processMultiSeriesChartData(rawData, keys, correctionFactor, locale) {
     isEmpty = false;
     const sortedData = rawSeries.sort((a, b) => a.ts - b.ts);
     const points = [];
-    let previousValue = 0;
-    let previousTs = 0;
-    for (let i = 0; i < sortedData.length; i++) {
-      const current = sortedData[i];
-      const currentValue = parseFloat(current.value);
-      const currentTs = current.ts;
-      if (i > 0) {
-        const deltaWh = currentValue - previousValue;
-        const deltaHours = (currentTs - previousTs) / (1e3 * 60 * 60);
-        if (deltaWh > 0 && deltaHours > 0) {
-          const demandKw = deltaWh / 1e3 / deltaHours * correctionFactor;
-          points.push({
-            x: currentTs,
-            y: demandKw
-          });
+    const isAggregated = aggregation && aggregation !== "NONE";
+    if (isAggregated) {
+      for (let i = 0; i < sortedData.length; i++) {
+        const current = sortedData[i];
+        const value = parseFloat(current.value) * correctionFactor;
+        const timestamp = current.ts;
+        points.push({
+          x: timestamp,
+          y: value
+        });
+      }
+    } else {
+      let previousValue = 0;
+      let previousTs = 0;
+      for (let i = 0; i < sortedData.length; i++) {
+        const current = sortedData[i];
+        const currentValue = parseFloat(current.value);
+        const currentTs = current.ts;
+        if (i > 0) {
+          const deltaWh = currentValue - previousValue;
+          const deltaHours = (currentTs - previousTs) / (1e3 * 60 * 60);
+          if (deltaWh > 0 && deltaHours > 0) {
+            const demandKw = deltaWh / 1e3 / deltaHours * correctionFactor;
+            points.push({
+              x: currentTs,
+              y: demandKw
+            });
+          }
         }
+        previousValue = currentValue;
+        previousTs = currentTs;
       }
-      previousValue = currentValue;
-      previousTs = currentTs;
     }
     let seriesPeak = null;
     if (points.length > 0) {
@@ -11816,7 +11829,9 @@ async function openDemandModal(params) {
         rawData,
         params.telemetryQuery?.keys || "consumption",
         params.correctionFactor || 1,
-        locale
+        locale,
+        params.telemetryQuery?.agg || "MAX"
+        // Pass aggregation type
       );
       if (chartData.isEmpty) {
         errorEl.style.display = "flex";
@@ -11849,6 +11864,24 @@ async function openDemandModal(params) {
           borderWidth: 1
         }));
         chart.options.plugins.legend.display = chartData.series.length > 1;
+        chart.options.plugins.tooltip.callbacks = {
+          title: function(context) {
+            const timestamp = context[0].parsed.x;
+            const date = new Date(timestamp);
+            return date.toLocaleDateString(locale, {
+              day: "2-digit",
+              month: "2-digit",
+              year: "numeric",
+              hour: "2-digit",
+              minute: "2-digit"
+            });
+          },
+          label: function(context) {
+            const seriesLabel = context.dataset.label || "";
+            const value = context.parsed.y;
+            return `${seriesLabel}: ${value.toFixed(2)} kW`;
+          }
+        };
         chart.update();
       } else {
         chart = new Chart(chartCanvas, {
@@ -11872,6 +11905,26 @@ async function openDemandModal(params) {
                 // Show legend only if multiple series
                 position: "top"
               },
+              tooltip: {
+                callbacks: {
+                  title: function(context) {
+                    const timestamp = context[0].parsed.x;
+                    const date = new Date(timestamp);
+                    return date.toLocaleDateString(locale, {
+                      day: "2-digit",
+                      month: "2-digit",
+                      year: "numeric",
+                      hour: "2-digit",
+                      minute: "2-digit"
+                    });
+                  },
+                  label: function(context) {
+                    const seriesLabel = context.dataset.label || "";
+                    const value = context.parsed.y;
+                    return `${seriesLabel}: ${value.toFixed(2)} kW`;
+                  }
+                }
+              },
               zoom: {
                 zoom: {
                   wheel: { enabled: true },

package/dist/index.js

@@ -11327,7 +11327,7 @@ async function fetchTelemetryData(token, deviceId, startDate, endDate, queryPara
   const data = await response.json();
   return data;
 }
-function processMultiSeriesChartData(rawData, keys, correctionFactor, locale) {
+function processMultiSeriesChartData(rawData, keys, correctionFactor, locale, aggregation) {
   const seriesKeys = keys.split(",").map((k) => k.trim());
   const seriesData = [];
   let globalPeak = null;
@@ -11342,25 +11342,38 @@ function processMultiSeriesChartData(rawData, keys, correctionFactor, locale) {
     isEmpty = false;
     const sortedData = rawSeries.sort((a, b) => a.ts - b.ts);
     const points = [];
-    let previousValue = 0;
-    let previousTs = 0;
-    for (let i = 0; i < sortedData.length; i++) {
-      const current = sortedData[i];
-      const currentValue = parseFloat(current.value);
-      const currentTs = current.ts;
-      if (i > 0) {
-        const deltaWh = currentValue - previousValue;
-        const deltaHours = (currentTs - previousTs) / (1e3 * 60 * 60);
-        if (deltaWh > 0 && deltaHours > 0) {
-          const demandKw = deltaWh / 1e3 / deltaHours * correctionFactor;
-          points.push({
-            x: currentTs,
-            y: demandKw
-          });
+    const isAggregated = aggregation && aggregation !== "NONE";
+    if (isAggregated) {
+      for (let i = 0; i < sortedData.length; i++) {
+        const current = sortedData[i];
+        const value = parseFloat(current.value) * correctionFactor;
+        const timestamp = current.ts;
+        points.push({
+          x: timestamp,
+          y: value
+        });
+      }
+    } else {
+      let previousValue = 0;
+      let previousTs = 0;
+      for (let i = 0; i < sortedData.length; i++) {
+        const current = sortedData[i];
+        const currentValue = parseFloat(current.value);
+        const currentTs = current.ts;
+        if (i > 0) {
+          const deltaWh = currentValue - previousValue;
+          const deltaHours = (currentTs - previousTs) / (1e3 * 60 * 60);
+          if (deltaWh > 0 && deltaHours > 0) {
+            const demandKw = deltaWh / 1e3 / deltaHours * correctionFactor;
+            points.push({
+              x: currentTs,
+              y: demandKw
+            });
+          }
         }
+        previousValue = currentValue;
+        previousTs = currentTs;
       }
-      previousValue = currentValue;
-      previousTs = currentTs;
     }
     let seriesPeak = null;
     if (points.length > 0) {
@@ -11742,7 +11755,9 @@ async function openDemandModal(params) {
         rawData,
         params.telemetryQuery?.keys || "consumption",
         params.correctionFactor || 1,
-        locale
+        locale,
+        params.telemetryQuery?.agg || "MAX"
+        // Pass aggregation type
       );
       if (chartData.isEmpty) {
         errorEl.style.display = "flex";
@@ -11775,6 +11790,24 @@ async function openDemandModal(params) {
           borderWidth: 1
         }));
         chart.options.plugins.legend.display = chartData.series.length > 1;
+        chart.options.plugins.tooltip.callbacks = {
+          title: function(context) {
+            const timestamp = context[0].parsed.x;
+            const date = new Date(timestamp);
+            return date.toLocaleDateString(locale, {
+              day: "2-digit",
+              month: "2-digit",
+              year: "numeric",
+              hour: "2-digit",
+              minute: "2-digit"
+            });
+          },
+          label: function(context) {
+            const seriesLabel = context.dataset.label || "";
+            const value = context.parsed.y;
+            return `${seriesLabel}: ${value.toFixed(2)} kW`;
+          }
+        };
         chart.update();
       } else {
         chart = new Chart(chartCanvas, {
@@ -11798,6 +11831,26 @@ async function openDemandModal(params) {
                 // Show legend only if multiple series
                 position: "top"
               },
+              tooltip: {
+                callbacks: {
+                  title: function(context) {
+                    const timestamp = context[0].parsed.x;
+                    const date = new Date(timestamp);
+                    return date.toLocaleDateString(locale, {
+                      day: "2-digit",
+                      month: "2-digit",
+                      year: "numeric",
+                      hour: "2-digit",
+                      minute: "2-digit"
+                    });
+                  },
+                  label: function(context) {
+                    const seriesLabel = context.dataset.label || "";
+                    const value = context.parsed.y;
+                    return `${seriesLabel}: ${value.toFixed(2)} kW`;
+                  }
+                }
+              },
               zoom: {
                 zoom: {
                   wheel: { enabled: true },

package/dist/myio-js-library.umd.js

@@ -11316,7 +11316,7 @@
     const data = await response.json();
     return data;
   }
-  function processMultiSeriesChartData(rawData, keys, correctionFactor, locale) {
+  function processMultiSeriesChartData(rawData, keys, correctionFactor, locale, aggregation) {
     const seriesKeys = keys.split(",").map((k) => k.trim());
     const seriesData = [];
     let globalPeak = null;
@@ -11331,25 +11331,38 @@
       isEmpty = false;
       const sortedData = rawSeries.sort((a, b) => a.ts - b.ts);
       const points = [];
-      let previousValue = 0;
-      let previousTs = 0;
-      for (let i = 0; i < sortedData.length; i++) {
-        const current = sortedData[i];
-        const currentValue = parseFloat(current.value);
-        const currentTs = current.ts;
-        if (i > 0) {
-          const deltaWh = currentValue - previousValue;
-          const deltaHours = (currentTs - previousTs) / (1e3 * 60 * 60);
-          if (deltaWh > 0 && deltaHours > 0) {
-            const demandKw = deltaWh / 1e3 / deltaHours * correctionFactor;
-            points.push({
-              x: currentTs,
-              y: demandKw
-            });
+      const isAggregated = aggregation !== "NONE";
+      if (isAggregated) {
+        for (let i = 0; i < sortedData.length; i++) {
+          const current = sortedData[i];
+          const value = parseFloat(current.value) * correctionFactor;
+          const timestamp = current.ts;
+          points.push({
+            x: timestamp,
+            y: value
+          });
+        }
+      } else {
+        let previousValue = 0;
+        let previousTs = 0;
+        for (let i = 0; i < sortedData.length; i++) {
+          const current = sortedData[i];
+          const currentValue = parseFloat(current.value);
+          const currentTs = current.ts;
+          if (i > 0) {
+            const deltaWh = currentValue - previousValue;
+            const deltaHours = (currentTs - previousTs) / (1e3 * 60 * 60);
+            if (deltaWh > 0 && deltaHours > 0) {
+              const demandKw = deltaWh / 1e3 / deltaHours * correctionFactor;
+              points.push({
+                x: currentTs,
+                y: demandKw
+              });
+            }
           }
+          previousValue = currentValue;
+          previousTs = currentTs;
         }
-        previousValue = currentValue;
-        previousTs = currentTs;
       }
       let seriesPeak = null;
       if (points.length > 0) {
@@ -11731,7 +11744,9 @@
           rawData,
           params.telemetryQuery?.keys || "consumption",
           params.correctionFactor || 1,
-          locale
+          locale,
+          params.telemetryQuery?.agg || "MAX"
+          // Pass aggregation type
         );
         if (chartData.isEmpty) {
           errorEl.style.display = "flex";
@@ -11764,6 +11779,24 @@
             borderWidth: 1
           }));
           chart.options.plugins.legend.display = chartData.series.length > 1;
+          chart.options.plugins.tooltip.callbacks = {
+            title: function(context) {
+              const timestamp = context[0].parsed.x;
+              const date = new Date(timestamp);
+              return date.toLocaleDateString(locale, {
+                day: "2-digit",
+                month: "2-digit",
+                year: "numeric",
+                hour: "2-digit",
+                minute: "2-digit"
+              });
+            },
+            label: function(context) {
+              const seriesLabel = context.dataset.label || "";
+              const value = context.parsed.y;
+              return `${seriesLabel}: ${value.toFixed(2)} kW`;
+            }
+          };
           chart.update();
         } else {
           chart = new Chart(chartCanvas, {
@@ -11787,6 +11820,26 @@
                   // Show legend only if multiple series
                   position: "top"
                 },
+                tooltip: {
+                  callbacks: {
+                    title: function(context) {
+                      const timestamp = context[0].parsed.x;
+                      const date = new Date(timestamp);
+                      return date.toLocaleDateString(locale, {
+                        day: "2-digit",
+                        month: "2-digit",
+                        year: "numeric",
+                        hour: "2-digit",
+                        minute: "2-digit"
+                      });
+                    },
+                    label: function(context) {
+                      const seriesLabel = context.dataset.label || "";
+                      const value = context.parsed.y;
+                      return `${seriesLabel}: ${value.toFixed(2)} kW`;
+                    }
+                  }
+                },
                 zoom: {
                   zoom: {
                     wheel: { enabled: true },