alsmanager_lib 2.0.74 → 2.0.76

package/lib/modules.js

@@ -2284,11 +2284,17 @@ function getDisplayProperties(db_used, id_device) {
 function createDisplayPropertiesMySQLObj(id_device, dev_prop) {
     var obj = {};
     obj.id_device = id_device;
-    obj.touch = dev_prop.touch;
+    if (!dev_prop.touch || dev_prop.touch == null)
+        obj.touch = 0;
+    else
+        obj.touch = dev_prop.touch;
     obj.format = dev_prop.formato;
     obj.size = dev_prop.dimensione;
     obj.technology = dev_prop.tecnologia;
-    obj.is_removable = dev_prop.rimovibile;
+    if (!dev_prop.rimovibile || dev_prop.rimovibile == null)
+        obj.is_removable = 0;
+    else
+        obj.is_removable = dev_prop.rimovibile;
     return obj;
 }
 
@@ -2361,10 +2367,7 @@ function updateDisplayProperties(db_used, id_device, dev_prop) {
 }
 // End Manage Display Properties
 
-
-
-// End of source
-
+// Manage models
 function queryDeviceManifactures() {
     var query = "SELECT DISTINCT manifacturer as search_manifacturer from devices order by search_manifacturer";
     return query;
@@ -2374,6 +2377,41 @@ function queryDeviceModels() {
     var query = "SELECT DISTINCT model from devices order by model";
     return query;
 }
+//
+function queryDeviceModelsByManifacturerSQLite(manifacturer) {
+    var query = "SELECT DISTINCT model from devices ";
+    query += "where manifacturer = '" + manifacturer + "' ";
+    query += "order by model";
+    return query;
+}
+
+function queryDeviceModelsByManifacturerMySQL(manifacturer) {
+    var query = "SELECT DISTINCT model from devices ";
+    query += "where manifacturer = :manifacturer ";
+    query += "order by model";
+    return query;
+}
+
+function queryDeviceModelsByManifacturer(db_used, manifacturer) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = queryDeviceModelsByManifacturerSQLite(manifacturer);
+                break;
+            case 'MYSQL':
+                query = queryDeviceModelsByManifacturerMySQL(manifacturer);
+                break;
+            case 'MYSQL2':
+                query = queryDeviceModelsByManifacturerSQLite(manifacturer);
+                break;
+        }
+    }
+    return query;
+}
+
+
+//end of Manage models
 
 // Device select
 function getDevicesSelectSQLite(search_type, inv_code, dev_type, marca, is_PNRR, dev_status, dev_gestione, id_dev_exclude) {
@@ -11009,6 +11047,7 @@ module.exports = {
     queryDeviceTypes,
     queryDeviceManifactures,
     queryDeviceModels,
+    queryDeviceModelsByManifacturer,
     getDevicesSelectByRelated,
     getDevicesSelect,
     getDevicesSelectBySite,

package/package.json

@@ -4,7 +4,7 @@
     ".": "./lib/modules.js",
     "./dbconn": "./lib/dbconn.js"
   },
-  "version": "2.0.74",
+  "version": "2.0.76",
   "description": "Funzioni per ALSManager",
   "license": "ISC",
   "author": "Luca Cattani",