alsmanager_lib 1.0.20 → 1.0.22

package/lib/modules.js

@@ -2555,9 +2555,6 @@ function selectDismissioniByYear(db_used, sel_year) {
                 break;
         }
     }
-    else {
-        query = selectDismissioniByYearSQLite(sel_year);
-    }
     return query;
 }
 
@@ -2585,9 +2582,6 @@ function selectDismissioneById(db_used, id_dismiss) {
                 break;
         }
     }
-    else {
-        query = selectDismissioneByIdSQLite(id_dismiss);
-    }
     return query;
 }
 //
@@ -2620,9 +2614,6 @@ function insertDismissione(db_used, data, descrizione, is_closed) {
                 break;
         }
     }
-    else {
-        query = insertDismissioneSQLite(data, descrizione, is_closed);
-    }
     return query;
 }
 
@@ -2646,7 +2637,7 @@ function updateDismissioneMySQL(id_dismiss, data, descrizione, is_closed) {
     return query;
 }
 
-function updateDismissione(db_used, data, descrizione, is_closed) {
+function updateDismissione(db_used, id_dismiss, data, descrizione, is_closed) {
     var query = "";
     if (db_used) {
         switch (db_used) {
@@ -2657,10 +2648,7 @@ function updateDismissione(db_used, data, descrizione, is_closed) {
                 query = updateDismissioneMySQL(id_dismiss, data, descrizione, is_closed);
                 break;
         }
-    }
-    else {
-        query = updateDismissioneSQLite(id_dismiss, data, descrizione, is_closed);
-    }
+    } 
     return query;
 }
 
@@ -2687,9 +2675,6 @@ function removeDismissioneById(db_used, id_dismiss) {
                 break;
         }
     }
-    else {
-        query = removeDismissioneByIdSQLite(id_dismiss);
-    }
     return query;
 }
 
@@ -2746,9 +2731,6 @@ function selectDismissioneDevicesByIdDismiss(db_used, id_dismiss) {
                 break;
         }
     }
-    else {
-        query = selectDismissioneDevicesByIdDismissSQLite(id_dismiss);
-    }
     return query;
 }
 
@@ -2777,9 +2759,6 @@ function selectDismissioneDevicesById(db_used, id_devdismiss) {
                 break;
         }
     }
-    else {
-        query = selectDismissioneDevicesByIdSQLite(id_devdismiss);
-    }
     return query;
 }
 
@@ -2808,9 +2787,6 @@ function removeDismissioneDeviceByIdDismissione(db_used, id_devdismiss) {
                 break;
         }
     }
-    else {
-        query = removeDismissioneDeviceByIdDismissioneSQLite(id_devdismiss);
-    }
     return query;
 }
 
@@ -2838,9 +2814,6 @@ function insertDismissioneDevice(db_used, id_dismiss, id_device, motivo, note, d
                 break;
         }
     }
-    else {
-        query = insertDismissioneDeviceSQLite(id_dismiss, id_device, motivo, note, data);
-    }
     return query;
 }
 
@@ -2877,9 +2850,6 @@ function updateDismissioneDevice(db_used, id_devdismiss, id_dismiss, id_device,
                 break;
         }
     }
-    else {
-        query = updateDismissioneDeviceSQLite(id_devdismiss, id_dismiss, id_device, motivo, note, data);
-    }
     return query;
 }
 
@@ -2906,9 +2876,6 @@ function removeDismissioneDevice(db_used, id_devdismiss) {
                 break;
         }
     }
-    else {
-        query = removeDismissioneDeviceSQLite(id_devdismiss);
-    }
     return query;
 }
 
@@ -3041,6 +3008,28 @@ function removeDismissioneDeviceFromDismissione(db_used, id_devdismiss, id_dismi
 }
 
 
+function queryLastDismissioneIdSQLite() {
+    return "select seq as id from sqlite_sequence where name = 'dismissioni'";
+}
+function queryLastDismissioneIdMySQL() {
+    return "SELECT AUTO_INCREMENT - 1 as CurrentId FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'ALS' AND TABLE_NAME = 'dismissioni'";
+}
+function queryLastDismissioneId(db_used) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = queryLastDismissioneIdSQLite();
+                break;
+            case 'MYSQL':
+                query = queryLastDismissioneIdMySQL();
+                break;
+        }
+    }
+    return query;
+}
+
+
 //End manage dismissioni
 
 
@@ -4439,6 +4428,7 @@ module.exports = {
     assignDevicesToDismissione,
     removeDevicesFromDismissione,
     removeDismissioneDeviceFromDismissione,
+    queryLastDismissioneId,
     //
     assignCategoryFromDBSQLite,
     assignCategoryFromDBMySQL,

package/package.json

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