alsmanager_lib 3.0.202 → 3.0.204

package/lib/modules.js

@@ -1374,7 +1374,7 @@ function getUtentiByIdDeviceMySQL(id_device) {
 }
 
 
-function getUtentiByIdDeviceSQLiteMYSQL2(id_device) {
+function getUtentiByIdDeviceMYSQL2(id_device) {
     var query = "select au.id, au.cognome_denominazione, au.nome, au.titolo from device_utenza du ";
     query += "join anagrafica_utenze au on au.id = du.id_utenza ";
     query += "where du.id_device = " + id_device + " ";
@@ -1394,7 +1394,7 @@ function getUtentiByIdDevice(db_used, id_device) {
                 query = getUtentiByIdDeviceMySQL(id_device);
                 break;
             case 'MYSQL2':
-                query = getUtentiByIdDeviceSQLiteMYSQL2(id_device);
+                query = getUtentiByIdDeviceMYSQL2(id_device);
                 break;
         }
     }
@@ -1415,8 +1415,42 @@ function removeUtentePerDevice(id_dev_user) {
 
 // End Anagrafica utenti
 //Anagrafica docenti
-function getDocentiCombo(db_used, id_place, ordine_scuola, ruolo) {
-    var query = "select id, concat(cognome, ' ', nome, ' - ', ordine, ' - ', ruolo) as nominativo from anagrafica_docenti ";
+function getDocentiComboSQLite(id_place, ordine_scuola, ruolo) {
+    var query = "select id, concat(cognome, ' ', nome, iif(ordine is not null, concat(' - ', ordine), ' '), iif(ruolo is not null, concat(' - ', ruolo), ' ')) as nominativo from anagrafica_docenti ";
+    query += "where is_attivo = 1 "
+    if (ordine_scuola && ordine_scuola.trim() != '') {
+        query += "and (ordine = '" + ordine_scuola + "' or ruolo <> 'DOCENTE') ";
+    }
+    if (id_place && id_place.trim() != '') {
+        query += "and (id_place = '" + id_place + "' or id_place is null) ";
+    }
+    if (ruolo && ruolo.trim() != '') {
+        query += "and ruolo = '" + ruolo + "' ";
+    }
+    query += "order by cognome, nome";
+    return query;
+}
+
+
+
+function getDocentiComboMySQL(id_place, ordine_scuola, ruolo) {
+    var query = "select id, concat(cognome, ' ', nome, if(ordine is not null, concat(' - ', ordine), ' '), if(ruolo is not null, concat(' - ', ruolo), ' ')) as nominativo from anagrafica_docenti ";
+    query += "where is_attivo = 1 "
+    if (ordine_scuola && ordine_scuola.trim() != '') {
+        query += "and (ordine = '" + ordine_scuola + "' or ruolo <> 'DOCENTE') ";
+    }
+    if (id_place && id_place.trim() != '') {
+        query += "and (id_place = '" + id_place + "' or id_place is null) ";
+    }
+    if (ruolo && ruolo.trim() != '') {
+        query += "and ruolo = '" + ruolo + "' ";
+    }
+    query += "order by cognome, nome";
+    return query;
+}
+
+function getDocentiComboMySQL2(id_place, ordine_scuola, ruolo) {
+    var query = "select id, concat(cognome, ' ', nome, if(ordine is not null, concat(' - ', ordine), ' '), if(ruolo is not null, concat(' - ', ruolo), ' ')) as nominativo from anagrafica_docenti ";
     query += "where is_attivo = 1 "
     if (ordine_scuola && ordine_scuola.trim() != '') {
         query += "and (ordine = '" + ordine_scuola + "' or ruolo <> 'DOCENTE') ";
@@ -1431,6 +1465,24 @@ function getDocentiCombo(db_used, id_place, ordine_scuola, ruolo) {
     return query;
 }
 
+function getDocentiCombo(db_used, id_place, ordine_scuola, ruolo) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getDocentiComboSQLite(id_place, ordine_scuola, ruolo);
+                break;
+            case 'MYSQL':
+                query = getDocentiComboMySQL(id_place, ordine_scuola, ruolo);
+                break;
+            case 'MYSQL2':
+                query = getDocentiComboMySQL2(id_place, ordine_scuola, ruolo);
+                break;
+        }
+    }
+    return query;    
+}
+
 function getDocenteById(db_used, id_docente) {
     var query = "select id, cognome, nome, email, id_place, ordine, ruolo, is_attivo from anagrafica_docenti ";
     query += "where id = " + id_docente;
@@ -4943,7 +4995,7 @@ function getDevicesSelectComboMySQL(categoria, id_dev_exclude, with_properties)
     var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
     query += "case ";
     query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id, '(ID)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
-    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number,iif(d.part_of is not null and trim(d.part_of) <> '', concat('/',d.part_of),''), ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number,if(d.part_of is not null and trim(d.part_of) <> '', concat('/',d.part_of),''), ' - ', 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) ";
@@ -4966,6 +5018,44 @@ function getDevicesSelectComboMySQL(categoria, id_dev_exclude, with_properties)
     query += "order by d.inv_ict3_number";
     return query;
 }
+
+function getDevicesSelectComboMySQL2(categoria, id_dev_exclude, with_properties) {
+    var query = "SELECT d.id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello, ";
+    /*
+    (case
+    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 ) 
+    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 ) 
+    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 )
+    when d.serial_no != '' and d.serial_no is not null then concat(d.serial_no,'(S/N)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model )
+    end) as Descrizione
+    */
+    query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id, '(ID)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number,if(d.part_of is not null and trim(d.part_of) <> '', concat('/',d.part_of),''), ' - ', 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 ";
+    if (with_properties && with_properties > 0) { 
+        query += "left join device_properties dp on d.id = dp.id_device ";
+    } 
+    query += "where (d.is_removed is null or d.is_removed = 0) "
+    if (categoria && categoria.trim() != '') {
+        query += "and d.type in (select tipo from categorie_device where categoria = '" + categoria +"') ";
+    }
+    if (id_dev_exclude && id_dev_exclude > 0) {
+        query += "and d.id <> " + id_dev_exclude + " ";
+    }
+    if (with_properties) {
+        query += "and dp.raw_properties is not null ";
+    } 
+    query += "order by d.inv_ict3_number";
+    return query;
+}
+
+
 function getDevicesSelectCombo(db_used, categoria, id_dev_exclude, with_properties) {
     var query = "";
     if (db_used) {
@@ -4977,7 +5067,7 @@ function getDevicesSelectCombo(db_used, categoria, id_dev_exclude, with_properti
                 query = getDevicesSelectComboMySQL(categoria, id_dev_exclude, with_properties);
                 break;
             case 'MYSQL2':
-                query = getDevicesSelectComboSQLite(categoria, id_dev_exclude, with_properties);
+                query = getDevicesSelectComboMySQL2(categoria, id_dev_exclude, with_properties);
                 break;
         }
     }
@@ -5010,7 +5100,7 @@ function getDevicesSelectBySiteComboMySQL(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.no_inventario is not null and d.no_inventario > 0 then concat(d.id, '(ID)', ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
-    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number,iif(d.part_of is not null and trim(d.part_of) <> '', concat('/',d.part_of),''), ' - ', d.type, ' - ', d.manifacturer, ' - ', d.model) ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number,if(d.part_of is not null and trim(d.part_of) <> '', concat('/',d.part_of),''), ' - ', 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) ";
@@ -5193,7 +5283,7 @@ function getDevicesWithPropertiesMySQL(id_device) {
     var query = "select ";
     query += "case ";
     query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id, '(ID)') ";
-    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number, iif(d.part_of is not null and trim(d.part_of) <> '', concat('/',d.part_of),'')) ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number, if(d.part_of is not null and trim(d.part_of) <> '', concat('/',d.part_of),'')) ";
     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)') ";
