alsmanager_lib 1.0.14 → 1.0.16

package/lib/modules.js

@@ -2640,16 +2640,52 @@ function selectDismissioneDevicesByIdDismissMySQL(id_dismiss) {
 }
 
 function selectDismissioneDevicesByIdSQLite(id_devdismiss) {
-    var query = "select id, id_device, id_dismissione, motivo, note from device_dismissione "
+    var query = "select id, id_device, id_dismissione, motivo, note from device_dismissioni "
     query += "where id = " + id_devdismiss;
     return query;
 }
 
 function selectDismissioneDevicesByIdMySQL(id_devdismiss) {
-    var query = "select id, id_device, id_dismissione, motivo, note from device_dismissione "
+    var query = "select id, id_device, id_dismissione, motivo, note from device_dismissioni "
     query += "where id = :id_devdismiss";
     return query;
 }
+function selectDismissioneDevicesByIdDismiss(db_used, id_dismiss) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = selectDismissioneDevicesByIdDismissSQLite(id_dismiss);
+                break;
+            case 'MYSQL':
+                query = selectDismissioneDevicesByIdDismissMySQL(id_dismiss);
+                break;
+        }
+    }
+    else {
+        query = selectDismissioneDevicesByIdDismissSQLite(id_dismiss);
+    }
+    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) {
@@ -3954,6 +3990,8 @@ module.exports = {
     updateDismissioneDeviceMySQL, 
     removeDismissioneDeviceSQLite,
     removeDismissioneDeviceMySQL, 
+    selectDismissioneDevicesById,
+    selectDismissioneDevicesByIdDismiss,
     loadDismissioniAttiveCombo,
     loadMotivoDismissioneCombo,  
     assignCategoryFromDBSQLite,

package/package.json

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

package/lib/select_db.js

@@ -1,42 +0,0 @@
-
-
-function selectDismissioneDevicesByIdDismiss(db_used, id_dismiss) {
-    var query = "";
-    if (db_used) {
-        switch (db_used) {
-            case 'SQLITE':
-                query = selectDismissioneDevicesByIdDismissSQLite(id_dismiss);
-                break;
-            case 'MYSQL':
-                query = selectDismissioneDevicesByIdDismissMySQL(id_dismiss);
-                break;
-        }
-    }
-    else {
-        query = selectDismissioneDevicesByIdDismissSQLite(id_dismiss);
-    }
-    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;
-}
-
-module.exports = { 
-    selectDismissioneDevicesById,
-    selectDismissioneDevicesByIdDismiss
-}