alsmanager_lib 3.0.82 → 3.0.84

package/lib/modules.js

@@ -4288,13 +4288,15 @@ function writeDeviceProperties(db_used, id_device, raw_data) {
 //Read Device properties
 function readDevicePropertiesSQLite(id_device) {
     var query = "select raw_properties from device_properties ";
-    query += "where id_device = " + id_device;
+    query += "where id_device = " + id_device + " ";
+    query += "and (is_imported is null or is_imported = 0)"
     return query;
 }
 
 function readDevicePropertiesMySQL() {
     var query = "select raw_properties from device_properties ";
-    query += "where id_device = :id_device";
+    query += "where id_device = :id_device ";
+    query += "and (is_imported is null or is_imported = 0)"
     return query;
 }
 function readDeviceProperties(db_used, id_device) {
@@ -4315,7 +4317,44 @@ function readDeviceProperties(db_used, id_device) {
     return query;
 }
 //End Read Device properties
+//Update Device Properties after import
+function updateDevicePropertiesSQLite(id_prop, is_imported, id_config) {
+    var query = "update device_properties set ";
+    query += "is_imported " + is_imported + " ";
+    if (id_config) {
+        query += ", id_config = " + id_config + " ";
+    }
+    query += "where id = " + id_prop;
+    return query;
+}
 
+function updateDevicePropertiesMySQL(id_prop, is_imported, id_config) {
+   var query = "update device_properties set ";
+    query += "is_imported :is_imported ";
+    if (id_config) {
+        query += ", id_config = :id_config ";
+    }
+    query += "where id = :id_prop";
+    return query;
+}
+function updateDeviceProperties(db_used, id_prop, is_imported, id_config) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = updateDevicePropertiesSQLite(id_prop, is_imported, id_config);
+                break;
+            case 'MYSQL':
+                query = updateDevicePropertiesMySQL(id_prop, is_imported, id_config);
+                break;
+            case 'MYSQL2':
+                query = updateDevicePropertiesSQLite(id_prop, is_imported, id_config);
+                break;
+        }
+    }
+    return query;
+}
+//End Update Device Properties after import
 // Get Devices with properties
 function getDevicesWithPropertiesSQLite(id_device) {
     var query = "select ";
@@ -5751,12 +5790,22 @@ function getFreeLanPortsCombo(db_used, id_place, id_site, port_type){
 //end Get Network on device
 //
 function getImportedPropertiesByIdDeviceSQLite(id_device) {
-    var query = "select raw_properties as Dati from device_properties dp ";
+    var query = "select dp.raw_properties as Dati, ";
+    query += "case ";
+    query += "when dp.is_imported = 1 then 'Importato' ";
+    query += "else ''";
+    query += "end as Stato ";    
+    query += "from device_properties dp ";
     query += "where dp.id_device = " + id_device;
     return query;
 }
 function getImportedPropertiesByIdDeviceMySQL(id_device) {
-    var query = "select raw_properties as Dati from device_properties dp ";
+    var query = "select dp.raw_properties as Dati, ";
+    query += "case ";
+    query += "when dp.is_imported = 1 then 'Importato' ";
+    query += "else ''";
+    query += "end as Stato ";    
+    query += "from device_properties dp ";
     query += "where dp.id_device = :id_device";
     return query;
 }
@@ -14344,6 +14393,7 @@ module.exports = {
     getDeviceMySQLPayload,
     writeDeviceProperties,
     readDeviceProperties,
+    updateDeviceProperties,
     //
     getDiskUsagesByIdStorage,
     getLastDiskUsagesByIdStorage,

package/package.json

@@ -4,7 +4,7 @@
     ".": "./lib/modules.js",
     "./dbconn": "./lib/dbconn.js"
   },
-  "version": "3.0.82",
+  "version": "3.0.84",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",