Merge pull request #1018 from AtlasOfLivingAustralia/feature/issue918

Feature/issue918
AtlasOfLivingAustralia · Sep 19, 2024 · a71fa6e · a71fa6e
2 parents 1632252 + 9697555
commit a71fa6e
Showing 1 changed file with 11 additions and 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
@@ -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
@@ -499,8 +500,17 @@ 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 as String)
+                        dataSets["protocol"] = protocolForm?.name
+                    }
 
+                }
+
+                // joining all investmentPriority, methods, measurementTypes and sensitivities  from list to String
                 if (dataSets?.investmentPriorities){
                     dataSets["investmentPriorities"] = dataValue?.investmentPriorities?.join(", ")
                 }