diff --git a/apps/maarch_entreprise/Views/user-administration.component.html b/apps/maarch_entreprise/Views/user-administration.component.html index eb310aacf314bd93142cbfd9364ef17a688d4cca..f1f13e940f64e06bd06e6b14eb15d9cb4dab54f3 100755 --- a/apps/maarch_entreprise/Views/user-administration.component.html +++ b/apps/maarch_entreprise/Views/user-administration.component.html @@ -269,7 +269,7 @@ </mat-list-item> <mat-divider></mat-divider> <h3 mat-subheader>{{lang.baskets}}</h3> - <ng-container *ngFor="let basket of user.baskets;let i = index"> + <ng-container *ngFor="let basket of user.baskets | sortBy : 'basket_name';let i = index"> <mat-list-item *ngIf="basket.group_id && basket.userToDisplay == ''"> <mat-icon mat-list-icon color="primary" *ngIf="basket.enabled" style="margin-top:-70px;"> <mat-slide-toggle matTooltip="activer / désactiver la bannette" color="primary" [(ngModel)]="basket.allowed" (change)="toggleBasket(basket)" @@ -279,9 +279,9 @@ <span class="label label-primary" style="font-weight:normal">{{basket.group_id}}</span> </h4> <p mat-line [ngStyle]="{'opacity': basket.allowed ? '1' : '0.5'}"> - <mat-form-field *ngIf="basket.userToDisplay == ''" floatLabel="never"> + <mat-form-field *ngIf="basket.allowed" floatLabel="never"> <input matTooltip="Rediriger la banette à une personne lors de l'activation de l'absence" matTooltipPosition="above" type="text" - placeholder="Utilisateur de redirection" matInput [matAutocomplete]="auto" [formControl]="userCtrl"> + placeholder="Utilisateur de redirection" matInput [matAutocomplete]="auto" [formControl]="userCtrl" [disabled]="!basket.allowed"> <mat-autocomplete #auto="matAutocomplete"> <mat-option *ngFor="let user of filteredUsers | async" [value]="user.id" (click)="addBasketRedirection(user.id,basket)"> <p mat-line matTooltip="{{ user.otherInfo }}"> @@ -297,17 +297,14 @@ </mat-autocomplete> </mat-form-field> <mat-form-field> - <input type="text" color="warn" matInput disabled value="Redirigé à {{basket.userToDisplay}}"> - <button mat-button color="warn" matSuffix mat-icon-button aria-label="Clear" (click)="delBasketRedirection(basket)" matTooltip="Supprimer la redirection"> - <mat-icon color="warn" class="fa fa-times text-danger"></mat-icon> - </button> + <input type="text" color="warn" matInput disabled value=""> </mat-form-field> </p> </mat-list-item> </ng-container> <mat-divider></mat-divider> <h3 mat-subheader>{{lang.basketsRedirected}}</h3> - <ng-container *ngFor="let basket of user.baskets;let i = index"> + <ng-container *ngFor="let basket of user.baskets | sortBy : 'basket_name';let i = index"> <mat-list-item *ngIf="basket.group_id && basket.userToDisplay != ''"> <mat-icon mat-list-icon color="primary" *ngIf="basket.enabled" style="margin-top:-60px;" class="fa fa-paper-plane-o"> </mat-icon> @@ -326,7 +323,7 @@ </ng-container> <mat-divider></mat-divider> <h3 mat-subheader>{{lang.basketsAssigned}}</h3> - <ng-container *ngFor="let basket of user.baskets;let i = index"> + <ng-container *ngFor="let basket of user.baskets | sortBy : 'basket_name';let i = index"> <mat-list-item *ngIf="!basket.group_id"> <mat-icon mat-list-icon color="primary" style="margin-top:-60px;" class="fa fa-reply"> </mat-icon>