Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop

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<IItem[]> {
+    skip?: number, take?: number, sourceTask?: string, exactMatchStartOrEndDate?: boolean, owner?:string): Observable<IItem[]> {
     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<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/`, { params: params });
   }
   
   getItemListCount(itemType: string, startDate?: Date, endDate?: Date, sourceTask?: string,
-    indexed?: boolean, exactMatchStartOrEndDate?: boolean): Observable<number> {
+    indexed?: boolean, exactMatchStartOrEndDate?: boolean, owner?:string): Observable<number> {
     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<number>(`${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<IItem[]> {
+                   exactMatchStartOrEndDate?: boolean, owner?:string): Observable<IItem[]> {
     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<number> {
+                        startDate?: Date, endDate?: Date, exactMatchStartOrEndDate?: boolean, owner?:string): Observable<number> {
     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<number>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children/count`, { params: params });
   }