From c4c5308ae11093a75e90e0d9a90ec85dce9b5d51 Mon Sep 17 00:00:00 2001 From: temi Date: Thu, 6 Feb 2025 15:49:53 +1100 Subject: [PATCH 1/2] AtlasOfLivingAustralia/ecodata#1049 - supports individual count in recruitment protocol to be a sum of juvenile_count, seedling_count and sapling_count --- forms/mongo/insertParatooProtocolConfig.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/forms/mongo/insertParatooProtocolConfig.js b/forms/mongo/insertParatooProtocolConfig.js index a33e0eab6..d0af7a50c 100644 --- a/forms/mongo/insertParatooProtocolConfig.js +++ b/forms/mongo/insertParatooProtocolConfig.js @@ -346,12 +346,7 @@ var protocols = { "dataType": "species" }, "recruitment-sapling-and-seedling-count.juvenile_count": { - "dwcAttribute": "individualCount" - }, - "recruitment-sapling-and-seedling-count.seedling_count": { - "dwcAttribute": "individualCount" - }, - "recruitment-sapling-and-seedling-count.sapling_count": { + "dwcExpression": "(juvenile_count ?:0) + (seedling_count ?:0) + (sapling_count ?:0)", "dwcAttribute": "individualCount" }, "recruitment-sapling-and-seedling-count.voucher_full.host_species": { From 18beab8315dc9e9b1d878ee14d4993da9836561f Mon Sep 17 00:00:00 2001 From: temi Date: Mon, 10 Feb 2025 17:45:54 +1100 Subject: [PATCH 2/2] AtlasOfLivingAustralia/ecodata#1049 - converted expression to SPEL --- forms/mongo/insertParatooProtocolConfig.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forms/mongo/insertParatooProtocolConfig.js b/forms/mongo/insertParatooProtocolConfig.js index d0af7a50c..e9c31edd6 100644 --- a/forms/mongo/insertParatooProtocolConfig.js +++ b/forms/mongo/insertParatooProtocolConfig.js @@ -346,7 +346,7 @@ var protocols = { "dataType": "species" }, "recruitment-sapling-and-seedling-count.juvenile_count": { - "dwcExpression": "(juvenile_count ?:0) + (seedling_count ?:0) + (sapling_count ?:0)", + "dwcExpression": "(['juvenile_count'] == null ? 0 : ['juvenile_count']) + (['seedling_count'] == null ? 0 : ['seedling_count']) + (['sapling_count'] == null ? 0 :['sapling_count'])", "dwcAttribute": "individualCount" }, "recruitment-sapling-and-seedling-count.voucher_full.host_species": {