alsmanager_lib 1.0.90 → 1.0.91

package/lib/modules.js

@@ -1577,6 +1577,7 @@ function getPCProperties(db_used, id_device) {
 }
 function createPCPropertiesMySQLObj(id_device, dev_prop) {
     var obj = {};
+    obj.id = dev_prop.id;
     obj.id_device = id_device;
     obj.pc_name = dev_prop.pc_name;
     obj.os = dev_prop.os;
@@ -1631,7 +1632,8 @@ function updatePCPropertiesSQLite(id_device, dev_prop) {
     query += "smartboard_ready = " + dev_prop.smartboard_ready + ", ";
     query += "note = '" + dev_prop.note + "', ";
     query += "da_properties = " + dev_prop.da_properties + " ";
-    query += "where id_device = " + id_device  
+    query += "where id_device = " + id_device + " ";
+    query += "and id = " + dev_prop.id;
     return query; 
 }
 
@@ -1652,9 +1654,46 @@ function updatePCProperties(db_used, id_device, dev_prop) {
     }
     return query;
 }
+function getLastPCPropertiesInsertedSQLite(id_device) {
+    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 device_pc dp ";
+    query += "left join devices d on dp.id_device = d.id ";
+    query += "where dp.id_device = " + id_device + " ";
+    query += "order by id desc LIMIT 1";
+    return query;
+}
+function getLastPCPropertiesInsertedMySQL(id_device) {
+    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 device_pc dp ";
+    query += "left join devices d on dp.id_device = d.id ";
+    query += "where dp.id_device = :id_device ";
+    query += "order by id desc LIMIT 1";
+    return query;
+}
+function getLastPCPropertiesInserted(db_used, id_device) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getLastPCPropertiesInsertedSQLite(id_device);
+                break;
+            case 'MYSQL':
+                query = getLastPCPropertiesInsertedMySQL(id_device);
+                break;
+        }
+    }
+    return query;    
+}
+
 //
 function getPCPropertiesByConfigSQLite(id_device, id_conf) {
-    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 ";
@@ -1662,15 +1701,15 @@ function getPCPropertiesByConfigSQLite(id_device, id_conf) {
     query += "left join device_pc dp on d.id = dp.id_device ";
     query += "where d.id = " + id_device + " ";
     if (id_conf > 0) { 
-        query += "and d.id in (select id_part from change_config where id_conf = " + id_conf + ")";
+        query += "and dp.id in (select id_part from change_config where id_conf = " + id_conf + ")";
     }
     else {
-        query += "and d.id in (select id_part from change_config where id_device = " + id_device + " and part_type = 'PC' order by id desc LIMIT 1)"
+        query += "and dp.id in (select id_part from change_config where id_device = " + id_device + " and part_type = 'PC' order by id desc LIMIT 1)"
     }
     return query;
 }
 function getPCPropertiesByConfigMySQL(id_device, id_conf) {
-    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 ";
@@ -1678,10 +1717,10 @@ function getPCPropertiesByConfigMySQL(id_device, id_conf) {
     query += "left join device_pc dp on d.id = dp.id_device ";
     query += "where d.id = :id_device ";
     if (id_conf > 0) { 
-        query += "and d.id in (select id_part from change_config where id_conf = :id_conf)";
+        query += "and dp.id in (select id_part from change_config where id_conf = :id_conf)";
     }
     else {
-        query += "and d.id in (select id_part from change_config where id_device = :id_device and part_type = 'PC' order by id desc LIMIT 1)"
+        query += "and dp.id in (select id_part from change_config where id_device = :id_device and part_type = 'PC' order by id desc LIMIT 1)"
     }
     return query;
 }
@@ -8871,6 +8910,7 @@ module.exports = {
     createPCPropertiesMySQLObj,
     insertPCProperties,
     updatePCProperties,
+    getLastPCPropertiesInserted,
     getPCPropertiesByConfig,
     existsDisplayProperties,
     getDisplayProperties,

package/package.json

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