alsmanager_lib 3.0.129 → 3.0.131

package/lib/modules.js

@@ -2818,7 +2818,7 @@ function queryDeviceModelsByFilter(db_used, manifacturer, dev_type) {
 
 //end of Manage models
 //Infos from details
-function queryOSByFilter(tipo) {
+function queryOSByFilter(tipo, date_ref) {
     var query = "select distinct dt.os as os from devices d ";
     query += "left join device_pc dt on d.id = dt.id_device ";
     query += "where d.type = '" + tipo + "' ";
@@ -5946,10 +5946,10 @@ function getDevicesNotAllocatedComboSQLite(id_site, id_place, sel_type, sel_make
     query += "from devices d ";
     query += "left join device_site ds on d.id = ds.id_device ";
     query += "left join site_destinations sd on ds.id_site = sd.id_site ";
-    query += "left join device_consegne dc on d.id = dc.id_device ";
+    //query += "left join device_consegne dc on d.id = dc.id_device ";
     query += "left join consegna_beni cb on d.id = cb.id_bene "
     query += "where (d.is_removed is null or d.is_removed = 0) "
-    query += "and ((dc.id_consegna is null) or (cb.id is null or (cb.tipo_bene = 'DEVICE' and cb.stato_restituzione = 2))) ";
+    query += "and ((cb.id_consegna is null) or (cb.id is null or (cb.tipo_bene = 'DEVICE' and cb.stato_restituzione = 2))) ";
     query += "and (ds.id_place is null ";
     query += "or ((ds.date_in <= date('now') and ds.date_out >= date('now') and sd.type in ('MAGAZZINO', 'CARRELLO DISPOSITIVI'))) and (ds.id_place <> '" + id_place + "' and ds.id_site <> " + id_site + ")) ";
     if (sel_type_str.trim() != '') {
@@ -5988,10 +5988,10 @@ function getDevicesNotAllocatedComboMySQL(id_site, id_place, sel_type, sel_maker
     query += "from devices d ";
     query += "left join device_site ds on d.id = ds.id_device ";
     query += "left join site_destinations sd on ds.id_site = sd.id_site ";
-    query += "left join device_consegne dc on d.id = dc.id_device ";
+    //query += "left join device_consegne dc on d.id = dc.id_device ";
     query += "left join consegna_beni cb on d.id = cb.id_bene "
     query += "where (d.is_removed is null or d.is_removed = 0) "
-    query += "and ((dc.id_consegna is null) or (cb.id is null or (cb.tipo_bene = 'DEVICE' and cb.stato_restituzione = 2))) ";
+    query += "and ((cb.id_consegna is null) or (cb.id is null or (cb.tipo_bene = 'DEVICE' and cb.stato_restituzione = 2))) ";
     query += "and (ds.id_place is null ";
     query += "or ((ds.date_in <= CURDATE() and ds.date_out >= CURDATE() and sd.type in ('MAGAZZINO', 'CARRELLO DISPOSITIVI'))) and (ds.id_place <> :id_place and ds.id_site <> :id_site)) ";
     if (sel_type_str.trim() != '') {
@@ -6030,7 +6030,7 @@ function getDevicesNotAllocatedComboMySQL2(id_site, id_place, sel_type, sel_make
     query += "from devices d ";
     query += "left join device_site ds on d.id = ds.id_device ";
     query += "left join site_destinations sd on ds.id_site = sd.id_site ";
-    query += "left join device_consegne dc on d.id = dc.id_device ";
+    //query += "left join device_consegne dc on d.id = dc.id_device ";
     query += "left join consegna_beni cb on d.id = cb.id_bene "
     query += "where (d.is_removed is null or d.is_removed = 0) "
     query += "and ((dc.id_consegna is null) or (cb.id is null or (cb.tipo_bene = 'DEVICE' and cb.stato_restituzione = 2))) ";
@@ -7182,8 +7182,72 @@ function esistonoBeniDaRestituire(id_consegna) {
 }
 
 //End Creazione email sollecito consegna
+// Beni in Limbo
+function getBeniInLimbo(data_ref_da, data_ref_a) {
+    /*
+    CREATE TABLE "beni_limbo" (
+	"id"	INTEGER,
+	"id_bene"	INTEGER,
+	"tipo_bene"	TEXT,
+	"id_doc"	INTEGER,
+	"data_rilievo"	TEXT,
+	"note"	TEXT,
+	PRIMARY KEY("id" AUTOINCREMENT)
+    )
+    */
+    var query = "select b.id, d.manifacturer, d.model, b.tipo_bene, b.id_doc, b.data_rilievo, b.note from beni_limbo b ";
+    query += "join device d on d.id = b.id_bene ";
+    if (data_ref_da) {
+        query += "and b.data_rilievo <= " + data_ref_da + " ";
+    }
+    if (data_ref_a) {
+        query += "and b.data_rilievo >= " + data_ref_a + " ";
+    }
+    return query;
+}
 
+function getBeneInLimboById(id_limbo) {
+    var query = "select b.id, b.id_bene, b.tipo_bene, b.id_doc, b.data_rilievo, b.note from beni_limbo b ";
+    query += "where b.id = " + id_limbo;
+    return query;        
+}
 
+function getBeneInLimboByIdBene(id_bene) {
+    var query = "select b.id, b.id_bene, b.tipo_bene, b.id_doc, b.data_rilievo, b.note from beni_limbo b ";
+    query += "where b.id_bene = " + id_bene;
+    return query;     
+}
+
+function writeBeneInLimbo(id_bene, tipo_bene, id_doc, data_rilievo, note) {
+    var query = "insert into beni_limbo (id_bene, tipo_bene, id_doc, data_rilievo, note) value (";
+    var dr_str = convertDateToStringDB(data_rilievo);
+    query += id_bene + ", ";
+    query += "'" + tipo_bene + "', ";
+    query += id_doc + ", ";
+    query += "'" + dr_str + "', ";
+    query += "'" + note + "'";
+    return query;
+}
+
+function updateBeneInLimbo(id_limbo, id_bene, tipo_bene, id_doc, data_rilievo, note) {
+    var query = "update beni_limbo set ";
+    var dr_str = convertDateToStringDB(data_rilievo);
+    query += "id_bene = " + id_bene + ", ";
+    query += "tipo_bene = '" + tipo_bene + "', ";
+    query += "id_doc = " + id_doc + ", ";
+    query += "data_rilievo = '" + dr_str + "', ";
+    query += "note = '" + note + "'";
+    query += "where id = " + id_limbo;
+    return query;
+}
+
+function deleteBeneInLimbo(id_limbo) {
+    var query = "delete from beni_limbo b ";
+    query += "where b.id = " + id_limbo;
+    return query;    
+}
+
+//End Beni in Limbo
 // Beni in consegna
 function queryConsegneByIdDeviceSQLite(id_device) {
     var query = "select c.data_consegna as Consegna, ";
@@ -7195,7 +7259,8 @@ function queryConsegneByIdDeviceSQLite(id_device) {
     query += "when c.stato_restituzione = 4 then 'Parti mancanti' ";
     query += "else '' ";
     query += "end as Stato, ";
-    query += "c.note as Note from device_consegne dc ";
+    //query += "c.note as Note from device_consegne dc ";
+    query += "c.note as Note from consegna_beni dc ";
     query += "inner join consegne c on c.id = dc.id_consegna ";
     query += "where dc.id_device = " + id_device;
     return query;
@@ -7211,7 +7276,8 @@ function queryConsegneByIdDeviceMySQL(id_device) {
     query += "when c.stato_restituzione = 4 then 'Parti mancanti' ";
     query += "else '' ";
     query += "end as Stato, ";
-    query += "c.note as Note from device_consegne dc ";
+    //query += "c.note as Note from device_consegne dc ";
+    query += "c.note as Note from consegna_beni dc ";
     query += "inner join consegne c on c.id = dc.id_consegna ";
     query += "where dc.id_device = :id_device";
     return query;
@@ -8018,7 +8084,7 @@ function insertConsegnaDeviceMySQL(id_consegna, id_device, note){
     query += ")";
     return query;
 }
-
+// NOT YET USED
 function insertConsegnaDevice(db_used, id_consegna, id_device, note) {
     var query = "";
     if (db_used) {
@@ -8054,7 +8120,7 @@ function updateConsegnaDeviceMySQL(id_devcons, id_consegna, id_device, note){
     query += "where id = :id_devcons"; 
     return query;
 }
-
+// NOT YET USED
 function updateConsegnaDevice(db_used, id_devcons, id_consegna, id_device, note) {
     var query = "";
     if (db_used) {
@@ -8085,6 +8151,7 @@ function removeConsegnaDeviceMySQL(id_devcons){
     query += "and id_device = :id_device";
     return query;
 }
+// NOT YET USED
 function removeConsegnaDevice(db_used, id_consegna, id_device) {
     var query = "";
     if (db_used) {
@@ -8469,6 +8536,8 @@ function selectDevicePerConsegnaMySQL(id_consegna) {
     query += " where dc.id_consegna = :id_consegna"; 
     return query;
 }
+
+// NOT YET USED
 function selectDevicePerConsegna(db_used, id_consegna) {
     var query = "";
     if (db_used) {
@@ -8519,7 +8588,7 @@ function selectDeviceConsegnaMySQL(id_consegna, id_device) {
     return query;
 }
 
-
+// NOT YET USED
 function selectDeviceConsegna(db_used, id_consegna, id_device) {
     var query = "";
     if (db_used) {
@@ -8682,7 +8751,7 @@ function selectSoftwareConsegnaMySQL(id_consegna, id_software) {
     return query;
 }
 
-
+// NOT YET USED
 function selectSoftwareConsegna(db_used, id_consegna, id_software) {
     var query = "";
     if (db_used) {
@@ -15286,6 +15355,13 @@ module.exports = {
     queryDocumentsDismissioneIdDevice,  
     getDevicesInDismissione,  
     //
+    getBeniInLimbo,
+    getBeneInLimboById,
+    getBeneInLimboByIdBene,
+    writeBeneInLimbo,
+    updateBeneInLimbo,
+    deleteBeneInLimbo,
+    //
     assignCategoryFromDB,
     getBeniConsumoByIdDevice,
     queryConsegneByIdDevice,

package/package.json

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