alsmanager_lib 1.0.7 → 1.0.9

package/lib/modules.js

@@ -2609,7 +2609,12 @@ function selectDismissioneDevicesByIdDismissSQLite(id_dismiss) {
     query += "end as Codice, ";
     query += "d.type as Tipo, d.manifacturer as Marca, d.model as Modello from device_dismissioni ";
     query += "join devices d on d.id = dm.id_device ";
-    query += "where id_dismissione = " + id_dismiss;
+    if (!id_dismiss || id_dismiss == 0) {
+        query += "where id_dismissione is null or id_dismissione = 0";
+    }
+    else { 
+        query += "where id_dismissione = " + id_dismiss;
+    }
     return query;
 }
 
@@ -2624,7 +2629,12 @@ function selectDismissioneDevicesByIdDismissMySQL(id_dismiss) {
     query += "end as Codice, ";
     query += "d.type as Tipo, d.manifacturer as Marca, d.model as Modello from device_dismissioni ";
     query += "join devices d on d.id = dm.id_device ";
-    query += "where id_dismissione = :id_dismiss";
+    if (!id_dismiss || id_dismiss == 0) {
+        query += "where id_dismissione is null or id_dismissione = 0";
+    }
+    else { 
+        query += "where id_dismissione = :id_dismiss";
+    }    
     return query;    
 }
 function removeDismissioneDeviceByIdDismissioneSQLite(id_dismiss) {
@@ -2637,26 +2647,28 @@ function removeDismissioneDeviceByIdDismissioneMySQL(id_dismiss) {
     query += "where id_dismissione = :id_dismiss";
     return query;        
 }
-function insertDismissioneDeviceSQLite(id_dismiss, id_device, note) {
-    var query = "insert into device_dismissioni (id_dismissione, id_device, note ) values ";
-    query += "(" + id_dismiss + ", " + id_device +  ", " + note + ")";
+function insertDismissioneDeviceSQLite(id_dismiss, id_device, motivo, note) {
+    var query = "insert into device_dismissioni (id_dismissione, id_device, motivo, note ) values ";
+    query += "(" + id_dismiss + ", " + id_device +  ", " + motivo + ", " + note + ")";
     return query;    
 }
 function insertDismissioneDeviceMySQL(id_dismiss, id_device, note) {
-    var query = "insert into device_dismissioni (id_dismissione, id_device, note ) values ";
-    query += "(:id_dismiss, :id_device, :note)";
+    var query = "insert into device_dismissioni (id_dismissione, id_device, motivo, note ) values ";
+    query += "(:id_dismiss, :id_device, :motivo, :note)";
     return query;        
 }    
-function updateDismissioneDeviceSQLite(id_devdismiss, id_device, note) {
+function updateDismissioneDeviceSQLite(id_devdismiss, id_device, motivo, note) {
     var query = "update device_dismissioni ";
     query += "set id_device = " + id_device + ", ";
+    query += "motivo = " + motivo + ", "; 
     query += "note = " + note + " ";
     query += "where id = " + id_devdismiss;    
     return query;    
 }
-function updateDismissioneDeviceMySQL(id_devdismiss, id_device, note) {
+function updateDismissioneDeviceMySQL(id_devdismiss, id_device, motivo, note) {
     var query = "update device_dismissioni ";
     query += "set id_device = :id_device, ";
+    query += "motivo = :motivo, "; 
     query += "note = :note ";
     query += "where id = :id_devdismiss";        
     return query;    
@@ -2671,6 +2683,16 @@ function removeDismissioneDeviceMySQL(id_devdismiss) {
     query += "where id = :id_devdismiss";
     return query;            
 }
+function loadDismissioniAttiveCombo() {
+    var query = "select id, concat(data, ' - ', descrizione) as Dismissione from dismissioni ";
+    query += "where is_closed is null or is_closed = 0";
+    return query;
+}
+
+function loadMotivoDismissioneCombo() {
+    var query = "select id, descrizione from motivo_dismissione ";
+    return query;
+}
 //End manage dismissioni
 
 
@@ -3914,7 +3936,9 @@ module.exports = {
     updateDismissioneDeviceSQLite,
     updateDismissioneDeviceMySQL, 
     removeDismissioneDeviceSQLite,
-    removeDismissioneDeviceMySQL,   
+    removeDismissioneDeviceMySQL, 
+    loadDismissioniAttiveCombo,
+    loadMotivoDismissioneCombo,  
     assignCategoryFromDBSQLite,
     assignCategoryFromDBMySQL,
     getBeniConsumoByIdDeviceSQLite,

package/package.json

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