alsmanager_lib 2.0.44 → 2.0.46

package/lib/dbconn.js

@@ -0,0 +1,28 @@
+var mysql = require('mysql');
+
+
+
+
+
+function dbtest(query) {
+    var con = mysql.createConnection({
+        host: "localhost",
+        user: "root",
+        password: "rootdb"
+    });
+  
+    con.connect(function(err) {
+        if (err) throw err;
+        console.log("Connected!");
+        con.query(query, function (err, result) {
+            if (err) throw err;
+            console.log("Result: " + result);
+            return result;
+        });
+    });
+
+} 
+
+module.exports = { 
+    dbtest 
+}

package/lib/modules.js

@@ -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.44",
+  "version": "2.0.46",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",