alsmanager_lib 2.0.65 → 2.0.66

package/lib/modules.js

@@ -15,6 +15,14 @@ function getConnectorsByIdDeviceMySQL(id_device) {
     return query;
 }
 
+function getConnectorsByIdDeviceMySQL2(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 ";
+    query += "join connection_types ct on ct.id = dc.conn_type ";
+    query += "join connection_protocols cp on cp.id = dc.conn_protocol ";
+    query += "where id_device = " + id_device;
+    return query;
+}
+
 function getConnectorsByIdDevice(db_used, id_device) {
     var query = "";
     if (db_used) {
@@ -25,6 +33,9 @@ function getConnectorsByIdDevice(db_used, id_device) {
             case 'MYSQL':
                 query = getConnectorsByIdDeviceMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getConnectorsByIdDeviceMySQL2(id_device);
+                break;                
         }
     }
     return query;
@@ -41,6 +52,7 @@ function getConnectorByIdMySQL() {
     query += "where dc.id = :id_conn";
     return query;
 }
+
 function getConnectorById(db_used, id_conn) {
     var query = "";
     if (db_used) {
@@ -51,6 +63,9 @@ function getConnectorById(db_used, id_conn) {
             case 'MYSQL':
                 query = getConnectorByIdMySQL();
                 break;
+            case 'MYSQL2':
+                query = getConnectorByIdSQLite();
+                break;
         }
     }
     return query;
@@ -89,6 +104,9 @@ function insertConnector(db_used, id_device, conn_obj) {
             case 'MYSQL':
                 query = insertConnectorMySQL(id_device, conn_obj);
                 break;
+            case 'MYSQL2':
+                query = insertConnectorSQLite(id_device, conn_obj);
+                break;
         }
     }
     return query;
@@ -123,6 +141,9 @@ function updateConnector(db_used, id_device, conn_obj) {
             case 'MYSQL':
                 query = updateConnectorMySQL(id_device, conn_obj);
                 break;
+            case 'MYSQL2':
+                query = updateConnectorSQLite(id_device, conn_obj);
+                break;
         }
     }
     return query;
@@ -149,6 +170,9 @@ function removeConnector(db_used, id_device, conn_obj) {
             case 'MYSQL':
                 query = removeConnectorMySQL();
                 break;
+            case 'MYSQL2':
+                query = removeConnectorSQLite(id_device, conn_obj);
+                break;
         }
     }
     return query;
@@ -184,6 +208,9 @@ function queryStorageModels(db_used, marca) {
             case 'MYSQL':
                 query = queryStorageModelsMySQL(marca);
                 break;
+            case 'MYSQL2':
+                query = queryStorageModelsSQLite(marca);
+                break;
         }
     }    
     return query;
@@ -212,6 +239,9 @@ function getStorageByIdDevice(db_used, id_device) {
             case 'MYSQL':
                 query = getStorageByIdDeviceMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getStorageByIdDeviceSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -247,6 +277,9 @@ function getStorageComboByIdDevice(db_used, id_device, id_exclude) {
             case 'MYSQL':
                 query = getStorageComboByIdDeviceMySQL(id_device, id_exclude);
                 break;
+            case 'MYSQL2':
+                query = getStorageComboByIdDeviceSQLite(id_device, id_exclude);
+                break;
         }
     }
     return query;
@@ -279,6 +312,9 @@ function getStorageByIdPartAndIdConf(db_used, id_storage, id_conf) {
             case 'MYSQL':
                 query = getStorageByIdPartAndIdConfMySQL(id_storage, id_conf);
                 break;
+            case 'MYSQL2':
+                query = getStorageByIdPartAndIdConfSQLite(id_storage, id_conf);
+                break;
         }
     }
     return query;
@@ -307,6 +343,9 @@ function getStorageById(db_used, id_storage) {
             case 'MYSQL':
                 query = getStorageByIdMySQL();
                 break;
+            case 'MYSQL2':
+                query = getStorageByIdSQLite(id_storage);
+                break;
         }
     }
     return query;
@@ -347,6 +386,9 @@ function insertStorage(db_used, id_device, storage_obj) {
             case 'MYSQL':
                 query = insertStorageMySQL(id_device, storage_obj);
                 break;
+            case 'MYSQL2':
+                query = insertStorageSQLite(id_device, storage_obj);
+                break;
         }
     }
     return query;
@@ -386,6 +428,9 @@ function updateStorage(db_used, id_device, storage_obj) {
             case 'MYSQL':
                 query = updateStorageMySQL(id_device, storage_obj);
                 break;
+            case 'MYSQL2':
+                query = updateStorageSQLite(id_device, storage_obj);
+                break;
         }
     }
     return query;
@@ -411,6 +456,9 @@ function removeStorage(db_used, id_device, storage_obj) {
             case 'MYSQL':
                 query = removeStorageMySQL(id_device, storage_obj);
                 break;
+            case 'MYSQL2':
+                query = removeStorageSQLite(id_device, storage_obj);
+                break;
         }
     }
     return query;
@@ -438,6 +486,9 @@ function getLastStorageInserted(db_used, id_device) {
             case 'MYSQL':
                 query = getLastStorageInsertedMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getLastStorageInsertedSQLite(id_device);
+                break;
         }
     }
     return query;    
@@ -482,6 +533,9 @@ function getStoragesByConfig(db_used, id_device, id_conf) {
             case 'MYSQL':
                 query = getStoragesByConfigMySQL(id_device, id_conf);
                 break;
+            case 'MYSQL2':
+                query = getStoragesByConfigSQLite(id_device, id_conf);
+                break;
         }
     }
     return query;
@@ -509,6 +563,9 @@ function getNetworkByIdDevice(db_used, id_device) {
             case 'MYSQL':
                 query = getNetworkByIdDeviceMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getNetworkByIdDeviceSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -540,6 +597,9 @@ function getNetworkComboByIdDevice(db_used, id_device, id_exclude) {
             case 'MYSQL':
                 query = getNetworkComboByIdDeviceMySQL(id_device, id_exclude);
                 break;
+            case 'MYSQL2':
+                query = getNetworkComboByIdDeviceSQLite(id_device, id_exclude);
+                break;
         }
     }
     return query;
@@ -571,6 +631,9 @@ function getNetworkByIdPartAndIdConf(db_used, id_network, id_conf) {
             case 'MYSQL':
                 query = getNetworkByIdPartAndIdConfMySQL(id_network, id_conf);
                 break;
+            case 'MYSQL2':
+                query = getNetworkByIdPartAndIdConfSQLite(id_network, id_conf);
+                break;
         }
     }
     return query;
@@ -597,6 +660,9 @@ function getNetworkById(db_used, id_network) {
             case 'MYSQL':
                 query = getNetworkByIdMySQL();
                 break;
+            case 'MYSQL2':
+                query = getNetworkByIdSQLite(id_network);
+                break;
         }
     }
     return query;
@@ -633,6 +699,9 @@ function insertNetwork(db_used, id_device, network_obj) {
             case 'MYSQL':
                 query = insertNetworkMySQL(id_device, network_obj);
                 break;
+            case 'MYSQL2':
+                query = insertNetworkSQLite(id_device, network_obj);
+                break;
         }
     }
     return query;
@@ -669,6 +738,9 @@ function updateNetwork(db_used, id_device, network_obj) {
             case 'MYSQL':
                 query = updateNetworkMySQL(id_device, network_obj);
                 break;
+            case 'MYSQL2':
+                query = updateNetworkSQLite(id_device, network_obj);
+                break;
         }
     }
     return query;
@@ -693,6 +765,9 @@ function removeNetwork(db_used, id_device, network_obj) {
             case 'MYSQL':
                 query = removeNetworkMySQL(id_device, network_obj);
                 break;
+            case 'MYSQL2':
+                query = removeNetworkSQLite(id_device, network_obj);
+                break;
         }
     }
     return query;
@@ -720,6 +795,9 @@ function getLastNetworkInserted(db_used, id_device) {
             case 'MYSQL':
                 query = getLastNetworkInsertedMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getLastNetworkInsertedSQLite(id_device);
+                break;
         }
     }
     return query;    
@@ -757,6 +835,9 @@ function getNetworksByConfig(db_used, id_device, id_conf) {
             case 'MYSQL':
                 query = getNetworksByConfigMySQL(id_device, id_conf);
                 break;
+            case 'MYSQL2':
+                query = getNetworksByConfigSQLite(id_device, id_conf);
+                break;
         }
     }
     return query;
@@ -782,6 +863,9 @@ function getAddOnTypes(db_used) {
             case 'MYSQL':
                 query = getAddOnTypesMySQL();
                 break;
+            case 'MYSQL2':
+                query = getAddOnTypesSQLite();
+                break;
         }
     }
     return query;
@@ -811,6 +895,9 @@ function getAddOnByIdDevice(db_used, id_device) {
             case 'MYSQL':
                 query = getAddOnByIdDeviceMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getAddOnByIdDeviceSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -844,6 +931,9 @@ function getAddOnComboByIdDevice(db_used, id_device, id_exclude) {
             case 'MYSQL':
                 query = getAddOnComboByIdDeviceMySQL(id_device, id_exclude);
                 break;
+            case 'MYSQL2':
+                query = getAddOnComboByIdDeviceSQLite(id_device, id_exclude);
+                break;
         }
     }
     return query;
