alsmanager_lib 3.0.226 → 3.0.228

package/lib/modules.js

@@ -9381,11 +9381,20 @@ function updateDataRientroConsegnaSQLite(consegna_id) {
 }
 
 function updateDataRientroConsegnaMySQL(consegna_id) {
-   var query = "update consegne ";
-    query += "set data_rientro = MAX(cb.data_restituzione) ";
+    var query = "UPDATE consegne as c ";
+    query += "SET c.data_rientro = (SELECT MAX(cb.data_restituzione) ";
     query += "from consegna_beni cb ";
-    query += "where consegne.id =  :consegna_id ";
-    query += "and cb.id_consegna = :consegna_id ";
+    query += "WHERE cb.id_consegna = :consegna_id) ";
+    query += "WHERE c.id = :consegna_id";
+    return query;
+}
+
+function updateDataRientroConsegnaMySQL2(consegna_id) {
+    var query = "UPDATE consegne as c ";
+    query += "SET c.data_rientro = (SELECT MAX(cb.data_restituzione) ";
+    query += "from consegna_beni cb ";
+    query += "WHERE cb.id_consegna = " + consegna_id + ") ";
+    query += "WHERE c.id = " + consegna_id;
     return query;
 }
 
@@ -9400,7 +9409,7 @@ function updateDataRientroConsegna(db_used, consegna_id) {
                 query = updateDataRientroConsegnaMySQL(consegna_id);
                 break;
             case 'MYSQL2':
-                query = updateDataRientroConsegnaSQLite(consegna_id);
+                query = updateDataRientroConsegnaMySQL2(consegna_id);
                 break;
         }
     }
@@ -13214,7 +13223,7 @@ function updateSiteDestination(id_site, id_place, date_start, date_end, name, fu
     return query;
 }
 
-function updateSiteDestinationAfterMove(id_site, id_place, date_start, name, funzione, date_start_ref) {
+function updateSiteDestinationAfterMoveSQLite(id_site, id_place, date_start, name, funzione, date_start_ref) {
     var dt_end = convertDateToStringDB(date_start_ref);
     var dt_start = convertDateToStringDB(date_start);
     var query = "update site_destinations set ";
@@ -13225,6 +13234,34 @@ function updateSiteDestinationAfterMove(id_site, id_place, date_start, name, fun
     return query;
 }
 
+function updateSiteDestinationAfterMoveMySQL2(id_site, id_place, date_start, name, funzione, date_start_ref) {
+    var dt_end = convertDateToStringDB(date_start_ref);
+    var dt_start = convertDateToStringDB(date_start);
+    var query = "update site_destinations set ";
+    query += "date_end = DATE_SUB('" + dt_end + "', INTERVAL 1 DAY) ";
+    query += "where id_site = " + id_site + " and id_place = '" + id_place + "' ";
+    query += "and date_start = '" + dt_start + "' ";
+    query += "and name = '" + name + "' and type = '" + funzione + "'";
+    return query;
+}
+
+function updateSiteDestinationAfterMove(db_used, id_site, id_place, date_start, name, funzione, date_start_ref) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = updateSiteDestinationAfterMoveSQLite(id_site, id_place, date_start, name, funzione, date_start_ref);
+                break;
+            case 'MYSQL':
+                break;
+            case 'MYSQL2':
+                query = updateSiteDestinationAfterMoveMySQL2(id_site, id_place, date_start, name, funzione, date_start_ref);
+                break;
+        }
+    }
+    return query;
+}
+
 function getSiteDestinationsByIdSite(id_site, id_place) {
     var query = "select date_start, date_end, name, type from site_destinations ";
     query += "where id_site = " + id_site + " and id_place = '" + id_place + "' ";
@@ -14379,7 +14416,7 @@ function updateSiteBySetMySQL(id_device) {
     return query;
 }
 function updateSiteBySetMySQL2(id_device) {
-    var query = "update device_site set date_out = date('now','-1 day'), date_in = date('now','-1 day') where id_device in "
+    var query = "update device_site set date_out = DATE_SUB(CURDATE(), INTERVAL 1 DAY), date_in = DATE_SUB(CURDATE(), INTERVAL 1 DAY) where id_device in "
     query += "(select dt.id_relateddevice from device_set dt ";
     query += "where dt.id_maindevice = " + id_device + ") ";
     query += "and CURDATE() >= date_in and CURDATE() <= date_out"

package/package.json

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