From 8fc51ef5b5565914664c3596a0c382eaecdb003c Mon Sep 17 00:00:00 2001 From: Alex ORLUC <alex.orluc@maarch.org> Date: Fri, 14 Aug 2020 09:26:04 +0200 Subject: [PATCH] FEAT #13998 TIME 0:10 filter issuing site input by user primary entity --- .../issuing-site/indexing/issuing-site-input.component.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/frontend/app/administration/registered-mail/issuing-site/indexing/issuing-site-input.component.ts b/src/frontend/app/administration/registered-mail/issuing-site/indexing/issuing-site-input.component.ts index 0a3d494da2f..9650cb9e83e 100644 --- a/src/frontend/app/administration/registered-mail/issuing-site/indexing/issuing-site-input.component.ts +++ b/src/frontend/app/administration/registered-mail/issuing-site/indexing/issuing-site-input.component.ts @@ -4,6 +4,7 @@ import { FormControl } from '@angular/forms'; import { tap, catchError, finalize } from 'rxjs/operators'; import { of } from 'rxjs/internal/observable/of'; import { NotificationService } from '../../../../../service/notification/notification.service'; +import { HeaderService } from '../../../../../service/header.service'; @Component({ selector: 'app-issuing-site-input', @@ -36,6 +37,7 @@ export class IssuingSiteInputComponent implements OnInit { constructor( public http: HttpClient, private notify: NotificationService, + private headerService: HeaderService ) { } @@ -52,11 +54,11 @@ export class IssuingSiteInputComponent implements OnInit { this.http.get(`../rest/registeredMail/ranges`).pipe( tap((data: any) => { this.issuingSiteAddress = null; - this.issuingSiteList = data['ranges'].filter((item: any) => item.registeredMailType === registeredMailType && item.status === 'OK').map((item: any) => { + this.issuingSiteList = data['ranges'].filter((item: any) => item.registeredMailType === registeredMailType && item.status === 'OK' && item.entities.indexOf(this.headerService.user.entities[0].id) > -1).map((item: any) => { return { ...item, id : `${item.trackerNumber}#${item.siteId}`, - label: `${item.siteLabel} (${item.customerAccountNumber})`, + label: `${item.label} (${item.customerAccountNumber})`, disabled: item.fullness === 100, }; }); -- GitLab