@@ -875,6 +965,9 @@ function getAddOnByIdPartAndIdConf(db_used, id_addon, id_conf) {
             case 'MYSQL':
                 query = getAddOnByIdPartAndIdConfMySQL(id_addon, id_conf);
                 break;
+            case 'MYSQL2':
+                query = getAddOnByIdPartAndIdConfSQLite(id_addon, id_conf);
+                break;
         }
     }
     return query;
@@ -900,6 +993,9 @@ function getAddOnById(db_used, id_addon) {
             case 'MYSQL':
                 query = getAddOnByIdMySQL();
                 break;
+            case 'MYSQL2':
+                query = getAddOnByIdSQLite(id_addon);
+                break;
         }
     }
     return query;
@@ -937,6 +1033,9 @@ function insertAddOn(db_used, id_device, addon_obj) {
             case 'MYSQL':
                 query = insertAddOnMySQL(id_device, addon_obj);
                 break;
+            case 'MYSQL2':
+                query = insertAddOnSQLite(id_device, addon_obj);
+                break;
         }
     }
     return query;
@@ -971,6 +1070,9 @@ function updateAddOn(db_used, id_device, addon_obj) {
             case 'MYSQL':
                 query = updateAddOnMySQL(id_device, addon_obj);
                 break;
+            case 'MYSQL2':
+                query = updateAddOnSQLite(id_device, addon_obj);
+                break;
         }
     }
     return query;
@@ -994,6 +1096,9 @@ function removeAddOn(db_used, id_device, addon_obj) {
             case 'MYSQL':
                 query = removeAddOnMySQL(id_device, addon_obj);
                 break;
+            case 'MYSQL2':
+                query = removeAddOnSQLite(id_device, addon_obj);
+                break;
         }
     }
     return query;
@@ -1021,6 +1126,9 @@ function getLastAddOnInserted(db_used, id_device) {
             case 'MYSQL':
                 query = getLastAddOnInsertedMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getLastAddOnInsertedSQLite(id_device);
+                break;
         }
     }
     return query;    
@@ -1060,6 +1168,9 @@ function getAddOnsByConfig(db_used, id_device, id_conf) {
             case 'MYSQL':
                 query = getAddOnsByConfigMySQL(id_device, id_conf);
                 break;
+            case 'MYSQL2':
+                query = getAddOnsByConfigSQLite(id_device, id_conf);
+                break;
         }
     }
     return query;
@@ -1088,6 +1199,9 @@ function getDeviceConfigurations(db_used, id_device) {
             case 'MYSQL':
                 query = getDeviceConfigurationsMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getDeviceConfigurationsSQLite(id_device);
+                break;
         }
     }
     return query;    
@@ -1115,6 +1229,9 @@ function getLastDeviceConfiguration(db_used, id_device) {
             case 'MYSQL':
                 query = getLastDeviceConfigurationMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getLastDeviceConfigurationSQLite(id_device);
+                break;
         }
     }
     return query;    
@@ -1141,6 +1258,9 @@ function getDeviceConfigurationById(db_used, id_conf) {
             case 'MYSQL':
                 query = getDeviceConfigurationByIdMySQL(id_conf);
                 break;
+            case 'MYSQL2':
+                query = getDeviceConfigurationByIdSQLite(id_conf);
+                break;
         }
     }
     return query;    
@@ -1171,6 +1291,9 @@ function insertDeviceConfiguration(db_used, id_device, data, note) {
             case 'MYSQL':
                 query = insertDeviceConfigurationMySQL(id_device, data, note);
                 break;
+            case 'MYSQL2':
+                query = insertDeviceConfigurationSQLite(id_device, data, note);
+                break;
         }
     }
     return query;    
@@ -1205,6 +1328,9 @@ function updateDeviceConfiguration(db_used, id_conf, data, note) {
             case 'MYSQL':
                 query = updateDeviceConfigurationMySQL(id_conf, data, note);
                 break;
+            case 'MYSQL2':
+                query = updateDeviceConfigurationSQLite(id_conf, data, note);
+                break;
         }
     }
     return query;    
@@ -1230,6 +1356,9 @@ function removeDeviceConfiguration(db_used, id_conf) {
             case 'MYSQL':
                 query = removeDeviceConfigurationMySQL(id_conf);
                 break;
+            case 'MYSQL2':
+                query = removeDeviceConfigurationSQLite(id_conf);
+                break;
         }
     }
     return query;    
@@ -1263,6 +1392,9 @@ function getPartChanged(db_used, id_conf, id_device, id_part, part_type) {
             case 'MYSQL':
                 query = getPartChangedMySQL(id_conf, id_device, id_part, part_type);
                 break;
+            case 'MYSQL2':
+                query = getPartChangedSQLite(id_conf, id_device, id_part, part_type);
+                break;
         }
     }
     return query;
@@ -1301,6 +1433,9 @@ function insertPartChanged(db_used, id_conf, id_device, id_part, part_type, oper
             case 'MYSQL':
                 query = insertPartChangedMySQL(id_conf, id_device, id_part, part_type, operation, id_part_replaced);
                 break;
+            case 'MYSQL2':
+                query = insertPartChangedSQLite(id_conf, id_device, id_part, part_type, operation, id_part_replaced);
+                break;
         }
     }
     return query;    
@@ -1332,6 +1467,9 @@ function updatePartChanged(db_used, id_change, operation, id_part_replaced) {
             case 'MYSQL':
                 query = updatePartChangedMySQL(id_change, operation, id_part_replaced);
                 break;
+            case 'MYSQL2':
+                query = updatePartChangedSQLite(id_change, operation, id_part_replaced);
+                break;
         }
     }
     return query;    
@@ -1363,6 +1501,9 @@ function removePartChanged(db_used, id_conf, id_part, part_type) {
             case 'MYSQL':
                 query = removePartChangedMySQL(id_conf, id_part, part_type);
                 break;
+            case 'MYSQL2':
+                query = removePartChangedSQLite(id_conf, id_part, part_type);
+                break;
         }
     }
     return query;    
@@ -1394,6 +1535,9 @@ function getLastPartInserted(db_used, id_device, id_conf, part_type) {
             case 'MYSQL':
                 query = getLastPartInsertedMySQL(id_device, id_conf, part_type);
                 break;
+            case 'MYSQL2':
+                query = getLastPartInsertedSQLite(id_device, id_conf, part_type);
+                break;
         }
     }
     return query;    
@@ -1427,6 +1571,9 @@ function existPartInConfig(db_used, id_device, id_conf, id_part, part_type) {
             case 'MYSQL':
                 query = existPartInConfigMySQL(id_device, id_conf, id_part, part_type);
                 break;
+            case 'MYSQL2':
+                query = existPartInConfigSQLite(id_device, id_conf, id_part, part_type);
+                break;
         }
     }
     return query;       
@@ -1455,6 +1602,9 @@ function getDiskUsagesByIdStorage(db_used, id_storage) {
             case 'MYSQL':
                 query = getDiskUsagesByIdStorageMySQL(id_storage);
                 break;
+            case 'MYSQL2':
+                query = getDiskUsagesByIdStorageSQLite(id_storage);
+                break;
         }
     }
     return query;    
@@ -1482,6 +1632,9 @@ function getLastDiskUsagesByIdStorage(db_used, id_storage) {
             case 'MYSQL':
                 query = getLastDiskUsagesByIdStorageMySQL(id_storage);
                 break;
+            case 'MYSQL2':
+                query = getLastDiskUsagesByIdStorageSQLite(id_storage);
+                break;
         }
     }
     return query;    
@@ -1511,6 +1664,9 @@ function getDiskUsageById(db_used, id_diskusage) {
             case 'MYSQL':
                 query = getDiskUsageByIdMySQL(id_diskusage);
                 break;
+            case 'MYSQL2':
+                query = getDiskUsageByIdSQLite(id_diskusage);
+                break;
         }
     }
     return query;    
@@ -1553,6 +1709,9 @@ function insertDiskUsage(db_used, id_device, id_storage, date_ref, size_unit, av
             case 'MYSQL':
                 query = insertDiskUsageMySQL(id_device, id_storage, date_ref, size_unit, available_space);
                 break;
+            case 'MYSQL2':
+                query = insertDiskUsageSQLite(id_device, id_storage, date_ref, size_unit, available_space);
+                break;
         }
     }
     return query;    
@@ -1590,6 +1749,9 @@ function updateDiskUsage(db_used, id_diskusage, date_ref, size_unit, available_s
             case 'MYSQL':
                 query = updateDiskUsageMySQL(id_diskusage, date_ref, size_unit, available_space);
                 break;
+            case 'MYSQL2':
+                query = updateDiskUsageSQLite(id_diskusage, date_ref, size_unit, available_space);
+                break;
         }
     }
     return query;     
