Merge branch 'bug/359_I_filtri_abilitato_nella_sezione_configurazione…

…_non_mostrano_la_label' into 3.5.x
link-it · Jul 21, 2021 · 7215022 · 7215022
2 parents 1e31073 + 7afef9f
commit 7215022
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/wars/web-console/src/main/angular/console/src/app/services/form.service.ts b/wars/web-console/src/main/angular/console/src/app/services/form.service.ts
@@ -40,6 +40,7 @@ export class FormService {
   public static FORM_RAGIONE_SOCIALE: string = 'Ragione sociale';
   public static FORM_STAZIONE: string = 'Identificativo stazione';
   public static FORM_PH_STAZIONE: string = '';
+  public static FORM_PH_ABILITAZIONE: string = 'Stato abilitazione';
 
   //RPPS
   public static FORM_IUV: string = 'Codice IUV';

diff --git a/wars/web-console/src/main/angular/console/src/app/services/util.service.ts b/wars/web-console/src/main/angular/console/src/app/services/util.service.ts
@@ -1518,13 +1518,15 @@ export class UtilService {
       case UtilService.APPLICAZIONI:
         _list = [
           new FormInput({ id: 'principal', label: FormService.FORM_PRINCIPAL, placeholder: FormService.FORM_PH_PRINCIPAL, type: UtilService.INPUT }),
-          new FormInput({ id: 'abilitato', label: FormService.FORM_PH_SELECT, noOptionLabel: 'Tutti', type: UtilService.SELECT, values: this.statiAbilitazione() })
+          new FormInput({ id: 'abilitato', label: FormService.FORM_PH_ABILITAZIONE, noOptionLabel: 'Tutti', showTooltip: false, type: UtilService.SELECT,
+            values: this.statiAbilitazione() })
         ];
         break;
       case UtilService.REGISTRO_INTERMEDIARI:
       case UtilService.OPERATORI:
         _list = [
-          new FormInput({ id: 'abilitato', label: FormService.FORM_PH_SELECT, noOptionLabel: 'Tutti', type: UtilService.SELECT, values: this.statiAbilitazione() })
+          new FormInput({ id: 'abilitato', label: FormService.FORM_PH_ABILITAZIONE, noOptionLabel: 'Tutti', showTooltip: false, type: UtilService.SELECT,
+            values: this.statiAbilitazione() })
         ];
         break;
       case UtilService.DOMINI:
@@ -1534,7 +1536,8 @@ export class UtilService {
             promise: { async: true, url: UtilService.RootByTOA() + UtilService.URL_DOMINI, mapFct: this.asyncElencoDominiPendenza.bind(this),
               eventType: 'idDominio-async-load' } }, this.http),
           new FormInput({ id: 'idStazione', label: FormService.FORM_STAZIONE, placeholder: FormService.FORM_PH_STAZIONE, type: UtilService.INPUT }),
-          new FormInput({ id: 'abilitato', label: FormService.FORM_PH_SELECT, noOptionLabel: 'Tutti', type: UtilService.SELECT, values: this.statiAbilitazione() })
+          new FormInput({ id: 'abilitato', label: FormService.FORM_PH_ABILITAZIONE, noOptionLabel: 'Tutti', showTooltip: false, type: UtilService.SELECT,
+            values: this.statiAbilitazione() })
         ];
         break;
       case UtilService.RPPS: