diff --git a/src/frontend/app/administration/home/administration.component.html b/src/frontend/app/administration/home/administration.component.html index 97886c0c8ed6285a3af6af4fa1265dd0988514a1..dc9cdc91c9487abc5f8c8567401faa8b6ec59c24 100644 --- a/src/frontend/app/administration/home/administration.component.html +++ b/src/frontend/app/administration/home/administration.component.html @@ -5,7 +5,7 @@ <div class="bg-head-title-label"> <header-left></header-left> </div> - <div class="bg-head-title-tool" stepNumber="1" joyrideStep="firstStep" title="demoTour" text="Hi, Welcome to demo tour"> + <div class="bg-head-title-tool" stepNumber="1" joyrideStep="firstStep" title="demoTour"> <header-right></header-right> </div> </div> @@ -30,11 +30,13 @@ </div> <mat-divider></mat-divider> <mat-form-field style="padding:10px;font-size: 10px;width: 250px !important;"> - <input matInput #searchServiceInput [formControl]="searchService" [placeholder]="this.translate.instant('lang.filterBy')"> + <input matInput #searchServiceInput [formControl]="searchService" + [placeholder]="this.translate.instant('lang.filterBy')"> </mat-form-field> <div style="margin: 20px;display: grid;grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));gap: 20px;padding:20px;padding-top:0px;margin-top:0px;"> - <button [joyrideStep]="administration.id" mat-button *ngFor="let administration of filteredAdministrations | async |Â sortBy : 'label'" + <button [joyrideStep]="administration.id" mat-button + *ngFor="let administration of filteredAdministrations | async |Â sortBy : 'label'" [title]="administration.comment | translate" style="font-size:20px;height:80px;" (click)="goToSpecifiedAdministration(administration)"> <div style="display: flex;align-items: center;"> @@ -42,7 +44,7 @@ <i class="avatarCount2 {{administration.style}}"></i> </span> <span class="countLabel" style="white-space: initial;text-align: left;"> - {{administration.label | translate}} + {{administration.label}} </span> </div> </button> diff --git a/src/frontend/app/administration/home/administration.component.ts b/src/frontend/app/administration/home/administration.component.ts index b6844343d5774629090a02005860988132eea022..acfc30be766634449a9a8fedc8342cd736d7386e 100644 --- a/src/frontend/app/administration/home/administration.component.ts +++ b/src/frontend/app/administration/home/administration.component.ts @@ -8,7 +8,7 @@ import { AppService } from '@service/app.service'; import { PrivilegeService } from '@service/privileges.service'; import { Observable, of } from 'rxjs'; import { FormControl } from '@angular/forms'; -import { startWith, map, tap, catchError, exhaustMap } from 'rxjs/operators'; +import { startWith, map, tap, catchError } from 'rxjs/operators'; import { LatinisePipe } from 'ngx-pipes'; import { NotificationService } from '@service/notification/notification.service'; import { FunctionsService } from '@service/functions.service'; @@ -20,7 +20,6 @@ import { FeatureTourService } from '@service/featureTour.service'; }) export class AdministrationComponent implements OnInit, AfterViewInit { - loading: boolean = false; shortcutsAdmin: any[] = []; @@ -61,7 +60,12 @@ export class AdministrationComponent implements OnInit, AfterViewInit { this.supervisionServices = this.privilegeService.getCurrentUserAdministrationsByUnit('supervision'); this.administrations = this.organisationServices.concat(this.productionServices).concat(this.classementServices).concat(this.supervisionServices); - + this.administrations = this.administrations.map((admin: any) => { + return { + ...admin, + label : this.translate.instant(admin.label) + }; + }); this.shortcutsAdmin = this.administrations.filter(admin => ['admin_users', 'admin_groups', 'manage_entities'].indexOf(admin.id) > -1).map(admin => { return { ...admin,