From ad5fe95b555029640a793d2700eaaad2fc732eb1 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Wed, 23 Oct 2024 14:00:47 +0200 Subject: [PATCH 01/31] AW-6410 Add extra parms to /api/v1/items/../children/count --- projects/common/src/fm/services/item.service.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/common/src/fm/services/item.service.ts b/projects/common/src/fm/services/item.service.ts index 116f8b7..23a89fb 100644 --- a/projects/common/src/fm/services/item.service.ts +++ b/projects/common/src/fm/services/item.service.ts @@ -127,7 +127,7 @@ export class ItemService { return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params }); } - getChildItemListCount(parentcode: string, itemType?: string,dataFilter?: any): Observable { + getChildItemListCount(parentcode: string, itemType?: string,dataFilter?: any, startDate?: Date, endDate?: Date): Observable { let params = new HttpParams(); if(itemType != null) { params = params.append("it", itemType); @@ -135,6 +135,8 @@ export class ItemService { if (dataFilter != null) { params = params.append("df", JSON.stringify(dataFilter)); } + if (startDate) params = params.append("sDate", startDate.toISOString()); + if (endDate) params = params.append("eDate", endDate.toISOString()); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children/count`, { params: params }); } From c3dbf85eb6f8077c8b9b2f01bb28eed37404de0c Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 23 Oct 2024 12:02:56 +0000 Subject: [PATCH 02/31] [ci skip] Updated packages #2519 --- package-lock.json | 12 ++++++------ package.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index f3f4390..535d805 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "farmmaps-lib-app", - "version": "4.11.0", + "version": "4.12.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "farmmaps-lib-app", - "version": "4.11.0", + "version": "4.12.0", "dependencies": { "@angular-eslint/eslint-plugin": "^18.2.0", "@angular/animations": "^18.2.3", @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.11.0-prerelease.2517", + "version": "4.11.0-prerelease.2518", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.11.0-prerelease.2517", + "version": "4.11.0-prerelease.2518", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.11.0-prerelease.2517", + "version": "4.11.0-prerelease.2518", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.11.0-prerelease.2517", + "version": "4.11.0-prerelease.2518", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" diff --git a/package.json b/package.json index 4de4148..34681c2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "farmmaps-lib-app", - "version": "4.11.0", + "version": "4.12.0", "scripts": { "ng": "ng", "start": "ng serve", From ceeaa89ba3c8f57c66e1aa1aea5a86da44af9e25 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Wed, 30 Oct 2024 11:37:51 +0100 Subject: [PATCH 03/31] AW-6410 Add indexed parm to getItemListCount --- projects/common/src/fm/services/item.service.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/common/src/fm/services/item.service.ts b/projects/common/src/fm/services/item.service.ts index 23a89fb..c857ff7 100644 --- a/projects/common/src/fm/services/item.service.ts +++ b/projects/common/src/fm/services/item.service.ts @@ -99,12 +99,14 @@ export class ItemService { return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/`, { params: params }); } - getItemListCount(itemType: string, startDate?: Date, endDate?: Date, sourceTask?: string): Observable { + getItemListCount(itemType: string, startDate?: Date, endDate?: Date, sourceTask?: string, + indexed?: boolean): Observable { let params = new HttpParams(); params = params.append("it", itemType); if (sourceTask) params = params.append("sourceTask", sourceTask); if (startDate) params = params.append("sDate", startDate.toISOString()); if (endDate) params = params.append("eDate", endDate.toISOString()); + if(indexed) params = params.append("ind",indexed?"true":"false"); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/count`, { params: params }); } From 0e8bd5343d93ac149c5e9dbedc88f4ddf6252d24 Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 30 Oct 2024 10:39:49 +0000 Subject: [PATCH 04/31] [ci skip] Updated packages #2520 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 535d805..6a3bd4c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.11.0-prerelease.2518", + "version": "4.12.0-prerelease.2519", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.11.0-prerelease.2518", + "version": "4.12.0-prerelease.2519", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.11.0-prerelease.2518", + "version": "4.12.0-prerelease.2519", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.11.0-prerelease.2518", + "version": "4.12.0-prerelease.2519", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From d977ddfb7bf0d33f106a6e86c78d9e3f9aefd14b Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Tue, 5 Nov 2024 09:26:00 +0100 Subject: [PATCH 05/31] Fix null ref exception --- projects/common/src/fm/services/itemtype.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common/src/fm/services/itemtype.service.ts b/projects/common/src/fm/services/itemtype.service.ts index c46930f..4eaab34 100644 --- a/projects/common/src/fm/services/itemtype.service.ts +++ b/projects/common/src/fm/services/itemtype.service.ts @@ -27,7 +27,7 @@ export class ItemTypeService { getExtraAttributes(itemType: string) { let extraAttributes = null; - if (this.itemTypes[itemType] && this.itemTypes[itemType].extraAttributes) extraAttributes = this.itemTypes[itemType].extraAttributes; + if (this.itemTypes[itemType] && this.itemTypes[itemType]?.extraAttributes) extraAttributes = this.itemTypes[itemType]?.extraAttributes; return extraAttributes; } From 86f3ddb34b3a68dc7e8074a209202752dad96e4f Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 5 Nov 2024 08:27:53 +0000 Subject: [PATCH 06/31] [ci skip] Updated packages #2521 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6a3bd4c..44f52e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.12.0-prerelease.2519", + "version": "4.12.0-prerelease.2520", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.12.0-prerelease.2519", + "version": "4.12.0-prerelease.2520", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.12.0-prerelease.2519", + "version": "4.12.0-prerelease.2520", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.12.0-prerelease.2519", + "version": "4.12.0-prerelease.2520", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 24e3765c28531ad07536db8b92def99bc4aa3271 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Tue, 12 Nov 2024 08:48:02 +0100 Subject: [PATCH 07/31] AW-6466 Overrule exact matching on data start/end date with from/until behavior --- projects/common/src/fm/services/item.service.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/projects/common/src/fm/services/item.service.ts b/projects/common/src/fm/services/item.service.ts index c857ff7..6563803 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): Observable { + skip?: number, take?: number, sourceTask?: string, exactMatchStartOrEndDate?: boolean): Observable { let params = new HttpParams(); if(itemType) params = params.append("it", itemType); if(dataFilter) params = params.append("df", JSON.stringify(dataFilter)); @@ -93,20 +93,23 @@ export class ItemService { if (crs) params = params.append("crs", crs); if (startDate) params = params.append("sDate", startDate.toISOString()); if (endDate) params = params.append("eDate", endDate.toISOString()); + if (endDate) params = params.append("eDate", endDate.toISOString()); if (sourceTask) params = params.append("sourceTask", sourceTask); if(skip) params = params.append("skip", skip); if(take) params = params.append("take", take); + if(exactMatchStartOrEndDate) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/`, { params: params }); } getItemListCount(itemType: string, startDate?: Date, endDate?: Date, sourceTask?: string, - indexed?: boolean): Observable { + indexed?: boolean, exactMatchStartOrEndDate?: boolean): Observable { let params = new HttpParams(); params = params.append("it", itemType); if (sourceTask) params = params.append("sourceTask", sourceTask); if (startDate) params = params.append("sDate", startDate.toISOString()); if (endDate) params = params.append("eDate", endDate.toISOString()); if(indexed) params = params.append("ind",indexed?"true":"false"); + if(exactMatchStartOrEndDate) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/count`, { params: params }); } From ddc7f97e27086770fd4546e6f118ac06296c81c4 Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 12 Nov 2024 07:49:58 +0000 Subject: [PATCH 08/31] [ci skip] Updated packages #2522 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 44f52e9..c43847e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.12.0-prerelease.2520", + "version": "4.12.0-prerelease.2521", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.12.0-prerelease.2520", + "version": "4.12.0-prerelease.2521", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.12.0-prerelease.2520", + "version": "4.12.0-prerelease.2521", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.12.0-prerelease.2520", + "version": "4.12.0-prerelease.2521", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 8cd7b85de2746fab37f8329b37d4c9736bdf4935 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Tue, 12 Nov 2024 08:56:50 +0100 Subject: [PATCH 09/31] AW-6466 Overrule exact matching on data start/end date with from/until behavior --- projects/common/src/fm/services/item.service.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/projects/common/src/fm/services/item.service.ts b/projects/common/src/fm/services/item.service.ts index 6563803..692ee07 100644 --- a/projects/common/src/fm/services/item.service.ts +++ b/projects/common/src/fm/services/item.service.ts @@ -114,7 +114,8 @@ export class ItemService { } getChildItemList(parentcode: string, itemType?: string, dataFilter?: any, level = 1, deep = true, - startDate?: Date, endDate?: Date, skip?: number, take?: number): Observable { + startDate?: Date, endDate?: Date, skip?: number, take?: number, + exactMatchStartOrEndDate?: boolean): Observable { let params = new HttpParams(); if(itemType != null) { params = params.append("it", itemType); @@ -126,13 +127,15 @@ 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) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); + if(skip) params = params.append("skip", skip); if(take) params = params.append("take", take); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params }); } - getChildItemListCount(parentcode: string, itemType?: string,dataFilter?: any, startDate?: Date, endDate?: Date): Observable { + getChildItemListCount(parentcode: string, itemType?: string,dataFilter?: any, + startDate?: Date, endDate?: Date, exactMatchStartOrEndDate?: boolean): Observable { let params = new HttpParams(); if(itemType != null) { params = params.append("it", itemType); @@ -142,6 +145,7 @@ export class ItemService { } if (startDate) params = params.append("sDate", startDate.toISOString()); if (endDate) params = params.append("eDate", endDate.toISOString()); + if(exactMatchStartOrEndDate) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children/count`, { params: params }); } From a8e1ba6c0216f57b5052fbd776bd234b4dec4d9f Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 12 Nov 2024 08:01:08 +0000 Subject: [PATCH 10/31] [ci skip] Updated packages #2523 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index c43847e..7deaabd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.12.0-prerelease.2521", + "version": "4.12.0-prerelease.2522", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.12.0-prerelease.2521", + "version": "4.12.0-prerelease.2522", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.12.0-prerelease.2521", + "version": "4.12.0-prerelease.2522", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.12.0-prerelease.2521", + "version": "4.12.0-prerelease.2522", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 093c26c7f3140a5bdc34637878b71af1014b9892 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Tue, 12 Nov 2024 10:12:12 +0100 Subject: [PATCH 11/31] AW-6466 Fix optional boolean value to overrule default. --- projects/common/src/fm/services/item.service.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/common/src/fm/services/item.service.ts b/projects/common/src/fm/services/item.service.ts index 692ee07..015930e 100644 --- a/projects/common/src/fm/services/item.service.ts +++ b/projects/common/src/fm/services/item.service.ts @@ -97,7 +97,7 @@ export class ItemService { if (sourceTask) params = params.append("sourceTask", sourceTask); if(skip) params = params.append("skip", skip); if(take) params = params.append("take", take); - if(exactMatchStartOrEndDate) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); + if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/`, { params: params }); } @@ -109,7 +109,7 @@ export class ItemService { if (startDate) params = params.append("sDate", startDate.toISOString()); if (endDate) params = params.append("eDate", endDate.toISOString()); if(indexed) params = params.append("ind",indexed?"true":"false"); - if(exactMatchStartOrEndDate) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); + if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/count`, { params: params }); } @@ -127,7 +127,7 @@ 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) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); + if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); if(skip) params = params.append("skip", skip); if(take) params = params.append("take", take); @@ -145,7 +145,7 @@ export class ItemService { } if (startDate) params = params.append("sDate", startDate.toISOString()); if (endDate) params = params.append("eDate", endDate.toISOString()); - if(exactMatchStartOrEndDate) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); + if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children/count`, { params: params }); } From 61d6446d75626060287ab994912ef1c88aa1d062 Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 12 Nov 2024 09:14:09 +0000 Subject: [PATCH 12/31] [ci skip] Updated packages #2524 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7deaabd..c42e0e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.12.0-prerelease.2522", + "version": "4.12.0-prerelease.2523", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.12.0-prerelease.2522", + "version": "4.12.0-prerelease.2523", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.12.0-prerelease.2522", + "version": "4.12.0-prerelease.2523", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.12.0-prerelease.2522", + "version": "4.12.0-prerelease.2523", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From a7abb4072bbac51bbcf9bbf4e38e6fa6ea2babf2 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Tue, 12 Nov 2024 14:40:05 +0100 Subject: [PATCH 13/31] AW-6466 Fixed double line of code --- projects/common/src/fm/services/item.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/common/src/fm/services/item.service.ts b/projects/common/src/fm/services/item.service.ts index 015930e..e017d0d 100644 --- a/projects/common/src/fm/services/item.service.ts +++ b/projects/common/src/fm/services/item.service.ts @@ -93,7 +93,6 @@ export class ItemService { if (crs) params = params.append("crs", crs); if (startDate) params = params.append("sDate", startDate.toISOString()); if (endDate) params = params.append("eDate", endDate.toISOString()); - if (endDate) params = params.append("eDate", endDate.toISOString()); if (sourceTask) params = params.append("sourceTask", sourceTask); if(skip) params = params.append("skip", skip); if(take) params = params.append("take", take); From 86f75c7f78c8384409d83ea6b2b404a7c59e542b Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 12 Nov 2024 13:41:57 +0000 Subject: [PATCH 14/31] [ci skip] Updated packages #2525 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index c42e0e2..4d94f1a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.12.0-prerelease.2523", + "version": "4.12.0-prerelease.2524", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.12.0-prerelease.2523", + "version": "4.12.0-prerelease.2524", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.12.0-prerelease.2523", + "version": "4.12.0-prerelease.2524", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.12.0-prerelease.2523", + "version": "4.12.0-prerelease.2524", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From db3734f8a3554052a5dba5fc32dafa21dc5109fd Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Thu, 14 Nov 2024 14:21:43 +0100 Subject: [PATCH 15/31] 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 }); } From ed1e1478b231c95e9b16a33fa07f608e748e4ea8 Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 14 Nov 2024 13:23:40 +0000 Subject: [PATCH 16/31] [ci skip] Updated packages #2526 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4d94f1a..b5bc7f9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.12.0-prerelease.2524", + "version": "4.12.0-prerelease.2525", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.12.0-prerelease.2524", + "version": "4.12.0-prerelease.2525", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.12.0-prerelease.2524", + "version": "4.12.0-prerelease.2525", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.12.0-prerelease.2524", + "version": "4.12.0-prerelease.2525", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From d4a230f96dbf414b4b5b6a611a1f2c5ed3ca0aeb Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Fri, 15 Nov 2024 14:06:11 +0100 Subject: [PATCH 17/31] AW-6495 Exception editor croppingscheme: do not use 'item' in route --- .../common/src/fm/effects/app-common.effects.ts | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/projects/common/src/fm/effects/app-common.effects.ts b/projects/common/src/fm/effects/app-common.effects.ts index d2570ec..4b19019 100644 --- a/projects/common/src/fm/effects/app-common.effects.ts +++ b/projects/common/src/fm/effects/app-common.effects.ts @@ -139,10 +139,17 @@ export class AppCommonEffects { const itemType = itemtypes[a.item.itemType]; var editor = itemType && itemType.editor ? itemType.editor : editor; } - this.router$.navigate(['/editor',editor,'item', a.item.code]) - return []; - } - ))); + if (editor == 'croppingscheme') { + // Exeception: no 'item' in route + this.router$.navigate(['/editor', editor, a.item.code]) + } + else { + this.router$.navigate(['/editor', editor, 'item', a.item.code]) + } + return []; + } + ) + )); viewItem$ = createEffect(() => this.actions$.pipe( ofType(appCommonActions.VIEWITEM), From 5e1bc6d705b8104fc148ef73dd05ac80594eab63 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Fri, 15 Nov 2024 14:06:33 +0100 Subject: [PATCH 18/31] AW-6495 Exception editor croppingscheme: do not use 'item' in route --- projects/common/src/fm/effects/app-common.effects.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common/src/fm/effects/app-common.effects.ts b/projects/common/src/fm/effects/app-common.effects.ts index 4b19019..87e42ff 100644 --- a/projects/common/src/fm/effects/app-common.effects.ts +++ b/projects/common/src/fm/effects/app-common.effects.ts @@ -134,7 +134,7 @@ export class AppCommonEffects { withLatestFrom(this.store$.select(appCommonReducers.selectGetItemTypes)), switchMap(([action, itemtypes]) => { const a = action as appCommonActions.EditItem; - var editor = "property"; + var editor = "property"; if(a.item.itemType) { const itemType = itemtypes[a.item.itemType]; var editor = itemType && itemType.editor ? itemType.editor : editor; From 57811f3f2e80a6c6922fdfe2fbbfbf2f518bee79 Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 15 Nov 2024 13:08:26 +0000 Subject: [PATCH 19/31] [ci skip] Updated packages #2527 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index b5bc7f9..b223fb1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.12.0-prerelease.2525", + "version": "4.12.0-prerelease.2526", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.12.0-prerelease.2525", + "version": "4.12.0-prerelease.2526", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.12.0-prerelease.2525", + "version": "4.12.0-prerelease.2526", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.12.0-prerelease.2525", + "version": "4.12.0-prerelease.2526", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 3f664b472c7df3940a81a67e0cadaa5bfb27eb63 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Tue, 19 Nov 2024 13:23:32 +0100 Subject: [PATCH 20/31] Fixed VM104:1 Uncaught TypeError: Cannot read properties of null (reading 'vnd.farmmaps.itemtype.croppingscheme') at eval (eval at getExtraAttributes (main.ce80740d3a633957.js:311566:14), :1:15) --- projects/common/src/fm/services/itemtype.service.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/common/src/fm/services/itemtype.service.ts b/projects/common/src/fm/services/itemtype.service.ts index 4eaab34..aff768f 100644 --- a/projects/common/src/fm/services/itemtype.service.ts +++ b/projects/common/src/fm/services/itemtype.service.ts @@ -15,37 +15,37 @@ export class ItemTypeService { getIcon(itemType: string) { let icon = "fal fa-file"; - if (this.itemTypes[itemType]) icon = this.itemTypes[itemType].icon; + if (this.itemTypes && this.itemTypes[itemType]) icon = this.itemTypes[itemType].icon; return icon; } getColor(itemType: string) { let color = "#000000"; - if (this.itemTypes[itemType]) color = this.itemTypes[itemType].iconColor; + if (this.itemTypes && this.itemTypes[itemType]) color = this.itemTypes[itemType].iconColor; return color; } getExtraAttributes(itemType: string) { let extraAttributes = null; - if (this.itemTypes[itemType] && this.itemTypes[itemType]?.extraAttributes) extraAttributes = this.itemTypes[itemType]?.extraAttributes; + if (this.itemTypes && this.itemTypes[itemType] && this.itemTypes[itemType]?.extraAttributes) extraAttributes = this.itemTypes[itemType]?.extraAttributes; return extraAttributes; } getSchema(itemType: string): string { let schema = null; - if (this.itemTypes[itemType]) schema = this.itemTypes[itemType].schema; + if (this.itemTypes && this.itemTypes[itemType]) schema = this.itemTypes[itemType].schema; return schema; } hasViewer(item: IItem) { const itemType: string = item.itemType; - if (this.itemTypes[itemType]) return this.itemTypes[itemType].viewer !== undefined; + if (this.itemTypes && this.itemTypes[itemType]) return this.itemTypes[itemType].viewer !== undefined; return false; } hasEditor(item: IItem) { const itemType: string = item.itemType; - if (this.itemTypes[itemType]) return this.itemTypes[itemType].editor !== undefined; + if (this.itemTypes && this.itemTypes[itemType]) return this.itemTypes[itemType].editor !== undefined; return false; } From fcbd68eca04ff1158b7a2aa902a05b008817b0b9 Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 19 Nov 2024 12:25:40 +0000 Subject: [PATCH 21/31] [ci skip] Updated packages #2528 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index b223fb1..7e86d47 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.12.0-prerelease.2526", + "version": "4.12.0-prerelease.2527", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.12.0-prerelease.2526", + "version": "4.12.0-prerelease.2527", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.12.0-prerelease.2526", + "version": "4.12.0-prerelease.2527", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.12.0-prerelease.2526", + "version": "4.12.0-prerelease.2527", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 852b1db89588f48b240c6c9c7eec47d1d218dd7b Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 20 Nov 2024 09:11:34 +0100 Subject: [PATCH 22/31] added workflowcode to IItemTask --- projects/common/src/fm/models/itemTask.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/common/src/fm/models/itemTask.ts b/projects/common/src/fm/models/itemTask.ts index acc0915..3ae4b0b 100644 --- a/projects/common/src/fm/models/itemTask.ts +++ b/projects/common/src/fm/models/itemTask.ts @@ -1,6 +1,7 @@ export interface IItemTask { code?: string; + workflowCode?: string; taskType?: string; attributes?: any; message?: string, @@ -11,6 +12,7 @@ export interface IItemTask { export class ItemTask implements IItemTask { public code?:string; + public workflowCode?: string; public taskType?: string; public attributes?: any; public message?: string; @@ -18,6 +20,6 @@ export class ItemTask implements IItemTask { public started?: Date; public finished?: Date; - constructor() { + constructor() { } -} \ No newline at end of file +} From 4a30707ec6565b2f20c03a13e4e6c8a0eae0ccbd Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 20 Nov 2024 08:13:33 +0000 Subject: [PATCH 23/31] [ci skip] Updated packages #2529 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7e86d47..5a9d4d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.12.0-prerelease.2527", + "version": "4.12.0-prerelease.2528", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.12.0-prerelease.2527", + "version": "4.12.0-prerelease.2528", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.12.0-prerelease.2527", + "version": "4.12.0-prerelease.2528", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.12.0-prerelease.2527", + "version": "4.12.0-prerelease.2528", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 068396ac9a74659c4740d1596aa8d7cf97839c51 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 20 Nov 2024 16:33:20 +0100 Subject: [PATCH 24/31] added TaskService --- .../common/src/fm/common-service.module.ts | 2 + .../common/src/fm/services/item.service.ts | 28 ++++++------- .../common/src/fm/services/task.service.ts | 40 +++++++++++++++++++ 3 files changed, 55 insertions(+), 15 deletions(-) create mode 100644 projects/common/src/fm/services/task.service.ts diff --git a/projects/common/src/fm/common-service.module.ts b/projects/common/src/fm/common-service.module.ts index 445472e..a01c703 100644 --- a/projects/common/src/fm/common-service.module.ts +++ b/projects/common/src/fm/common-service.module.ts @@ -13,6 +13,7 @@ import { SchemaService } from './services/schema.service'; import { FolderService } from './services/folder.service'; import { TimespanService } from './services/timespan.service'; import { ItemService } from './services/item.service'; +import { TaskService } from './services/task.service'; import { AdminService } from './services/admin.service'; import { EventService } from './services/event.service'; import { TypeaheadService } from './services/typeahead.service'; @@ -44,6 +45,7 @@ export { ItemTypeService, TimespanService, ItemService, + TaskService, AdminService, EventService, TypeaheadService, diff --git a/projects/common/src/fm/services/item.service.ts b/projects/common/src/fm/services/item.service.ts index 1117004..d42cd7f 100644 --- a/projects/common/src/fm/services/item.service.ts +++ b/projects/common/src/fm/services/item.service.ts @@ -1,14 +1,12 @@ -import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; -import { map } from 'rxjs/operators'; -import { IItemType } from '../models/item.type'; -import { IItemLinkType } from '../models/itemlink.type'; -import { IUrlType } from '../models/url.type'; -import { IItem } from '../models/item'; -import { IJsonline } from '../models/json-line'; -import { IItemTask } from '../models/itemTask'; -import { HttpClient, HttpParams, HttpHeaders } from "@angular/common/http"; -import { AppConfig } from "../shared/app.config"; +import {Injectable} from '@angular/core'; +import {Observable} from 'rxjs'; +import {IItemType} from '../models/item.type'; +import {IItemLinkType} from '../models/itemlink.type'; +import {IItem} from '../models/item'; +import {IJsonline} from '../models/json-line'; +import {IItemTask} from '../models/itemTask'; +import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http'; +import {AppConfig} from '../shared/app.config'; import {ItemTypeService} from './itemtype.service'; import {IListItem} from '../models/list.item'; @@ -96,11 +94,11 @@ export class ItemService { if (sourceTask) params = params.append("sourceTask", sourceTask); if(skip) params = params.append("skip", skip); if(take) params = params.append("take", take); - 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/`, { params: params }); } - + getItemListCount(itemType: string, startDate?: Date, endDate?: Date, sourceTask?: string, indexed?: boolean, exactMatchStartOrEndDate?: boolean, owner?:string): Observable { let params = new HttpParams(); @@ -129,8 +127,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(owner) params = params.append("owner", owner); - + if(owner) params = params.append("owner", owner); + if(skip) params = params.append("skip", skip); if(take) params = params.append("take", take); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params }); diff --git a/projects/common/src/fm/services/task.service.ts b/projects/common/src/fm/services/task.service.ts new file mode 100644 index 0000000..f681f12 --- /dev/null +++ b/projects/common/src/fm/services/task.service.ts @@ -0,0 +1,40 @@ +import {Injectable} from '@angular/core'; +import {HttpClient, HttpParams} from '@angular/common/http'; +import {AppConfig} from '../shared/app.config'; + +@Injectable({ + providedIn: 'root', +}) +export class TaskService { + constructor(public httpClient: HttpClient, public appConfig: AppConfig) { + } + + ApiEndpoint() { + return this.appConfig.getConfig("apiEndPoint"); + } + + getTask(taskCode: string) { + return this.httpClient.get(`${this.appConfig.getConfig('apiEndPoint')}/api/v1/tasks/${taskCode}`) + } + + getTasks(workflowCode: string, itemCode: string = null, taskType: string = null, skip = 0, take = 25) { + let params = new HttpParams(); + + if (workflowCode) { + params = params.append('workflowCode', workflowCode); + } + + if (itemCode) { + params = params.append('itemCode', itemCode); + } + + if (taskType) { + params = params.append('taskType', taskType); + } + + params = params.append('skip', skip.toString()); + params = params.append('take', take.toString()); + return this.httpClient.get(`${this.appConfig.getConfig('apiEndPoint')}/api/v1/tasks`, + {params: params}) + } +} From 475c5220391f74903dc6c56346d328e67a7e828d Mon Sep 17 00:00:00 2001 From: jenkins Date: Wed, 20 Nov 2024 15:35:21 +0000 Subject: [PATCH 25/31] [ci skip] Updated packages #2530 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5a9d4d4..1673315 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.12.0-prerelease.2528", + "version": "4.12.0-prerelease.2529", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.12.0-prerelease.2528", + "version": "4.12.0-prerelease.2529", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.12.0-prerelease.2528", + "version": "4.12.0-prerelease.2529", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.12.0-prerelease.2528", + "version": "4.12.0-prerelease.2529", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 8ab1611f39da7e783ebd60a4a8ce1a79312277cc Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Thu, 21 Nov 2024 10:47:42 +0100 Subject: [PATCH 26/31] AW-6504 Support indexed on retrieving child items --- projects/common/src/fm/services/item.service.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/projects/common/src/fm/services/item.service.ts b/projects/common/src/fm/services/item.service.ts index 1117004..d5ac231 100644 --- a/projects/common/src/fm/services/item.service.ts +++ b/projects/common/src/fm/services/item.service.ts @@ -116,7 +116,7 @@ export class ItemService { getChildItemList(parentcode: string, itemType?: string, dataFilter?: any, level = 1, deep = true, startDate?: Date, endDate?: Date, skip?: number, take?: number, - exactMatchStartOrEndDate?: boolean, owner?:string): Observable { + exactMatchStartOrEndDate?: boolean, owner?:string, indexed?: boolean): Observable { let params = new HttpParams(); if(itemType != null) { params = params.append("it", itemType); @@ -133,11 +133,13 @@ export class ItemService { if(skip) params = params.append("skip", skip); if(take) params = params.append("take", take); + if(indexed) params = params.append("ind",indexed?"true":"false"); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params }); } getChildItemListCount(parentcode: string, itemType?: string,dataFilter?: any, - startDate?: Date, endDate?: Date, exactMatchStartOrEndDate?: boolean, owner?:string): Observable { + startDate?: Date, endDate?: Date, exactMatchStartOrEndDate?: boolean, owner?:string, + indexed?: boolean): Observable { let params = new HttpParams(); if(itemType != null) { params = params.append("it", itemType); @@ -149,6 +151,7 @@ export class ItemService { if (endDate) params = params.append("eDate", endDate.toISOString()); if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate); if(owner) params = params.append("owner", owner); + if(indexed) params = params.append("ind",indexed?"true":"false"); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children/count`, { params: params }); } From cc879b85e5edb0af849dc5cc125cc2d59a680047 Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 21 Nov 2024 09:49:47 +0000 Subject: [PATCH 27/31] [ci skip] Updated packages #2531 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1673315..5a32d62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.12.0-prerelease.2529", + "version": "4.12.0-prerelease.2530", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.12.0-prerelease.2529", + "version": "4.12.0-prerelease.2530", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.12.0-prerelease.2529", + "version": "4.12.0-prerelease.2530", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.12.0-prerelease.2529", + "version": "4.12.0-prerelease.2530", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 50af55acb210afef45a1b519c5321b6b22a9a039 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 2 Dec 2024 10:29:18 +0100 Subject: [PATCH 28/31] AW-6480 Blauwe balk van upload venster is niet zichtbaar in de explorer --- .../resumable-file-upload/resumable-file-upload.component.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss b/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss index 55a33e1..76b5c87 100644 --- a/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss +++ b/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.component.scss @@ -4,6 +4,7 @@ div.resumable-file-upload { bottom: 0px; width: 300px; max-height: 250px; + z-index: 1; /*z-index:2000 !important;*/ } From f89f7412657ea9d9b88beb9e33afaf65e289fe8d Mon Sep 17 00:00:00 2001 From: jenkins Date: Mon, 2 Dec 2024 09:31:15 +0000 Subject: [PATCH 29/31] [ci skip] Updated packages #2532 --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5a32d62..7e0bf49 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.12.0-prerelease.2530", + "version": "4.12.0-prerelease.2531", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.12.0-prerelease.2530", + "version": "4.12.0-prerelease.2531", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.12.0-prerelease.2530", + "version": "4.12.0-prerelease.2531", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.12.0-prerelease.2530", + "version": "4.12.0-prerelease.2531", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0" From 72ba8eca81d0b413e76b7d9308ea47ca04d6f030 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Tue, 3 Dec 2024 13:00:12 +0100 Subject: [PATCH 30/31] AW-6556 The Angular Material version (18.2.4) does not match the Angular CDK version (18.2.3). --- package.json | 26 +++++++++++++------------- projects/common-map/package.json | 2 +- projects/common-map3d/package.json | 4 ++-- projects/common/package.json | 6 +++--- projects/ng-openlayers/package.json | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 34681c2..9c5d09b 100644 --- a/package.json +++ b/package.json @@ -12,14 +12,14 @@ "private": true, "dependencies": { "@angular-eslint/eslint-plugin": "^18.2.0", - "@angular/animations": "^18.2.3", - "@angular/common": "^18.2.3", - "@angular/compiler": "^18.2.3", - "@angular/core": "^18.2.3", - "@angular/forms": "^18.2.3", - "@angular/platform-browser": "^18.2.3", - "@angular/platform-browser-dynamic": "^18.2.3", - "@angular/router": "^18.2.3", + "@angular/animations": "18.2.3", + "@angular/common": "18.2.3", + "@angular/compiler": "18.2.3", + "@angular/core": "18.2.3", + "@angular/forms": "18.2.3", + "@angular/platform-browser": "18.2.3", + "@angular/platform-browser-dynamic": "18.2.3", + "@angular/router": "18.2.3", "@farmmaps/common": "file:dist/common", "@farmmaps/common-map": "file:dist/common-map", "@farmmaps/common-map3d": "file:dist/common-map3d", @@ -62,11 +62,11 @@ }, "devDependencies": { "@angular-builders/custom-webpack": "^18.0.0", - "@angular-devkit/build-angular": "^18.2.3", - "@angular/cli": "^18.2.3", - "@angular/compiler-cli": "^18.2.3", - "@angular/language-service": "^18.2.3", - "@angular/localize": "^18.2.3", + "@angular-devkit/build-angular": "18.2.3", + "@angular/cli": "18.2.3", + "@angular/compiler-cli": "18.2.3", + "@angular/language-service": "18.2.3", + "@angular/localize": "18.2.3", "@types/arcgis-rest-api": "^10.4.5", "@types/jasmine": "~2.8.8", "@types/jasminewd2": "^2.0.9", diff --git a/projects/common-map/package.json b/projects/common-map/package.json index 6a000e7..a767d92 100644 --- a/projects/common-map/package.json +++ b/projects/common-map/package.json @@ -8,7 +8,7 @@ "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/core": "^18.2.3", + "@angular/core": "18.2.3", "ngrx-store-localstorage": "^18.0.0", "@ngrx/effects": "^18.0.2", "@ngrx/router-store": "^18.0.2", diff --git a/projects/common-map3d/package.json b/projects/common-map3d/package.json index d2c55d8..41d5b82 100644 --- a/projects/common-map3d/package.json +++ b/projects/common-map3d/package.json @@ -8,8 +8,8 @@ "tslib": "^2.0.0" }, "peerDependencies": { - "@angular/common": "^18.2.3", - "@angular/core": "^18.2.3", + "@angular/common": "18.2.3", + "@angular/core": "18.2.3", "cesium": "^1.97.0", "ol-cesium": ">=2.13.0" } diff --git a/projects/common/package.json b/projects/common/package.json index 78bf3b7..8bfa106 100644 --- a/projects/common/package.json +++ b/projects/common/package.json @@ -6,9 +6,9 @@ }, "peerDependencies": { "@ng-bootstrap/ng-bootstrap": "^17.0.1", - "@angular/common": "^18.2.3", - "@angular/core": "^18.2.3", - "@angular/forms": "^18.2.3", + "@angular/common": "18.2.3", + "@angular/core": "18.2.3", + "@angular/forms": "18.2.3", "@ngrx/effects": "^18.0.2", "@ngrx/router-store": "^18.0.2", "@ngrx/store": "^18.0.2", diff --git a/projects/ng-openlayers/package.json b/projects/ng-openlayers/package.json index 70983c7..1ddb241 100644 --- a/projects/ng-openlayers/package.json +++ b/projects/ng-openlayers/package.json @@ -31,8 +31,8 @@ "tslib": "^2.3.0" }, "peerDependencies": { - "@angular/common": "^18.2.3", - "@angular/core": "^18.2.3", + "@angular/common": "18.2.3", + "@angular/core": "18.2.3", "ol": "^8.2.0" } } From 5c8fd6452121950a8959a8c0755a04889a6a3dae Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 3 Dec 2024 12:02:22 +0000 Subject: [PATCH 31/31] [ci skip] Updated packages #2533 --- package-lock.json | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7e0bf49..bb39ee0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,14 +9,14 @@ "version": "4.12.0", "dependencies": { "@angular-eslint/eslint-plugin": "^18.2.0", - "@angular/animations": "^18.2.3", - "@angular/common": "^18.2.3", - "@angular/compiler": "^18.2.3", - "@angular/core": "^18.2.3", - "@angular/forms": "^18.2.3", - "@angular/platform-browser": "^18.2.3", - "@angular/platform-browser-dynamic": "^18.2.3", - "@angular/router": "^18.2.3", + "@angular/animations": "18.2.3", + "@angular/common": "18.2.3", + "@angular/compiler": "18.2.3", + "@angular/core": "18.2.3", + "@angular/forms": "18.2.3", + "@angular/platform-browser": "18.2.3", + "@angular/platform-browser-dynamic": "18.2.3", + "@angular/router": "18.2.3", "@farmmaps/common": "file:dist/common", "@farmmaps/common-map": "file:dist/common-map", "@farmmaps/common-map3d": "file:dist/common-map3d", @@ -55,11 +55,11 @@ }, "devDependencies": { "@angular-builders/custom-webpack": "^18.0.0", - "@angular-devkit/build-angular": "^18.2.3", - "@angular/cli": "^18.2.3", - "@angular/compiler-cli": "^18.2.3", - "@angular/language-service": "^18.2.3", - "@angular/localize": "^18.2.3", + "@angular-devkit/build-angular": "18.2.3", + "@angular/cli": "18.2.3", + "@angular/compiler-cli": "18.2.3", + "@angular/language-service": "18.2.3", + "@angular/localize": "18.2.3", "@types/arcgis-rest-api": "^10.4.5", "@types/jasmine": "~2.8.8", "@types/jasminewd2": "^2.0.9", @@ -90,7 +90,7 @@ }, "dist/common": { "name": "@farmmaps/common", - "version": "4.12.0-prerelease.2531", + "version": "4.12.0-prerelease.2532", "dependencies": { "tslib": "^2.3.0" }, @@ -115,7 +115,7 @@ }, "dist/common-map": { "name": "@farmmaps/common-map", - "version": "4.12.0-prerelease.2531", + "version": "4.12.0-prerelease.2532", "dependencies": { "tslib": "^2.0.0" }, @@ -130,7 +130,7 @@ }, "dist/common-map3d": { "name": "@farmmaps/common-map3d", - "version": "4.12.0-prerelease.2531", + "version": "4.12.0-prerelease.2532", "dependencies": { "tslib": "^2.0.0" }, @@ -143,7 +143,7 @@ }, "dist/ng-openlayers": { "name": "@farmmaps/ng-openlayers", - "version": "4.12.0-prerelease.2531", + "version": "4.12.0-prerelease.2532", "license": "MPL-2.0", "dependencies": { "tslib": "^2.3.0"