Issue #444: Gestione del numero di risultati

link-it · Jan 31, 2022 · 92dfb3c · 92dfb3c
1 parent e93cd8b
commit 92dfb3c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/wars/web-console/src/main/angular/console/src/app/elements/list-view/list-view.component.ts b/wars/web-console/src/main/angular/console/src/app/elements/list-view/list-view.component.ts
@@ -36,8 +36,8 @@ export class ListViewComponent implements OnInit, AfterContentChecked {
     if(this.sideList) {
       let _query:string = this._formQuery(event);
 
-      this.sideList.loadMetadati(null, _query);
       this.sideList.getList(null, _query);
+      this.sideList.loadMetadati(null, _query);
     }
   }
 

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
@@ -57,8 +57,8 @@ export class SideListComponent implements OnInit, OnDestroy, IExport {
     let _dashboard_link_query = UtilService.DASHBOARD_LINKS_PARAMS.params.map((item) => {
       return item.controller + '=' + item.value;
     }).join('&');
-    this.loadMetadati(_service, _dashboard_link_query);
     this.getList(_service, _dashboard_link_query);
+    this.loadMetadati(_service, _dashboard_link_query);
   }
 
   ngOnDestroy() {
@@ -202,7 +202,7 @@ export class SideListComponent implements OnInit, OnDestroy, IExport {
    */
   loadMetadati(service: string = '', query: string = '') {
     service = (service || this.rsc.fullPath); // ROUTING - fullPath
-    // this.__waitForMeta();
+    this.__waitForMeta();
     let _query: string = this.__setupQueryForMeta(service, query);
     if(!this._isLoadingMeta) {
       this._isLoadingMeta = true;
@@ -361,13 +361,13 @@ export class SideListComponent implements OnInit, OnDestroy, IExport {
   }
 
   protected _risultati(_lastResponse: any) {
-    let txt: string = (!_lastResponse && this._isLoadingMeta)?'Caricamento in corso...':'Nessun risultato.';
+    let txt: string = (!_lastResponse && this._isLoadingMeta) ? 'Caricamento in corso...' : 'Numero di risultati sconosciuto.';
     if (_lastResponse) {
       const _value = (_lastResponse.numRisultati || 0);
-      txt = (_value !== 1)?`Trovati ${_value} risultati`:`Trovato ${_value} risultato`;
-      // ROUTING - fullPath
-      if (this.rsc.fullPath === UtilService.URL_PAGAMENTI && _lastResponse.maxRisultati && _lastResponse.numRisultati === _lastResponse.maxRisultati) {
-        txt = `Trovati più di ${(_lastResponse.maxRisultati - 1)} `;
+      txt = (_value !== 1) ? `Trovati ${_value} risultati` : `Trovato ${_value} risultato`;
+
+      if (_lastResponse.maxRisultati && _lastResponse.numRisultati === _lastResponse.maxRisultati) {
+        txt = `Trovati oltre ${(_lastResponse.maxRisultati - 1)} risultati`;
       }
     }
     return txt;