myio-js-library 0.1.71 → 0.1.73

package/dist/index.cjs

@@ -11401,11 +11401,13 @@ 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, timezoneOffset) {
   const seriesKeys = keys.split(",").map((k) => k.trim());
   const seriesData = [];
   let globalPeak = null;
   let isEmpty = true;
+  const tzOffset = timezoneOffset !== void 0 ? timezoneOffset : -3;
+  const tzOffsetMs = tzOffset * 60 * 60 * 1e3;
   const colors = ["#4A148C", "#2196F3", "#4CAF50", "#FF9800", "#F44336", "#9C27B0", "#795548", "#607D8B"];
   seriesKeys.forEach((key, index) => {
     const rawSeries = rawData[key] || [];
@@ -11416,25 +11418,39 @@ 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 + tzOffsetMs;
+        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;
+            const timestamp = currentTs + tzOffsetMs;
+            points.push({
+              x: timestamp,
+              y: demandKw
+            });
+          }
         }
+        previousValue = currentValue;
+        previousTs = currentTs;
       }
-      previousValue = currentValue;
-      previousTs = currentTs;
     }
     let seriesPeak = null;
     if (points.length > 0) {
@@ -11816,7 +11832,11 @@ async function openDemandModal(params) {
         rawData,
         params.telemetryQuery?.keys || "consumption",
         params.correctionFactor || 1,
-        locale
+        locale,
+        params.telemetryQuery?.agg || "MAX",
+        // Pass aggregation type
+        params.timezoneOffset
+        // Pass timezone offset (default: -3)
       );
       if (chartData.isEmpty) {
         errorEl.style.display = "flex";
@@ -11856,9 +11876,7 @@ async function openDemandModal(params) {
             return date.toLocaleDateString(locale, {
               day: "2-digit",
               month: "2-digit",
-              year: "numeric",
-              hour: "2-digit",
-              minute: "2-digit"
+              year: "numeric"
             });
           },
           label: function(context) {
@@ -11898,9 +11916,7 @@ async function openDemandModal(params) {
                     return date.toLocaleDateString(locale, {
                       day: "2-digit",
                       month: "2-digit",
-                      year: "numeric",
-                      hour: "2-digit",
-                      minute: "2-digit"
+                      year: "numeric"
                     });
                   },
                   label: function(context) {
@@ -11936,10 +11952,8 @@ async function openDemandModal(params) {
                   callback: function(value) {
                     const date = new Date(value);
                     return date.toLocaleDateString(locale, {
-                      month: "2-digit",
                       day: "2-digit",
-                      hour: "2-digit",
-                      minute: "2-digit"
+                      month: "2-digit"
                     });
                   }
                 }

package/dist/index.d.cts

@@ -1292,6 +1292,7 @@ interface DemandModalParams {
     telemetryQuery?: TelemetryQueryParams;
     yAxisLabel?: string;
     correctionFactor?: number;
+    timezoneOffset?: number;
 }
 interface TelemetryQueryParams {
     keys?: string;

package/dist/index.js

@@ -11327,11 +11327,13 @@ 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, timezoneOffset) {
   const seriesKeys = keys.split(",").map((k) => k.trim());
   const seriesData = [];
   let globalPeak = null;
   let isEmpty = true;
+  const tzOffset = timezoneOffset !== void 0 ? timezoneOffset : -3;
+  const tzOffsetMs = tzOffset * 60 * 60 * 1e3;
   const colors = ["#4A148C", "#2196F3", "#4CAF50", "#FF9800", "#F44336", "#9C27B0", "#795548", "#607D8B"];
   seriesKeys.forEach((key, index) => {
     const rawSeries = rawData[key] || [];
@@ -11342,25 +11344,39 @@ 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 + tzOffsetMs;
+        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;
+            const timestamp = currentTs + tzOffsetMs;
+            points.push({
+              x: timestamp,
+              y: demandKw
+            });
+          }
         }
+        previousValue = currentValue;
+        previousTs = currentTs;
       }
-      previousValue = currentValue;
-      previousTs = currentTs;
     }
     let seriesPeak = null;
     if (points.length > 0) {
@@ -11742,7 +11758,11 @@ async function openDemandModal(params) {
         rawData,
         params.telemetryQuery?.keys || "consumption",
         params.correctionFactor || 1,
-        locale
+        locale,
+        params.telemetryQuery?.agg || "MAX",
+        // Pass aggregation type
+        params.timezoneOffset
+        // Pass timezone offset (default: -3)
       );
       if (chartData.isEmpty) {
         errorEl.style.display = "flex";
@@ -11782,9 +11802,7 @@ async function openDemandModal(params) {
             return date.toLocaleDateString(locale, {
               day: "2-digit",
               month: "2-digit",
-              year: "numeric",
-              hour: "2-digit",
-              minute: "2-digit"
+              year: "numeric"
             });
           },
           label: function(context) {
@@ -11824,9 +11842,7 @@ async function openDemandModal(params) {
                     return date.toLocaleDateString(locale, {
                       day: "2-digit",
                       month: "2-digit",
-                      year: "numeric",
-                      hour: "2-digit",
-                      minute: "2-digit"
+                      year: "numeric"
                     });
                   },
                   label: function(context) {
@@ -11862,10 +11878,8 @@ async function openDemandModal(params) {
                   callback: function(value) {
                     const date = new Date(value);
                     return date.toLocaleDateString(locale, {
-                      month: "2-digit",
                       day: "2-digit",
-                      hour: "2-digit",
-                      minute: "2-digit"
+                      month: "2-digit"
                     });
                   }
                 }

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

@@ -11316,11 +11316,13 @@
     const data = await response.json();
     return data;
   }
-  function processMultiSeriesChartData(rawData, keys, correctionFactor, locale) {
+  function processMultiSeriesChartData(rawData, keys, correctionFactor, locale, aggregation, timezoneOffset) {
     const seriesKeys = keys.split(",").map((k) => k.trim());
     const seriesData = [];
     let globalPeak = null;
     let isEmpty = true;
+    const tzOffset = timezoneOffset !== void 0 ? timezoneOffset : -3;
+    const tzOffsetMs = tzOffset * 60 * 60 * 1e3;
     const colors = ["#4A148C", "#2196F3", "#4CAF50", "#FF9800", "#F44336", "#9C27B0", "#795548", "#607D8B"];
     seriesKeys.forEach((key, index) => {
       const rawSeries = rawData[key] || [];
@@ -11331,25 +11333,39 @@
       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 + tzOffsetMs;
+          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;
+              const timestamp = currentTs + tzOffsetMs;
+              points.push({
+                x: timestamp,
+                y: demandKw
+              });
+            }
           }
+          previousValue = currentValue;
+          previousTs = currentTs;
         }
-        previousValue = currentValue;
-        previousTs = currentTs;
       }
       let seriesPeak = null;
       if (points.length > 0) {
@@ -11731,7 +11747,11 @@
           rawData,
           params.telemetryQuery?.keys || "consumption",
           params.correctionFactor || 1,
-          locale
+          locale,
+          params.telemetryQuery?.agg || "MAX",
+          // Pass aggregation type
+          params.timezoneOffset
+          // Pass timezone offset (default: -3)
         );
         if (chartData.isEmpty) {
           errorEl.style.display = "flex";
@@ -11771,9 +11791,7 @@
               return date.toLocaleDateString(locale, {
                 day: "2-digit",
                 month: "2-digit",
-                year: "numeric",
-                hour: "2-digit",
-                minute: "2-digit"
+                year: "numeric"
               });
             },
             label: function(context) {
@@ -11813,9 +11831,7 @@
                       return date.toLocaleDateString(locale, {
                         day: "2-digit",
                         month: "2-digit",
-                        year: "numeric",
-                        hour: "2-digit",
-                        minute: "2-digit"
+                        year: "numeric"
                       });
                     },
                     label: function(context) {
@@ -11851,10 +11867,8 @@
                     callback: function(value) {
                       const date = new Date(value);
                       return date.toLocaleDateString(locale, {
-                        month: "2-digit",
                         day: "2-digit",
-                        hour: "2-digit",
-                        minute: "2-digit"
+                        month: "2-digit"
                       });
                     }
                   }