alsmanager_lib 2.0.103 → 2.0.105

package/lib/modules.js

@@ -1,3 +1,7 @@
+/*
+    Raccolta call per accesso ai dati di ALS
+    Author : Luca Cattani
+*/
 // Manage connectors
 function getConnectorsByIdDeviceSQLite(id_device) {
     var query = "select dc.id, ct.conn_type as Tipo, cp.name as Protocollo, dc.conn_number as Numero, dc.conn_verse as Verso from device_connectors dc ";
@@ -5086,7 +5090,8 @@ function removeSetInfoSQLite(id_device, id_device_col) {
     var query = "";
     if (id_device > 0 && id_device_col > 0) {
         query = "delete from device_set  ";
-        query += "where id_maindevice = " + id_device + " or id_relateddevice = " + id_device_col; 
+        query += "where (id_maindevice = " + id_device + " and id_relateddevice = " + id_device_col + ") or ";
+        query += "(id_relateddevice = " + id_device + " and id_maindevice = " + id_device_col + ") ";
     }
     return query;
 }
@@ -5095,7 +5100,8 @@ function removeSetInfoMySQL(id_device, id_device_col) {
     var query = "";
     if (id_device > 0 && id_device_col > 0) {
         query = "delete from device_set  ";
-        query += "where id_maindevice = :id_device or id_relateddevice = :id_device_col";
+        query += "where (id_maindevice = :id_device and id_relateddevice = :id_device_col) or ";
+        query += "(id_relateddevice = :id_device and id_maindevice = :id_device_col) ";
     }
     return query;
 }
@@ -9748,6 +9754,11 @@ function updateDeviceSiteMySQL(id_device) {
     query += "where id_device = :id_device and date_in = (select max(date_in) from device_site where id_device = :id_device)";
     return query;
 }
+function updateDeviceSiteMySQL2(id_device) {
+    var query = "update device_site set date_out = DATE_SUB(CURDATE(), INTERVAL 1 DAY) ";
+    query += "where id_device = " + id_device + " and date_in = (select max(date_in) from device_site where id_device = " + id_device + ")";
+    return query;
+}
 function updateDeviceSite(db_used,id_device) {
     var query = "";
     if (db_used) {
@@ -9759,7 +9770,7 @@ function updateDeviceSite(db_used,id_device) {
                 query = updateDeviceSiteMySQL(id_device);
                 break;
             case 'MYSQL2':
-                query = updateDeviceSiteSQLite(id_device);
+                query = updateDeviceSiteMySQL2(id_device);
                 break;
         }
     }
@@ -9799,6 +9810,22 @@ function insertDeviceSiteMySQL(id_device, id_place, id_site, start_date) {
     query += ")";
     return query;
 }
+function insertDeviceSiteMySQL2(id_device, id_place, id_site, start_date) {
+    var query = "insert into device_site (date_in, date_out, id_device, id_site, id_place) ";
+    query += "values (";
+    if ((!start_date || start_date == '') || start_date == "TODAY") {
+        query += "CURDATE(),";
+    }
+    else {
+        query += "'" + start_date + "',";
+    }
+    query += "'2999-12-31',";
+    query += id_device + ",";
+    query += id_site + ",";
+    query += "'" + id_place + "'";
+    query += ")";
+    return query;
+}
 function insertDeviceSite(db_used,id_device, id_place, id_site, start_date) {
     var query = "";
     if (db_used) {
@@ -9810,7 +9837,7 @@ function insertDeviceSite(db_used,id_device, id_place, id_site, start_date) {
                 query = insertDeviceSiteMySQL(id_device, id_place, id_site, start_date);
                 break;
             case 'MYSQL2':
-                query = insertDeviceSiteSQLite(id_device, id_place, id_site, start_date);
+                query = insertDeviceSiteMySQL2(id_device, id_place, id_site, start_date);
                 break;
         }
     }
@@ -12035,6 +12062,7 @@ function updateAltroBeneSQLite(id_bene, inv_ict3_number, inv_comune_prov, id_typ
     query += "descrizione = '" + descrizione + "', ";
     query += "manifacturer = '" + model + "', ";
     query += "note = '" + note + "' ";
+    query += "where id = " + id_bene;
     return query;
 }
 function updateAltroBeneMySQL(id_bene, inv_ict3_number, inv_comune_prov, id_type, descrizione, manifacturer, model, note) {
@@ -12045,6 +12073,7 @@ function updateAltroBeneMySQL(id_bene, inv_ict3_number, inv_comune_prov, id_type
     query += "descrizione = :descrizione, ";
     query += "manifacturer = :model, ";
     query += "note = :note ";
+    query += "where id = :id_bene";
     return query;    
 }
 function updateAltroBene(db_used, id_bene, inv_ict3_number, inv_comune_prov, id_type, descrizione, manifacturer, model, note) {
@@ -12093,6 +12122,18 @@ function removeAltroBene(db_used, id_bene) {
     return query;    
 }
 
+function getAltroBeneManifacturerCombo() {
+    var query = "select DISTINCT manifacturer from altri_beni ";
+    return query;
+}
+
+function getAltroBeneModelCombo(manifacturer) {
+    var query = "select DISTINCT model from altri_beni ";
+    query += "where manifacturer = '" + manifacturer + "'";
+    return query;
+}
+
+
 function getAltroBeneByIdSQLite(id_bene) {
     var query = "select id, inv_ict3_number, inv_comune_prov, id_type, descrizione, manifacturer, model, note from altri_beni ";
     query += "where id = " + id_bene;
@@ -12121,72 +12162,254 @@ function getAltroBeneById(db_used, id_bene) {
     return query;    
 }
 
-function getAltriBeniSQLite(id_type, manifacturer, model) {
-    var query = "select id, inv_ict3_number, inv_comune_prov, id_type, descrizione, manifacturer, model, note from altri_beni ";
+function getAltriBeniSQLite(id_type, manifacturer, model, id_site, id_place) {
+    var query = "select id, inv_ict3_number, inv_comune_prov, id_type, descrizione, manifacturer, model, note from altri_beni ab ";
+    if ((id_site && id_site > 0) || (id_place && id_place != '')) {
+        query += "left join altri_beni_site s on ab.id = s.id_bene ";
+    }
     var where_clause = "";
-    if ((manifacturer && manifacturer != '') || (model && model != '') || (id_type && id_type != '')) {
+    if ((manifacturer && manifacturer != '') || (model && model != '') || (id_type && id_type != '') || (id_site && id_site > 0) || (id_place && id_place != '')) {
         where_clause = "where "
         if (manifacturer && manifacturer != '') {
             where_clause += "manifacturer = '" + manifacturer + "' ";
-            if ((model && model != '') || (id_type && id_type != '')) {
+            if ((model && model != '') || (id_type && id_type != '') || (id_site && id_site > 0) || (id_place && id_place != '')) {
                 where_clause += " and ";
             }
         }
         if (model && model != '') {
             where_clause += "model = '" + model + "' ";
-            if (id_type && id_type != '') {
+            if ((id_type && id_type != '') || (id_site && id_site > 0) || (id_place && id_place != '')) {
                 where_clause += " and ";
             }
         }
         if (id_type && id_type != '') {
             where_clause += "id_type = " + id_type + " ";
+            if ((id_site && id_site > 0) || (id_place && id_place != '')) {
+                where_clause += " and ";
+            }
+        }
+        if ((id_site && id_site > 0) || (id_place && id_place != '')) {
+            where_clause += "(s.id_place is not null and s.id_place = '" + id_place + "' && id_site = " + id_site + " ";
+            where_clause += "and s.date_in <= date('now') and s.date_out >= date('now'))";
         }
     }
     query += where_clause;
     return query;
 }
-function getAltriBeniMySQL(id_type, manifacturer, model) {
+function getAltriBeniMySQL(id_type, manifacturer, model, id_site, id_place) {
     var query = "select id, inv_ict3_number, inv_comune_prov, id_type, descrizione, manifacturer, model, note from altri_beni ";
+    if ((id_site && id_site > 0) || (id_place && id_place != '')) {
+        query += "left join altri_beni_site s on ab.id = s.id_bene ";
+    }
     var where_clause = "";
-    if ((manifacturer && manifacturer != '') || (model && model != '') || (id_type && id_type != '')) {
+    if ((manifacturer && manifacturer != '') || (model && model != '') || (id_type && id_type != '') || (id_site && id_site > 0) || (id_place && id_place != '')) {
         where_clause = "where "
         if (manifacturer && manifacturer != '') {
             where_clause += "manifacturer = :manifacturer ";
-            if ((model && model != '') || (id_type && id_type != '')) {
+            if ((model && model != '') || (id_type && id_type != '') || (id_site && id_site > 0) || (id_place && id_place != '')) {
                 where_clause += " and ";
             }
         }
         if (model && model != '') {
             where_clause += "model = :model ";
-            if (id_type && id_type != '') {
+            if ((id_type && id_type != '') || (id_site && id_site > 0) || (id_place && id_place != '')) {
                 where_clause += " and ";
             }
         }
         if (id_type && id_type != '') {
             where_clause += "id_type = :id_type ";
+            if ((id_site && id_site > 0) || (id_place && id_place != '')) {
+                where_clause += " and ";
+            }
+        }
+        if ((id_site && id_site > 0) || (id_place && id_place != '')) {
+            where_clause += "(s.id_place is not null and s.id_place = :id_place && id_site = :id_site ";
+            where_clause += "and s.date_in <= CURDATE() and s.date_out >= CURDATE()) ";
         }
     }
     query += where_clause;
     return query;
 }
-function getAltriBeni(db_used, id_type, manifacturer, model) {
+function getAltriBeniMySQL2(id_type, manifacturer, model, id_site, id_place) {
+    var query = "select id, inv_ict3_number, inv_comune_prov, id_type, descrizione, manifacturer, model, note from altri_beni ab ";
+    if ((id_site && id_site > 0) || (id_place && id_place != '')) {
+        query += "left join altri_beni_site s on ab.id = s.id_bene ";
+    }
+    var where_clause = "";
+    if ((manifacturer && manifacturer != '') || (model && model != '') || (id_type && id_type != '') || (id_site && id_site > 0) || (id_place && id_place != '')) {
+        where_clause = "where "
+        if (manifacturer && manifacturer != '') {
+            where_clause += "manifacturer = '" + manifacturer + "' ";
+            if ((model && model != '') || (id_type && id_type != '') || (id_site && id_site > 0) || (id_place && id_place != '')) {
+                where_clause += " and ";
+            }
+        }
+        if (model && model != '') {
+            where_clause += "model = '" + model + "' ";
+            if ((id_type && id_type != '') || (id_site && id_site > 0) || (id_place && id_place != '')) {
+                where_clause += " and ";
+            }
+        }
+        if (id_type && id_type != '') {
+            where_clause += "id_type = " + id_type + " ";
+            if ((id_site && id_site > 0) || (id_place && id_place != '')) {
+                where_clause += " and ";
+            }
+        }
+        if ((id_site && id_site > 0) || (id_place && id_place != '')) {
+            where_clause += "(s.id_place is not null and s.id_place = '" + id_place + "' && id_site = " + id_site + " ";
+            where_clause += "and s.date_in <= CURDATE() and s.date_out >= CURDATE())";
+        }
+    }
+    query += where_clause;
+    return query;
+}
+function getAltriBeni(db_used, id_type, manifacturer, model, id_site, id_place) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = getAltriBeniSQLite(id_type, manifacturer, model);
+                query = getAltriBeniSQLite(id_type, manifacturer, model, id_site, id_place);
                 break;
             case 'MYSQL':
-                query = getAltriBeniMySQL(id_type, manifacturer, model);
+                query = getAltriBeniMySQL(id_type, manifacturer, model, id_site, id_place);
                 break;
             case 'MYSQL2':
-                query = getAltriBeniSQLite(id_type, manifacturer, model);
+                query = getAltriBeniMySQL2(id_type, manifacturer, model, id_site, id_place);
                 break;
         }
     }
     return query;    
 }
 // --- Gestione luoghi altri beni
+function updateAltroBeneSiteSQLite(id_bene) {
+    var query = "update altri_beni_site set date_out = date('now','-1 day') ";
+    query += "where id_bene = " + id_bene + " and date_in = (select max(date_in) from altri_beni_site where id_bene = " + id_bene + ")";
+    return query;
+}
+function updateAltroBeneSiteMySQL(id_bene) {
+    var query = "update altri_beni_site set date_out = DATE_SUB(CURDATE(), INTERVAL 1 DAY) ";
+    query += "where id_bene = :id_bene and date_in = (select max(date_in) from altri_beni_site where id_bene = :id_bene)";
+    return query;
+}
+function updateAltroBeneSiteMySQL2(id_bene) {
+    var query = "update altri_beni_site set date_out = DATE_SUB(CURDATE(), INTERVAL 1 DAY) ";
+    query += "where id_bene = " + id_bene + " and date_in = (select max(date_in) from altri_beni_site where id_bene = " + id_bene + ")";
+    return query;
+}
+function updateAltroBeneSite(db_used, id_bene) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = updateAltroBeneSiteSQLite(id_bene);
+                break;
+            case 'MYSQL':
+                query = updateAltroBeneSiteMySQL(id_bene);
+                break;
+            case 'MYSQL2':
+                query = updateAltroBeneSiteMySQL2(id_bene);
+                break;
+        }
+    }
+    return query;
+}
+// end manage updateDevicesSite
+// Manage insertDeviceSite
+function insertAltroBeneSiteSQLite(id_bene, id_place, id_site, start_date) {
+    var query = "insert into altri_beni_site (date_in, date_out, id_bene, id_site, id_place) ";
+    query += "values (";
+    if ((!start_date || start_date == '') || start_date == "TODAY") {
+        query += "date('now'),";
+    }
+    else {
+        query += "'" + start_date + "',";
+    }
+    query += "'2999-12-31',";
+    query += id_bene + ",";
+    query += id_site + ",";
+    query += "'" + id_place + "'";
+    query += ")";
+    return query;
+}
+function insertAltroBeneSiteMySQL(id_bene, id_place, id_site, start_date) {
+    var query = "insert into altri_beni_site (date_in, date_out, id_bene, id_site, id_place) ";
+    query += "values (";
+    if ((!start_date || start_date == '') || start_date == "TODAY") {
+        query += "CURDATE(),";
+    }
+    else {
+        query += ":start_date,";
+    }
+    query += "'2999-12-31',";
+    query += ":id_bene,";
+    query += ":id_site,";
+    query += ":id_place";
+    query += ")";
+    return query;
+}
+function insertAltroBeneSiteMySQL2(id_bene, id_place, id_site, start_date) {
+    var query = "insert into altri_beni_site (date_in, date_out, id_bene, id_site, id_place) ";
+    query += "values (";
+    if ((!start_date || start_date == '') || start_date == "TODAY") {
+        query += "CURDATE(),";
+    }
+    else {
+        query += "'" + start_date + "',";
+    }
+    query += "'2999-12-31',";
+    query += id_bene + ",";
+    query += id_site + ",";
+    query += "'" + id_place + "'";
+    query += ")";
+    return query;
+}
+function insertAltroBeneSite(db_used, id_bene, id_place, id_site, start_date) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = insertAltroBeneSiteSQLite(id_bene, id_place, id_site, start_date);
+                break;
+            case 'MYSQL':
+                query = insertAltroBeneSiteMySQL(id_bene, id_place, id_site, start_date);
+                break;
+            case 'MYSQL2':
+                query = insertAltroBeneSiteMySQL2(id_bene, id_place, id_site, start_date);
+                break;
+        }
+    }
+    return query;
+}
+// end manage updateDevicesSite
+//
+function removeAltroBeneFromAllSitesSQLite(id_bene) {
+    var query = "delete from altri_beni_site ";
+    query += "where id_device = " + id_bene;
+    return query; 
+}
+function removeAltroBeneFromAllSitesMySQL(id_bene) {
+    var query = "delete from altri_beni_site ";
+    query += "where id_device = :id_bene";
+    return query;     
+}
+function removeAltroBeneFromAllSites(db_used, id_bene) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = removeAltroBeneFromAllSitesSQLite(id_bene);
+                break;
+            case 'MYSQL':
+                query = removeAltroBeneFromAllSitesMySQL(id_bene);
+                break;
+            case 'MYSQL2':
+                query = removeAltroBeneFromAllSitesSQLite(id_bene);
+                break;
+        }
+    }
+    return query;
+}
 
 // --- Gestione dimissione altri beni
 function insertAltroBeneDismissioneSQLite(id_dismiss, id_bene, motivo, note, data) {
@@ -12729,12 +12952,14 @@ module.exports = {
     removeAltroBene,
     getAltriBeni,
     getAltroBeneById,
-    /*
-    getAltroBeneByIdSite,
+    getAltroBeneManifacturerCombo,
+    getAltroBeneModelCombo,
     insertAltroBeneSite,
     updateAltroBeneSite,
-    removeAltroBeneSite,
+    /*
+    getAltroBeneByIdSite,
     */
+    removeAltroBeneFromAllSites,
     insertAltroBeneDismissione,
     updateAltroBeneDismissione,
     removeAltroBeneDismissione,

package/package.json

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