From e1575156a9552419f49261bb47a8bc2a9fc9388f Mon Sep 17 00:00:00 2001
From: ludo <ludo@ludo.fr>
Date: Mon, 21 Jun 2021 17:21:53 +0200
Subject: [PATCH] =?UTF-8?q?FEAT=20#17347=20mettre=20un=20accord=C3=A9on=20?=
=?UTF-8?q?pour=20les=20groupes=20de=20bannette?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../app/basket/basket-home.component.html | 65 ++++++++++---------
1 file changed, 35 insertions(+), 30 deletions(-)
diff --git a/src/frontend/app/basket/basket-home.component.html b/src/frontend/app/basket/basket-home.component.html
index 4dc9a627499..5c93c7306a3 100755
--- a/src/frontend/app/basket/basket-home.component.html
+++ b/src/frontend/app/basket/basket-home.component.html
@@ -25,36 +25,41 @@
</span>
</mat-list>
<ng-container *ngFor="let regroupedBasket of homeData.regroupedBaskets">
- <span *ngIf="regroupedBasket.baskets[0] && !editOrderGroups" class="basketGroupTitle">{{regroupedBasket.groupDesc}}</span>
- <mat-divider *ngIf="regroupedBasket.baskets[0] && !editOrderGroups" style="width: 80%;"></mat-divider>
- <mat-nav-list style="padding-bottom: 10px;" *ngIf="!editOrderGroups">
- <ng-container
- *ngFor="let basket of regroupedBasket.baskets | filterList:listFilter.value:'basket_name'">
- <a mat-list-item *ngIf="basket.redirected" disableRipple="true" style="cursor:not-allowed;">
- <mat-icon [ngStyle]="{'color': basket.color}"
- *ngIf="basket.redirected && !appService.getViewMode()" mat-list-icon class="fa fa-share">
- </mat-icon>
- <span *ngIf="basket.resourceNumber==0" class="nbResZero">{{basket.resourceNumber}}</span>
- <span *ngIf="basket.resourceNumber!=0" class="nbRes">{{basket.resourceNumber}}</span>
- <p mat-line title="{{basket.basket_name}}" [ngStyle]="{'color': basket.color}">
- {{basket.basket_name}}<br /><small color="primary">({{lang.redirectedTo}}
- {{basket.redirectedUser}})</small>
- </p>
- </a>
- <a mat-list-item
- [ngClass]="{'selectedBasket': headerService.currentBasketInfo.basketId == basket.id && headerService.currentBasketInfo.ownerId == basket.owner_user_id && headerService.currentBasketInfo.groupId == regroupedBasket.groupSerialId}"
- *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'}">
- <span *ngIf="basket.resourceNumber==0" class="nbResZero">{{basket.resourceNumber}}</span>
- <span *ngIf="basket.resourceNumber!=0" class="nbRes">{{basket.resourceNumber}}</span>
- <p mat-line title="{{basket.basket_name}}" [ngStyle]="{'color': basket.color}">
- {{basket.basket_name}}
- </p>
- </a>
- </ng-container>
- </mat-nav-list>
+ <mat-accordion>
+ <mat-expansion-panel [expanded]="true">
+ <mat-expansion-panel-header>
+ <span *ngIf="regroupedBasket.baskets[0] && !editOrderGroups" class="basketGroupTitle">{{regroupedBasket.groupDesc}}</span>
+ </mat-expansion-panel-header>
+ <mat-divider *ngIf="regroupedBasket.baskets[0] && !editOrderGroups" style="width: 80%;"></mat-divider>
+ <mat-nav-list style="padding-bottom: 10px;" *ngIf="!editOrderGroups">
+ <ng-container *ngFor="let basket of regroupedBasket.baskets | filterList:listFilter.value:'basket_name'">
+ <a mat-list-item *ngIf="basket.redirected" disableRipple="true" style="cursor:not-allowed;">
+ <mat-icon [ngStyle]="{'color': basket.color}"
+ *ngIf="basket.redirected && !appService.getViewMode()" mat-list-icon class="fa fa-share">
+ </mat-icon>
+ <span *ngIf="basket.resourceNumber==0" class="nbResZero">{{basket.resourceNumber}}</span>
+ <span *ngIf="basket.resourceNumber!=0" class="nbRes">{{basket.resourceNumber}}</span>
+ <p mat-line title="{{basket.basket_name}}" [ngStyle]="{'color': basket.color}">
+ {{basket.basket_name}}<br /><small color="primary">({{lang.redirectedTo}}
+ {{basket.redirectedUser}})</small>
+ </p>
+ </a>
+ <a mat-list-item
+ [ngClass]="{'selectedBasket': headerService.currentBasketInfo.basketId == basket.id && headerService.currentBasketInfo.ownerId == basket.owner_user_id && headerService.currentBasketInfo.groupId == regroupedBasket.groupSerialId}"
+ *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'}">
+ <span *ngIf="basket.resourceNumber==0" class="nbResZero">{{basket.resourceNumber}}</span>
+ <span *ngIf="basket.resourceNumber!=0" class="nbRes">{{basket.resourceNumber}}</span>
+ <p mat-line title="{{basket.basket_name}}" [ngStyle]="{'color': basket.color}">
+ {{basket.basket_name}}s
+ </p>
+ </a>
+ </ng-container>
+ </mat-nav-list>
+ </mat-expansion-panel>
+ </mat-accordion>
</ng-container>
<ng-container *ngIf="homeData.assignedBaskets.length>0 && !editOrderGroups">
<span color="primary" style="font-weight:bold;"
--
GitLab