Skip to content
Snippets Groups Projects
Commit a74c70e1 authored by Jean-Laurent DUZANT's avatar Jean-Laurent DUZANT
Browse files

Merge branch 'fix/25122/2301' into '2301_releases'

[25122] RGAA- Attribut aria de la bannette sélectionnée

See merge request maarch/MaarchCourrier!1163
parents 48d0d4d6 4ad4d3c9
No related branches found
No related tags found
No related merge requests found
......@@ -48,7 +48,8 @@
*ngIf="!basket.redirected" (click)="refreshDatas(basket);closePanelLeft();"
routerLink="/basketList/users/{{basket.owner_user_id}}/groups/{{regroupedBasket.groupSerialId}}/baskets/{{basket.id}}"
style="cursor:pointer;"
[ngStyle]="{'opacity': basket.resourceNumber==0 ? '0.5' : '1', 'height': appService.getViewMode() ? '50px' : '38px'}">
[ngStyle]="{'opacity': basket.resourceNumber==0 ? '0.5' : '1', 'height': appService.getViewMode() ? '50px' : '38px'}"
[attr.aria-current]="(headerService.currentBasketInfo.basketId == basket.id && headerService.currentBasketInfo.ownerId == basket.owner_user_id && headerService.currentBasketInfo.groupId == regroupedBasket.groupSerialId) ? 'true' : null">
<span *ngIf="basket.resourceNumber==0" class="nbResZero" [style.color]="basket.color">{{basket.resourceNumber}}</span>
<span *ngIf="basket.resourceNumber!=0" class="nbRes" [ngStyle]="{'color': basket.color !== '#666666' ? basket.color : ''}" [class.defaultColor]="basket.color === '#666666'">{{basket.resourceNumber}}</span>
<p mat-line title="{{basket.basket_name}}" [ngStyle]="{'color': basket.color}">
......@@ -66,6 +67,7 @@
<a mat-list-item
*ngFor="let basket of homeData.assignedBaskets | filterList:listFilter.value:'basket_name'"
[ngClass]="{'selectedBasket': headerService.currentBasketInfo.basketId==basket.id && headerService.currentBasketInfo.ownerId==basket.owner_user_id && headerService.currentBasketInfo.groupId==basket.group_id}"
[attr.aria-current]="headerService.currentBasketInfo.basketId==basket.id && headerService.currentBasketInfo.ownerId==basket.owner_user_id && headerService.currentBasketInfo.groupId==basket.group_id ? 'true' : null"
routerLink="/basketList/users/{{basket.owner_user_id}}/groups/{{basket.group_id}}/baskets/{{basket.id}}">
<mat-icon *ngIf="!appService.getViewMode()" style="color:#666" mat-list-icon
class="fa fa-paper-plane"></mat-icon>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment