iobroker.sbfspot 4.1.0 → 4.1.1

package/LICENSE

@@ -1,7 +1,21 @@
-Copyright (C) <2017-2022>  <info@rg-engineering.eu>
+MIT License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Copyright (c) 2017-2022 rg-engineering <info@rg-engineering.eu>
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -51,8 +51,9 @@ sometimes npm intall must be called more then one time to successfully install a
 
 ## Changelog
 
-### 4.1.0 (2022-04-21)
-* (René) add datapoint to show when data uploaded to sbfspot
+### 4.1.1 (2022-08-18)
+* (René) tooltip in wizard added
+* (René) flot and dependencies updated
 
 ### 4.0.8 (2021-07-11)
 * (René) bug fix color of labels in widget

package/io-package.json

@@ -1,19 +1,19 @@
 {
     "common": {
         "name": "sbfspot",
-        "version": "4.1.0",
+        "version": "4.1.1",
         "news": {
-            "4.1.0": {
-                "en": "add datapoint to show when data uploaded to sbfspot",
-                "de": "Datenpunkt hinzufügen, um anzuzeigen, wann Daten auf sbfspot hochgeladen wurden",
-                "ru": "добавить точку данных, чтобы показать, когда данные загружаются в sbfspot",
-                "pt": "adicionar ponto de dados para mostrar quando os dados são carregados no sbfspot",
-                "nl": "voeg datapunt toe om te laten zien wanneer gegevens zijn geüpload naar sbfspot",
-                "fr": "ajouter un point de données pour montrer quand les données sont téléchargées sur sbfspot",
-                "it": "aggiungi datapoint per mostrare quando i dati sono stati caricati su sbfspot",
-                "es": "agregue un punto de datos para mostrar cuándo se cargan los datos en sbfspot",
-                "pl": "dodaj punkt danych, aby pokazać, kiedy dane zostały przesłane do sbfspot",
-                "zh-cn": "添加数据点以显示何时将数据上传到 sbfspot"
+            "4.1.1": {
+                "en": "widget with tooltip",
+                "de": "Widget mit Tooltip",
+                "ru": "виджет с подсказкой",
+                "pt": "widget com dica de ferramenta",
+                "nl": "widget met knopinfo",
+                "fr": "widget avec info-bulle",
+                "it": "widget con descrizione comando",
+                "es": "widget con información sobre herramientas",
+                "pl": "widżet z podpowiedź",
+                "zh-cn": "带有工具提示的小部件"
             },
             "4.0.8": {
                 "en": "bug fix color of labels in widget",

package/main.js

@@ -61,7 +61,7 @@ async function main() {
         adapter.terminate ? adapter.terminate(11) : process.exit(11);
     }
 
-    await CheckInverterVariables();
+    //await CheckInverterVariables();
 
     killTimer = setTimeout(function () {
         //adapter.stop();
@@ -336,11 +336,45 @@ async function AddInverterVariables(serial) {
 }
 
 
+async function CreateObject(key, obj) {
+
+    const obj_new = await adapter.getObjectAsync(key);
+    //adapter.log.warn("got object " + JSON.stringify(obj_new));
+
+    if (obj_new != null) {
+
+        if ((obj_new.common.role != obj.common.role
+            || obj_new.common.type != obj.common.type
+            || (obj_new.common.unit != obj.common.unit && obj.common.unit != null)
+            || obj_new.common.read != obj.common.read
+            || obj_new.common.write != obj.common.write
+            || obj_new.common.name != obj.common.name)
+            && obj.type === "state"
+        ) {
+            adapter.log.warn("change object " + JSON.stringify(obj) + " " + JSON.stringify(obj_new));
+            await adapter.extendObject(key, {
+                common: {
+                    name: obj.common.name,
+                    role: obj.common.role,
+                    type: obj.common.type,
+                    unit: obj.common.unit,
+                    read: obj.common.read,
+                    write: obj.common.write
+                }
+            });
+        }
+    }
+    else {
+        await adapter.setObjectNotExistsAsync(key, obj);
+    }
+}
+
+
 async function AddObject(key, type, common_name, common_type, common_role, common_unit, common_read, common_write) {
 
     adapter.log.debug("addObject " + key);
 
-    await adapter.setObjectNotExistsAsync(key, {
+    obj= {
         type: type,
         common: {
             name: common_name,
@@ -353,37 +387,9 @@ async function AddObject(key, type, common_name, common_type, common_role, commo
         native: {
             location: key
         }
-    });
+    };
 
-    const obj = await adapter.getObjectAsync(key);
-
-    if (obj != null) {
-        //adapter.log.debug(" got Object " + JSON.stringify(obj));
-        if (obj.type != type
-            || obj.common.name != common_name
-            || obj.common.type != common_type
-            || obj.common.role != common_role
-            || obj.common.unit != common_unit
-            || obj.common.read != common_read
-            || obj.common.write != common_write ) {
-            adapter.log.debug(" !!! need to extend for " + key);
-            await adapter.extendObject(key, {
-                type: type,
-                common: {
-                    name: common_name,
-                    type: common_type,
-                    role: common_role,
-                    unit: common_unit,
-                    read: common_read,
-                    write: common_write
-                },
-                native: {
-                    location: key
-                }
-            });
-        }
-
-    }
+    await CreateObject(key, obj);
 }
 
 
@@ -394,11 +400,11 @@ sbfspot.0	2021-07-08 19:30:13.024	info	State value to set for "sbfspot.0.2000562
 sbfspot.0	2021-07-08 19:30:12.888	info	State value to set for "sbfspot.0.2000562095.history.last30Days" has to be type "number" but received type "string"
  */
 
-
+/*
 async function CheckInverterVariables() {
 
 }
-
+*/
 
 
 async function DB_Connect() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sbfspot",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "sbfspot (SMA inverter) Adapter",
   "author": {
     "name": "René G.",
@@ -19,30 +19,29 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "2.6.0",
-    "@sentry/node": "6.19.6",
-    "better-sqlite3": "7.5.1",
+    "better-sqlite3": "7.6.2",
     "mysql2": "2.3.3",
     "suncalc2": "1.8.1"
   },
   "devDependencies": {
-    "@iobroker/testing": "2.6.0",
-    "@types/chai": "4.3.1",
+    "@iobroker/testing": "3.0.2",
+    "@types/chai": "4.3.3",
     "@types/chai-as-promised": "7.1.5",
     "@types/gulp": "4.0.9",
     "@types/mocha": "9.1.1",
-    "@types/node": "17.0.25",
+    "@types/node": "18.7.3",
     "@types/proxyquire": "1.3.28",
     "@types/request-promise-native": "1.0.18",
-    "@types/sinon": "10.0.11",
+    "@types/sinon": "10.0.13",
     "@types/sinon-chai": "3.2.8",
-    "axios": "0.26.1",
+    "axios": "0.27.2",
     "chai": "4.3.6",
     "chai-as-promised": "7.1.1",
-    "eslint": "8.13.0",
+    "eslint": "8.22.0",
     "gulp": "4.0.2",
-    "mocha": "9.2.2",
+    "mocha": "10.0.0",
     "proxyquire": "2.1.3",
-    "sinon": "13.0.2",
+    "sinon": "14.0.0",
     "sinon-chai": "3.7.0"
   },
   "main": "main.js",

package/sbfspot.njsproj

@@ -70,8 +70,6 @@
     <Content Include="widgets\sbfspot\lib\js\flot\jquery.canvaswrapper.js" />
     <Content Include="widgets\sbfspot\lib\js\flot\jquery.colorhelpers.js" />
     <Content Include="widgets\sbfspot\lib\js\flot\jquery.flot.axislabels.js" />
-    <Content Include="widgets\sbfspot\lib\js\flot\jquery.flot.axislabels_V2.js" />
-    <Content Include="widgets\sbfspot\lib\js\flot\jquery.flot.axislabels_V3.js" />
     <Content Include="widgets\sbfspot\lib\js\flot\jquery.flot.browser.js" />
     <Content Include="widgets\sbfspot\lib\js\flot\jquery.flot.categories.js" />
     <Content Include="widgets\sbfspot\lib\js\flot\jquery.flot.composeImages.js" />
@@ -96,6 +94,10 @@
     <Content Include="widgets\sbfspot\lib\js\flot\jquery.flot.touchNavigate.js" />
     <Content Include="widgets\sbfspot\lib\js\flot\jquery.flot.uiConstants.js" />
     <Content Include="widgets\sbfspot\lib\js\flot\jquery.js" />
+    <Content Include="widgets\sbfspot\lib\js\lib\globalize.culture.en-US.js" />
+    <Content Include="widgets\sbfspot\lib\js\lib\globalize.js" />
+    <Content Include="widgets\sbfspot\lib\js\lib\jquery.event.drag.js" />
+    <Content Include="widgets\sbfspot\lib\js\lib\jquery.mousewheel.js" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include=".github\" />
@@ -128,6 +130,7 @@
     <Folder Include="widgets\sbfspot\lib\js\" />
     <Folder Include="widgets\sbfspot\lib\js\flot\" />
     <Folder Include="widgets\sbfspot\js\" />
+    <Folder Include="widgets\sbfspot\lib\js\lib\" />
   </ItemGroup>
   <ItemGroup>
     <TypeScriptCompile Include="typings\globals\node\index.d.ts" />

package/widgets/sbfspot/lib/js/flot/jquery.canvaswrapper.js

@@ -372,8 +372,6 @@ don't work unless the canvas is attached to the DOM.
 
         // Tweak the div's position to match the text's alignment
 
-        console.log('add text ' + text);
-
         if (halign === 'center') {
             x -= info.width / 2;
         } else if (halign === 'right') {

package/widgets/sbfspot/lib/js/flot/jquery.flot.axislabels.js

@@ -144,10 +144,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     };
 
     function init(plot) {
-        plot.hooks.processOptions.push(function (plot, options) {
-
-            console.log('??????? ');
-
+        plot.hooks.processOptions.push(function(plot, options) {
             if (!options.axisLabels.show) {
                 return;
             }

package/widgets/sbfspot/lib/js/flot/jquery.flot.hover.js

@@ -45,6 +45,8 @@ the tooltip from webcharts).
         var lastMouseMoveEvent;
         var highlights = [];
 
+        console.log("hover init");
+
         function bindEvents(plot, eventHolder) {
             var o = plot.getOptions();
 

package/widgets/sbfspot/lib/js/flot/jquery.flot.js

@@ -99,6 +99,8 @@ Licensed under the MIT license.
         // where series is either just the data as [ [x1, y1], [x2, y2], ... ]
         // or { data: [ [x1, y1], [x2, y2], ... ], label: "some label", ... }
 
+        console.log("xxx Plot started...");
+
         var series = [],
             options = {
                 // the color theme used for graphs
@@ -380,6 +382,8 @@ Licensed under the MIT license.
                 Canvas: Canvas
             };
 
+            console.log("init plugins " + plugins.length);
+
             for (var i = 0; i < plugins.length; ++i) {
                 var p = plugins[i];
                 p.init(plot, classes);
@@ -1520,7 +1524,7 @@ Licensed under the MIT license.
             var magn = parseFloat('1e' + (-dec)),
                 norm = delta / magn;
 
-            if (norm > 2.25 && norm < 3 && (dec + 1) <= tickDecimals) {
+            if (norm > 2.25 && norm < 3 && (tickDecimals == null || (dec + 1) <= tickDecimals)) {
                 //we need an extra decimals when tickSize is 2.5
                 ++dec;
             }
@@ -1777,37 +1781,35 @@ Licensed under the MIT license.
             surface.clear();
             executeHooks(hooks.drawBackground, [ctx]);
 
-           
             var grid = options.grid;
-            
+
             // draw background, if any
             if (grid.show && grid.backgroundColor) {
                 drawBackground();
             }
-            
+
             if (grid.show && !grid.aboveData) {
                 drawGrid();
             }
-            
+
             for (var i = 0; i < series.length; ++i) {
                 executeHooks(hooks.drawSeries, [ctx, series[i], i, getColorOrGradient]);
                 drawSeries(series[i]);
             }
-            
+
             executeHooks(hooks.draw, [ctx]);
-            
+
             if (grid.show && grid.aboveData) {
                 drawGrid();
             }
-            
+
             surface.render();
-            
+
             // A draw implies that either the axes or data have changed, so we
             // should probably update the overlay highlights as well.
             triggerRedrawOverlay();
-            
-            ShowTickLabels();
 
+            ShowTickLabels();
         }
 
         //*******************************************************************
@@ -2447,9 +2449,9 @@ Licensed under the MIT license.
                         //*******************************************************************
                         //labelBoxes.push(drawAxisLabel(axis.ticks[0], labelBoxes));
                         //labelBoxes.push(drawAxisLabel(axis.ticks[axis.ticks.length - 1], labelBoxes));
-                        for (i = 1; i < axis.ticks.length - 1; ++i) {
-                            //labelBoxes.push(drawAxisLabel(axis.ticks[i], labelBoxes));
-                        }
+                        //for (i = 1; i < axis.ticks.length - 1; ++i) {
+                        //    labelBoxes.push(drawAxisLabel(axis.ticks[i], labelBoxes));
+                        //}
                         break;
                     case 'all':
                         //*******************************************************************
@@ -2458,9 +2460,9 @@ Licensed under the MIT license.
                         //*******************************************************************
                         //labelBoxes.push(drawAxisLabel(axis.ticks[0], []));
                         //labelBoxes.push(drawAxisLabel(axis.ticks[axis.ticks.length - 1], labelBoxes));
-                        for (i = 1; i < axis.ticks.length - 1; ++i) {
-                            //labelBoxes.push(drawAxisLabel(axis.ticks[i], labelBoxes));
-                        }
+                        //for (i = 1; i < axis.ticks.length - 1; ++i) {
+                        //    labelBoxes.push(drawAxisLabel(axis.ticks[i], labelBoxes));
+                        //}
                         break;
                 }
             });

package/widgets/sbfspot/lib/js/flot/jquery.flot.time.js

@@ -31,11 +31,11 @@ API.txt for details.
 
         var oldSetTime = newDate.setTime.bind(newDate);
         newDate.update = function(microEpoch) {
-            oldSetTime(microEpoch);
-
             // Round epoch to 3 decimal accuracy
             microEpoch = Math.round(microEpoch * 1000) / 1000;
 
+            oldSetTime(microEpoch);
+
             // Microseconds are stored as integers
             this.microseconds = 1000 * (microEpoch - Math.floor(microEpoch));
         };
@@ -395,11 +395,10 @@ API.txt for details.
         // reset smaller components
 
         if (step >= timeUnitSize.millisecond) {
-            if (step >= timeUnitSize.second) {
-                d.setMicroseconds(0);
-            } else {
-                d.setMicroseconds(d.getMilliseconds() * 1000);
-            }
+            d.setMicroseconds(0);
+        }
+        if (step >= timeUnitSize.second) {
+            d.setMilliseconds(0);
         }
         if (step >= timeUnitSize.minute) {
             d.setSeconds(0);

package/widgets/sbfspot/lib/js/lib/globalize.culture.en-US.js

@@ -0,0 +1,33 @@
+/*
+ * Globalize Culture en-US
+ *
+ * http://github.com/jquery/globalize
+ *
+ * Copyright Software Freedom Conservancy, Inc.
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * This file was generated by the Globalize Culture Generator
+ * Translation: bugs found in this file need to be fixed in the generator
+ */
+
+(function( window, undefined ) {
+
+var Globalize;
+
+if ( typeof require !== "undefined" &&
+	typeof exports !== "undefined" &&
+	typeof module !== "undefined" ) {
+	// Assume CommonJS
+	Globalize = require( "globalize" );
+} else {
+	// Global variable
+	Globalize = window.Globalize;
+}
+
+Globalize.addCultureInfo( "en-US", "default", {
+	name: "en-US",
+	englishName: "English (United States)"
+});
+
+}( this ));