Skip to content
Snippets Groups Projects
Verified Commit 47b64077 authored by Damien's avatar Damien
Browse files

FEAT #9082 Basket Id route

parent 249721af
No related branches found
No related tags found
No related merge requests found
...@@ -223,14 +223,8 @@ class ExportController ...@@ -223,14 +223,8 @@ class ExportController
$csvContent[] = ExportController::getSignatureDates(['resId' => $resource['res_id']]); $csvContent[] = ExportController::getSignatureDates(['resId' => $resource['res_id']]);
} }
} else { } else {
if (in_array($value['value'], ['doc_date', $allDates = ['doc_date', 'departure_date', 'admission_date', 'process_limit_date', 'recommendation_limit_date', 'closing_date', 'sve_start_date'];
'departure_date', if (in_array($value['value'], $allDates)) {
'admission_date',
'process_limit_date',
'recommendation_limit_date',
'closing_date',
'sve_start_date',
'getSignatureDates'])) {
$csvContent[] = TextFormatModel::formatDate($resource[$value['value']]); $csvContent[] = TextFormatModel::formatDate($resource[$value['value']]);
} else { } else {
$csvContent[] = $resource[$value['value']]; $csvContent[] = $resource[$value['value']];
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
{{basket.basket_name}}<br/><small color="primary">({{lang.redirectedTo}} {{basket.redirectedUser}})</small> {{basket.basket_name}}<br/><small color="primary">({{lang.redirectedTo}} {{basket.redirectedUser}})</small>
</p> </p>
</a> </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> <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" 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> <span *ngIf="basket.resourceNumber!=0" bgcolor="warn" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span>
......
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