alsmanager_lib 2.0.4 → 2.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/modules.js +7 -3
- package/package.json +1 -1
package/lib/modules.js
CHANGED
|
@@ -5812,7 +5812,7 @@ function selectDevicePerConsegnaSQLite(id_consegna) {
|
|
|
5812
5812
|
query += "when trim(d.inv_pnrr_number) is null then '' ";
|
|
5813
5813
|
query += "when trim(d.inv_pnrr_number) = '' then '' ";
|
|
5814
5814
|
query += "else 'SI' ";
|
|
5815
|
-
query += "end as PNRR ";
|
|
5815
|
+
query += "end as PNRR, dc.note as Note_cons ";
|
|
5816
5816
|
query += " from devices d";
|
|
5817
5817
|
query += " left join device_consegne dc on dc.id_device = d.id";
|
|
5818
5818
|
query += " where dc.id_consegna = " + id_consegna;
|
|
@@ -5832,7 +5832,7 @@ function selectDevicePerConsegnaMySQL(id_consegna) {
|
|
|
5832
5832
|
query += "when trim(d.inv_pnrr_number) is null then '' ";
|
|
5833
5833
|
query += "when trim(d.inv_pnrr_number) = '' then '' ";
|
|
5834
5834
|
query += "else 'SI' ";
|
|
5835
|
-
query += "end as PNRR ";
|
|
5835
|
+
query += "end as PNRR, dc.note as Note_cons ";
|
|
5836
5836
|
query += " from devices d";
|
|
5837
5837
|
query += " left join device_consegne dc on dc.id_device = d.id";
|
|
5838
5838
|
query += " where dc.id_consegna = :id_consegna";
|
|
@@ -9033,7 +9033,11 @@ function createConsegnaDoc(consegna_obj, scuola_obj, listaDispositivi) {
|
|
|
9033
9033
|
// Tabella dispositivi
|
|
9034
9034
|
let j = 1;
|
|
9035
9035
|
for (let i = 0; i < listaDispositivi.length; i++) {
|
|
9036
|
-
|
|
9036
|
+
var descr = listaDispositivi[i].descrizione;
|
|
9037
|
+
if (listaDispositivi[i].note && listaDispositivi[i].note != '') {
|
|
9038
|
+
descr += "\n" + listaDispositivi[i].note;
|
|
9039
|
+
}
|
|
9040
|
+
tabObj.table.body[j++] = [{text: listaDispositivi[i].num, bold: false}, {text: descr, bold: false}];
|
|
9037
9041
|
}
|
|
9038
9042
|
|
|
9039
9043
|
var dd = {
|