diff --git a/grails-app/services/au/org/ala/ecodata/ParatooService.groovy b/grails-app/services/au/org/ala/ecodata/ParatooService.groovy index b79c63adc..c5901f93a 100644 --- a/grails-app/services/au/org/ala/ecodata/ParatooService.groovy +++ b/grails-app/services/au/org/ala/ecodata/ParatooService.groovy @@ -29,7 +29,7 @@ class ParatooService { static final String PARATOO_APP_NAME = "Monitor" static final String MONITOR_AUTH_HEADER = "Authorization" static final List DEFAULT_MODULES = - ['Plot Selection and Layout', 'Plot Description'] + ['Plot Selection and Layout', 'Plot Description', 'Opportune'] GrailsApplication grailsApplication SettingService settingService @@ -422,6 +422,7 @@ class ParatooService { site.projects = [] // get all projects for the user I suppose - not sure why this isn't in the payload as it's in the UI... site.type = Site.TYPE_SURVEY_AREA site.externalIds = [new ExternalId(idType:ExternalId.IdType.MONITOR_PLOT_GUID, externalId:geoJson.properties.externalId)] + site.publicationStatus = PublicationStatus.PUBLISHED // Mark the plot as read only as it is managed by the Monitor app site } diff --git a/src/main/groovy/au/org/ala/ecodata/reporting/OrganisationXlsExporter.groovy b/src/main/groovy/au/org/ala/ecodata/reporting/OrganisationXlsExporter.groovy index a408d60ee..22eaaf285 100644 --- a/src/main/groovy/au/org/ala/ecodata/reporting/OrganisationXlsExporter.groovy +++ b/src/main/groovy/au/org/ala/ecodata/reporting/OrganisationXlsExporter.groovy @@ -36,7 +36,7 @@ class OrganisationXlsExporter extends TabbedExporter { List activityProperties = ['type','description','progress', 'lastUpdated'] List commonActivityHeadersSummary = ["Organisation ID",'Organisation Name','Organisation ABN', 'Report ID', 'Report name', 'Report Description', 'From Date', 'To Date', 'Financial Year', 'Current Report Status', 'Date of status change', 'Changed by'] List commonActivityHeaders = commonActivityHeadersSummary + activityHeaders - List commonActivityPropertiesSummary = ["organisationId",'organisationName','organisationABN', REPORT_PREFIX+'reportId', REPORT_PREFIX+'reportName', REPORT_PREFIX+'reportDescription', REPORT_PREFIX+'fromDate', REPORT_PREFIX+'toDate', REPORT_PREFIX+'financialYear', REPORT_PREFIX+'reportStatus', REPORT_PREFIX+'dateChanged', REPORT_PREFIX+'changedBy'] + List commonActivityPropertiesSummary = ["organisationId",'organisationName','abn', REPORT_PREFIX+'reportId', REPORT_PREFIX+'reportName', REPORT_PREFIX+'reportDescription', REPORT_PREFIX+'fromDate', REPORT_PREFIX+'toDate', REPORT_PREFIX+'financialYear', REPORT_PREFIX+'reportStatus', REPORT_PREFIX+'dateChanged', REPORT_PREFIX+'changedBy'] List commonActivityProperties = commonActivityPropertiesSummary + activityProperties.collect { ACTIVITY_DATA_PREFIX+it diff --git a/src/test/groovy/au/org/ala/ecodata/ParatooServiceSpec.groovy b/src/test/groovy/au/org/ala/ecodata/ParatooServiceSpec.groovy index 9f8b467f8..6b4029040 100644 --- a/src/test/groovy/au/org/ala/ecodata/ParatooServiceSpec.groovy +++ b/src/test/groovy/au/org/ala/ecodata/ParatooServiceSpec.groovy @@ -168,7 +168,7 @@ class ParatooServiceSpec extends MongoSpec implements ServiceUnitTest