@@ -1617,6 +1779,9 @@ function removeDiskUsage(db_used, id_diskusage) {
             case 'MYSQL':
                 query = removeDiskUsageMySQL(id_diskusage);
                 break;
+            case 'MYSQL2':
+                query = removeDiskUsageSQLite(id_diskusage);
+                break;
         }
     }
     return query;   
@@ -1645,6 +1810,9 @@ function existsPCProperties(db_used, id_device) {
             case 'MYSQL':
                 query = existsPCPropertiesMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = existsPCPropertiesSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -1681,6 +1849,9 @@ function getPCProperties(db_used, id_device) {
             case 'MYSQL':
                 query = getPCPropertiesMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getPCPropertiesSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -1723,6 +1894,9 @@ function insertPCProperties(db_used, id_device, dev_prop) {
             case 'MYSQL':
                 query = insertPCPropertiesMySQL();
                 break;
+            case 'MYSQL2':
+                query = insertPCPropertiesSQLite(id_device, dev_prop);
+                break;
         }
     }
     return query;
@@ -1775,6 +1949,9 @@ function updatePCProperties(db_used, id_device, dev_prop) {
             case 'MYSQL':
                 query = updatePCPropertiesMySQL();
                 break;
+            case 'MYSQL2':
+                query = updatePCPropertiesSQLite(id_device, dev_prop);
+                break;
         }
     }
     return query;
@@ -1811,6 +1988,9 @@ function getLastPCPropertiesInserted(db_used, id_device) {
             case 'MYSQL':
                 query = getLastPCPropertiesInsertedMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getLastPCPropertiesInsertedSQLite(id_device);
+                break;
         }
     }
     return query;    
@@ -1859,6 +2039,9 @@ function getPCPropertiesByConfig(db_used, id_device, id_conf) {
             case 'MYSQL':
                 query = getPCPropertiesByConfigMySQL(id_device, id_conf);
                 break;
+            case 'MYSQL2':
+                query = getPCPropertiesByConfigSQLite(id_device, id_conf);
+                break;
         }
     }
     return query;
@@ -1892,6 +2075,9 @@ function getDisplayPartProperties(db_used, id_device) {
             case 'MYSQL':
                 query = getDisplayPartPropertiesMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getDisplayPartPropertiesSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -1915,6 +2101,9 @@ function existsDisplayPartProperties(db_used, id_device) {
             case 'MYSQL':
                 query = existsDisplayPartPropertiesMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = existsDisplayPartPropertiesSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -1939,6 +2128,9 @@ function insertDisplayPartProperties(db_used, id_device, dev_prop) {
             case 'MYSQL':
                 query = insertDisplayPartPropertiesMySQL();
                 break;
+            case 'MYSQL2':
+                query = insertDisplayPartPropertiesSQLite(id_device, dev_prop);
+                break;
         }
     }
     return query;
@@ -1976,6 +2168,9 @@ function updateDisplayPartProperties(db_used, id_device, dev_prop) {
             case 'MYSQL':
                 query = updateDisplayPartPropertiesMySQL();
                 break;
+            case 'MYSQL2':
+                query = updateDisplayPartPropertiesSQLite(id_device, dev_prop);
+                break;
         }
     }
     return query;
@@ -2003,6 +2198,9 @@ function existsDisplayProperties(db_used, id_device) {
             case 'MYSQL':
                 query = existsDisplayPropertiesMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = existsDisplayPropertiesSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -2034,6 +2232,9 @@ function getDisplayProperties(db_used, id_device) {
             case 'MYSQL':
                 query = getDisplayPropertiesMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getDisplayPropertiesSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -2069,6 +2270,9 @@ function insertDisplayProperties(db_used, id_device, dev_prop) {
             case 'MYSQL':
                 query = insertDisplayPropertiesMySQL();
                 break;
+            case 'MYSQL2':
+                query = insertDisplayPropertiesSQLite(id_device, dev_prop);
+                break;
         }
     }
     return query;
@@ -2105,6 +2309,9 @@ function updateDisplayProperties(db_used, id_device, dev_prop) {
             case 'MYSQL':
                 query = updateDisplayPropertiesMySQL();
                 break;
+            case 'MYSQL2':
+                query = updateDisplayPropertiesSQLite(id_device, dev_prop);
+                break;
         }
     }
     return query;
@@ -2274,6 +2481,80 @@ function getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, is_PNRR,
     query += " order by id";
     return query;
 }
