Merge branch '3.5.x' of github.com:link-it/GovPay into 3.5.x

link-it · Mar 21, 2022 · 7b337f1 · 7b337f1
2 parents b06ba86 + e1cb982
commit 7b337f1
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/wars/web-console/src/main/angular/console/src/app/elements/list-view/side-list.component.ts b/wars/web-console/src/main/angular/console/src/app/elements/list-view/side-list.component.ts
@@ -879,7 +879,7 @@ export class SideListComponent implements OnInit, OnDestroy, IExport {
       }, []);
     }
     _preloadedData['numPagine'] = Math.ceil(_preloadedMeta['numRisultati']/_preloadedData['risultatiPerPagina']);
-    if(_preloadedData['pagina'] == _preloadedData['numPagine']) {
+    if(_preloadedData['pagina'] >= _preloadedData['numPagine']) {
       const cachedCalls: any[] = this.listResults.map((result) => {
         return result.jsonP;
       });
@@ -953,9 +953,16 @@ export class SideListComponent implements OnInit, OnDestroy, IExport {
         this.us.filteredJson(_properties, _jsonData);
         break;
       case UtilService.EXPORT_GIORNALE_EVENTI:
-      case UtilService.EXPORT_INCASSI:
         this.us.fullJson(_jsonData);
         break;
+      case UtilService.EXPORT_INCASSI:
+        let _cloneJsondData = JSON.parse(JSON.stringify(_jsonData));
+        _cloneJsondData = _cloneJsondData.map((item) => {
+          item.dominio = item.dominio.idDominio;
+          return item;
+        });
+        this.us.fullJson(_cloneJsondData);
+        break;
       case UtilService.EXPORT_RENDICONTAZIONI:
         _jsonData = _jsonData.map((item) => {
           let _segnalazioni = item.segnalazioni;