alsmanager_lib 1.0.10 → 1.0.12

package/lib/modules.js

@@ -2607,13 +2607,13 @@ function selectDismissioneDevicesByIdDismissSQLite(id_dismiss) {
     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 ";
+    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 id_dismissione is null or id_dismissione = 0";
+        query += "where dm.id_dismissione is null or dm.id_dismissione = 0";
     }
     else { 
-        query += "where id_dismissione = " + id_dismiss;
+        query += "where dm.id_dismissione = " + id_dismiss;
     }
     return query;
 }
@@ -2627,13 +2627,13 @@ function selectDismissioneDevicesByIdDismissMySQL(id_dismiss) {
     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 ";
+    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 id_dismissione is null or id_dismissione = 0";
+        query += "where dm.id_dismissione is null or dm.id_dismissione = 0";
     }
     else { 
-        query += "where id_dismissione = :id_dismiss";
+        query += "where dm.id_dismissione = :id_dismiss";
     }    
     return query;    
 }
@@ -2656,6 +2656,36 @@ function selectDismissioneDevicesByIdDismiss(db_used, id_dismiss) {
     return query;
 }
 
+function selectDismissioneDevicesByIdSQLite(id_devdismiss) {
+    var query = "select id, id_device, id_dismissione, motivo, note from device_dismissione "
+    query += "where id = " + id_devdismiss;
+    return query;
+}
+
+function selectDismissioneDevicesByIdMySQL(id_devdismiss) {
+    var query = "select id, id_device, id_dismissione, motivo, note from device_dismissione "
+    query += "where id = :id_devdismiss";
+    return query;
+}
+
+function selectDismissioneDevicesById(db_used, id_devdismiss) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = selectDismissioneDevicesByIdSQLite(id_devdismiss);
+                break;
+            case 'MYSQL':
+                query = selectDismissioneDevicesByIdMySQL(id_devdismiss);
+                break;
+        }
+    }
+    else {
+        query = selectDismissioneDevicesByIdSQLite(id_devdismiss);
+    }
+    return query;
+}
+
 
 function removeDismissioneDeviceByIdDismissioneSQLite(id_dismiss) {
     var query = "delete from device_dismissioni ";

package/package.json

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