iobroker-ucl 1.2.73 → 1.2.75

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker-ucl",
-  "version": "1.2.73",
+  "version": "1.2.75",
   "main": "main.js",
     "scripts": {
     "build": "tsc --build",

package/shellyFunctions.js

@@ -461,6 +461,7 @@ function loadShellyRollladen(adapter) {
             ));
         }
     });
+    cacheRollladenArray = sortArray(cacheRollladenArray);
     return cacheRollladenArray;
 }
 exports.loadShellyRollladen = loadShellyRollladen;
@@ -483,6 +484,7 @@ function loadShellySensoren(adapter) {
             ));
         }
     });
+    cacheSensorenArray = sortArray(cacheSensorenArray);
     return cacheSensorenArray;
 }
 exports.loadShellySensoren = loadShellySensoren;
@@ -595,6 +597,7 @@ function loadShellyDimmer(adapter) {
             ));
         }
     });
+    cacheDimmerArray = sortArray(cacheDimmerArray);
     return cacheDimmerArray;
 }
 exports.loadShellyDimmer = loadShellyDimmer;
@@ -629,6 +632,7 @@ function loadShellyLampenWeiss(adapter) {
             ));
         }
     });
+    cacheLampenWeissArray = sortArray(cacheLampenWeissArray);
     return cacheLampenWeissArray;
 }
 exports.loadShellyLampenWeiss = loadShellyLampenWeiss;
@@ -663,6 +667,7 @@ function loadShellySteckdosen(adapter) {
             ));
         }
     });
+    cacheSteckdosenArray = sortArray(cacheSteckdosenArray);
     return cacheSteckdosenArray;
 }
 exports.loadShellySteckdosen = loadShellySteckdosen;
@@ -693,6 +698,7 @@ function loadShellyDevicesAll(adapter) {
         // @ts-ignore                    
         shellyAllArray.push(shelly);
     });
+    shellyAllArray = sortArray(shellyAllArray);
     return shellyAllArray;
 }
 exports.loadShellyDevicesAll = loadShellyDevicesAll;
@@ -705,4 +711,50 @@ function toStringArray(databaseValue) {
         return databaseValue.split('|');
     }
 }
+function sortArray(inputArray) {
+    inputArray.sort(function (a, b) {
+        var elementA = a;
+        var elementB = b;
+        var etageA = elementA.getEtage();
+        var etageB = elementB.getEtage();
+        var compareEtage = getEtageSortIndex(etageA).localeCompare(getEtageSortIndex(etageB));
+        if (compareEtage != 0) {
+            return compareEtage;
+        }
+        var typA = elementA.getCategory();
+        var typB = elementB.getCategory();
+        var compareTyp = typA.localeCompare(typB);
+        if (compareTyp != 0) {
+            return compareTyp;
+        }
+        var raumA = elementA.getRaum();
+        var raumB = elementB.getRaum();
+        var compareRaum = raumA.localeCompare(raumB);
+        if (compareRaum != 0) {
+            return compareRaum;
+        }
+        var deviceA = elementA.getDevice();
+        var deviceB = elementB.getDevice();
+        var compareDevice = deviceA.localeCompare(deviceB);
+        if (compareDevice != 0) {
+            return compareDevice;
+        }
+        return 0;
+    });
+    return inputArray;
+}
+function getEtageSortIndex(etage) {
+    if (etage == "OG") {
+        return "a";
+    }
+    else if (etage == "EG") {
+        return "b";
+    }
+    else if (etage == "UG") {
+        return "c";
+    }
+    else {
+        return "d";
+    }
+}
 module.exports = { createShellyDevice: createShellyDevice, createShellySensor: createShellySensor, createShellyLampeRGB: createShellyLampeRGB, createShellyRollladen: createShellyRollladen, createShellyDimmer: createShellyDimmer, createShellyLampe: createShellyLampe, createShellySteckdose: createShellySteckdose, loadShellyRollladen: loadShellyRollladen, loadShellySensoren: loadShellySensoren, loadShellyDimmer: loadShellyDimmer, loadShellyLampenWeiss: loadShellyLampenWeiss, loadShellySteckdosen: loadShellySteckdosen, loadShellyDevicesAll: loadShellyDevicesAll };