+
+function getDevicesSelectMySQL2(search_type, inv_code, dev_type, marca, is_PNRR, dev_status, dev_gestione, id_dev_exclude) {
+    var query = "SELECT DISTINCT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
+    query += "case ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
+    query += "when d.inv_pnrr_number != '' and d.inv_pnrr_number is not null then d.inv_pnrr_number ";
+    query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number,'(TN)') ";
+    query += "when d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)') ";
+    query += "when d.serial_no != '' and d.serial_no is not null then concat(d.serial_no,'(S/N)') ";
+    query += "end as Codice ";
+    query += "from devices d ";
+    if (dev_status)
+        query += "left join device_usage du on d.id = du.id_device"
+    if (dev_gestione)
+        query += "left join device_gestioni dg on d.id = dg.id_device"
+
+    var where_clause = " where (d.is_removed is null or d.is_removed = 0) ";
+    if (inv_code || dev_type || marca || (is_PNRR && is_PNRR > 0) || dev_status || dev_gestione) {
+        if (inv_code) {
+            if (search_type == "ESATTA") {
+                where_clause += " and (d.inv_ict3_number = '" + inv_code + "' or ";
+                where_clause += "d.inv_tn_number = '" + inv_code + "' or ";
+                where_clause += "d.serial_no = '" + inv_code + "' or ";
+                where_clause += "d.inv_tndigit_number = '" + inv_code + "' or ";
+                where_clause += "d.inv_pnrr_number = '" + inv_code + "')";
+            }
+            else {
+                where_clause += " and (d.inv_ict3_number like '" + inv_code + "%' or ";
+                where_clause += "d.inv_tn_number like '" + inv_code + "%' or ";
+                where_clause += "d.serial_no like '%" + inv_code + "%' or ";
+                where_clause += "d.inv_tndigit_number like '" + inv_code + "%' or ";
+                where_clause += "d.inv_pnrr_number = '" + inv_code + "')";
+            }
+        }
+        else {
+            where_clause += " and ";
+            if (dev_type) {
+                where_clause += "d.type = '" + dev_type + "'";
+                if (marca || (is_PNRR && is_PNRR > 0) || dev_status) {
+                    where_clause += " and ";
+                }
+            }
+            if (marca) {
+                where_clause += " d.manifacturer = '" + marca + "'";
+                if ((is_PNRR && is_PNRR > 0) || dev_status) {
+                    where_clause += " and ";
+                }
+            }
+            if (is_PNRR && is_PNRR > 0) {
+                where_clause += " (d.inv_pnrr_number <> '' and inv_pnrr_number is not null) ";
+                if (dev_status || dev_gestione) {
+                    where_clause += " and ";
+                }                
+            }
+            if (dev_status) {
+                where_clause += " du.status = " + dev_status + " and CURDATE() >= du.date_status";
+                if (dev_gestione) {
+                    where_clause += " and ";
+                }                
+            }
+            if (dev_gestione) {
+                where_clause += " dg.id_gestione = " + dev_gestione + " and CURDATE() >= dg.date_start and CURDATE() <= dg.date_end";
+            }
+        }
+    }
+    else {
+        if (id_dev_exclude > 0) {
+            where_clause += " and d.id <> " + id_dev_exclude;
+        }
+    }
+    query += where_clause;
+    return query;
+}
+
 function getDevicesSelect(db_used, search_type, inv_code, dev_type, marca, is_PNRR, dev_status, dev_gestione, id_dev_exclude) {
     var query = "";
     if (db_used) {
@@ -2284,6 +2565,9 @@ function getDevicesSelect(db_used, search_type, inv_code, dev_type, marca, is_PN
             case 'MYSQL':
                 query = getDevicesSelectMySQL(search_type, inv_code, dev_type, marca, is_PNRR, dev_status, dev_gestione, id_dev_exclude);
                 break;
+            case 'MYSQL2':
+                query = getDevicesSelectMySQL2(search_type, inv_code, dev_type, marca, is_PNRR, dev_status, dev_gestione, id_dev_exclude);
+                break;
         }
     }
     return query;
@@ -2344,6 +2628,34 @@ function getDevicesSelectBySiteMySQL(id_site, dev_type) {
 
     return query;
 }
+
+function getDevicesSelectBySiteMySQL2(id_site, dev_type) {
+    var query = "select distinct d.id, d.type as Tipo, d.manifacturer as Marca, d.model as modello, ";
+    query += "case ";
+    query += "when inv_ict3_number != '' and inv_ict3_number is not null then inv_ict3_number ";
+    query += "when inv_pnrr_number != '' and inv_pnrr_number is not null then inv_pnrr_number ";
+    query += "when inv_tn_number != '' and inv_tn_number is not null then concat(inv_tn_number,'(TN)') ";
+    query += "when inv_tndigit_number != '' and inv_tndigit_number is not null then concat(inv_tndigit_number,'(TNDigit)') ";
+    query += "when serial_no != '' and serial_no is not null then concat(serial_no,'(S/N)') ";
+    query += "end as Codice, ";
+    query += "case ";
+    query += "when trim(inv_pnrr_number) is null then '' ";
+    query += "when trim(inv_pnrr_number) = '' then '' ";
+    query += "else 'SI' ";
+    query += "end as PNRR ";
+    query += " from devices d ";
+    query += "inner join device_site ds on ds.id_device = d.id ";
+    query += "inner join sites s on s.id = ds.id_site ";
+    query += "where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out) ";
+    query += "and (d.is_removed is null or d.is_removed = 0) ";
+    query += "and s.id = " + id_site + " ";
+    if (dev_type && dev_type != '') {
+        query += "and d.type = '" + dev_type + "' ";
+    }    
+    query += "order by d.type ";
+    return query;
+}
+
 function getDevicesSelectBySite(db_used, id_site, dev_type) {
     var query = "";
     if (db_used) {
@@ -2354,6 +2666,9 @@ function getDevicesSelectBySite(db_used, id_site, dev_type) {
             case 'MYSQL':
                 query = getDevicesSelectBySiteMySQL(id_site, dev_type);
                 break;
+            case 'MYSQL2':
+                query = getDevicesSelectBySiteMySQL2(id_site, dev_type);
+                break;
         }
     }
     return query;
@@ -2413,6 +2728,32 @@ function getDevicesSelectByPlaceMySQL(id_place, dev_type) {
     query += "order by d.type ";
     return query;
 }
+function getDevicesSelectByPlaceMySQL2(id_place, dev_type) {
+    var query = "select distinct d.id, d.type as Tipo, d.manifacturer as Marca, d.model as modello, ";
+    query += "case ";
+    query += "when inv_ict3_number != '' and inv_ict3_number is not null then inv_ict3_number ";
+    query += "when inv_pnrr_number != '' and inv_pnrr_number is not null then inv_pnrr_number ";
+    query += "when inv_tn_number != '' and inv_tn_number is not null then concat(inv_tn_number,'(TN)') ";
+    query += "when inv_tndigit_number != '' and inv_tndigit_number is not null then concat(inv_tndigit_number,'(TNDigit)') ";
+    query += "when serial_no != '' and serial_no is not null then concat(serial_no,'(S/N)') ";
+    query += "end as Codice, ";
+    query += "case ";
+    query += "when trim(inv_pnrr_number) is null then '' ";
+    query += "when trim(inv_pnrr_number) = '' then '' ";
+    query += "else 'SI' ";
+    query += "end as PNRR ";
+    query += " from devices d ";
+    query += "inner join device_site ds on ds.id_device = d.id ";
+    query += "inner join sites s on s.id = ds.id_site ";
+    query += "where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out) ";
+    query += "and (d.is_removed is null or d.is_removed = 0) ";
+    query += "and s.id_place = '" + id_place + "' ";
+    if (dev_type && dev_type != '') {
+        query += "and d.type = '" + dev_type + "' ";
+    }
+    query += "order by d.type ";
+    return query;
+}
 function getDevicesSelectByPlace(db_used, id_place, dev_type) {
     var query = "";
     if (db_used) {
@@ -2423,6 +2764,9 @@ function getDevicesSelectByPlace(db_used, id_place, dev_type) {
             case 'MYSQL':
                 query = getDevicesSelectByPlaceMySQL(id_place, dev_type);
                 break;
+            case 'MYSQL2':
+                query = getDevicesSelectByPlaceMySQL2(id_place, dev_type);
+                break;
         }
     }
     return query;
@@ -2451,6 +2795,16 @@ function getDevicesCounterBySiteMySQL(id_site) {
     return query;
 }
 
+function getDevicesCounterBySiteMySQL2(id_site) {
+    var query = "select d.type as Tipo, count(d.type) as Numero from devices d ";
+    query += "inner join device_site ds on ds.id_device = d.id ";
+    query += "where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out) ";
+    query += "and (d.is_removed is null or d.is_removed = 0) ";
+    query += "and ds.id_site = " + id_site + " ";
+    query += "group by d.type";
+    return query;
+}
+
 function getDevicesCounterBySite(db_used, id_site) {
     var query = "";
     if (db_used) {
@@ -2461,6 +2815,9 @@ function getDevicesCounterBySite(db_used, id_site) {
             case 'MYSQL':
                 query = getDevicesCounterBySiteMySQL(id_site);
                 break;
+            case 'MYSQL2':
+                query = getDevicesCounterBySiteMySQL2(id_site);
+                break;
         }
     }
     return query;
@@ -2488,6 +2845,16 @@ function getDevicesCounterByPlaceMySQL(id_place) {
     return query;
 }
 
+function getDevicesCounterByPlaceMySQL2(id_place) {
+    var query = "select d.type as Tipo, count(d.type) as Numero from devices d ";
+    query += "inner join device_site ds on ds.id_device = d.id ";
+    query += "inner join sites s on s.id = ds.id_site ";
+    query += "where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out) ";
+    query += "and ds.id_place = '" + id_place + "' ";
+    query += "group by d.type";
+    return query;
+}
+
 function getDevicesCounterByPlace(db_used, id_place) {
     var query = "";
     if (db_used) {
@@ -2498,6 +2865,9 @@ function getDevicesCounterByPlace(db_used, id_place) {
             case 'MYSQL':
                 query = getDevicesCounterByPlaceMySQL(id_place);
                 break;
+            case 'MYSQL2':
+                query = getDevicesCounterByPlaceMySQL2(id_place);
+                break;
         }
     }
     return query;
@@ -2553,6 +2923,9 @@ function getDevicesSelectByRelated(db_used, id_device) {
             case 'MYSQL':
                 query = getDevicesSelectByRelatedMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getDevicesSelectByRelatedSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -2587,6 +2960,9 @@ function queryDeviceById(db_used, id_device) {
             case 'MYSQL':
                 query = queryDeviceByIdMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = queryDeviceByIdSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -2628,6 +3004,9 @@ function queryDeviceByIdentificativo(db_used, identificativo) {
             case 'MYSQL':
                 query = queryDeviceByIdentificativoMySQL(identificativo);
                 break;
+            case 'MYSQL2':
+                query = queryDeviceByIdentificativoSQLite(identificativo);
+                break;
         }
     }
     return query;
@@ -2671,6 +3050,23 @@ function queryDeviceStatusMySQL(id_device, date_ref) {
     query += "order by id desc limit 1"
     return query;
 }
+function queryDeviceStatusMySQL2(id_device, date_ref) {
+    var query = "select case when status is null then 0 else status end as stato, date_status from device_usage du ";
+    query += "where du.id_device = " + id_device + " ";
+    if (date_ref) {
+        switch (date_ref) {
+            case "current":
+                query += "and CURDATE() >= du.date_status ";
+                break;
+            default:
+                query += "and '" + date_ref + "' >= du.date_status ";
+                break;
+
+        }
+    }
+    query += "order by id desc limit 1"
+    return query;
+}
 function queryDeviceStatus(db_used, id_device, date_ref) {
     var query = "";
     if (db_used) {
@@ -2681,6 +3077,9 @@ function queryDeviceStatus(db_used, id_device, date_ref) {
             case 'MYSQL':
                 query = queryDeviceStatusMySQL(id_device, date_ref);
                 break;
+            case 'MYSQL2':
+                query = queryDeviceStatusMySQL2(id_device, date_ref);
+                break;
         }
     }
     return query;
@@ -2707,6 +3106,9 @@ function updateDeviceStatus(db_used, id_device) {
             case 'MYSQL':
                 query = updateDeviceStatusMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = updateDeviceStatusSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -2742,6 +3144,20 @@ function insertDeviceStatusMySQL(id_device, dev_status, start_date) {
     query += ")";
     return query;
 }
+function insertDeviceStatusMySQL2(id_device, dev_status, start_date) {
+    var query = "insert into device_usage (date_status, id_device, status) ";
+    query += "values (";
+    if ((!start_date || start_date == '') || start_date == "TODAY") {
+        query += "CURDATE(),";
+    }
+    else {
+        query += "'" + start_date + "',";
+    }
+    query += id_device + ",";
+    query += dev_status;
+    query += ")";
+    return query;
+}
 function insertDeviceStatus(db_used, id_device, dev_status, start_date) {
     var query = "";
     if (db_used) {
@@ -2752,6 +3168,9 @@ function insertDeviceStatus(db_used, id_device, dev_status, start_date) {
             case 'MYSQL':
                 query = insertDeviceStatusMySQL(id_device, dev_status, start_date);
                 break;
+            case 'MYSQL2':
+                query = insertDeviceStatusMySQL2(id_device, dev_status, start_date);
+                break;
         }
     }
     return query;
@@ -2834,6 +3253,9 @@ function insertDevice(db_used, deviceObj) {
             case 'MYSQL':
                 query = insertDeviceMySQL();
                 break;
+            case 'MYSQL2':
+                query = insertDeviceSQLite(deviceObj);
+                break;
         }
     }
     return query;
@@ -2916,6 +3338,9 @@ function updateDevice(db_used, deviceObj) {
             case 'MYSQL':
                 query = updateDeviceMySQL();
                 break;
+            case 'MYSQL2':
+                query = updateDeviceSQLite(deviceObj);
+                break;
         }
     }
     return query;
@@ -2997,6 +3422,9 @@ function removeDevice(db_used, id_device) {
             case 'MYSQL':
                 query = removeDeviceMySQL();
                 break;
+            case 'MYSQL2':
+                query = removeDeviceSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -3021,6 +3449,9 @@ function queryLastDeviceId(db_used) {
             case 'MYSQL':
                 query = queryLastDeviceIdMySQL();
                 break;
+            case 'MYSQL2':
+                query = queryLastDeviceIdMySQL();
+                break;
         }
     }
     return query;
@@ -3098,6 +3529,9 @@ function getDevicesSelectCombo(db_used, categoria, id_dev_exclude, with_properti
             case 'MYSQL':
                 query = getDevicesSelectComboMySQL(categoria, id_dev_exclude, with_properties);
                 break;
+            case 'MYSQL2':
+                query = getDevicesSelectComboSQLite(categoria, id_dev_exclude, with_properties);
+                break;
         }
     }
     return query;
@@ -3144,6 +3578,27 @@ function getDevicesSelectBySiteComboMySQL(id_site, dev_type) {
     query += "order by d.inv_ict3_number";
     return query;
 }
+function getDevicesSelectBySiteComboMySQL2(id_site, dev_type) {
+    var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
+    query += "case ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
+    query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number, '(TN)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
+    query += "when d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
+    query += "when d.serial_no != '' and d.serial_no is not null then concat(d.serial_no,'(S/N)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
+    query += "else '' "
+    query += "end as Descrizione ";
+    query += "from devices d ";
+    query += "join device_site ds on ds.id_device = d.id ";
+    query += "where (d.is_removed is null or d.is_removed = 0) ";
+    query += "and ds.id_site = " + id_site + " ";
+    query += "and CURDATE() >= ds.date_in and CURDATE() <= ds.date_out ";
+    if (dev_type && dev_type != '') {
+        query += "and d.type = '" + dev_type + "' ";
+    }
+    query += "order by d.inv_ict3_number";
+    return query;
+}
+
 
 function getDevicesSelectBySiteCombo(db_used, id_site, dev_type) {
     var query = "";
@@ -3155,6 +3610,9 @@ function getDevicesSelectBySiteCombo(db_used, id_site, dev_type) {
             case 'MYSQL':
                 query = getDevicesSelectBySiteComboMySQL(id_site, dev_type);
                 break;
+            case 'MYSQL2':
+                query = getDevicesSelectBySiteComboMySQL2(id_site, dev_type);
+                break;
         }
     }
     return query;
@@ -3183,6 +3641,9 @@ function writeDeviceProperties(db_used, id_device, raw_data) {
             case 'MYSQL':
                 query = writeDevicePropertiesMySQL();
                 break;
+            case 'MYSQL2':
+                query = writeDevicePropertiesSQLite(id_device, raw_data);
+                break;
         }
     }
     return query;
@@ -3210,6 +3671,9 @@ function readDeviceProperties(db_used, id_device) {
             case 'MYSQL':
                 query = readDevicePropertiesMySQL();
                 break;
+            case 'MYSQL2':
+                query = readDevicePropertiesSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -3263,6 +3727,9 @@ function getDevicesWithProperties(db_used, id_device) {
             case 'MYSQL':
                 query = getDevicesWithPropertiesMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getDevicesWithPropertiesSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -3433,6 +3900,9 @@ function getBeniDaInventari(db_used, table_name, inv_code, include_imp, is_pnrr,
             case 'MYSQL':
                 query = getBeniDaInventariMySQL(table_name, inv_code, include_imp, is_pnrr, is_dismissione);
                 break;
+            case 'MYSQL2':
+                query = getBeniDaInventariSQLite(table_name, inv_code, include_imp, is_pnrr, is_dismissione);
+                break;
         }
     }
     return query;
@@ -3591,6 +4061,9 @@ function getBeniDaInventariNonAllocati(db_used, table_name, is_pnrr, is_dismissi
             case 'MYSQL':
                 query = getBeniDaInventariNonAllocatiMySQL(table_name, table_name, is_pnrr, is_dismissione);
                 break;
+            case 'MYSQL2':
+                query = getBeniDaInventariNonAllocatiSQLite(table_name, table_name, is_pnrr, is_dismissione);
+                break;
         }
     }
     return query;
@@ -3761,6 +4234,9 @@ function getBeniDaInventariOnDescription(db_used, table_name, search_string, inc
             case 'MYSQL':
                 query = getBeniDaInventariOnDescriptionMySQL(table_name, search_string, include_imp, is_pnrr, is_dismissione);
                 break;
+            case 'MYSQL2':
+                query = getBeniDaInventariOnDescriptionSQLite(table_name, search_string, include_imp, is_pnrr, is_dismissione);
+                break;
         }
     }
     return query;
@@ -3852,6 +4328,9 @@ function selectInventariPerIntervallo(db_used,table_name, is_pnrr, is_dismission
             case 'MYSQL':
                 query = selectInventariPerIntervalloMySQL(table_name, is_pnrr, is_dismissione, code_da, code_a);
                 break;
+            case 'MYSQL2':
+                query = selectInventariPerIntervalloSQLite(table_name, is_pnrr, is_dismissione, code_da, code_a);
+                break;
         }
     }
     return query;
@@ -3992,6 +4471,9 @@ function getBeniAcquisiti(db_used, tab_name, is_pnrr, is_dismissione) {
             case 'MYSQL':
                 query = getBeniAcquisitiMySQL(tab_name, is_pnrr, is_dismissione);
                 break;
+            case 'MYSQL2':
+                query = getBeniAcquisitiSQLite(tab_name, is_pnrr, is_dismissione);
+                break;
         }
     }
     return query;
@@ -4092,6 +4574,9 @@ function insertDeviceMassivo(db_used,table_name,lista_inv) {
             case 'MYSQL':
                 query = insertDeviceMassivoMySQL(table_name,lista_inv);
                 break;
+            case 'MYSQL2':
+                query = insertDeviceMassivoSQLite(table_name,lista_inv);
+                break;
         }
     }
     return query;
@@ -4159,6 +4644,9 @@ function updateDeviceFromInventario(db_used, marca_sel, type_sel, lista_inv) {
             case 'MYSQL':
                 query = updateDeviceFromInventarioMySQL(marca_sel, type_sel, lista_inv);
                 break;
+            case 'MYSQL2':
+                query = updateDeviceFromInventarioSQLite(marca_sel, type_sel, lista_inv);
+                break;
         }
     }
     return query;