@@ -5208,6 +5298,25 @@ function getDevicesWithPropertiesMySQL(id_device) {
     query += "order by d.id";
     return query;
 }
+function getDevicesWithPropertiesMySQL2(id_device) {
+    var query = "select ";
+    query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id, '(ID)') ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number, if(d.part_of is not null and trim(d.part_of) <> '', concat('/',d.part_of),'')) ";
+    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 += "d.manifacturer as Marca, d.model as Modello, d.id as Id from devices d ";
+    query += "left join device_properties dp on d.id = dp.id_device ";
+    query += "where dp.id_device is not null ";
+    if (id_device > 0) {
+        query += "and d.id = " + id_device + " ";
+    }
+    query += "order by d.id";
+    return query;
+}
 function getDevicesWithProperties(db_used, id_device) {
     var query = "";
     if (db_used) {
@@ -5219,7 +5328,7 @@ function getDevicesWithProperties(db_used, id_device) {
                 query = getDevicesWithPropertiesMySQL(id_device);
                 break;
             case 'MYSQL2':
-                query = getDevicesWithPropertiesSQLite(id_device);
+                query = getDevicesWithPropertiesMySQL2(id_device);
                 break;
         }
     }
@@ -10380,7 +10489,7 @@ function selectDismissioneDevicesByIdDismissSQLite(id_dismiss) {
 function selectDismissioneDevicesByIdDismissMySQL(id_dismiss) {
     var query = "select dm.id, ";
     query += "case ";
-    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number,iif(d.part_of is not null and trim(d.part_of) <> '', concat('/',d.part_of),'')) ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number,if(d.part_of is not null and trim(d.part_of) <> '', concat('/',d.part_of),'')) ";
     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)') ";
