alsmanager_lib 1.0.91 → 1.0.93

package/lib/modules.js

@@ -1323,6 +1323,41 @@ function getLastPartInserted(db_used, id_device, id_conf, part_type) {
     }
     return query;    
 }
+
+function existPartInConfigSQLite(id_device, id_conf, id_part, part_type) {
+    var query = "select count(*) as num from change_config ";
+    query += "where id_device = " + id_device + " ";
+    query += "and part_type = '" + part_type + "' ";
+    query += "and id_conf = " + id_conf + " "; 
+    query += "and id_part = " + id_part;
+    return query;
+}
+    
+function existPartInConfigMySQL(id_device, id_conf, id_part, part_type) {
+    var query = "select count(*) as num from change_config ";
+    query += "where id_device = :id_device ";
+    query += "and part_type = :part_type ";
+    query += "and id_conf = :id_conf "; 
+    query += "and id_part = :id_part";
+    return query; 
+}
+
+function existPartInConfig(db_used, id_device, id_conf, id_part, part_type) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = existPartInConfigSQLite(id_device, id_conf, id_part, part_type);
+                break;
+            case 'MYSQL':
+                query = existPartInConfigMySQL(id_device, id_conf, id_part, part_type);
+                break;
+        }
+    }
+    return query;       
+}
+
+
 //End Device configurations
 // Disk usage
 function getDiskUsagesByIdStorageSQLite(id_storage) {
@@ -1540,23 +1575,23 @@ function existsPCProperties(db_used, id_device) {
     return query;
 }
 function getPCPropertiesSQLite(id_device) {
-    var query = "select d.id as Id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello,";
+    var query = "select dp.id as id_prop, d.id as Id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello,";
     query += "dp.pc_name as Name, dp.CPU as CPU, dp.CPU_arch as CPUArch, dp.OS_arch as OSArch, dp.OS as OS, dp.OS_version as OSVersion, ";
     query += "dp.smartboard_ready as SB_Ready, dp.video_card as VideoCardAdded, ";
     query += "dp.RAM_GB as RAM, dp.note, dp.da_properties ";
-    query += "from devices d ";
-    query += "left join device_pc dp on d.id = dp.id_device ";
-    query += "where d.id = " + id_device;
+    query += "from device_pc dp ";
+    query += "left join devices d on dp.id_device = d.id ";
+    query += "where dp.id = " + id_device;
 
     return query;
 }
 function getPCPropertiesMySQL(id_device) {
-    var query = "select d.id as Id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello,";
+    var query = "select dp.id as id_prop, d.id as Id, d.type as Tipo, d.manifacturer as Marca, d.model as Modello,";
     query += "dp.pc_name as Name, dp.CPU as CPU, dp.CPU_arch as CPUArch, dp.OS_arch as OSArch, dp.OS as OS, dp.OS_version as OSVersion, ";
     query += "dp.smartboard_ready as SB_Ready, dp.video_card as VideoCardAdded, ";
     query += "dp.RAM_GB as RAM, dp.note, dp.da_properties ";
-    query += "from devices d ";
-    query += "left join device_pc dp on d.id = dp.id_device ";
+    query += "from device_pc dp ";
+    query += "left join devices d on dp.id_device = d.id ";
     query += "where d.id = :id_device";
     return query;
 }
@@ -1577,7 +1612,7 @@ function getPCProperties(db_used, id_device) {
 }
 function createPCPropertiesMySQLObj(id_device, dev_prop) {
     var obj = {};
-    obj.id = dev_prop.id;
+    obj.id = dev_prop.id_prop;
     obj.id_device = id_device;
     obj.pc_name = dev_prop.pc_name;
     obj.os = dev_prop.os;
@@ -1697,9 +1732,9 @@ function getPCPropertiesByConfigSQLite(id_device, id_conf) {
     query += "dp.pc_name as Name, dp.CPU as CPU, dp.CPU_arch as CPUArch, dp.OS_arch as OSArch, dp.OS as OS, dp.OS_version as OSVersion, ";
     query += "dp.smartboard_ready as SB_Ready, dp.video_card as VideoCardAdded, ";
     query += "dp.RAM_GB as RAM, dp.note, dp.da_properties ";
-    query += "from devices d ";
-    query += "left join device_pc dp on d.id = dp.id_device ";
-    query += "where d.id = " + id_device + " ";
+    query += "from device_pc dp ";
+    query += "left join devices d on dp.id_device = d.id ";
+    query += "where dp.id_device = " + id_device + " ";
     if (id_conf > 0) { 
         query += "and dp.id in (select id_part from change_config where id_conf = " + id_conf + ")";
     }
@@ -1713,9 +1748,9 @@ function getPCPropertiesByConfigMySQL(id_device, id_conf) {
     query += "dp.pc_name as Name, dp.CPU as CPU, dp.CPU_arch as CPUArch, dp.OS_arch as OSArch, dp.OS as OS, dp.OS_version as OSVersion, ";
     query += "dp.smartboard_ready as SB_Ready, dp.video_card as VideoCardAdded, ";
     query += "dp.RAM_GB as RAM, dp.note, dp.da_properties ";
-    query += "from devices d ";
-    query += "left join device_pc dp on d.id = dp.id_device ";
-    query += "where d.id = :id_device ";
+    query += "from device_pc dp ";
+    query += "left join devices d on dp.id_device = d.id ";
+    query += "where dp.id_device = :id_device ";
     if (id_conf > 0) { 
         query += "and dp.id in (select id_part from change_config where id_conf = :id_conf)";
     }
@@ -8970,6 +9005,7 @@ module.exports = {
     updatePartChanged,    
     removePartChanged,
     getLastPartInserted,
+    existPartInConfig,
     //
     selectBeneDaInventario,
     getDevicesSelectForInventarioRaw,

package/package.json

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