Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/issue918 #1018

Merged
merged 3 commits into from
Sep 19, 2024
Merged

Feature/issue918 #1018

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbbf219
commit update to use protocol name in the data set summary #918
salomon-j Sep 19, 2024
890bcda
Merge branch 'dev' into feature/issue918
salomon-j Sep 19, 2024
9697555
commit update to use protocol name in the data set summary #918
salomon-j Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/main/groovy/au/org/ala/ecodata/reporting/ProjectXlsExporter.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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(", ")
}
Expand Down
Loading