alsmanager_lib 1.0.87 → 1.0.89

package/lib/modules.js

@@ -1108,8 +1108,13 @@ function getDeviceConfigurationById(db_used, id_conf) {
 }
 
 function insertDeviceConfigurationSQLite(id_device, data, note) {
+    var data_str = "";
+    if (data) {
+        var d = new Date(data);
+        data_str = d.getFullYear() + "-" + String((d.getMonth() + 1)).padStart(2, '0') + "-" + String(d.getDate()).padStart(2, '0');
+    }
     var query = "insert into device_changes (id_device, date_conf, note) values (";
-    query += id_device + ", '" + data + "', '" + note + "')";
+    query += id_device + ", '" + data_str + "', '" + note + "')";
     return query;
 }
 function insertDeviceConfigurationMySQL(id_device, data, note) {
@@ -1133,8 +1138,13 @@ function insertDeviceConfiguration(db_used, id_device, data, note) {
 }
 
 function updateDeviceConfigurationSQLite(id_conf, data, note) {
+    var data_str = "";
+    if (data) {
+        var d = new Date(data);
+        data_str = d.getFullYear() + "-" + String((d.getMonth() + 1)).padStart(2, '0') + "-" + String(d.getDate()).padStart(2, '0');
+    }        
     var query = "update device_changes set ";
-    query += "date_conf = '" + data +"',";
+    query += "date_conf = '" + data_str +"',";
     query += "note = '" + note + "' ";
     query += "where id = " + id_conf;
     return query;
@@ -1642,6 +1652,53 @@ function updatePCProperties(db_used, id_device, dev_prop) {
     }
     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,";
+    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;
+    if (id_conf > 0) { 
+        query += "and d.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)"
+    }
+    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,";
+    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 ";
+    if (id_conf > 0) { 
+        query += "and d.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)"
+    }
+    return query;
+}
+function getPCPropertiesByConfig(db_used, id_device, id_conf) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = getPCPropertiesByConfigSQLite(id_device, id_conf);
+                break;
+            case 'MYSQL':
+                query = getPCPropertiesByConfigMySQL(id_device, id_conf);
+                break;
+        }
+    }
+    return query;
+}
 //End Manage PC Properties
 // Manage Display Part Properties
 function getDisplayPartPropertiesSQLite(id_device) {
@@ -8814,6 +8871,7 @@ module.exports = {
     createPCPropertiesMySQLObj,
     insertPCProperties,
     updatePCProperties,
+    getPCPropertiesByConfig,
     existsDisplayProperties,
     getDisplayProperties,
     createDisplayPropertiesMySQLObj,

package/package.json

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