alsmanager_lib 1.0.27 → 1.0.28

package/lib/modules.js

@@ -1720,6 +1720,21 @@ function getDevicesSelectForInventarioRawMySQL(inv_code) {
     return query;
 }
 
+function getDevicesSelectForInventarioRaw(db_used, inv_code) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getDevicesSelectForInventarioRawSQLite(inv_code);
+                break;
+            case 'MYSQL':
+                query = getDevicesSelectForInventarioRawMySQL(inv_code);
+                break;
+        }
+    }
+    return query;
+}
+
 function getDevicesSelectForInventarioRawByIdSQLite(id_device) {
     var query = "SELECT id, type as Tipo, manifacturer as Marca, model as Modello, ";
     query += "type as Tipo, ";
@@ -1750,6 +1765,21 @@ function getDevicesSelectForInventarioRawByIdMySQL(id_device) {
     return query;
 }
 
+function getDevicesSelectForInventarioRawById(db_used, id_device) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getDevicesSelectForInventarioRawByIdSQLite(id_device);
+                break;
+            case 'MYSQL':
+                query = getDevicesSelectForInventarioRawByIdMySQL(id_device);
+                break;
+        }
+    }
+    return query;
+}
+
 
 function selectBeneDaInventarioSQLite(table_name, inv_code, is_pnrr, is_dismissione) {
     var query = "";
@@ -1773,9 +1803,6 @@ function selectBeneDaInventarioSQLite(table_name, inv_code, is_pnrr, is_dismissi
             query += " group by Inventario";
         }
         else if (table_name == "devices") {
-            // Get the global function
-            var getDevicesSelectForInventarioRaw = global.get("getDevicesSelectForInventarioRaw");
-
             // Use the function
             query = getDevicesSelectForInventarioRaw(inv_code);
         }
@@ -1844,9 +1871,6 @@ function selectBeneDaInventarioMySQL(table_name, inv_code, is_pnrr, is_dismissio
             query += " group by Inventario";
         }
         else if (table_name == "devices") {
-            // Get the global function
-            var getDevicesSelectForInventarioRaw = global.get("getDevicesSelectForInventarioRaw");
-
             // Use the function
             query = getDevicesSelectForInventarioRaw(inv_code);
         }
@@ -1894,6 +1918,21 @@ function selectBeneDaInventarioMySQL(table_name, inv_code, is_pnrr, is_dismissio
     return result;
 }
 
+function selectBeneDaInventario(db_used, table_name, inv_code, is_pnrr, is_dismissione) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = selectBeneDaInventarioSQLite(table_name, inv_code, is_pnrr, is_dismissione);
+                break;
+            case 'MYSQL':
+                query = selectBeneDaInventarioMySQL(table_name, inv_code, is_pnrr, is_dismissione);
+                break;
+        }
+    }
+    return query;
+}
+
 
 function queryCloseGestioneDeviceSQLite(id_gestione) {
     var query = "update device_gestioni  ";
@@ -3054,7 +3093,7 @@ function queryDocumentsIdDeviceMySQL(id_device) {
     return query;
 }
 
-function queryDocumentsIdDevice(id_device) {
+function queryDocumentsIdDevice(db_used, id_device) {
     var query = "";
     if (db_used) {
         switch (db_used) {
@@ -3079,7 +3118,7 @@ function getDocumentByIdDocMySQL(id_doc) {
     query += "where c.id = :id_doc";
     return query;
 }
-function getDocumentByIdDoc(id_doc) {
+function getDocumentByIdDoc(db_used, id_doc) {
     var query = "";
     if (db_used) {
         switch (db_used) {
@@ -3105,7 +3144,7 @@ function selectDocumentoByIdMySQL(id_doc) {
     query += "where id = :id_doc";
     return query;
 }
-function selectDocumentoById(id_doc) {
+function selectDocumentoById(db_used, id_doc) {
     var query = "";
     if (db_used) {
         switch (db_used) {
@@ -3162,7 +3201,7 @@ function selectDocumentiComboMySQL(tipo, anno_emissione) {
     return query; 
 }
 
-function selectDocumentiCombo(tipo, anno_emissione) {
+function selectDocumentiCombo(db_used, tipo, anno_emissione) {
     var query = "";
     if (db_used) {
         switch (db_used) {
@@ -3189,7 +3228,7 @@ function insertDocumentoMySQL(descrizione, tipo, data_emissione, riferimento, fi
     query += "(:descrizione, :tipo, :data_emissione, :riferimento, :file_name)";
     return query;
 }
-function insertDocumento(descrizione, tipo, data_emissione, riferimento, file_name) {
+function insertDocumento(db_used, descrizione, tipo, data_emissione, riferimento, file_name) {
     var query = "";
     if (db_used) {
         switch (db_used) {
@@ -3226,7 +3265,7 @@ function updateDocumentoMySQL(id_doc, descrizione, tipo, data_emissione, riferim
     return query;    
 }
 
-function updateDocumento(id_doc, descrizione, tipo, data_emissione, riferimento, file_name) {
+function updateDocumento(db_used, id_doc, descrizione, tipo, data_emissione, riferimento, file_name) {
     var query = "";
     if (db_used) {
         switch (db_used) {
@@ -3254,7 +3293,7 @@ function removeDocumentoMySQL(id_doc) {
     return query;    
 }
 
-function removeDocumento(id_doc) {
+function removeDocumento(db_used, id_doc) {
     var query = "";
     if (db_used) {
         switch (db_used) {
@@ -3592,16 +3631,13 @@ function querySites(db_used, place, piano, funzione) {
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = alsmgr.querySitesSQLite(place, piano, funzione);
+                query = querySitesSQLite(place, piano, funzione);
                 break;
             case 'MYSQL':
-                query = alsmgr.querySitesMySQL(place, piano, funzione);
+                query = querySitesMySQL(place, piano, funzione);
                 break;
         }
     }
-    else {
-        query = alsmgr.querySitesSQLite(place, piano, funzione);
-    }
     return query;
 
 }
@@ -3637,6 +3673,20 @@ function getSitesFromDeviceMySQL(id_device, prec_pos) {
     query += " order by site_destinations.name, sites.floor";
     return query;
 }
+function getSitesFromDevice(db_used, id_device, prec_pos) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getSitesFromDeviceSQLite(id_device, prec_pos);
+                break;
+            case 'MYSQL':
+                query = getSitesFromDeviceMySQL(id_device, prec_pos);
+                break;
+        }
+    }
+    return query;
+}
 //End Sites by devices
 //Sites from device with date
 function getSitesWithDatesFromDeviceSQLite(id_device) {
@@ -3657,6 +3707,20 @@ function getSitesWithDatesFromDeviceMySQL(id_device) {
     return query;
 }
 
+function getSitesWithDatesFromDevice(db_used, id_device) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getSitesWithDatesFromDeviceSQLite(id_device);
+                break;
+            case 'MYSQL':
+                query = getSitesWithDatesFromDeviceMySQL(id_device);
+                break;
+        }
+    }
+    return query;
+}
 // Query Sites with Default
 
 function querySitesWithDefaultsSQLite(def_values) {
@@ -3719,6 +3783,21 @@ function querySitesWithDefaultsMySQL(def_values) {
     return query;
 }
 
+function querySitesWithDefaults(db_used, def_values) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = querySitesWithDefaultsSQLite(def_values);
+                break;
+            case 'MYSQL':
+                query = querySitesWithDefaultsMySQL(def_values);
+                break;
+        }
+    }
+    return query;
+}
+
 function getPorteByIdSiteSQLite(id_site) {
     var query = "select port_type as Tipo, port_sign as Porta, note as Note from site_ports sp ";
     query += "where sp.id_site = " + id_site;
@@ -3730,6 +3809,22 @@ function getPorteByIdSiteMySQL(id_site) {
     query += "where sp.id_site = :id_site";
     return query;
 } 
+
+function getPorteByIdSite(db_used, id_site) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getPorteByIdSiteSQLite(id_site);
+                break;
+            case 'MYSQL':
+                query = getPorteByIdSiteMySQL(id_site);
+                break;
+        }
+    }
+    return query;
+} 
+
 // Manage updateDevicesSite
 function verifyPrevDeviceSiteSQLite(id_device) {
     var query = "select count(id_site) as numero from device_site ";
@@ -3742,6 +3837,21 @@ function verifyPrevDeviceSiteMySQL(id_device) {
     return query;
 }
 
+function verifyPrevDeviceSite(db_used, id_device) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = verifyPrevDeviceSiteSQLite(id_device);
+                break;
+            case 'MYSQL':
+                query = verifyPrevDeviceSiteMySQL(id_device);
+                break;
+        }
+    }
+    return query;
+}
+
 function removeDeviceSiteSQLite(id_site, id_place, id_device) {
 
 }
@@ -4427,12 +4537,9 @@ module.exports = {
     updateAddOnMySQL,
     removeAddOnSQLite,
     removeAddOnMySQL,
-    selectBeneDaInventarioSQLite,
-    selectBeneDaInventarioMySQL,
-    getDevicesSelectForInventarioRawSQLite,
-    getDevicesSelectForInventarioRawMySQL,
-    getDevicesSelectForInventarioRawByIdSQLite,
-    getDevicesSelectForInventarioRawByIdMySQL,
+    selectBeneDaInventario,
+    getDevicesSelectForInventarioRaw,
+    getDevicesSelectForInventarioRawById,
     getBeniConsumo,
     getBeniConsumoNotNull,
     getBeneConsumoUsatoSQLite,
@@ -4557,8 +4664,7 @@ module.exports = {
     getSiteByIdMySQL,
     getSitesSelectComboSQLite,
     getSitesSelectComboMySQL,
-    verifyPrevDeviceSiteSQLite,
-    verifyPrevDeviceSiteMySQL,
+    verifyPrevDeviceSite,
     insertDeviceSiteSQLite,
     insertDeviceSiteMySQL,
     updateDeviceSiteSQLite,
@@ -4569,14 +4675,10 @@ module.exports = {
     queryFloorsByPlace,
     queryFunzioneByPlaceAndFloor,
     querySites,
-    getSitesFromDeviceSQLite,
-    getSitesFromDeviceMySQL,
-    getSitesWithDatesFromDeviceSQLite,
-    getSitesWithDatesFromDeviceMySQL,
-    querySitesWithDefaultsSQLite,
-    querySitesWithDefaultsMySQL,
-    getPorteByIdSiteSQLite,
-    getPorteByIdSiteMySQL,
+    getSitesFromDevice,
+    getSitesWithDatesFromDevice,
+    querySitesWithDefaults,
+    getPorteByIdSite,
     //
     queryStatisticSQLite,
     queryStatisticMySQL,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alsmanager_lib",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",