From 1cc007e10d752df1a0feecd26f96e9964b887514 Mon Sep 17 00:00:00 2001
From: Vinciane <vinciane.bizet@maarch.org>
Date: Wed, 20 Mar 2019 11:20:52 +0100
Subject: [PATCH] FEAT #9907 refresh basket home
---
src/frontend/app/basket/basket-home.component.ts | 7 +++++++
src/frontend/app/list/basket-list.component.html | 2 +-
src/frontend/app/list/basket-list.component.ts | 11 +++--------
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/frontend/app/basket/basket-home.component.ts b/src/frontend/app/basket/basket-home.component.ts
index c8f0486536e..80f82e91dd5 100755
--- a/src/frontend/app/basket/basket-home.component.ts
+++ b/src/frontend/app/basket/basket-home.component.ts
@@ -47,4 +47,11 @@ export class BasketHomeComponent implements OnInit {
this.snavL.close();
}
}
+
+ refreshBasketHome(){
+ this.http.get(this.coreUrl + "rest/home")
+ .subscribe((data: any) => {
+ this.homeData = data;
+ });
+ }
}
diff --git a/src/frontend/app/list/basket-list.component.html b/src/frontend/app/list/basket-list.component.html
index c05cbc5575f..c83f99af5ea 100644
--- a/src/frontend/app/list/basket-list.component.html
+++ b/src/frontend/app/list/basket-list.component.html
@@ -4,7 +4,7 @@
[opened]="mobileMode ? false : true" autoFocus="false" style="overflow-x:hidden;" [ngStyle]="{'width': mobileMode ? '80%' : '400px'}">
<menu-shortcut></menu-shortcut>
<menu-nav></menu-nav>
- <basket-home *ngIf="homeData" [homeData]="homeData" [snavL]="snav" [currentBasketInfo]="currentBasketInfo"></basket-home>
+ <basket-home *ngIf="homeData" #basketHome [homeData]="homeData" [snavL]="snav" [currentBasketInfo]="currentBasketInfo"></basket-home>
<mat-divider></mat-divider>
</mat-sidenav>
<mat-sidenav-content>
diff --git a/src/frontend/app/list/basket-list.component.ts b/src/frontend/app/list/basket-list.component.ts
index cfe9b5af4ca..394d3a16624 100755
--- a/src/frontend/app/list/basket-list.component.ts
+++ b/src/frontend/app/list/basket-list.component.ts
@@ -20,6 +20,7 @@ import { ActionsListComponent } from '../actions/actions-list.component';
import { Overlay, OverlayRef } from '@angular/cdk/overlay';
import { VisaWorkflowComponent } from '../visa/visa-workflow.component';
import { AvisWorkflowComponent } from '../avis/avis-workflow.component';
+import { BasketHomeComponent } from '../basket/basket-home.component';
declare function $j(selector: any): any;
@@ -94,6 +95,7 @@ export class BasketListComponent implements OnInit {
@ViewChild('appDiffusionsList') appDiffusionsList: DiffusionsListComponent;
@ViewChild('appVisaWorkflow') appVisaWorkflow: VisaWorkflowComponent;
@ViewChild('appAvisWorkflow') appAvisWorkflow: AvisWorkflowComponent;
+ @ViewChild('basketHome') basketHome: BasketHomeComponent;
currentSelectedChrono: string = '';
@@ -240,16 +242,9 @@ export class BasketListComponent implements OnInit {
this.filtersChange.emit();
}
- refreshHomeBasket(){
- this.http.get('../../rest/home')
- .subscribe((data: any) => {
- this.homeData = data;
- });
- }
-
refreshDaoAfterAction() {
this.refreshDao();
- this.refreshHomeBasket();
+ this.basketHome.refreshBasketHome();
const e:any = {checkd : false};
this.toggleAllRes(e);
}
--
GitLab