alsmanager_lib 3.0.180 → 3.0.182

package/lib/modules.js

@@ -2143,7 +2143,56 @@ function createPCPropertiesMySQLObj(id_device, dev_prop) {
 
 function insertPCPropertiesSQLite(id_device, dev_prop) {
     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 + ")";
+    query += "(" + id_device + ", "; 
+    if (dev_prop.pc_name)
+        query += "'" + dev_prop.pc_name + "', '";
+    else
+        query += ", ";
+    if (dev_prop.os_platform)
+        query += "'" + dev_prop.os_platform + "', ";
+    else
+        query += ", ";
+    if (dev_prop.os)
+        query += "'" + dev_prop.os + "', ";
+    else
+        query += ", ";
+    if (dev_prop.os_version)
+        query += "'" + dev_prop.os_version + "', ";
+    else
+        query += ", ";
+    if (dev_prop.os_arch)
+        query += "'" + dev_prop.os_arch + "', ";
+    else
+        query += ", ";
+    if (dev_prop.cpu)
+        query += "'" + dev_prop.cpu + "', ";
+    else
+        query += ", ";
+    if (dev_prop.cpu_arch)
+        query += "'" + dev_prop.cpu_arch + "', ";
+    else
+        query += ", ";
+    if (dev_prop.ram_size)
+        query += dev_prop.ram_size + ", ";
+    else
+        query += "0, ";
+    if (dev_prop.video_card)
+        query += dev_prop.video_card + ", ";
+    else
+        query += "0, ";
+    if (dev_prop.smartboard_ready)
+        query += dev_prop.smartboard_ready + ", ";
+    else
+        query += "0, ";
+    if (dev_prop.note)
+        query += "'" + dev_prop.note + "', ";
+    else
+        query += ", ";
+    if (dev_prop.da_properties)
+        query += dev_prop.da_properties;
+    else
+        query += "0";
+    query += ")";
     return query; 
 }
 function insertPCPropertiesMySQL() {
@@ -2171,18 +2220,30 @@ function insertPCProperties(db_used, id_device, dev_prop) {
 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 + "', ";
-    query += "CPU = '" + dev_prop.cpu + "', ";
-    query += "CPU_arch = '" + dev_prop.cpu_arch + "', ";
-    query += "RAM_GB = " + dev_prop.ram_size + ", ";
-    query += "video_card = " + dev_prop.video_card + ", ";
-    query += "smartboard_ready = " + dev_prop.smartboard_ready + ", ";
-    query += "note = '" + dev_prop.note + "', ";
-    query += "da_properties = " + dev_prop.da_properties + " ";
+    if (dev_prop.pc_name)
+        query += "pc_name = '" + dev_prop.pc_name + "', ";
+    if (dev_prop.os_platform)
+        query += "os_platform = '" + dev_prop.os_platform + "', ";
+    if (dev_prop.os)
+        query += "OS = '" + dev_prop.os + "', ";
+    if (dev_prop.os_version)
+        query += "OS_version = '" + dev_prop.os_version + "', ";
+    if (dev_prop.os_arch)
+        query += "OS_arch = '" + dev_prop.os_arch + "', ";
+    if (dev_prop.cpu)
+        query += "CPU = '" + dev_prop.cpu + "', ";
+    if (dev_prop.cpu_arch)
+        query += "CPU_arch = '" + dev_prop.cpu_arch + "', ";
+    if (dev_prop.ram_size)
+        query += "RAM_GB = " + dev_prop.ram_size + ", ";
+    if (dev_prop.video_card)
+        query += "video_card = " + dev_prop.video_card + ", ";
+    if (dev_prop.smartboard_ready)
+        query += "smartboard_ready = " + dev_prop.smartboard_ready + ", ";
+    if (dev_prop.note)
+        query += "note = '" + dev_prop.note + "', ";
+    if (dev_prop.da_properties)
+        query += "da_properties = " + dev_prop.da_properties + " ";
     query += "where id_device = " + id_device + " ";
     query += "and id = " + dev_prop.id_prop;
     return query; 
@@ -8325,6 +8386,68 @@ function removeIntervento(db_used,id_intervento) {
 
 
 // Device intervento
+function selectDevicesInterventoByIdInterventoSQLite(id_intervento) {
+    var query = "select id, id_device, id_intervento, date_start, date_end, note_intervento, tempo_stimato_min, tempo_effettivo_min from device_interventi ";
+    query += "where id_intervento = " + id_intervento;
+    return query;
+}
+
+function selectDevicesInterventoByIdInterventoMySQL(id_intervento) {
+    var query = "select id, id_device, id_intervento, date_start, date_end, note_intervento, tempo_stimato_min, tempo_effettivo_min from device_interventi ";
+    query += "where id_intervento = :id_intervento";
+    return query;
+}
+
+function selectDevicesInterventoByIdIntervento(db_used, id_intervento) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = selectDevicesInterventoByIdInterventoSQLite(id_intervento);
+                break;
+            case 'MYSQL':
+                query = selectDevicesInterventoByIdInterventoMySQL();
+                break;
+            case 'MYSQL2':
+                query = selectDevicesInterventoByIdInterventoSQLite(id_intervento);
+                break;
+        }
+    }
+    return query;
+}
+
+
+
+function selectDevicesInterventoByIdSQLite(id_dev_intervento) {
+    var query = "select id, id_device, id_intervento, date_start, date_end, note_intervento, tempo_stimato_min, tempo_effettivo_min from device_interventi ";
+    query += "where id = " + id_dev_intervento;
+    return query;
+}
+
+function selectDevicesInterventoByIdMySQL(id_dev_intervento) {
+    var query = "select id, id_device, id_intervento, date_start, date_end, note_intervento, tempo_stimato_min, tempo_effettivo_min from device_interventi ";
+    query += "where id = :id_dev_intervento";
+    return query;
+}
+
+function selectDevicesInterventoById(db_used, id_dev_intervento) {
+    var query = "";
+    if (db_used) {
+        switch (db_used) {
+            case 'SQLITE':
+                query = selectDevicesInterventoByIdSQLite(id_dev_intervento);
+                break;
+            case 'MYSQL':
+                query = selectDevicesInterventoByIdMySQL();
+                break;
+            case 'MYSQL2':
+                query = selectDevicesInterventoByIdSQLite(id_dev_intervento);
+                break;
+        }
+    }
+    return query;
+}
+
 function insertDeviceInterventoSQLite(id_intervento, id_device, dt_inizio, dt_fine, note, t_stima_min, t_effettivo_min) {
 /*CREATE TABLE "device_interventi" (
 	"id"	INTEGER,
@@ -16352,6 +16475,8 @@ module.exports = {
     insertDeviceIntervento,
     updateDeviceIntervento,
     removeDeviceIntervento,
+    selectDevicesInterventoByIdIntervento,
+    selectDevicesInterventoById,
     //
     getConnectionTypes,
     getConnectionProtocols,

package/package.json

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