alsmanager_lib 3.0.124 → 3.0.125

package/lib/modules.js

@@ -2084,7 +2084,7 @@ function existsPCProperties(db_used, id_device) {
 }
 function getPCPropertiesSQLite(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.pc_name as Name, dp.CPU as CPU, dp.CPU_arch as CPUArch, dp.OS_arch as OSArch, dp.os_platform as Platform, 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 ";
@@ -2095,7 +2095,7 @@ function getPCPropertiesSQLite(id_device) {
 }
 function getPCPropertiesMySQL(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.pc_name as Name, dp.CPU as CPU, dp.CPU_arch as CPUArch, dp.OS_arch as OSArch, dp.os_platform as Platform, 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 ";
@@ -2127,6 +2127,7 @@ function createPCPropertiesMySQLObj(id_device, dev_prop) {
     obj.id_device = id_device;
     obj.pc_name = dev_prop.pc_name;
     obj.os = dev_prop.os;
+    obj.os_platform = dev_prop.os_platform;
     obj.os_version = dev_prop.os_version;
     obj.os_arch = dev_prop.os_arch;
     obj.cpu = dev_prop.cpu;
@@ -2141,13 +2142,13 @@ function createPCPropertiesMySQLObj(id_device, dev_prop) {
 
 
 function insertPCPropertiesSQLite(id_device, dev_prop) {
-    var query = "insert into device_pc (id_device, pc_name, OS, OS_version, OS_arch, CPU, CPU_arch, RAM_GB, video_card, smartboard_ready, note, da_properties) values ";
-    query += "(" + id_device + ", '" + dev_prop.pc_name + "', '" + dev_prop.os + "', '" + dev_prop.os_version + "', '" + dev_prop.os_arch + "', '" + dev_prop.cpu + "', '" + dev_prop.cpu_arch + "', " + dev_prop.ram_size + ", " + dev_prop.video_card + ", " + dev_prop.smartboard_ready + ", '" + dev_prop.note + "', " + dev_prop.da_properties + ")";
+    var query = "insert into device_pc (id_device, pc_name, os_platform, OS, OS_version, OS_arch, CPU, CPU_arch, RAM_GB, video_card, smartboard_ready, note, da_properties) values ";
+    query += "(" + id_device + ", '" + dev_prop.pc_name + "', '" + dev_prop.os_platform + "','" + dev_prop.os + "', '" + dev_prop.os_version + "', '" + dev_prop.os_arch + "', '" + dev_prop.cpu + "', '" + dev_prop.cpu_arch + "', " + dev_prop.ram_size + ", " + dev_prop.video_card + ", " + dev_prop.smartboard_ready + ", '" + dev_prop.note + "', " + dev_prop.da_properties + ")";
     return query; 
 }
 function insertPCPropertiesMySQL() {
-    var query = "insert into device_pc (id_device, pc_name, OS, OS_version, OS_arch, CPU, CPU_arch, RAM_GB, video_card, smartboard_ready, note, da_properties) values ";
-    query += "(:id_device, :pc_name, :os, :os_version, :os_arch, :cpu, :cpu_arch, :ram_size, :video_card, :smartboard_ready, :note, :da_properties)";
+    var query = "insert into device_pc (id_device, pc_name, os_platform, OS, OS_version, OS_arch, CPU, CPU_arch, RAM_GB, video_card, smartboard_ready, note, da_properties) values ";
+    query += "(:id_device, :pc_name, :os_platform, :os, :os_version, :os_arch, :cpu, :cpu_arch, :ram_size, :video_card, :smartboard_ready, :note, :da_properties)";
 }
 function insertPCProperties(db_used, id_device, dev_prop) {
     var query = "";
@@ -2171,6 +2172,7 @@ function updatePCPropertiesSQLite(id_device, dev_prop) {
     var query = "update device_pc set ";
     query += "id_device = " + id_device + ", ";
     query += "pc_name = '" + dev_prop.pc_name + "', ";
+    query += "os_platform = '" + dev_prop.os_platform + "', ";
     query += "OS = '" + dev_prop.os + "', ";
     query += "OS_version = '" + dev_prop.os_version + "', ";
     query += "OS_arch = '" + dev_prop.os_arch + "', ";
@@ -2190,6 +2192,7 @@ function updatePCPropertiesMySQL() {
     var query = "update device_pc set ";
     query += "id_device = :id_device, ";
     query += "pc_name = :pc_name, ";
+    query += "os_platform = :os_platform, ";
     query += "OS = :os, ";
     query += "OS_version = :os_version, ";
     query += "OS_arch = :os_arch, ";
@@ -2223,7 +2226,7 @@ function updatePCProperties(db_used, id_device, dev_prop) {
 }
 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.pc_name as Name, dp.CPU as CPU, dp.CPU_arch as CPUArch, dp.OS_arch as OSArch, dp.os_platform as Platform, 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 ";
@@ -2234,7 +2237,7 @@ function getLastPCPropertiesInsertedSQLite(id_device) {
 }
 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.pc_name as Name, dp.CPU as CPU, dp.CPU_arch as CPUArch, dp.OS_arch as OSArch, dp.os_platform as Platform, 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 ";
@@ -2264,7 +2267,7 @@ function getLastPCPropertiesInserted(db_used, id_device) {
 //
 function getPCPropertiesByConfigSQLite(id_device, id_conf) {
     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.pc_name as Name, dp.CPU as CPU, dp.CPU_arch as CPUArch, dp.OS_arch as OSArch, dp.os_platform as Platform, 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 ";
@@ -2280,7 +2283,7 @@ function getPCPropertiesByConfigSQLite(id_device, id_conf) {
 }
 function getPCPropertiesByConfigMySQL(id_device, id_conf) {
     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.pc_name as Name, dp.CPU as CPU, dp.CPU_arch as CPUArch, dp.OS_arch as OSArch, dp.os_platform as Platform, 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 ";
@@ -3110,6 +3113,15 @@ function getDevicesSelect(db_used, search_type, inv_code, dev_type, marca, dev_m
     }
     return query;
 }
+
+function buildDevicesQuery(queryList) {
+    var whereClause = "";
+    queryList.forEach(element => {
+        
+    });
+    return whereClause;
+}
+
 // End Device select
 // Select by idDoc
 function getDevicesByIdDocSQLite(id_doc) {
@@ -3844,6 +3856,7 @@ function insertDeviceSQLite(dev) {
         let modello = "";
         let serial_no = "";
         let note = "";
+        let peso = 0;
 
         if (dev.inventario)
             inventario = dev.inventario;
@@ -3863,8 +3876,10 @@ function insertDeviceSQLite(dev) {
             serial_no = dev.serial_no;
         if (dev.note)
             note = dev.note;
+        if (dev.peso_g)
+            peso = dev.peso_g;
 
-        query = "insert into devices (inv_ict3_number, inv_tn_number, inv_pnrr_number, inv_tndigit_number, type, manifacturer, model, serial_no, note, num_objects, no_inventario) ";
+        query = "insert into devices (inv_ict3_number, inv_tn_number, inv_pnrr_number, inv_tndigit_number, type, manifacturer, model, serial_no, note, num_objects, no_inventario, peso_g) ";
         query += "values (";
         query += "'" + String(inventario).trim() + "',";
         query += "'" + String(inv_comune).trim() + "',";
@@ -3876,7 +3891,8 @@ function insertDeviceSQLite(dev) {
         query += "'" + String(serial_no).trim() + "',";
         query += "'" + String(note).trim() + "',";
         query += dev.num_objects + ", ";
-        query += dev.no_inv;
+        query += dev.no_inv + ", ";
+        query += peso;
         query += ")";
     }
     return query;
@@ -3893,8 +3909,9 @@ function insertDeviceMySQL() {
     query += ":modello, ";
     query += ":serial_no, ";
     query += ":note, ";
-    query += ":num_objects";
-    query += ":no_inv";
+    query += ":num_objects, ";
+    query += ":no_inv, ";
+    query += ":peso_g ";
     query += ")";
     return query;
 }
@@ -3931,6 +3948,7 @@ function updateDeviceSQLite(deviceObj) {
         let modello = "";
         let serial_no = "";
         let note = "";
+        let peso = 0;
 
         if (dev.inventario)
             inventario = dev.inventario;
@@ -3951,6 +3969,8 @@ function updateDeviceSQLite(deviceObj) {
         if (dev.note) {
             note = dev.note;
         }
+        if (dev.peso_g)
+            peso = dev.peso_g;
         query = "update devices set ";
         query += "inv_ict3_number = '" + inventario.trim() + "',";
         query += "inv_tn_number = '" + inv_comune.trim() + "',";
@@ -3962,7 +3982,8 @@ function updateDeviceSQLite(deviceObj) {
         query += "serial_no = '" + serial_no.trim() + "',";
         query += "note = '" + note.trim() + "',";
         query += "num_objects = " + dev.num_objects + ", ";
-        query += "no_inventario = " + dev.no_inv + " ";
+        query += "no_inventario = " + dev.no_inv + ", ";
+        query += "peso_g = " + peso + " ";
         query += " where id = " + dev.id;
     }
     return query;
@@ -3980,7 +4001,8 @@ function updateDeviceMySQL() {
     query += "serial_no = :serial_no, ";
     query += "note = :note, ";
     query += "num_objects = :num_objects, ";
-    query += "no_inventario = :no_inv ";
+    query += "no_inventario = :no_inv, ";
+    query += "peso_g = :peso_g ";
     query += " where id = :id_device";
     return query;
 }
@@ -4038,6 +4060,10 @@ function getDeviceMySQLPayload(dev) {
         if (dev.note) {
             retValue.note = dev.note;
         }
+        if (dev.peso_g) {
+            retValue.peso_g = dev.peso_g;
+        }
+        
         retValue.num_objects = dev.num_objects;
         retValue.no_inv = dev.no_inv;
         payloadObj = {
@@ -4052,6 +4078,7 @@ function getDeviceMySQLPayload(dev) {
             "note": retValue.note.trim(),
             "num_objects": retValue.num_objects,
             "no_inv": retValue.no_inv,
+            "peso_g": retValue.peso_g,
             "id_device": dev.id
         };
     }
@@ -13297,6 +13324,25 @@ function createConsegnaBckDoc(consegna_obj, scuola_obj, listaDispositivi) {
     return dd;
 }
 
+
+function selectUserInfo(os_platform, user_type) {
+    /*
+    CREATE TABLE "os_users" (
+	"id"	INTEGER NOT NULL UNIQUE,
+	"name"	TEXT,
+	"password"	TEXT,
+	"type"	TEXT,
+	"os_platform"	TEXT,
+	PRIMARY KEY("id" AUTOINCREMENT)
+    )
+    */
+    var query = "select id, name, password, type, os_platform from os_users ";
+    query += "where os_platform = '" + os_platform + "' ";
+    query += "and type = '" + user_type + "' ";
+    return query;
+}
+
+
 function createIstruzioniStandard(user, pwd, email, id_consegna, data_cons) {
     var dd = {
         content: [
@@ -15304,6 +15350,7 @@ module.exports = {
     getPackageJsVersion,
     createConsegnaDoc,
     createConsegnaBckDoc,
+    selectUserInfo,
     createIstruzioniStandard,
     exportDBSQL,
     //

package/package.json

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