Merge pull request #914 from AtlasOfLivingAustralia/feature/paratoo

Feature/paratoo

Author: salomon-j

grails-app/conf/application.groovy

@@ -530,6 +530,7 @@ if (!ecodata.use.uuids) {
 ecodata.documentation.exampleProjectUrl = 'http://ecodata-test.ala.org.au/ws/activitiesForProject/746cb3f2-1f76-3824-9e80-fa735ae5ff35'
 // Used by ParatooService to sync available protocols
 paratoo.core.baseUrl = 'https://dev.core-api.monitor.tern.org.au/api'
+paratoo.excludeInterventionProtocols = true
 
 auth.baseUrl = 'https://auth-test.ala.org.au'
 userDetails.web.url = "${auth.baseUrl}/userdetails/"

grails-app/services/au/org/ala/ecodata/ParatooService.groovy

@@ -32,6 +32,7 @@ class ParatooService {
     static final List DEFAULT_MODULES =
             ['Plot Selection and Layout', 'Plot Description', 'Opportune']
     static final List ADMIN_ONLY_PROTOCOLS = ['Plot Selection']
+    static final String INTERVENTION_PROTOCOL_TAG = 'intervention'
 
     GrailsApplication grailsApplication
     SettingService settingService
@@ -66,7 +67,7 @@ class ParatooService {
         projects.findAll{it.protocols}
     }
 
-    private static List findProjectProtocols(ParatooProject project) {
+    private List findProjectProtocols(ParatooProject project) {
         log.debug "Finding protocols for ${project.id} ${project.name}"
         List<ActivityForm> protocols = []
 
@@ -77,6 +78,11 @@ class ParatooService {
             if (!project.isParaooAdmin()) {
                 protocols = protocols.findAll{!(it.name in ADMIN_ONLY_PROTOCOLS)}
             }
+            // Temporarily exclude intervention protocols until they are ready
+            if (grailsApplication.config.getProperty('paratoo.excludeInterventionProtocols', Boolean.class, true)) {
+                protocols = protocols.findAll{!(INTERVENTION_PROTOCOL_TAG in it.tags)}
+            }
+
         }
         protocols
     }
@@ -304,7 +310,7 @@ class ParatooService {
             String guid = protocol.attributes.identifier
             guids << guid
             String name = protocol.attributes.name
-            ParatooProtocolConfig protocolConfig = getProtocolConfig(id)
+            ParatooProtocolConfig protocolConfig = getProtocolConfig(guid)
             ActivityForm form = ActivityForm.findByExternalId(guid)
             if (!form) {
                 form = new ActivityForm()