@@ -4281,6 +4769,9 @@ function insertDeviceSiteFromInventario(db_used, table_name, data_in, id_place,
             case 'MYSQL':
                 query = insertDeviceSiteFromInventarioMySQL(table_name, data_in, id_place, id_site, lista_inv);
                 break;
+            case 'MYSQL2':
+                query = insertDeviceSiteFromInventarioSQLite(table_name, data_in, id_place, id_site, lista_inv);
+                break;
         }
     }
     return query;
@@ -4309,6 +4800,9 @@ function getSetInfoByIdSet(db_used, id_set) {
             case 'MYSQL':
                 query = getSetInfoByIdSetMySQL(id_set);
                 break;
+            case 'MYSQL2':
+                query = getSetInfoByIdSetSQLite(id_set);
+                break;
         }
     }
     return query;
@@ -4334,6 +4828,9 @@ function getSetInfoByIdDevice(db_used, id_device) {
             case 'MYSQL':
                 query = getSetInfoByIdDeviceMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getSetInfoByIdDeviceSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -4367,6 +4864,9 @@ function insertSetInfo(db_used, id_device, id_device_col) {
             case 'MYSQL':
                 query = insertSetInfoMySQL(id_device, id_device_col);
                 break;
+            case 'MYSQL2':
+                query = insertSetInfoSQLite(id_device, id_device_col);
+                break;
         }
     }
     return query;
@@ -4382,6 +4882,9 @@ function insertSetInfoInverse(db_used, id_device, id_device_col) {
             case 'MYSQL':
                 query = insertSetInfoMySQL(id_device_col, id_device);
                 break;
+            case 'MYSQL2':
+                query = insertSetInfoSQLite(id_device_col, id_device);
+                break;
         }
     }
     return query;
@@ -4415,6 +4918,9 @@ function removeSetInfo(db_used, id_device, id_device_col) {
             case 'MYSQL':
                 query = removeSetInfoMySQL(id_device, id_device_col);
                 break;
+            case 'MYSQL2':
+                query = removeSetInfoSQLite(id_device, id_device_col);
+                break;
         }
     }
     return query;
