diff --git a/.gitignore b/.gitignore index 3ded67828..3db23c63c 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ out /grails-app/assets/vendor/ /node_modules/ /grails-app/assets/dist/ +~/data/ecodata \ No newline at end of file diff --git a/build.gradle b/build.gradle index e687e6cce..1ffcd9fc2 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ plugins { id 'jacoco' } -version "4.4-SNAPSHOT" +version "4.5-SNAPSHOT" group "au.org.ala" description "Ecodata" diff --git a/grails-app/controllers/au/org/ala/ecodata/ActivityController.groovy b/grails-app/controllers/au/org/ala/ecodata/ActivityController.groovy index bc124371f..2b9dcfadd 100644 --- a/grails-app/controllers/au/org/ala/ecodata/ActivityController.groovy +++ b/grails-app/controllers/au/org/ala/ecodata/ActivityController.groovy @@ -185,6 +185,24 @@ class ActivityController { } } + /** + * Returns a detailed list of all activities associated with a project activity + * + * @param id of the project activity + */ + def activitiesForProjectActivity(String id) { + if (id) { + def activityList = [] + + activityList.addAll activityService.findAllForProjectActivityId(id, "all") + + asJson([list: activityList]) + } else { + response.status = 404 + render status:404, text: 'No such id' + } + } + def listForUser(String id){ def sort = params.sort ?: "lastUpdated" diff --git a/grails-app/controllers/au/org/ala/ecodata/UrlMappings.groovy b/grails-app/controllers/au/org/ala/ecodata/UrlMappings.groovy index 9ce1abbd7..95803e93f 100644 --- a/grails-app/controllers/au/org/ala/ecodata/UrlMappings.groovy +++ b/grails-app/controllers/au/org/ala/ecodata/UrlMappings.groovy @@ -46,6 +46,12 @@ class UrlMappings { controller = 'activity' action = 'activitiesForProject' } + + "/ws/activitiesForProjectActivity/$id" { + controller = 'activity' + action = 'activitiesForProjectActivity' + } + "/ws/deleteByProjectActivity/$id" { controller = 'activity' action = 'deleteByProjectActivity'