alsmanager_lib 2.0.43 → 2.0.45

package/lib/modules.js

@@ -4573,10 +4573,10 @@ function getDevicesNotAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker
     query += "and (ds.id_place is null ";
     query += "or ((ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and sd.type = 'MAGAZZINO')) and (ds.id_place <> :id_place and ds.id_site <> :id_site)) ";
     if (sel_type_str.trim() != '') {
-        query += "and d.type = ':dev_type' ";
+        query += "and d.type = :dev_type ";
     }
     if (sel_maker_str.trim() != '') {
-        query += "and d.manifacturer = ':dev_manifacturer' ";
+        query += "and d.manifacturer = :dev_manifacturer ";
     }
     if (ordered_by && ordered_by == "ID") { 
         query += "order by d.id desc";
@@ -7762,7 +7762,7 @@ function getBeniConsumo() {
     return query;
 }
 
-function getBeniConsumoNotNull() {
+function getBeniConsumoNotNullSQLite() {
     var query = "select id, Tipo, Marca, Modello, Quantitativo, "
     query += " (select count() from device_beniconsumo where id_bene = bc.id) as Usati"
     query += " from beniconsumo bc";
@@ -7770,6 +7770,30 @@ function getBeniConsumoNotNull() {
     query += " order by Tipo";
     return query;
 }
+
+function getBeniConsumoNotNullMySQL() {
+    var query = "select id, Tipo, Marca, Modello, Quantitativo, "
+    query += " (select count() from device_beniconsumo where id_bene = bc.id) as Usati"
+    query += " from beniconsumo bc";
+    query += " where bc.Quantitativo - Usati  > 0"
+    query += " order by Tipo";
+    return query;
+}
+
+function getBeniConsumoNotNull(db_used) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getBeniConsumoNotNullSQLite();
+                break;
+            case 'MYSQL':
+                query = getBeniConsumoNotNullMySQL();
+                break;
+        }
+    }
+    return query;
+}
 //
 function getBeneConsumoUsatoSQLite(id_device, id_bene) {
     var query = "select b.id, b.tipo, b.marca, b.modello, db.numero from device_beniconsumo db ";

package/package.json

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