alsmanager_lib 3.0.130 → 3.0.132

package/lib/modules.js

@@ -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))) ";
@@ -7259,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;
@@ -7275,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;
@@ -8082,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) {
@@ -8118,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) {
@@ -8149,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) {
@@ -8533,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) {
@@ -8583,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) {
@@ -8747,6 +8752,7 @@ function selectSoftwareConsegnaMySQL(id_consegna, id_software) {
 }
 
 
+// NOT YET USED
 function selectSoftwareConsegna(db_used, id_consegna, id_software) {
     var query = "";
     if (db_used) {

package/package.json

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