From cbbf21947f0159d6050d20344757aa9ef7103fc4 Mon Sep 17 00:00:00 2001 From: sal153 Date: Thu, 19 Sep 2024 14:00:11 +1000 Subject: [PATCH 1/2] commit update to use protocol name in the data set summary #918 --- .../ala/ecodata/reporting/ProjectXlsExporter.groovy | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/groovy/au/org/ala/ecodata/reporting/ProjectXlsExporter.groovy b/src/main/groovy/au/org/ala/ecodata/reporting/ProjectXlsExporter.groovy index 5f7d1fa1d..a17523302 100644 --- a/src/main/groovy/au/org/ala/ecodata/reporting/ProjectXlsExporter.groovy +++ b/src/main/groovy/au/org/ala/ecodata/reporting/ProjectXlsExporter.groovy @@ -1,5 +1,6 @@ package au.org.ala.ecodata.reporting +import au.org.ala.ecodata.ActivityForm import au.org.ala.ecodata.DataDescription import au.org.ala.ecodata.ExternalId import au.org.ala.ecodata.ManagementUnit @@ -429,8 +430,18 @@ class ProjectXlsExporter extends ProjectExporter { Map dataSets = [:] dataValue.each{k, v -> dataSets.put(k,v)} - // joining all investmentPriority, methods, measurementTypes and sensitivities from list to String + if (dataSets?.protocol){ + if (dataSets.protocol == "other") { + dataSets["protocol"] = "other" + } else { + ActivityForm protocolForm = ActivityForm.findByExternalId(dataSets.protocol) + String dataSetName = protocolForm?.name + dataSets["protocol"] = dataSetName + } + } + + // joining all investmentPriority, methods, measurementTypes and sensitivities from list to String if (dataSets?.investmentPriorities){ dataSets["investmentPriorities"] = dataValue?.investmentPriorities?.join(", ") } From 9697555bed15ff68ac4a5b615c1cb4f007d92c97 Mon Sep 17 00:00:00 2001 From: sal153 Date: Thu, 19 Sep 2024 15:45:53 +1000 Subject: [PATCH 2/2] commit update to use protocol name in the data set summary #918 --- .../au/org/ala/ecodata/reporting/ProjectXlsExporter.groovy | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/groovy/au/org/ala/ecodata/reporting/ProjectXlsExporter.groovy b/src/main/groovy/au/org/ala/ecodata/reporting/ProjectXlsExporter.groovy index 45b89b157..07fd28b7e 100644 --- a/src/main/groovy/au/org/ala/ecodata/reporting/ProjectXlsExporter.groovy +++ b/src/main/groovy/au/org/ala/ecodata/reporting/ProjectXlsExporter.groovy @@ -504,9 +504,8 @@ class ProjectXlsExporter extends ProjectExporter { if (dataSets.protocol == "other") { dataSets["protocol"] = "other" } else { - ActivityForm protocolForm = ActivityForm.findByExternalId(dataSets.protocol) - String dataSetName = protocolForm?.name - dataSets["protocol"] = dataSetName + ActivityForm protocolForm = ActivityForm.findByExternalId(dataSets.protocol as String) + dataSets["protocol"] = protocolForm?.name } }