From db3734f8a3554052a5dba5fc32dafa21dc5109fd Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Thu, 14 Nov 2024 14:21:43 +0100 Subject: [PATCH] AW-6466 Filter by (given) owner --- projects/common/src/fm/services/item.service.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/projects/common/src/fm/services/item.service.ts b/projects/common/src/fm/services/item.service.ts index e017d0d..1117004 100644 --- a/projects/common/src/fm/services/item.service.ts +++ b/projects/common/src/fm/services/item.service.ts @@ -81,7 +81,7 @@ export class ItemService { getItemList(itemType?: string, dataFilter?: any, level?: number, atItemLocationItemCode?: string, indexed?: boolean, validToday?: boolean,tags?:string,crs?:string, startDate?: Date, endDate?: Date, - skip?: number, take?: number, sourceTask?: string, exactMatchStartOrEndDate?: boolean): Observable { + skip?: number, take?: number, sourceTask?: string, exactMatchStartOrEndDate?: boolean, owner?:string): Observable { let params = new HttpParams(); if(itemType) params = params.append("it", itemType); if(dataFilter) params = params.append("df", JSON.stringify(dataFilter)); @@ -97,11 +97,12 @@ export class ItemService { if(skip) params = params.append("skip", skip); if(take) params = params.append("take", take); if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); + if(owner) params = params.append("owner", owner); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/`, { params: params }); } getItemListCount(itemType: string, startDate?: Date, endDate?: Date, sourceTask?: string, - indexed?: boolean, exactMatchStartOrEndDate?: boolean): Observable { + indexed?: boolean, exactMatchStartOrEndDate?: boolean, owner?:string): Observable { let params = new HttpParams(); params = params.append("it", itemType); if (sourceTask) params = params.append("sourceTask", sourceTask); @@ -109,12 +110,13 @@ export class ItemService { if (endDate) params = params.append("eDate", endDate.toISOString()); if(indexed) params = params.append("ind",indexed?"true":"false"); if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); + if(owner) params = params.append("owner", owner); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/count`, { params: params }); } getChildItemList(parentcode: string, itemType?: string, dataFilter?: any, level = 1, deep = true, startDate?: Date, endDate?: Date, skip?: number, take?: number, - exactMatchStartOrEndDate?: boolean): Observable { + exactMatchStartOrEndDate?: boolean, owner?:string): Observable { let params = new HttpParams(); if(itemType != null) { params = params.append("it", itemType); @@ -126,7 +128,8 @@ export class ItemService { params = params.append("deep", deep.toString()); if (startDate) params = params.append("sDate", startDate.toISOString()); if (endDate) params = params.append("eDate", endDate.toISOString()); - if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); + if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); + if(owner) params = params.append("owner", owner); if(skip) params = params.append("skip", skip); if(take) params = params.append("take", take); @@ -134,7 +137,7 @@ export class ItemService { } getChildItemListCount(parentcode: string, itemType?: string,dataFilter?: any, - startDate?: Date, endDate?: Date, exactMatchStartOrEndDate?: boolean): Observable { + startDate?: Date, endDate?: Date, exactMatchStartOrEndDate?: boolean, owner?:string): Observable { let params = new HttpParams(); if(itemType != null) { params = params.append("it", itemType); @@ -144,7 +147,8 @@ export class ItemService { } if (startDate) params = params.append("sDate", startDate.toISOString()); if (endDate) params = params.append("eDate", endDate.toISOString()); - if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); + if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); + if(owner) params = params.append("owner", owner); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children/count`, { params: params }); }