alsmanager_lib 3.0.81 → 3.0.83

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 ";
@@ -6777,8 +6816,8 @@ function getDatesRangeConsegne() {
 }
 
 
-function queryConsegneSQLite(data_da, data_a, data_filter, adulto, alunno) {
-    var query = "SELECT id, data_richiesta as Richiesta, data_consegna as Consegna, richiedente_adulto as Adulto, richiedente_alunno as Alunno, richiedente_genitore as Genitore, is_home as Casa, note as Note, email_adulto, email_genitore from consegne ";
+function queryConsegneSQLite(data_da, data_a, data_filter, adulto, alunno, still_open) {
+    var query = "SELECT c.id, c.data_richiesta as Richiesta, c.data_consegna as Consegna, c.richiedente_adulto as Adulto, c.richiedente_alunno as Alunno, c.richiedente_genitore as Genitore, c.is_home as Casa, c.note as Note, c.email_adulto, c.email_genitore from consegne c ";
     query += "where (removed is null or removed = 0) ";
     if (adulto && adulto.trim() != '') {
         query += "and richiedente_adulto = '" + adulto + "' ";
@@ -6807,6 +6846,9 @@ function queryConsegneSQLite(data_da, data_a, data_filter, adulto, alunno) {
             else
                 query += "data_consegna <= '" + data_str + "'";
         }
+        if (still_open) {
+            query += " and (select count(*) from consegna_beni where id_consegna = c.id and stato_restituzione in(0,1)) > 0"
+        }
     }
     if (data_filter == "RICHIESTA")
         query += " order by data_richiesta desc";
@@ -6815,7 +6857,7 @@ function queryConsegneSQLite(data_da, data_a, data_filter, adulto, alunno) {
     return query;    
 }
 
-function queryConsegneMySQL(data_da, data_a, data_filter, adulto, alunno) {
+function queryConsegneMySQL(data_da, data_a, data_filter, adulto, alunno, still_open) {
     var query = "SELECT id, data_richiesta as Richiesta, data_consegna as Consegna, richiedente_adulto as Adulto, richiedente_alunno as Alunno, richiedente_genitore as Genitore, is_home as Casa, note as Note, email_adulto, email_genitore from consegne ";
     query += "where (removed is null or removed = 0) ";
     if (adulto && adulto.trim() != '') {
@@ -6841,6 +6883,9 @@ function queryConsegneMySQL(data_da, data_a, data_filter, adulto, alunno) {
             else
                 query += "data_consegna <= :data_a";
         }
+        if (still_open) {
+            query += " and (select count(*) from consegna_beni where id_consegna = c.id and stato_restituzione in(0,1)) > 0"
+        }
     }
     if (data_filter == "RICHIESTA")
         query += " order by data_richiesta desc";
@@ -6849,18 +6894,18 @@ function queryConsegneMySQL(data_da, data_a, data_filter, adulto, alunno) {
 
     return query;
 }
-function queryConsegne(db_used,data_da, data_a, data_filter, adulto, alunno) {
+function queryConsegne(db_used,data_da, data_a, data_filter, adulto, alunno, still_open) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = queryConsegneSQLite(data_da, data_a, data_filter, adulto, alunno);
+                query = queryConsegneSQLite(data_da, data_a, data_filter, adulto, alunno, still_open);
                 break;
             case 'MYSQL':
-                query = queryConsegneMySQL(data_da, data_a, data_filter, adulto, alunno);
+                query = queryConsegneMySQL(data_da, data_a, data_filter, adulto, alunno, still_open);
                 break;
             case 'MYSQL2':
-                query = queryConsegneSQLite(data_da, data_a, data_filter, adulto, alunno);
+                query = queryConsegneSQLite(data_da, data_a, data_filter, adulto, alunno, still_open);
                 break;
         }
     }
@@ -14338,6 +14383,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.81",
+  "version": "3.0.83",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",