alsmanager_lib 3.0.178 → 3.0.180

package/lib/modules.js

@@ -4111,7 +4111,16 @@ function queryDeviceByIdSQLite(id_device) {
     query += "d.manifacturer as Marca, d.model as Modello, ";
     query += "d.inv_ict3_number as Inventario, d.serial_no, ";
     query += "d.inv_tn_number, d.inv_pnrr_number, d.inv_tndigit_number, "; 
-    query += "d.note, d.num_objects, d.no_inventario, d.peso_g, d.part_of, d.is_unused from devices d ";
+    query += "d.note, d.num_objects, d.no_inventario, d.peso_g, d.part_of, d.is_unused, ";
+    query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id,'(ID)') ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
+    query += "when d.inv_pnrr_number != '' and d.inv_pnrr_number is not null then d.inv_pnrr_number ";
+    query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number,'(TN)') ";
+    query += "when d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)') ";
+    query += "when d.serial_no != '' and d.serial_no is not null then concat(d.serial_no,'(S/N)') ";
+    query += "end as Codice ";    
+    query += "from devices d ";
     query += "where d.id = " + id_device;
     return query;
 }
@@ -4120,7 +4129,16 @@ function queryDeviceByIdMySQL(id_device) {
     query += "d.manifacturer as Marca, d.model as Modello, ";
     query += "d.inv_ict3_number as Inventario, d.serial_no, ";
     query += "d.inv_tn_number, d.inv_pnrr_number, d.inv_tndigit_number, ";
-    query += "d.note, d.num_objects, d.no_inventario, d.peso_g, d.part_of, d.is_unused from devices d ";
+    query += "d.note, d.num_objects, d.no_inventario, d.peso_g, d.part_of, d.is_unused, ";
+    query += "case ";
+    query += "when d.no_inventario is not null and d.no_inventario > 0 then concat(d.id,'(ID)') ";
+    query += "when d.inv_ict3_number != '' and d.inv_ict3_number is not null then d.inv_ict3_number ";
+    query += "when d.inv_pnrr_number != '' and d.inv_pnrr_number is not null then d.inv_pnrr_number ";
+    query += "when d.inv_tn_number != '' and d.inv_tn_number is not null then concat(d.inv_tn_number,'(TN)') ";
+    query += "when d.inv_tndigit_number != '' and d.inv_tndigit_number is not null then concat(d.inv_tndigit_number,'(TNDigit)') ";
+    query += "when d.serial_no != '' and d.serial_no is not null then concat(d.serial_no,'(S/N)') ";
+    query += "end as Codice ";    
+    query += "from devices d ";
     query += "where d.id = :id_device";
     return query;
 }
