From 47b640770ac8f12d6db42a39bc56dafaa39d1108 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Tue, 29 Jan 2019 10:43:09 +0100
Subject: [PATCH] FEAT #9082 Basket Id route
---
src/app/resource/controllers/ExportController.php | 10 ++--------
src/frontend/app/basket/basket-home.component.html | 2 +-
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/src/app/resource/controllers/ExportController.php b/src/app/resource/controllers/ExportController.php
index ff4e5fa9585..05ee75e0886 100644
--- a/src/app/resource/controllers/ExportController.php
+++ b/src/app/resource/controllers/ExportController.php
@@ -223,14 +223,8 @@ class ExportController
$csvContent[] = ExportController::getSignatureDates(['resId' => $resource['res_id']]);
}
} else {
- if (in_array($value['value'], ['doc_date',
- 'departure_date',
- 'admission_date',
- 'process_limit_date',
- 'recommendation_limit_date',
- 'closing_date',
- 'sve_start_date',
- 'getSignatureDates'])) {
+ $allDates = ['doc_date', 'departure_date', 'admission_date', 'process_limit_date', 'recommendation_limit_date', 'closing_date', 'sve_start_date'];
+ if (in_array($value['value'], $allDates)) {
$csvContent[] = TextFormatModel::formatDate($resource[$value['value']]);
} else {
$csvContent[] = $resource[$value['value']];
diff --git a/src/frontend/app/basket/basket-home.component.html b/src/frontend/app/basket/basket-home.component.html
index 77dc9b124cd..01bab3ab543 100755
--- a/src/frontend/app/basket/basket-home.component.html
+++ b/src/frontend/app/basket/basket-home.component.html
@@ -39,7 +39,7 @@
{{basket.basket_name}}<br/><small color="primary">({{lang.redirectedTo}} {{basket.redirectedUser}})</small>
</p>
</a>
- <a mat-list-item [ngClass]="{'selectedBasket': currentBasketInfo.basketId==basket.basket_id && currentBasketInfo.ownerId==basket.owner_user_id && currentBasketInfo.groupId==regroupedBasket.groupSerialId}" *ngIf="!basket.redirected" (click)="closePanelLeft();" routerLink="/basketList/users/{{basket.owner_user_id}}/groups/{{regroupedBasket.groupSerialId}}/baskets/{{basket.basket_id}}" style="cursor:pointer;" [ngStyle]="{'opacity': basket.resourceNumber==0 ? '0.5' : '1', 'height': mobileMode ? '50px' : '38px'}">
+ <a mat-list-item [ngClass]="{'selectedBasket': currentBasketInfo.basketId==basket.basket_id && currentBasketInfo.ownerId==basket.owner_user_id && currentBasketInfo.groupId==regroupedBasket.groupSerialId}" *ngIf="!basket.redirected" (click)="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': mobileMode ? '50px' : '38px'}">
<mat-icon [ngStyle]="{'color': basket.color}" *ngIf="!mobileMode" mat-list-icon class="fa fa-inbox"></mat-icon>
<span *ngIf="basket.resourceNumber==0" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
<span *ngIf="basket.resourceNumber!=0" bgcolor="warn" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
--
GitLab