alsmanager_lib 1.0.17 → 1.0.19

package/lib/modules.js

@@ -2530,7 +2530,7 @@ function getBeniConsumoByIdDeviceMySQL(id_device) {
 function selectDismissioniByYearSQLite(sel_year) {
     var query = "select id, data, descrizione from dismissioni ";
     if (sel_year && sel_year > 0) {
-        query += "where data >= concat(" + sel_year + ", '-01-01') && data <= concat(" + sel_year + ", '-12-31')"; 
+        query += "where data >= concat(" + sel_year + ", '-01-01') and data <= concat(" + sel_year + ", '-12-31')"; 
     }
     return query;
 }
@@ -2538,7 +2538,7 @@ function selectDismissioniByYearSQLite(sel_year) {
 function selectDismissioniByYearMySQL(sel_year) {
     var query = "select id, data, descrizione from dismissioni ";
     if (sel_year && sel_year > 0) {
-        query += "where data >= concat(:sel_year, '-01-01') && data <= concat(:sel_year, '-12-31')"; 
+        query += "where data >= concat(:sel_year, '-01-01') and data <= concat(:sel_year, '-12-31')"; 
     }
     return query;    
 }
@@ -2923,6 +2923,23 @@ function loadMotivoDismissioneCombo() {
     var query = "select id, descrizione from motivo_dismissione ";
     return query;
 }
+
+function loadDeviceDaDismettereCombo() {
+    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, ' - ', 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 device_dismissioni dm ";
+    query += "join devices d on dm.id_device = d.id ";
+    query += "where (dm.id_dismissione is null or dm.id_dismissione = 0) "
+    query += "order by d.inv_ict3_number";
+    return query;
+}
+
 //End manage dismissioni
 
 
@@ -4223,6 +4240,7 @@ module.exports = {
     selectDismissioneDevicesByIdDismiss,
     loadDismissioniAttiveCombo,
     loadMotivoDismissioneCombo,  
+    loadDeviceDaDismettereCombo,
     //
     assignCategoryFromDBSQLite,
     assignCategoryFromDBMySQL,

package/package.json

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