@@ -8307,60 +8325,84 @@ function removeIntervento(db_used,id_intervento) {
 
 
 // Device intervento
-function insertDeviceInterventoSQLite(id_intervento, id_device, note) {
-    var query = "insert into device_interventi (id_intervento, id_device, note) ";
-    query += "values (" + id_intervento + ", " + id_device + ", '" + note + "')";
+function insertDeviceInterventoSQLite(id_intervento, id_device, dt_inizio, dt_fine, note, t_stima_min, t_effettivo_min) {
+/*CREATE TABLE "device_interventi" (
+	"id"	INTEGER,
+	"id_device"	INTEGER,
+	"id_intervento"	INTEGER,
+	"date_start"	TEXT,
+	"date_end"	TEXT,
+	"note_intervento"	TEXT,
+	"tempo_stimato"	INTEGER,
+	"tempo_effettivo"	INTEGER,
+	PRIMARY KEY("id" AUTOINCREMENT)
+)
+*/
+    var dt_inizio_str = convertDateToStringDB(dt_inizio);
+    var dt_fine_str = convertDateToStringDB(dt_fine);
+    
+    var query = "insert into device_interventi (id_device, id_intervento, date_start, date_end, note_intervento, tempo_stimato_min, tempo_effettivo_min) ";
+    query += "values (" + id_device + ", " + id_intervento + ", '" + dt_inizio_str + "', '" + dt_fine_str + "', '" + note + "', " + t_stima_min + ", " + t_effettivo_min + ")";
     return query;
 }
-function insertDeviceInterventoMySQL(id_intervento, id_device, note) {
-    var query = "insert into device_interventi (id_intervento, id_device, note) ";
-    query += "values (:id_intervento, :id_device, :note)";
+function insertDeviceInterventoMySQL() {
+    var query = "insert into device_interventi (id_device, id_intervento, date_start, date_end, note_intervento, tempo_stimato_min, tempo_effettivo_min) ";
+    query += "values (:id_device, :id_intervento, :dt_inizio, :dt_fine, :note, :t_stima_min, :t_effettivo_min)";
     return query;
 }
-function insertDeviceIntervento(db_used,id_intervento, id_device, note) {
+function insertDeviceIntervento(db_used, id_intervento, id_device, dt_inizio, dt_fine, note, t_stima_min, t_effettivo_min) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = insertDeviceInterventoSQLite(id_intervento, id_device, note);
+                query = insertDeviceInterventoSQLite(id_intervento, id_device, dt_inizio, dt_fine, note, t_stima_min, t_effettivo_min);
                 break;
             case 'MYSQL':
-                query = insertDeviceInterventoMySQL(id_intervento, id_device, note);
+                query = insertDeviceInterventoMySQL();
                 break;
             case 'MYSQL2':
-                query = insertDeviceInterventoSQLite(id_intervento, id_device, note);
+                query = insertDeviceInterventoSQLite(id_intervento, id_device, dt_inizio, dt_fine, note, t_stima_min, t_effettivo_min);
                 break;
         }
     }
     return query;
 }
 // Update
-function updateDeviceInterventoSQLite(id_dev_interv, id_device, note) {
+function updateDeviceInterventoSQLite(id_dev_interv, dt_inizio, dt_fine, note, t_stima_min, t_effettivo_min) {
+    var dt_inizio_str = convertDateToStringDB(dt_inizio);
+    var dt_fine_str = convertDateToStringDB(dt_fine);
+
     var query = "update device_interventi set ";
-    query += "id_device = " + id_device + ", ";
-    query += "note = " + note + " ";
+    query += "date_start = '" + dt_inizio_str + "', ";
+    query += "date_end = '" + dt_fine_str + "', ";
+    query += "note = '" + note + "', ";
+    query += "tempo_stimato_min = " + t_stima_min + ", ";
+    query += "tempo_effettivo_min = " + t_effettivo_min + " ";
     query += "where id = " + id_dev_interv;
     return query;
 }
-function updateDeviceInterventoMySQL(id_dev_interv, id_device, note) {
+function updateDeviceInterventoMySQL() {
     var query = "update device_interventi set ";
-    query += "id_device = :id_device ";
-    query += "note = :note ";
+    query += "date_start = :dt_inizio, ";
+    query += "date_end = :dt_fine, ";
+    query += "note = :note, ";
+    query += "tempo_stimato_min = :t_stima_min, ";
+    query += "tempo_effettivo_min = :t_effettivo_min ";
     query += "where id = :id_dev_interv";
     return query;
 }
-function updateDeviceIntervento(db_used, id_dev_interv, id_device, note) {
+function updateDeviceIntervento(db_used, id_dev_interv, dt_inizio, dt_fine, note, t_stima_min, t_effettivo_min) {
     var query = "";
     if (db_used) {
         switch (db_used) {
             case 'SQLITE':
-                query = updateDeviceInterventoSQLite(id_dev_interv, id_device, note);
+                query = updateDeviceInterventoSQLite(id_dev_interv, dt_inizio, dt_fine, note, t_stima_min, t_effettivo_min);
                 break;
             case 'MYSQL':
-                query = updateDeviceInterventoMySQL(id_dev_interv, id_device, note);
+                query = updateDeviceInterventoMySQL();
                 break;
             case 'MYSQL2':
-                query = updateDeviceInterventoSQLite(id_dev_interv, id_device, note);
+                query = updateDeviceInterventoSQLite(id_dev_interv, dt_inizio, dt_fine, note, t_stima_min, t_effettivo_min);
                 break;
         }
     }
@@ -8372,7 +8414,7 @@ function removeDeviceInterventoSQLite(id_dev_interv) {
     query += "where id = " + id_dev_interv;
     return query;
 }
-function removeDeviceInterventoMySQL(id_intervento, id_device, note) {
+function removeDeviceInterventoMySQL() {
     var query = "delete from device_interventi ";
     query += "where id = :id_dev_interv";
     return query;
@@ -8385,7 +8427,7 @@ function removeDeviceIntervento(db_used, id_dev_interv) {
                 query = removeDeviceInterventoSQLite(id_dev_interv);
                 break;
             case 'MYSQL':
-                query = removeDeviceInterventoMySQL(id_dev_interv);
+                query = removeDeviceInterventoMySQL();
                 break;
             case 'MYSQL2':
                 query = removeDeviceInterventoSQLite(id_dev_interv);

package/package.json

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