@@ -4461,6 +4967,9 @@ function updateSetInfo(db_used, set_info) {
             case 'MYSQL':
                 query = updateSetInfoMySQL();
                 break;
+            case 'MYSQL2':
+                query = updateSetInfoSQLite(set_info);
+                break;
         }
     }
     return query;
@@ -4489,6 +4998,9 @@ function selectSetsByIdDevice(db_used, id_device) {
             case 'MYSQL':
                 query = selectSetsByIdDeviceMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = selectSetsByIdDeviceSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -4530,6 +5042,9 @@ function getNetworksOnDevice(db_used, id_device) {
             case 'MYSQL':
                 query = getNetworksOnDeviceMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getNetworksOnDeviceSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -4556,6 +5071,9 @@ function getImportedPropertiesByIdDevice(db_used, id_device) {
             case 'MYSQL':
                 query = getImportedPropertiesByIdDeviceMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getImportedPropertiesByIdDeviceSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -4568,8 +5086,48 @@ function queryDeviceTypes() {
     query += "order by search_type";
     return query;
 }
-// Define getDevicesNotAllocatedCombo
-function getDevicesNotAllocatedComboSQLite(id_site, id_place, sel_type, sel_maker, ordered_by) {
+// Define getDevicesNotAllocatedCombo
+function getDevicesNotAllocatedComboSQLite(id_site, id_place, sel_type, sel_maker, ordered_by) {
+    var sel_type_str = "";
+    if (sel_type) {
+        sel_type_str = sel_type;
+    }
+    var sel_maker_str = "";
+    if (sel_maker) {
+        sel_maker_str = sel_maker;
+    }
+    var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";    
+    query += "case ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
+    query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number, '(TN)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
+    query += "when d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
+    query += "when d.serial_no != '' and d.serial_no is not null then concat(d.serial_no,'(S/N)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
+    query += "else '' "
+    query += "end as Descrizione ";
+    query += "from devices d ";
+    query += "left join device_site ds on d.id = ds.id_device ";
+    query += "left join site_destinations sd on ds.id_site = sd.id_site ";
+    query += "left join device_consegne dc on d.id = dc.id_device ";
+    query += "where (d.is_removed is null or d.is_removed = 0) "
+    query += "and (dc.id_consegna is null) ";
+    query += "and (ds.id_place is null ";
+    query += "or ((ds.date_in <= date('now') and ds.date_out >= date('now') and sd.type = 'MAGAZZINO')) and (ds.id_place <> '" + id_place + "' and ds.id_site <> " + id_site + ")) ";
+    if (sel_type_str.trim() != '') {
+        query += "and d.type = '" + sel_type_str.trim() + "' ";
+    }
+    if (sel_maker_str.trim() != '') {
+        query += "and d.manifacturer = '" + sel_maker_str.trim() + "' ";
+    }
+    if (ordered_by && ordered_by == "ID") { 
+        query += "order by d.id desc";
+    }
+    else {
+        query += "order by d.inv_ict3_number";
+    }
+    return query;
+}
+
+function getDevicesNotAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker,ordered_by) {
     var sel_type_str = "";
     if (sel_type) {
         sel_type_str = sel_type;
@@ -4578,7 +5136,7 @@ function getDevicesNotAllocatedComboSQLite(id_site, id_place, sel_type, sel_make
     if (sel_maker) {
         sel_maker_str = sel_maker;
     }
-    var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";    
+    var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
     query += "case ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number, '(TN)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
@@ -4593,12 +5151,12 @@ function getDevicesNotAllocatedComboSQLite(id_site, id_place, sel_type, sel_make
     query += "where (d.is_removed is null or d.is_removed = 0) "
     query += "and (dc.id_consegna is null) ";
     query += "and (ds.id_place is null ";
-    query += "or ((ds.date_in <= date('now') and ds.date_out >= date('now') and sd.type = 'MAGAZZINO')) and (ds.id_place <> '" + id_place + "' and ds.id_site <> " + id_site + ")) ";
+    query += "or ((ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and sd.type = 'MAGAZZINO')) and (ds.id_place <> :id_place and ds.id_site <> :id_site)) ";
     if (sel_type_str.trim() != '') {
-        query += "and d.type = '" + sel_type_str.trim() + "' ";
+        query += "and d.type = :dev_type ";
     }
     if (sel_maker_str.trim() != '') {
-        query += "and d.manifacturer = '" + sel_maker_str.trim() + "' ";
+        query += "and d.manifacturer = :dev_manifacturer ";
     }
     if (ordered_by && ordered_by == "ID") { 
         query += "order by d.id desc";
@@ -4609,7 +5167,7 @@ function getDevicesNotAllocatedComboSQLite(id_site, id_place, sel_type, sel_make
     return query;
 }
 
-function getDevicesNotAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker,ordered_by) {
+function getDevicesNotAllocatedComboMySQL2(id_site, id_place, sel_type, sel_maker, ordered_by) {
     var sel_type_str = "";
     if (sel_type) {
         sel_type_str = sel_type;
@@ -4618,7 +5176,7 @@ function getDevicesNotAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker
     if (sel_maker) {
         sel_maker_str = sel_maker;
     }
-    var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
+    var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";    
     query += "case ";
     query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
     query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number, '(TN)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
@@ -4633,12 +5191,12 @@ function getDevicesNotAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker
     query += "where (d.is_removed is null or d.is_removed = 0) "
     query += "and (dc.id_consegna is null) ";
     query += "and (ds.id_place is null ";
-    query += "or ((ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and sd.type = 'MAGAZZINO')) and (ds.id_place <> :id_place and ds.id_site <> :id_site)) ";
+    query += "or ((ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and sd.type = 'MAGAZZINO')) and (ds.id_place <> '" + id_place + "' and ds.id_site <> " + id_site + ")) ";
     if (sel_type_str.trim() != '') {
-        query += "and d.type = :dev_type ";
+        query += "and d.type = '" + sel_type_str.trim() + "' ";
     }
     if (sel_maker_str.trim() != '') {
-        query += "and d.manifacturer = :dev_manifacturer ";
+        query += "and d.manifacturer = '" + sel_maker_str.trim() + "' ";
     }
     if (ordered_by && ordered_by == "ID") { 
         query += "order by d.id desc";
@@ -4648,6 +5206,7 @@ function getDevicesNotAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker
     }
     return query;
 }
+
 function getDevicesNotAllocatedCombo(db_used, id_site, id_place, sel_type, sel_maker, ordered_by) {
     var query = "";
     if (db_used) {
@@ -4658,6 +5217,9 @@ function getDevicesNotAllocatedCombo(db_used, id_site, id_place, sel_type, sel_m
             case 'MYSQL':
                 query = getDevicesNotAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker, ordered_by);
                 break;
+            case 'MYSQL2':
+                query = getDevicesNotAllocatedComboMySQL2(id_site, id_place, sel_type, sel_maker, ordered_by);
+                break;
         }
     }
     return query;
@@ -4739,6 +5301,44 @@ function getDevicesAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker, o
     }
     return query;
 }
+function getDevicesAllocatedComboMySQL2(id_site, id_place, sel_type, sel_maker, ordered_by) {
+    var sel_type_str = "";
+    if (sel_type) {
+        sel_type_str = sel_type;
+    }
+    var sel_maker_str = "";
+    if (sel_maker) {
+        sel_maker_str = sel_maker;
+    }
+
+    var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
+    query += "case ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number, ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
+    query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number, '(TN)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
+    query += "when d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
+    query += "when d.serial_no != '' and d.serial_no is not null then concat(d.serial_no,'(S/N)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
+    query += "else '' "
+    query += "end as Descrizione ";
+    query += "from devices d ";
+    query += "left join device_site ds on d.id = ds.id_device ";
+    query += "left join site_destinations sd on ds.id_site = sd.id_site ";
+    query += "where (d.is_removed is null or d.is_removed = 0) "
+    query += "and (ds.id_place is not null ";
+    query += "or (ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and ds.id_site <> " + id_site + " and ds.id_place <> '" + id_place + "')) ";
+    if (sel_type_str.trim() != '') {
+        query += "and d.type = '" + sel_type_str.trim() + "' ";
+    }
+    if (sel_maker_str.trim() != '') {
+        query += "and d.manifacturer = '" + sel_maker_str.trim() + "' ";
+    }
+    if (ordered_by && ordered_by == "ID") { 
+        query += "order by d.id desc";
+    }
+    else {
+        query += "order by d.inv_ict3_number";
+    }
+    return query;
+}
 function getDevicesAllocatedCombo(db_used, id_site, id_place, sel_type, sel_maker, ordered_by) {
     var query = "";
     if (db_used) {
@@ -4749,6 +5349,9 @@ function getDevicesAllocatedCombo(db_used, id_site, id_place, sel_type, sel_make
             case 'MYSQL':
                 query = getDevicesAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker, ordered_by);
                 break;
+            case 'MYSQL2':
+                query = getDevicesAllocatedComboMySQL2(id_site, id_place, sel_type, sel_maker, ordered_by);
+                break;
         }
     }
     return query;
@@ -4803,6 +5406,9 @@ function getDevicesSelectForInventarioRaw(db_used, inv_code) {
             case 'MYSQL':
                 query = getDevicesSelectForInventarioRawMySQL(inv_code);
                 break;
+            case 'MYSQL2':
+                query = getDevicesSelectForInventarioRawSQLite(inv_code);
+                break;
         }
     }
     return query;
@@ -4838,6 +5444,21 @@ function getDevicesSelectForInventarioRawByIdMySQL(id_device) {
     return query;
 }
 
+function getDevicesSelectForInventarioRawByIdMySQL2(id_device) {
+    var query = "SELECT id, type as Tipo, manifacturer as Marca, model as Modello, ";
+    query += "type as Tipo, ";
+    query += "inv_ict3_number as Inventario, ";
+    query += "inv_tn_number as Precedente, ";
+    query += "serial_no as Matricola, ";
+    query += "ds.id_place as Plesso, "
+    query += "ds.id_site as Collocazione "
+    query += "from devices d ";
+    query += "join device_site ds on ds.id_device = d.id "
+    query += "where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out)";
+    query += " and id = " + id_device;
+    return query;
+}
+
 function getDevicesSelectForInventarioRawById(db_used, id_device) {
     var query = "";
     if (db_used) {
@@ -4848,6 +5469,9 @@ function getDevicesSelectForInventarioRawById(db_used, id_device) {
             case 'MYSQL':
                 query = getDevicesSelectForInventarioRawByIdMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getDevicesSelectForInventarioRawByIdMySQL2(id_device);
+                break;
         }
     }
     return query;
@@ -5001,6 +5625,9 @@ function selectBeneDaInventario(db_used, table_name, inv_code, is_pnrr, is_dismi
             case 'MYSQL':
                 query = selectBeneDaInventarioMySQL(table_name, inv_code, is_pnrr, is_dismissione);
                 break;
+            case 'MYSQL2':
+                query = selectBeneDaInventarioSQLite(table_name, inv_code, is_pnrr, is_dismissione);
+                break;
         }
     }
     return query;
@@ -5030,6 +5657,9 @@ function checkEsistenzaInInventario(db_used,codice) {
             case 'MYSQL':
                 query = checkEsistenzaInInventarioMySQL(codice);
                 break;
+            case 'MYSQL2':
+                query = checkEsistenzaInInventarioSQLite(codice);
+                break;
         }
     }
     return query;
@@ -5077,6 +5707,9 @@ function selectTabelleInventariCombo(db_used, only_dismiss, only_pnrr) {
             case 'MYSQL':
                 query = selectTabelleInventariComboMySQL(only_dismiss, only_pnrr);
                 break;
+            case 'MYSQL2':
+                query = selectTabelleInventariComboSQLite(only_dismiss, only_pnrr);
+                break;
         }
     }
     return query;
@@ -5100,6 +5733,9 @@ function selectTabellaInventarioByName(db_used, tab_name) {
             case 'MYSQL':
                 query = selectTabellaInventarioByNameMySQL(tab_name);
                 break;
+            case 'MYSQL2':
+                query = selectTabellaInventarioByNameSQLite(tab_name);
+                break;
         }
     }
     return query;
@@ -5121,6 +5757,15 @@ function queryCloseGestioneDeviceMySQL(id_gestione, id_device, id_gestore) {
     query += "and date_start < CURDATE()";
     return query;
 }
+
+function queryCloseGestioneDeviceMySQL2(id_gestione) {
+    var query = "update device_gestioni  ";
+    query += "set date_end = DATE_SUB(CURDATE(), INTERVAL 1 DAY) ";
+    query += "where id = " + id_gestione + " ";
+    query += "and date_start < CURDATE()";
+    return query;
+}
+
 function queryCloseGestioneDevice(db_used,id_gestione) {
     var query = "";
     if (db_used) {
@@ -5131,6 +5776,9 @@ function queryCloseGestioneDevice(db_used,id_gestione) {
             case 'MYSQL':
                 query = queryCloseGestioneDeviceMySQL(id_gestione);
                 break;
+            case 'MYSQL2':
+                query = queryCloseGestioneDeviceMySQL2(id_gestione);
+                break;
         }
     }
     return query;
@@ -5167,6 +5815,9 @@ function selectGestoreById(db_used,id_gestore) {
             case 'MYSQL':
                 query = selectGestoreByIdMySQL(id_gestore);
                 break;
+            case 'MYSQL2':
+                query = selectGestoreByIdSQLite(id_gestore);
+                break;
         }
     }
     return query;
@@ -8075,6 +8726,9 @@ function queryFloorsByPlace(db_used, id_place) {
             case 'MYSQL':
                 query = queryFloorsByPlaceMySQL(id_place);
                 break;
+            case 'MYSQL2':
+                query = queryFloorsByPlaceSQLite(id_place);
+                break;
         }
     }
     return query;
@@ -8112,6 +8766,22 @@ function queryFunzioneByPlaceAndFloorMySQL(id_place, piano) {
 
 }
 
+function queryFunzioneByPlaceAndFloorMySQL2(id_place, piano) {
+    var query = "";
+    query = "SELECT DISTINCT sd.type as funzione from site_destinations sd";
+    query += " JOIN sites s ON s.id = sd.id_site"
+    if (id_place) {
+        query += " where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end";
+        query += " and sd.id_place = '" + id_place + "'";
+        if (piano) {
+            query += " and s.floor = '" + piano + "'";
+        }
+    }
+    query += " order by funzione";
+    return query;
+
+}
+
 function queryFunzioneByPlaceAndFloor(db_used, id_place, piano) {
     var query = "";
     if (db_used) {
@@ -8122,6 +8792,9 @@ function queryFunzioneByPlaceAndFloor(db_used, id_place, piano) {
             case 'MYSQL':
                 query = queryFunzioneByPlaceAndFloorMySQL(id_place, piano);
                 break;
+            case 'MYSQL2':
+                query = queryFunzioneByPlaceAndFloorMySQL2(id_place, piano);
+                break;
         }
     }
     return query;
@@ -8167,6 +8840,25 @@ function querySitesMySQL(place, piano, funzione) {
     return query;
 }
 
+function querySitesMySQL2(place, piano, funzione) {
+    var query = "SELECT sd.id_site as id, s.id_place as Plesso, sd.name as Nome, s.mark as Codice, s.floor as Piano, sd.type as Funzione from site_destinations sd";
+    query += " LEFT JOIN sites s ON s.id = sd.id_site"
+    query += " where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end";
+
+    if (place) {
+        query += " and s.id_place = '" + place + "'";
+    }
+    if (funzione) {
+        query += " and sd.type = '" + funzione + "'";
+    }
+
+    if (piano) {
+        query += " and s.floor = '" + piano + "'";
+    }
+    query += " order by s.id_place, s.floor";
+    return query;
+}
+
 function querySites(db_used, place, piano, funzione) {
     var query = "";
     if (db_used) {
@@ -8177,6 +8869,9 @@ function querySites(db_used, place, piano, funzione) {
             case 'MYSQL':
                 query = querySitesMySQL(place, piano, funzione);
                 break;
+            case 'MYSQL2':
+                query = querySitesMySQL2(place, piano, funzione);
+                break;
         }
     }
     return query;
@@ -8214,6 +8909,21 @@ function getSitesFromDeviceMySQL(id_device, prec_pos) {
     query += " order by sd.name, s.floor";
     return query;
 }
+function getSitesFromDeviceMySQL2(id_device, prec_pos) {
+    var query = "SELECT p.mark as Sigla, p.name as Plesso, sd.name as Aula, sd.type as Funzione, s.floor as Piano from device_site ds ";
+    query += " JOIN sites s ON s.id = ds.id_site";
+    query += " JOIN site_destinations sd ON sd.id_site = ds.id_site";
+    query += " JOIN places p ON p.mark = sd.id_place";
+    if (prec_pos == 1) {
+        query += " where ds.id_device = " + id_device;
+    }
+    else {
+        query += " where (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out) and";
+        query += " ds.id_device = " + id_device;
+    }
+    query += " order by sd.name, s.floor";
+    return query;
+}
 function getSitesFromDevice(db_used, id_device, prec_pos) {
     var query = "";
     if (db_used) {
@@ -8224,6 +8934,9 @@ function getSitesFromDevice(db_used, id_device, prec_pos) {
             case 'MYSQL':
                 query = getSitesFromDeviceMySQL(id_device, prec_pos);
                 break;
+            case 'MYSQL2':
+                query = getSitesFromDeviceMySQL2(id_device, prec_pos);
+                break;
         }
     }
     return query;
@@ -8258,6 +8971,9 @@ function getSitesWithDatesFromDevice(db_used, id_device) {
             case 'MYSQL':
                 query = getSitesWithDatesFromDeviceMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = getSitesWithDatesFromDeviceSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -8324,6 +9040,36 @@ function querySitesWithDefaultsMySQL(def_values) {
     return query;
 }
 
+function querySitesWithDefaultsMySQL2(def_values) {
+    var where_clause = "";
+    if (def_values && (def_values.site_place || def_values.site_floor || def_values.site_type)) {
+        where_clause = " and ";
+        if (def_values.site_place) {
+            where_clause += "s.id_place = '" + def_values.site_place + "'";
+            if (def_values.site_floor || def_values.site_type) {
+                where_clause += " and ";
+            }
+        }
+        if (def_values.site_floor) {
+            where_clause += "s.floor = '" + def_values.site_floor + "'";
+            if (def_values.site_type) {
+                where_clause += " and ";
+            }
+        }
+        if (def_values.type) {
+            where_clause += "s.type = '" + def_values.site_type + "'";
+        }
+    }
+
+    var query = "select s.id, s.id_place as Plesso, p.name as Denominazione, sd.name as Destinazione, s.mark as Codice, sd.type as Tipo from sites s ";
+    query += "join site_destinations sd on sd.id_site = s.id ";
+    query += "join places p on p.mark = s.id_place ";
+    query += "where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end ";
+    query += where_clause;
+    query += " order by sd.id_place, s.mark";
+    return query;
+} 
+
 function querySitesWithDefaults(db_used, def_values) {
     var query = "";
     if (db_used) {
@@ -8334,6 +9080,9 @@ function querySitesWithDefaults(db_used, def_values) {
             case 'MYSQL':
                 query = querySitesWithDefaultsMySQL(def_values);
                 break;
+            case 'MYSQL2':
+                query = querySitesWithDefaultsMySQL2(def_values);
+                break;
         }
     }
     return query;
@@ -8361,6 +9110,9 @@ function getPorteByIdSite(db_used, id_site) {
             case 'MYSQL':
                 query = getPorteByIdSiteMySQL(id_site);
                 break;
+            case 'MYSQL2':
+                query = getPorteByIdSiteSQLite(id_site);
+                break;
         }
     }
     return query;
@@ -8388,6 +9140,9 @@ function verifyPrevDeviceSite(db_used, id_device) {
             case 'MYSQL':
                 query = verifyPrevDeviceSiteMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = verifyPrevDeviceSiteSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -8413,6 +9168,9 @@ function removeDeviceSite(db_used,id_site, id_place, id_device) {
             case 'MYSQL':
                 query = removeDeviceSiteMySQL(id_site, id_place, id_device);
                 break;
+            case 'MYSQL2':
+                query = removeDeviceSiteSQLite(id_site, id_place, id_device);
+                break;
         }
     }
     return query;
@@ -8438,6 +9196,9 @@ function updateDeviceSiteAfterRemove(db_used,id_device) {
             case 'MYSQL':
                 query = updateDeviceSiteAfterRemoveMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = updateDeviceSiteAfterRemoveSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -8464,6 +9225,9 @@ function updateDeviceSite(db_used,id_device) {
             case 'MYSQL':
                 query = updateDeviceSiteMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = updateDeviceSiteSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -8512,6 +9276,9 @@ function insertDeviceSite(db_used,id_device, id_place, id_site, start_date) {
             case 'MYSQL':
                 query = insertDeviceSiteMySQL(id_device, id_place, id_site, start_date);
                 break;
+            case 'MYSQL2':
+                query = insertDeviceSiteSQLite(id_device, id_place, id_site, start_date);
+                break;
         }
     }
     return query;
@@ -8538,6 +9305,9 @@ function removeDeviceFromAllSites(db_used, id_device) {
             case 'MYSQL':
                 query = removeDeviceFromAllSitesMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = removeDeviceFromAllSitesSQLite(id_device);
+                break;
         }
     }
     return query;
@@ -8587,6 +9357,28 @@ function getSitesSelectComboMySQL(id_place, tipo_aula) {
     query += "order by p.name, s.floor,  sd.name ";
     return query;
 }
+
+function getSitesSelectComboMySQL2(id_place, tipo_aula) {
+    var query = "select s.id, concat(p.name, ' - ', sd.name, ' - ', s.mark) as Descrizione from sites s ";
+    query += "join site_destinations sd on sd.id_site = s.id ";
+    query += "join places p on p.mark = s.id_place ";
+    query += "where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end ";
+    if (id_place || tipo_aula) {
+        if (id_place && id_place != "") {
+            query += "and s.id_place = '" + id_place +"' ";
+        }
+        if (tipo_aula && tipo_aula != "ALL") {
+            query += "and sd.type = '" + tipo_aula + "' ";
+        }
+    }
+    else {
+        if (!tipo_aula || tipo_aula == "ALL")
+            query += "and sd.type in ('DIDATTICA', 'LABORATORIO', 'UFFICIO', 'SERVIZIO') ";
+    }
+    query += "order by p.name, s.floor, sd.name ";
+    return query;
+}
+
 function getSitesSelectCombo(db_used,id_place, tipo_aula) {
     var query = "";
     if (db_used) {
@@ -8597,6 +9389,9 @@ function getSitesSelectCombo(db_used,id_place, tipo_aula) {
             case 'MYSQL':
                 query = getSitesSelectComboMySQL(id_place, tipo_aula);
                 break;
+            case 'MYSQL2':
+                query = getSitesSelectComboMySQL2(id_place, tipo_aula);
+                break;
         }
     }
     return query;
@@ -8620,6 +9415,17 @@ function getSiteByIdMySQL(id_site) {
     query += "and s.id = :id_site";
     return query;
 }
+
+function getSiteByIdMySQL2(id_site) {
+    var query = "select s.id, s.id_place as Plesso, p.name as Denominazione, sd.name as Destinazione, s.mark as Codice, sd.type as Tipo from sites s ";
+    query += "join site_destinations sd on sd.id_site = s.id ";
+    query += "join places p on p.mark = s.id_place ";
+    query += "where CURDATE() >= sd.date_start and CURDATE() <= sd.date_end ";
+    query += "and s.id = " + id_site;
+    return query;
+}
+
+
 function getSiteById(db_used,id_site) {
     var query = "";
     if (db_used) {
@@ -8630,6 +9436,9 @@ function getSiteById(db_used,id_site) {
             case 'MYSQL':
                 query = getSiteByIdMySQL(id_site);
                 break;
+            case 'MYSQL2':
+                query = getSiteByIdMySQL2(id_site);
+                break;
         }
     }
     return query;
@@ -8659,6 +9468,9 @@ function querySitesLab(db_used,id_place) {
             case 'MYSQL':
                 query = querySitesLabMySQL(id_place);
                 break;
+            case 'MYSQL2':
+                query = querySitesLabSQLite(id_place);
+                break;
         }
     }
     return query;
@@ -8683,6 +9495,15 @@ function removeSiteBySetMySQL(id_device) {
     query += ")";
     return query;
 }
+function removeSiteBySetMySQL2(id_device) {
+    var query = "delete from device_site where id_device in ";
+    query += "(select dt.id_relateddevice from device_set dt ";
+    query += "left join device_site ds on dt.id_maindevice = ds.id_device ";
+    query += "where dt.id_maindevice = " + id_device + " ";
+    query += "and (CURDATE() >= ds.date_in and CURDATE() <= ds.date_out)";
+    query += ")";
+    return query;
+}
 function removeSiteBySet(db_used, id_device) {
     var query = "";
     if (db_used) {
@@ -8693,6 +9514,9 @@ function removeSiteBySet(db_used, id_device) {
             case 'MYSQL':
                 query = removeSiteBySetMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = removeSiteBySetMySQL2(id_device);
+                break;
         }
     }
     return query;
@@ -8714,6 +9538,13 @@ function updateSiteBySetMySQL(id_device) {
     query += "and CURDATE() >= date_in and CURDATE() <= date_out"
     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 "
+    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"
+    return query;
+}
 function updateSiteBySet(db_used,id_device) {
     var query = "";
     if (db_used) {
@@ -8724,6 +9555,9 @@ function updateSiteBySet(db_used,id_device) {
             case 'MYSQL':
                 query = updateSiteBySetMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = updateSiteBySetMySQL2(id_device);
+                break;
         }
     }
     return query;
@@ -8746,6 +9580,14 @@ function insertSiteBySetMySQL(id_device) {
     query += "where ds.id_maindevice = :id_device";
     return query;
 }
+function insertSiteBySetMySQL2(id_device) {
+    var query = "insert into device_site (id_site, id_place, date_in, date_out, id_device) ";
+    query += "select das.id_site, das.id_place, CURDATE(), '2999-12-31', d.id from devices d ";
+    query += "join device_set ds on ds.id_relateddevice = d.id ";
+    query += "join device_as_site das on das.id_device = ds.id_maindevice ";
+    query += "where ds.id_maindevice = " + id_device;
+    return query;
+}
 function insertSiteBySet(db_used,id_device) {
     var query = "";
     if (db_used) {
@@ -8756,6 +9598,9 @@ function insertSiteBySet(db_used,id_device) {
             case 'MYSQL':
                 query = insertSiteBySetMySQL(id_device);
                 break;
+            case 'MYSQL2':
+                query = insertSiteBySetMySQL2(id_device);
+                break;
         }
     }
     return query;