package/shellyFunctions.ts

@@ -501,6 +501,7 @@ export function loadShellyRollladen(adapter: any) {
             ));
         }
     });
+    cacheRollladenArray = sortArray(cacheRollladenArray);                
     return cacheRollladenArray;
 }
 
@@ -524,6 +525,7 @@ export function loadShellySensoren(adapter: any) {
             ));
         }
     });
+    cacheSensorenArray = sortArray(cacheSensorenArray);            
     return cacheSensorenArray;
 }
 
@@ -679,10 +681,10 @@ export function loadShellyDimmer(adapter: any) {
             ));
         }
     });
+    cacheDimmerArray = sortArray(cacheDimmerArray);            
     return cacheDimmerArray;
 }
 
-
 var cacheLampenWeissArray = null;
 export function loadShellyLampenWeiss(adapter: any) {
     if (cacheLampenWeissArray != null) {
@@ -717,6 +719,7 @@ export function loadShellyLampenWeiss(adapter: any) {
             ));
         }
     });
+    cacheLampenWeissArray = sortArray(cacheLampenWeissArray);        
     return cacheLampenWeissArray;
 }
 
@@ -754,6 +757,7 @@ export function loadShellySteckdosen(adapter: any) {
             ));
         }
     });
+    cacheSteckdosenArray = sortArray(cacheSteckdosenArray);    
     return cacheSteckdosenArray;
 }
 
@@ -786,6 +790,7 @@ export function loadShellyDevicesAll(adapter: any) {
         // @ts-ignore                    
         shellyAllArray.push(shelly);
     });
+    shellyAllArray = sortArray(shellyAllArray);
     return shellyAllArray;
 }
 
@@ -798,4 +803,56 @@ function toStringArray(databaseValue) { // z.B. "Werkbank|Arbeiten|Keller"
     }
 }
 
+function sortArray(inputArray) {
+    inputArray.sort((a,b) => {
+        var elementA = a;
+        var elementB = b;
+
+        var etageA = elementA.getEtage();
+        var etageB = elementB.getEtage();
+        var compareEtage = getEtageSortIndex(etageA).localeCompare(getEtageSortIndex(etageB));
+        if (compareEtage != 0) {
+            return compareEtage;
+        }
+
+        var typA = elementA.getCategory();
+        var typB = elementB.getCategory();
+        var compareTyp = typA.localeCompare(typB);
+        if (compareTyp != 0) {
+            return compareTyp;
+        }
+
+
+        var raumA = elementA.getRaum();
+        var raumB = elementB.getRaum();
+        var compareRaum = raumA.localeCompare(raumB);
+        if (compareRaum != 0) {
+            return compareRaum;
+        }
+
+        var deviceA = elementA.getDevice();
+        var deviceB = elementB.getDevice();
+        var compareDevice = deviceA.localeCompare(deviceB);
+        if (compareDevice != 0) {
+            return compareDevice;
+        }
+
+        return 0;
+    });    
+    return inputArray;
+}
+
+function getEtageSortIndex(etage: string) {
+    if (etage == "OG") {
+        return "a";
+    } else if (etage == "EG") {
+        return "b";
+    } else if (etage == "UG") {
+        return "c";
+    } else {
+        return "d";
+    }
+}
+
+
 module.exports = { createShellyDevice, createShellySensor, createShellyLampeRGB, createShellyRollladen, createShellyDimmer, createShellyLampe, createShellySteckdose, loadShellyRollladen, loadShellySensoren, loadShellyDimmer, loadShellyLampenWeiss, loadShellySteckdosen, loadShellyDevicesAll };