@@ -10397,6 +10506,26 @@ function selectDismissioneDevicesByIdDismissMySQL(id_dismiss) {
     return query;    
 }
 
+function selectDismissioneDevicesByIdDismissMySQL2(id_dismiss) {
+    var query = "select dm.id, ";
+    query += "case ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then concat(d.inv_ict3_number,if(d.part_of is not null and trim(d.part_of) <> '', concat('/',d.part_of),'')) ";
+    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 += "d.type as Tipo, d.manifacturer as Marca, d.model as Modello from device_dismissioni dm ";
+    query += "join devices d on d.id = dm.id_device ";
+    if (!id_dismiss || id_dismiss == 0) {
+        query += "where dm.id_dismissione is null or dm.id_dismissione = 0";
+    }
+    else { 
+        query += "where dm.id_dismissione = " + id_dismiss;
+    }
+    return query;
+}
+
 function selectDismissioneDevicesByIdDismiss(db_used, id_dismiss) {
     var query = "";
     if (db_used) {
@@ -10408,7 +10537,7 @@ function selectDismissioneDevicesByIdDismiss(db_used, id_dismiss) {
                 query = selectDismissioneDevicesByIdDismissMySQL(id_dismiss);
                 break;
             case 'MYSQL2':
-                query = selectDismissioneDevicesByIdDismissSQLite(id_dismiss);
+                query = selectDismissioneDevicesByIdDismissMySQL2(id_dismiss);
                 break;
         }
     }
@@ -12839,7 +12968,7 @@ function deletePortPerSite(id_port) {
     return query;
 }
 
-function getSwitches(id_place) {
+function getSwitchesSQLite(id_place) {
     var query = "select d.id, dw.rete_appartenenza, concat(d.manifacturer, ' - ', d.model, ' - ', dw.rete_appartenenza) as description from devices d ";
     query += "join device_site ds on ds.id_device = d.id ";
     query += "join device_switch dw on dw.id_device = d.id ";
@@ -12851,6 +12980,50 @@ function getSwitches(id_place) {
     return query;
 }
 
+function getSwitchesMySQL() {
+    var query = "select d.id, dw.rete_appartenenza, concat(d.manifacturer, ' - ', d.model, ' - ', dw.rete_appartenenza) as description from devices d ";
+    query += "join device_site ds on ds.id_device = d.id ";
+    query += "join device_switch dw on dw.id_device = d.id ";
+    query += "join site_destinations sd on sd.id_site = ds.id_site ";
+    query += "where sd.type = 'SERVER' and CURDATE() >= sd.date_start and CURDATE() <= sd.date_end ";
+    query += "and CURDATE() >= ds.date_in and CURDATE() <= ds.date_out ";
+    query += "and d.type = 'SWITCH' ";
+    query += "and sd.id_place = :id_place ";
+    return query;
+}
+
+function getSwitchesMySQL2(id_place) {
+    var query = "select d.id, dw.rete_appartenenza, concat(d.manifacturer, ' - ', d.model, ' - ', dw.rete_appartenenza) as description from devices d ";
+    query += "join device_site ds on ds.id_device = d.id ";
+    query += "join device_switch dw on dw.id_device = d.id ";
+    query += "join site_destinations sd on sd.id_site = ds.id_site ";
+    query += "where sd.type = 'SERVER' and CURDATE() >= sd.date_start and CURDATE() <= sd.date_end ";
+    query += "and CURDATE() >= ds.date_in and CURDATE() <= ds.date_out ";
+    query += "and d.type = 'SWITCH' ";
+    query += "and sd.id_place = '" + id_place + "' ";
+    return query;
+}
+
+
+function getSwitches(db_used, id_place) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getSwitchesSQLite(id_place);
+                break;
+            case 'MYSQL':
+                query = getSwitchesMySQL();
+                break;
+            case 'MYSQL2':
+                query = getSwitchesMySQL2(id_place);
+                break;
+        }
+    }
+    return query;
+} 
+
+
 function getTipiPorta() {
     var query = "select DISTINCT port_type from site_ports ";
     query += "order by port_type";
@@ -13844,10 +14017,16 @@ function queryStatisticInventarySQLite() {
     return query;
 }
 function queryStatisticInventaryMySQL() {
-    var query = "select COUNT(IIF(d.inv_ict3_number is not null and round(d.inv_ict3_number) > 0, 1, NULL)) as Con_Inventario, COUNT(IIF(d.inv_ict3_number is null or trim(d.inv_ict3_number) = '' or round(d.inv_ict3_number) > 0, 1, NULL)) as Senza_Inventario from devices d ";
+    var query = "select COUNT(IF(d.inv_ict3_number is not null and round(d.inv_ict3_number) > 0, 1, NULL)) as Con_Inventario, COUNT(IF(d.inv_ict3_number is null or trim(d.inv_ict3_number) = '' or round(d.inv_ict3_number) > 0, 1, NULL)) as Senza_Inventario from devices d ";
     query += "where (is_removed is null or is_removed = 0) ";
     return query;
 }
+function queryStatisticInventaryMySQL2() {
+    var query = "select COUNT(IF(d.inv_ict3_number is not null and round(d.inv_ict3_number) > 0, 1, NULL)) as Con_Inventario, COUNT(IF(d.inv_ict3_number is null or trim(d.inv_ict3_number) = '' or round(d.inv_ict3_number) > 0, 1, NULL)) as Senza_Inventario from devices d ";
+    query += "where (is_removed is null or is_removed = 0) ";
+    return query;
+}
+
 function queryStatisticInventary(db_used) {
     var query = "";
     if (db_used) {
@@ -13859,7 +14038,7 @@ function queryStatisticInventary(db_used) {
                 query = queryStatisticInventaryMySQL();
                 break;
             case 'MYSQL2':
-                query = queryStatisticInventarySQLite();
+                query = queryStatisticInventaryMySQL2();
                 break;
         }
     }

package/package.json

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