From b88a3eb81134996ce422e64882150a89986b086a Mon Sep 17 00:00:00 2001 From: chrisala Date: Fri, 29 May 2015 10:33:02 +1000 Subject: [PATCH 01/18] Bumped version to 1.2.4-SNAPSHOT --- application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application.properties b/application.properties index a1c9e489d..0b53774b6 100644 --- a/application.properties +++ b/application.properties @@ -2,4 +2,4 @@ #Mon Nov 03 17:25:26 EST 2014 app.grails.version=2.4.4 app.name=ecodata -app.version=1.2.3-SNAPSHOT +app.version=1.2.4-SNAPSHOT From 2e19198f31748c9f4ef142b2f5ff39c647eeb945 Mon Sep 17 00:00:00 2001 From: chrisala Date: Fri, 29 May 2015 10:34:13 +1000 Subject: [PATCH 02/18] Assign the creating user as admin when creating a new Organisation. --- .../org/ala/ecodata/OrganisationService.groovy | 7 +++++-- .../ecodata/OrganisationControllerSpec.groovy | 17 ++++++++++++++++- .../ala/ecodata/OrganisationServiceSpec.groovy | 10 +++++++++- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/grails-app/services/au/org/ala/ecodata/OrganisationService.groovy b/grails-app/services/au/org/ala/ecodata/OrganisationService.groovy index 24d888de6..55bfe9949 100644 --- a/grails-app/services/au/org/ala/ecodata/OrganisationService.groovy +++ b/grails-app/services/au/org/ala/ecodata/OrganisationService.groovy @@ -8,11 +8,11 @@ import grails.validation.ValidationException class OrganisationService { /** Use to include related projects in the toMap method */ - public static final String PROJECTS = 'projects' // + public static final String PROJECTS = 'projects' static transactional = 'mongo' - def grailsApplication, webService, commonService, projectService, permissionService, documentService, collectoryService + def grailsApplication, webService, commonService, projectService, userService, documentService, collectoryService, permissionService // create ecodata organisations for any institutions in collectory which are not yet in ecodata // return null if sucessful, or errors @@ -70,6 +70,9 @@ class OrganisationService { props.remove('collectoryInstitutionId') commonService.updateProperties(organisation, props) + // Assign the creating user as an admin. + permissionService.addUserAsRoleToOrganisation(userService.getCurrentUserDetails().userId, AccessLevel.admin, organisation.organisationId) + [status:'ok',organisationId:organisation.organisationId] } catch (Exception e) { diff --git a/test/integration/au/org/ala/ecodata/OrganisationControllerSpec.groovy b/test/integration/au/org/ala/ecodata/OrganisationControllerSpec.groovy index d5eccb83d..de61e53a4 100644 --- a/test/integration/au/org/ala/ecodata/OrganisationControllerSpec.groovy +++ b/test/integration/au/org/ala/ecodata/OrganisationControllerSpec.groovy @@ -4,18 +4,28 @@ class OrganisationControllerSpec extends IntegrationTestHelper { def organisationController = new OrganisationController() def organisationService + def userService def stubbedCollectoryService = Stub(CollectoryService) + def stubbedUserService = Stub(UserService) def setup() { organisationService.collectoryService = stubbedCollectoryService + organisationService.userService = stubbedUserService organisationController.organisationService = organisationService } + def cleanup() { + // The environment persists for all integration tests so we need to restore the service to it's previous condition. + organisationService.userService = userService + } + void "test create organisation"() { setup: def institutionId = "dr1" + def userId = '1234' stubbedCollectoryService.createInstitution(_) >> institutionId + stubbedUserService.getCurrentUserDetails() >> [userId:userId] def org = TestDataHelper.buildNewOrganisation([name: 'Test Organisation', description: 'Test description', dynamicProperty: 'dynamicProperty']) setupPost(organisationController.request, org) @@ -23,7 +33,6 @@ class OrganisationControllerSpec extends IntegrationTestHelper { def resp = organisationController.update('') // Empty or null ID triggers a create then: "ensure we get a response including an organisationId" - def organisationId = resp.organisationId organisationController.response.contentType == 'application/json;charset=UTF-8' resp.message == 'created' @@ -41,6 +50,12 @@ class OrganisationControllerSpec extends IntegrationTestHelper { savedOrganisation.dynamicProperty == org.dynamicProperty savedOrganisation.collectoryInstitutionId == institutionId + and: "the user who created the organisation is an admin of the new organisation" + def orgPermissions = UserPermission.findAllByEntityIdAndEntityType(savedOrganisation.organisationId, Organisation.class.name) + orgPermissions.size() == 1 + orgPermissions[0].userId == userId + orgPermissions[0].accessLevel == AccessLevel.admin + } void "projects should be associated with an organisation by the organisationId property"() { diff --git a/test/unit/au/org/ala/ecodata/OrganisationServiceSpec.groovy b/test/unit/au/org/ala/ecodata/OrganisationServiceSpec.groovy index 2252e21c8..fa17ea3b2 100644 --- a/test/unit/au/org/ala/ecodata/OrganisationServiceSpec.groovy +++ b/test/unit/au/org/ala/ecodata/OrganisationServiceSpec.groovy @@ -14,6 +14,8 @@ class OrganisationServiceSpec extends Specification { OrganisationService service = new OrganisationService() def stubbedCollectoryService = Stub(CollectoryService) + def stubbedUserService = Stub(UserService) + def mockedPermissionService = Mock(PermissionService) def setup() { Fongo fongo = new Fongo("ecodata-test") @@ -22,12 +24,17 @@ class OrganisationServiceSpec extends Specification { service.commonService = new CommonService() service.commonService.grailsApplication = grailsApplication service.collectoryService = stubbedCollectoryService + service.userService = stubbedUserService + service.permissionService = mockedPermissionService } + def "test create organisation"() { given: - def orgData = [name:'test org', description: 'test org description', dynamicProperty: 'dynamicProperty'] + def orgData = [name:'test org', description: 'test org description', dynamicProperty: 'dynamicProperty'] def institutionId = 'dr1' + def userId = '1234' stubbedCollectoryService.createInstitution(_) >> institutionId + stubbedUserService.getCurrentUserDetails() >> [userId:userId] def result @@ -38,6 +45,7 @@ class OrganisationServiceSpec extends Specification { then: "ensure the response contains the id of the new organisation" result.status == 'ok' result.organisationId != null + 1 * mockedPermissionService.addUserAsRoleToOrganisation(userId, AccessLevel.admin, !null) when: "select the new organisation back from the database" From 2edd2541f08d9e8cee64d715ba5f6c076410415e Mon Sep 17 00:00:00 2001 From: chrisala Date: Fri, 29 May 2015 15:53:52 +1000 Subject: [PATCH 03/18] Synced models. --- models/activities-model.json | 5893 +++++++++-------- models/activityAttachments/dataModel.json | 87 +- .../communityActivityDetails/dataModel.json | 7 + models/fireInformation/dataModel.json | 151 +- models/programs-model.json | 361 +- .../dataModel.json | 2 +- models/smallGrantAquittal/dataModel.json | 72 +- models/smallGrantFinalReport/dataModel.json | 244 +- models/smallGrantOutputs/dataModel.json | 638 +- .../smallGrantProgressReport/dataModel.json | 223 +- 10 files changed, 4294 insertions(+), 3384 deletions(-) diff --git a/models/activities-model.json b/models/activities-model.json index fc3b698c6..fa7ae508d 100644 --- a/models/activities-model.json +++ b/models/activities-model.json @@ -1,3463 +1,3872 @@ { - "selectedActivity": { - "supportsSites": true, - "category": "Implementation actions", - "name": "Conservation Actions for Species and Communities", - "type": "Activity", - "outputs": [ - "Conservation Works Details", - "Participant Information" - ], - "gmsId": "CATS" - }, - "activities": [ + "outputs": [ { - "status": "deleted", - "name": "Biodiversity Fund - Outcomes and Monitoring", - "type": "Assessment", - "outputs": ["Biodiversity Fund Outcomes & Monitoring Methodology"] + "template": "revegetationDetails", + "scores": [ + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "RVA", + "name": "areaRevegHa", + "description": "The area of land actually revegetated with native species by the planting of seedlings, sowing of seed and managed native regeneration actions.", + "label": "Area of revegetation works (Ha)", + "units": "Ha", + "listName": "", + "category": "Revegetation", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", + "displayType": "", + "name": "lengthReveg", + "description": "The lineal length (longest axis) of waterways and coastline revegetated.", + "label": "Length (kilometres) of waterway / coastline revegetated", + "listName": "", + "category": "Revegetation" + }, + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "RVN", + "name": "totalNumberPlanted", + "description": "The total number of seedlings planted.", + "label": "Number of plants planted", + "units": "", + "category": "Revegetation", + "isOutputTarget": true + }, + { + "aggregationType": "COUNT", + "displayType": "", + "name": "species", + "description": "The total number of species occurrence records as an aggregate of the number of species in each revegetation activity. Individual species may be multi-counted if the same species has been planted in multiple activities.", + "label": "Total No. of species occurrence records", + "listName": "planting", + "category": "Revegetation" + }, + { + "aggregationType": "SUM", + "displayType": "barchart", + "name": "numberPlanted", + "description": "The number of seedlings of each species planted to establish native vegetation in revegetation sites.", + "label": "No. of plants planted by species", + "groupBy": "output:species.name", + "listName": "planting", + "category": "Revegetation" + }, + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "RVSS", + "name": "totalSeedSownKg", + "description": "The total weight of seed sown in revegetation plots.", + "label": "Kilograms of seed sown", + "units": "Kg", + "category": "Revegetation", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", + "displayType": "barchart", + "name": "seedSownKg", + "description": "The weight of seed of each species sown to establish native vegetation in revegetation sites.", + "label": "Kilograms of seed sown by species", + "units": "", + "groupBy": "output:species.name", + "listName": "planting", + "category": "Revegetation", + "isOutputTarget": false + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "piechart", + "name": "environmentalBenefits", + "description": "The proportional distribution of environmental benefits being delivered by revegetation activities. Individual activities may be delivering multiple benefits.", + "label": "Proportion of activities undertaking revegetation by environmental benefit type", + "units": "", + "listName": "", + "category": "Revegetation" + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "piechart", + "name": "revegMethod", + "description": "The proportional distribution of methods used for revegetation by revegetation activities. Individual activities may be applying multiple methods..", + "label": "No. of activities undertaking revegetation by revegetation method", + "category": "Revegetation" + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "piechart", + "name": "connectivityIndex", + "description": "The proportional break-down of revegetation activities contributing to landscape connectivity by connectivity category.", + "label": "No. of activities increasing connectivity by type of connection", + "listName": "", + "category": "Revegetation" + }, + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "RVT2A", + "name": "numberPlanted", + "description": "Total number of plants planted which will grow to a mature height of greater than 2 metres. This does not include natural regeneration or plants established from the sowing of seed.", + "label": "No. of plants planted > 2 metres in height", + "groupBy": "output:matureHeight", + "listName": "planting", + "category": "Revegetation", + "filterBy": "> 2 metres", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "RVS2A", + "name": "numberPlanted", + "description": "Kilograms of seed sown of species expected to grow > 2 metres in height", + "label": "Kilograms of seed sown of species expected to grow > 2 metres in height", + "units": "Kg", + "groupBy": "output:matureHeight", + "listName": "planting", + "category": "Revegetation", + "filterBy": "> 2 metres", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "RVT2B", + "name": "numberPlanted", + "description": "Total number of plants planted which will grow to a mature height of less than 2 metres. This does not include natural regeneration or plants established from the sowing of seed.", + "label": "No. of plants planted < 2 metres in height", + "groupBy": "output:matureHeight", + "listName": "planting", + "category": "Revegetation", + "filterBy": "< 2 metres", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "RVS2B", + "name": "seedSownKg", + "description": "Kilograms of seed sown of species expected to grow < 2 metres in height", + "label": "Kilograms of seed sown of species expected to grow < 2 metres in height", + "units": "Kg", + "groupBy": "output:matureHeight", + "listName": "planting", + "category": "Revegetation", + "filterBy": "< 2 metres", + "isOutputTarget": true + } + ], + "name": "Revegetation Details" }, { - "supportsSites": true, - "category": "Implementation actions", - "name": "Community Participation and Engagement", - "type": "Activity", - "outputs": [ - "Event Details", - "Participant Information", - "Materials Provided to Participants" + "template": "seedCollectionDetails", + "scores": [ + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "SDC", + "name": "totalSeedCollectedKg", + "description": "The total weight of seed collected for storage or propagation.", + "label": "Total seed collected (Kg)", + "units": "Kg", + "listName": "", + "category": "Revegetation", + "isOutputTarget": true + }, + { + "aggregationType": "COUNT", + "displayType": "", + "name": "seedSourceSpecies", + "description": "The total number of species occurrence records as an aggregate of the number of species in each seed collection activity. Individual species may be multi-counted if seed has been collecteted from the same species in multiple activities.", + "label": "Total No. of species records", + "listName": "seedsList", + "category": "Revegetation" + }, + { + "aggregationType": "SUM", + "displayType": "barchart", + "name": "seedCollectedKg", + "description": "The total weight of seed collected from each recorded species.", + "label": "Kg of seed collected by species", + "units": "Kg", + "groupBy": "output:seedSourceSpecies.name", + "listName": "seedsList", + "category": "Revegetation" + } ], - "gmsId": "CPEE" + "name": "Seed Collection Details" }, { - "supportsSites": true, - "category": "Implementation actions", - "name": "Debris Removal", - "type": "Activity", - "outputs": [ - "Debris Removal Details", - "Participant Information" + "template": "sitePreparationActions", + "scores": [ + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "STP", + "name": "preparationAreaTotal", + "description": "Sum of the area of land specifically recorded as having preparatory works undertaken in advance of another associated activity. Site preparation works include activities such as fencing, weed or pest treatment, drainage or soil moisture management actions, etc.", + "label": "Total area prepared (Ha) for follow-up treatment actions", + "units": "Ha", + "category": "Sites and Activity Planning", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", + "displayType": "piechart", + "name": "preparationAreaTotal", + "description": "Breakdown of the area prepared for a follow-up action by the type of preparation action.", + "label": "Area prepared (Ha) by type of preparation works", + "units": "Ha", + "groupBy": "output:actionsList.groundPreparationWorks", + "listName": "", + "category": "Sites and Activity Planning" + }, + { + "aggregationType": "COUNT", + "displayType": "piechart", + "name": "groundPreparationWorks", + "description": "Count of the number of actions of each type associated with the site preparation activity. ", + "label": "Proportion of actions contributing to the preparation of land for subsequent actions by the type of subsequent action", + "groupBy": "output:associatedActivity", + "listName": "actionsList", + "category": "Sites and Activity Planning" + } ], - "gmsId": "DRV DRW" + "name": "Site Preparation Actions" }, { - "supportsSites": true, - "category": "Implementation actions", - "name": "Disease Management", - "type": "Activity", - "outputs": [ - "Disease Management Details", - "Participant Information" + "template": "participation", + "scores": [ + { + "aggregationType": "SUM", + "displayType": "", + "name": "totalParticipantsNotEmployed", + "description": "The number of participants at activities and events who are not employed on projects. Individuals attending multiple activities will be counted for their attendance at each event.", + "label": "No of volunteers participating in project activities", + "units": "", + "listName": "", + "category": "Community Engagement and Capacity Building", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", + "displayType": "", + "name": "numberOfIndigenousParticipants", + "description": "The number of Indigenous people attending and/or participating in activities and events. Individuals attending multiple activities will be counted for their attendance at each event.", + "label": "No of Indigenous participants at project events. ", + "units": "", + "category": "Indigenous Capacity", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", + "displayType": "", + "name": "totalParticipantsNew", + "description": "The total number of unique individuals who attended at least one project event. This measure is an attempt to determine new vs repeat participation as a measure of the effectiveness of projects/programmes in reaching out and engaging with their communities.", + "label": "Total No. of new participants (attending project events for the first time)", + "units": "", + "category": "Community Engagement and Capacity Building", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", + "displayType": "", + "name": "numberOfFarmingEntitiesNew", + "description": "The total number of unique/individual farming entities (farm businesses) engaged in project activities. This data may double-count entities which participate in more than one activity/event in a given project.", + "label": "Total No. of unique farming entities engaged", + "units": "", + "category": "Farm Management Practices", + "isOutputTarget": false + } ], - "gmsId": "DMA" + "name": "Participant Information" }, { - "supportsSites": true, - "category": "Implementation actions", - "name": "Erosion Management", - "supportsPhotoPoints": true, - "type": "Activity", - "outputs": [ - "Erosion Management Details", - "Participant Information" - ], - "gmsId": "EMA EML" - }, - { - "supportsSites": true, - "category": "Assessment & monitoring", - "name": "Fauna Survey - general", - "supportsPhotoPoints": true, - "type": "Assessment", - "outputs": [ - "Survey Information", - "Fauna Survey Details", - "Participant Information" - ], - "gmsId": "FBS" - }, - { - "supportsSites": true, - "category": "Implementation actions", - "name": "Fencing", - "type": "Activity", - "outputs": [ - "Fence Details", - "Participant Information" - ], - "gmsId": "FNC" - }, - { - "supportsSites": true, - "category": "Implementation actions", - "name": "Conservation Grazing Management", - "supportsPhotoPoints": true, - "type": "Activity", - "outputs": [ - "Stock Management Details", - "Photo Points" - ], - "gmsId": "CGM" - }, - { - "supportsSites": true, - "category": "Implementation actions", - "name": "Fire Management", - "supportsPhotoPoints": true, - "type": "Activity", - "outputs": [ - "Fire Management Details", - "Participant Information", - "Photo Points" - ], - "gmsId": "FMA" + "template": "photoPoints", + "scores": [{ + "aggregationType": "SUM", + "name": "numberOfPoints", + "label": "No. of photo points", + "units": "", + "isOutputTarget": false + }], + "name": "Photo Points" }, { - "supportsSites": true, - "category": "Assessment & monitoring", - "name": "Flora Survey - general", - "supportsPhotoPoints": true, - "type": "Assessment", - "outputs": [ - "Survey Information", - "Flora Survey Details", - "Participant Information" + "template": "communityActivityDetails", + "scores": [ + { + "aggregationType": "COUNT", + "displayType": "", + "gmsId": "CPEE", + "name": "eventType", + "description": "Count of the number of community participation and engagement events run.", + "label": "Total No. of community participation and engagement events run", + "listName": "events", + "category": "Community Engagement and Capacity Building", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", + "displayType": "", + "name": "totalEventHrs", + "description": "Sum of the duration of events run", + "label": "Total amount of time (Hrs) over which events have run", + "units": "", + "listName": "", + "category": "Community Engagement and Capacity Building" + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "piechart", + "name": "eventPurpose", + "description": "Breakdown of the number of events run for different purposes", + "label": "No. of events run by purpose of event", + "units": "", + "listName": "events", + "category": "Community Engagement and Capacity Building", + "isOutputTarget": false + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "piechart", + "name": "industryType", + "description": "Breakdown of the number of events run by the type of industry that they are targeted at.", + "label": "No. of events by type of industry", + "groupBy": "", + "listName": "events", + "category": "Community Engagement and Capacity Building" + } ], - "gmsId": "FRBS" + "name": "Event Details" }, { - "supportsSites": true, - "category": "Implementation actions", - "name": "Heritage Conservation", - "type": "Activity", - "outputs": [ - "Heritage Conservation Information", - "Expected Heritage Outcomes", - "Participant Information" - ], - "gmsId": "HC HSA" + "template": "communicationMaterialsSupplied", + "scores": [], + "name": "Materials Provided to Participants" }, { - "category": "Administration, management & reporting", - "name": "Indigenous Employment and Businesses", - "type": "Activity", - "outputs": [ - "Indigenous Employment", - "Indigenous Businesses" + "template": "fireInformation", + "scores": [ + { + "aggregationType": "COUNT", + "displayType": "", + "name": "areaOfFireHa", + "description": "The total number of activities applying fire as a management tool. This figure may also include some activities undertaking wildfire management actions.", + "label": "No. of activities undertaking fire management measures", + "listName": "", + "category": "Natural Resources Management" + }, + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "FMA", + "name": "areaOfFireHa", + "description": "The area of the fire ground actually burnt. This may be different to the total area managed.", + "label": "Burnt area (Ha)", + "units": "Ha", + "category": "Natural Resources Management", + "isOutputTarget": true + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "", + "name": "fireReason", + "description": "Proportional breakdown of the number of fire management activities by the reason for using fire as a management tool. Activities may be undertaken for multiple reasons and therefore may be double-counted in the total figures. This graph should only be interpreted as a proportional breakdown.", + "label": "No. of activities by reason for burn", + "units": "", + "listName": "", + "category": "Natural Resources Management", + "isOutputTarget": false + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "", + "name": "fireEventType", + "description": "Breakdown of the number of fire management activities undertaken by the type of fire event.", + "label": "No. of activities by type of fire event", + "units": "", + "category": "Natural Resources Management" + } ], - "gmsId": "IPE" - }, - { - "category": "Training", - "name": "Indigenous Knowledge Transfer", - "type": "Activity", - "outputs": ["Indigenous Knowledge Transfer Details"], - "gmsId": "IKM IKT" + "name": "Fire Management Details" }, { - "category": "Implementation actions", - "name": "Management Plan Development", - "type": "Activity", - "outputs": [ - "Plan Development Details", - "Participant Information" + "template": "evidenceOfWeedTreatment", + "scores": [ + { + "aggregationType": "AVERAGE", + "displayType": "", + "name": "evidenceOfPreviousWeedTreatment", + "description": "Average effectiveness of previous treatment (% killed) as assessed from the evidence of previous treatment events during weed mapping and monitoring activities", + "label": "Average effectiveness of Previous Treatment (% killed)", + "units": "%", + "listName": "", + "category": "Invasive Species Management - Weeds", + "isOutputTarget": false + }, + { + "aggregationType": "COUNT", + "displayType": "piechart", + "name": "effectivenessOfPreviousWeedTreatment", + "description": "Proportional breakdown of the number of reportings of different typs of evidence of previous weed treatment actions, as noted during weed mapping and monitoring activities.", + "label": "Proportional breakdown of the No. of reports of different types of previous treatment evidence", + "groupBy": "output:evidenceOfPreviousWeedTreatment", + "listName": "", + "category": "Invasive Species Management - Weeds" + } ], - "gmsId": "MPD" - }, - { - "supportsSites": true, - "category": "Implementation actions", - "name": "Management Practice Change", - "type": "Activity", - "outputs": ["Management Practice Change Details"], - "gmsId": "MPC MPCFE MPCSP" + "name": "Evidence of Weed Treatment" }, { - "supportsSites": true, - "category": "Implementation actions", - "name": "Conservation Actions for Species and Communities", - "type": "Activity", - "outputs": [ - "Conservation Works Details", - "Participant Information" + "template": "weedObservationDetails", + "scores": [ + { + "aggregationType": "COUNT", + "displayType": "", + "gmsId": "WMM WSA", + "name": "weedObservationMonitoringDetails", + "description": "Count of the number of weed observation, mapping and monitoring activities undertaken.", + "label": "No. of activities undertaking weed monitoring", + "listName": "", + "category": "Invasive Species Management - Weeds", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", + "displayType": "", + "name": "weedCoverHa", + "description": "Sum of the assessed area of all weed species reported in mapping and monitoring activities. Several species may occur on the same area of land and therefore this figure IS NOT representative of the net area of land on which weeds have been reported (ie. the total area covered by weeds)", + "label": "Area (Ha) of weed cover monitored", + "units": "", + "listName": "weedObservationMonitoringDetails", + "category": "Invasive Species Management - Weeds", + "isOutputTarget": false + }, + { + "aggregationType": "COUNT", + "displayType": "piechart", + "name": "weedSpecies", + "description": "Frequency count of reported weed observation/monitoring records by different infestation status classes", + "label": "Frequency of reported weed observation/monitoring records by infestation status", + "groupBy": "output:weedStatus", + "listName": "weedObservationMonitoringDetails", + "category": "Invasive Species Management - Weeds" + }, + { + "aggregationType": "SUM", + "displayType": "barchart", + "name": "weedCoverHa", + "description": "Total area of reported weed cover by species. Note that the sum of areas will likely be greater than the net total area of weed cover.", + "label": "Total area (Ha) of reported weed cover by species", + "groupBy": "output:weedSpecies.name", + "listName": "weedObservationMonitoringDetails", + "category": "Invasive Species Management - Weeds" + } ], - "gmsId": "CATS" - }, - { - "category": "Administration, management & reporting", - "name": "Outcomes, Evaluation and Learning - final report", - "type": "Activity", - "outputs": [ - "Outcomes", - "Evaluation", - "Lessons Learned" - ] + "name": "Weed Observation and Monitoring Details" }, { - "supportsSites": true, - "category": "Assessment & monitoring", - "status": "active", - "name": "Pest Animal Survey", - "supportsPhotoPoints": true, - "type": "Assessment", - "outputs": [ - "Evidence of Pest Management Activity", - "Pest Observation and Monitoring Details", - "Participant Information", - "Photo Points" - ], - "gmsId": "PSA" - }, - { - "supportsSites": true, - "category": "Implementation actions", - "name": "Pest Management", - "supportsPhotoPoints": true, - "type": "Activity", - "outputs": [ - "Pest Management Details", - "Fence Details", - "Participant Information", - "Photo Points" - ], - "gmsId": "PMA PMQ" - }, - { - "category": "Implementation actions", - "name": "Plant Propagation", - "type": "Activity", - "outputs": [ - "Plant Propagation Details", - "Participant Information" - ], - "gmsId": "PPRP" - }, - { - "supportsSites": true, - "category": "Assessment & monitoring", - "name": "Plant Survival Survey", - "supportsPhotoPoints": true, - "type": "Assessment", - "outputs": [ - "Vegetation Monitoring Results", - "Participant Information", - "Photo Points" - ], - "gmsId": "PSS PSC" - }, - { - "category": "Administration, management & reporting", - "name": "Project Administration", - "type": "Activity", - "outputs": [ - "Administration Activities", - "Participant Information" - ] - }, - { - "supportsSites": true, - "category": "Implementation actions", - "name": "Public Access and Infrastructure", - "type": "Activity", - "outputs": [ - "Access Control Details", - "Infrastructure Details", - "Participant Information" - ], - "gmsId": "PAM" - }, - { - "supportsSites": true, - "category": "Implementation actions", - "name": "Research", - "type": "Activity", - "outputs": [ - "Research Information", - "Participant Information" - ] - }, - { - "supportsSites": true, - "category": "Implementation actions", - "name": "Revegetation", - "supportsPhotoPoints": true, - "type": "Activity", - "outputs": [ - "Revegetation Details", - "Participant Information", - "Photo Points" - ], - "gmsId": "RVA RVN RVSS RVT2A RVT2B RVS2B" - }, - { - "supportsSites": true, - "category": "Implementation actions", - "name": "Seed Collection", - "type": "Activity", - "outputs": [ - "Seed Collection Details", - "Participant Information" - ], - "gmsId": "SDC" - }, - { - "supportsSites": true, - "category": "Assessment & monitoring", - "name": "Site Monitoring Plan", - "type": "Activity", - "outputs": ["Planned Monitoring Approach"] - }, - { - "supportsSites": true, - "category": "Implementation actions", - "name": "Site Preparation", - "supportsPhotoPoints": true, - "type": "Activity", - "outputs": [ - "Site Preparation Actions", - "Weed Treatment Details", - "Participant Information", - "Photo Points" - ], - "gmsId": "STP" - }, - { - "category": "Training", - "name": "Training and Skills Development", - "type": "Activity", - "outputs": [ - "Training Details", - "Skills Development", - "Participant Information" - ], - "gmsId": "TSD" - }, - { - "supportsSites": true, - "category": "Implementation actions", - "name": "Water Management", - "type": "Activity", - "outputs": ["Water Management Details"], - "gmsId": "WMA WMN" - }, - { - "supportsSites": true, - "category": "Assessment & monitoring", - "name": "Water Quality Survey", - "type": "Assessment", - "outputs": [ - "General information & Participants", - "Environmental Information at the Time of Sampling", - "Water Quality Measurements" - ], - "gmsId": "WQSA" - }, - { - "supportsSites": true, - "category": "Assessment & monitoring", - "name": "Weed Mapping & Monitoring", - "supportsPhotoPoints": true, - "type": "Assessment", - "outputs": [ - "Evidence of Weed Treatment", - "Weed Observation and Monitoring Details", - "Participant Information", - "Photo Points" - ], - "gmsId": "WMM WSA" - }, - { - "supportsSites": true, - "category": "Implementation actions", - "name": "Weed Treatment", - "supportsPhotoPoints": true, - "type": "Activity", - "outputs": [ - "Weed Treatment Details", - "Participant Information", - "Photo Points" + "template": "Weed", + "scores": [ + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "WDT", + "name": "areaTreatedHa", + "description": "The total area of weeds for which an initial treatment was undertaken.", + "label": "Total new area treated (Ha)", + "units": "Ha", + "groupBy": "output:treatmentEventType", + "category": "Invasive Species Management - Weeds", + "filterBy": "Initial treatment", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", + "displayType": "", + "name": "linearAreaTreated", + "description": "Total lineal length of stream frontage and/or roadside treated for weeds.", + "label": "Total lineal length (Km) of stream frontage and/or roadside treated for weeds.", + "listName": "", + "category": "Invasive Species Management - Weeds" + }, + { + "aggregationType": "AVERAGE", + "displayType": "", + "description": "Average cost per hectare of weed treatment. This is a non-mandatory field and the calculated average may be skewed by incomplete data.", + "label": "Average cost ($/Ha) of weed treatment", + "category": "Invasive Species Management - Weeds" + }, + { + "aggregationType": "COUNT", + "displayType": "", + "name": "targetSpecies", + "description": "The total number of occurrence records of reported weed species.", + "label": "Total No. of weed records reported", + "listName": "weedsTreated", + "category": "Invasive Species Management - Weeds" + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "", + "name": "treatmentEventType", + "description": "Breakdown of the number of activities treating weeds by type of treatment", + "label": "Proportion of activities treating weeds by type of treatment event", + "listName": "", + "category": "Invasive Species Management - Weeds" + }, + { + "aggregationType": "COUNT", + "displayType": "barchart", + "name": "treatmentMethod", + "description": "Breakdown of the number of weed treatment actions undertaken by species.", + "label": "No. of activities treating weeds by species treated", + "units": "", + "groupBy": "output:targetSpecies.name", + "listName": "weedsTreated", + "category": "Invasive Species Management - Weeds", + "isOutputTarget": false + }, + { + "aggregationType": "COUNT", + "displayType": "barchart", + "name": "treatmentObjective", + "description": "Proportional breakdown of the number of activities treating weeds by treatment method. A single activity may include multiple treatment methods being applied to different species in the activity, but for any given species the count is valid.", + "label": "Proportion of activities treating weeds by treatment method", + "groupBy": "output:weedsTreated.treatmentMethod", + "listName": "", + "category": "Invasive Species Management - Weeds", + "isOutputTarget": false + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "", + "name": "treatmentObjective", + "description": "Breakdown of the number of activities treating weeds by treatment objective.", + "label": "No. of activities treating weeds by treatment objective", + "listName": "", + "category": "Invasive Species Management - Weeds" + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "", + "name": "partnerType", + "description": "Breakdown of the number of activities undertaking weed treatment by the main type of partner undertaking the action.", + "label": "No. of activities treating weeds by type of delivery partner", + "listName": "", + "category": "Invasive Species Management - Weeds" + }, + { + "aggregationType": "SUM", + "displayType": "piechart", + "name": "areaTreatedHa", + "description": "Total area of weed treatment undertaken grouped by the main type of partner undertaking actions.", + "label": "Total area (Ha.) of weed treatment by main activity partner", + "groupBy": "output:partnerType", + "listName": "", + "category": "Invasive Species Management - Weeds" + }, + { + "aggregationType": "SUM", + "displayType": "piechart", + "name": "areaTreatedHa", + "description": "Total area of weed treatment undertaken grouped by the type of treatment objective.", + "label": "Total area (Ha.) of weed treatment by treatment objective", + "groupBy": "output:treatmentObjective", + "listName": "", + "category": "Invasive Species Management - Weeds" + } ], - "gmsId": "WDT" + "name": "Weed Treatment Details" }, { - "supportsSites": true, - "category": "Implementation actions", - "name": "Works Planning and Risk", - "supportsPhotoPoints": true, - "type": "Activity", - "outputs": [ - "Site Planning Details", - "Threatening Processes and Site Condition Risks", - "Participant Information" + "template": "stockManagementDetails", + "scores": [ + { + "aggregationType": "COUNT", + "displayType": "", + "name": "areaOfStockManagementHa", + "description": "Count of the total number of activities undertaken involving conservation grazing", + "label": "Total No. of activities undertaken involving conservation grazing", + "listName": "", + "category": "Natural Resources Management" + }, + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "CGM", + "name": "areaOfStockManagementHa", + "description": "Total area managed with conservation grazing", + "label": "Area managed with conservation grazing (Ha)", + "units": "Ha", + "listName": "", + "category": "Natural Resources Management", + "isOutputTarget": true + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "", + "name": "stockManagementReason", + "description": "Breakdown of the number of activities undertaking conservation management actions by the reason for undertaking actions", + "label": "Proportion of activities undertaking conservation grazing by stock management reason", + "units": "", + "category": "Natural Resources Management", + "isOutputTarget": false + }, + { + "aggregationType": "SUM", + "displayType": "barchart", + "name": "areaOfStockManagementHa", + "description": "Proportional breakdown of the area managed with conservation grazing by species used. Multiple species may be used concurrently and therefore area may be double-counted in such cases. This data should only be interpreted as proportional representation.", + "label": "Proportional breakdown of the area managed with conservation grazing by species used", + "groupBy": "output:stockingDetails.stockingManagementSpecies", + "listName": "", + "category": "Natural Resources Management" + } ], - "gmsId": "STA" - }, - { - "category": "Administration, management & reporting", - "name": "Progress, Outcomes and Learning - stage report", - "type": "Activity", - "outputs": [ - "Overview of Project Progress", - "Environmental, Economic and Social Outcomes", - "Implementation Update", - "Lessons Learned and Improvements" - ] + "name": "Stock Management Details" }, { - "supportsSites": true, - "category": "Assessment & monitoring", - "name": "Vegetation Assessment - Commonwealth government methodology", - "supportsPhotoPoints": true, - "type": "Assessment", - "outputs": [ - "Sampling Site Information", - "Photo Points", - "Field Sheet 1 - Ground Cover", - "Field Sheet 2 - Exotic Fauna", - "Field Sheet 3 - Overstorey and Midstorey Projected Crown Cover", - "Field Sheet 4 - Crown Type", - "Field Sheet 5 - Species Diversity" + "template": "infrastructureDetails", + "scores": [ + { + "aggregationType": "COUNT", + "displayType": "", + "name": "infrastructureType", + "description": "The total number of activities undertaken to build/install infrastructure for the protection, enhancement or public appreciation of native species and natural environments.", + "label": "No. of activities undertaking infrastructure works", + "listName": "infrastructureInstallations", + "category": "Natural Resources Management" + }, + { + "aggregationType": "SUM", + "displayType": "", + "name": "noInstallationsTotal", + "description": "Total number of infrastructure installations / facilities established for the protection, enhancement or public appreciation of native species and natural environments.", + "label": "No. of infrastructure installations / facilities established", + "category": "Natural Resources Management" + }, + { + "aggregationType": "SUM", + "displayType": "barchart", + "name": "noInstallations", + "description": "Total number of infrastructure installations / facilities established for the protection, enhancement or public appreciation of native species and natural environments by the type of facility built/installed.", + "label": "No. of installations by type of infrastructure", + "units": "", + "groupBy": "output:infrastructureType", + "listName": "infrastructureInstallations", + "category": "Natural Resources Management" + } ], - "gmsId": "VAC" - }, - { - "category": "Assessment & monitoring", - "status": "deleted", - "name": "Vegetation Assessment - BioCondition (QLD)", - "type": "Assessment", - "outputs": ["BioCondition Method"] - }, - { - "supportsSites": true, - "status": "deleted", - "name": "Vegetation Assessment - BioMetric (NSW)", - "supportsPhotoPoints": true, - "type": "Assessment", - "outputs": ["Floristic Composition"] - }, - { - "category": "Assessment & monitoring", - "name": "Vegetation Assessment - Habitat Hectares v2 (VIC)", - "type": "Assessment", - "outputs": [ - "Vegetation Assessment - Survey Information", - "Native Species", - "Weed Species", - "Trees" - ] - }, - { - "supportsSites": true, - "status": "deleted", - "name": "Vegetation Assessment - Native Vegetation Condition Assessment and Monitoring (WA)", - "supportsPhotoPoints": true, - "type": "Assessment", - "outputs": ["Floristic Composition"] - }, - { - "category": "Assessment & monitoring", - "status": "active", - "name": "TasVeg - Native Vegetation Assessment - Forest Vegetation", - "type": "Assessment", - "outputs": ["TasVeg Native Vegetation Assessment Method - Forest Vegetation"] - }, - { - "category": "Assessment & monitoring", - "status": "deleted", - "name": "TasVeg - Native Vegetation Assessment - Non-Forest Vegetation", - "type": "Assessment", - "outputs": ["TasVeg Native Vegetation Assessment Method - Non-Forest Vegetation"] - }, - { - "status": "deleted", - "name": "Feral animal assessment", - "type": "Assessment", - "outputs": [ - "Feral Animal Abundance Score", - "Feral Animal Frequency Score" - ] - }, - { - "status": "deleted", - "name": "Site assessment", - "type": "Assessment", - "outputs": [ - "Participant Information", - "Vegetation Assessment", - "Site Condition Components", - "Landscape Context Components", - "Threatening Processes and Site Condition Risks", - "Photo Points" - ] - }, - { - "category": "Assessment & monitoring", - "status": "deleted", - "name": "Vegetation Assessment - Bushland Condition Monitoring (SA)", - "type": "Assessment", - "outputs": [ - "Bushland Condition - Site Health Summary", - "Indicator 1 - Plant Species Diversity", - "Indicator 2 - Weed Abundance & Threat", - "Indicator 3 - Structural Diversity", - "Indicator 4 - Regeneration", - "Indicator 5 - Tree and Shrub Health", - "Indicator 6 - Tree Habitat", - "Indicator 7 - Feral Animals", - "Indicator 8 - Total Grazing Pressure", - "Indicator 9 - Animal Species", - "Indicator 10 - Bushland Degradation Risk", - "Benchmarks - SA" - ] - }, - { - "category": "Small Grants", - "status": "deleted", - "name": "Progress Report", - "type": "Assessment", - "outputs": [ - "Progress Report Details", - "Attachments" - ] - }, - { - "category": "Small Grants", - "status": "deleted", - "name": "Final Report", - "type": "Assessment", - "outputs": [ - "Final Report Details", - "Output Details", - "Project Acquittal", - "Attachments" - ] + "name": "Infrastructure Details" }, { - "category": "None", - "status": "deleted", - "name": "Upload of stage 1 and 2 reporting data", - "type": "Activity", - "outputs": ["Upload of stage 1 and 2 reporting data"], - "gmsId": "" + "template": "planningActivityDetails", + "scores": [ + { + "aggregationType": "COUNT", + "displayType": "", + "gmsId": "MPD", + "name": "typeOfPlan", + "description": "The total number of plans developed", + "label": "No. of activities undertaking plan development work", + "listName": "", + "category": "Project Management, Planning and Research Outputs" + }, + { + "aggregationType": "COUNT", + "displayType": "", + "name": "typeOfPlan", + "description": "Count of the number of plans developed which have been classified as NEW plans (ie. not revisions of existing plans).", + "label": "No. of new plans developed", + "groupBy": "output:versionOfPlan", + "listName": "", + "category": "Project Management, Planning and Research Outputs", + "filterBy": "New plan" + }, + { + "aggregationType": "SUM", + "displayType": "", + "name": "noOfPlanActionsAddressed", + "description": "Total of the number of actions specified in plans which have been addressed by scheduled activities.", + "label": "No. of Plan actions addressed", + "category": "Project Management, Planning and Research Outputs", + "isOutputTarget": false + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "piechart", + "name": "typeOfPlan", + "description": "Breakdown of the number of different types of plans developed", + "label": "No. of plan development activities by type of plan", + "category": "Project Management, Planning and Research Outputs", + "isOutputTarget": false + } + ], + "name": "Plan Development Details" }, { - "supportsSites": false, - "category": "Programme Reporting", - "name": "Green Army - Monthly project status report", - "supportsPhotoPoints": false, - "type": "Report", - "outputs": ["Monthly Status Report Data"] + "template": "researchInformation", + "scores": [ + { + "aggregationType": "COUNT", + "displayType": "", + "name": "typeOfResearch", + "description": "The total number of research activities undertaken which have recorded data.", + "label": "Total No. of research activities undertaken", + "listName": "", + "category": "Project Management, Planning and Research Outputs" + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "", + "name": "typeOfResearch", + "description": "Breakdown of the number of research projects by type of project", + "label": "No. of research activities by type of research", + "category": "Project Management, Planning and Research Outputs" + } + ], + "name": "Research Information" }, { - "supportsSites": false, - "category": "Programme Reporting", - "name": "Green Army - Quarterly project report", - "supportsPhotoPoints": false, - "type": "Report", - "outputs": ["Three Monthly Report"] + "template": "waterManagementDetails", + "scores": [ + { + "aggregationType": "COUNT", + "displayType": "", + "gmsId": "WMN", + "name": "isCurrentFlowNatural", + "description": "Simple count of the number of activities undertaking water management actions.", + "label": "No. of water management activities implemented", + "listName": "", + "category": "Natural Resources Management" + }, + { + "aggregationType": "SUM", + "displayType": "", + "name": "hydrologicalStructuresInstalled", + "description": "The total number of hydrological structures installed", + "label": "No. of hydrological structures installed", + "category": "Natural Resources Management", + "isOutputTarget": false + }, + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "WMA", + "name": "managedArea", + "description": "The area of land actively managed with water management activities for enhanced environmental values.", + "label": "Area (Ha) managed for water values", + "units": "Ha", + "listName": "", + "category": "Natural Resources Management", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", + "displayType": "piechart", + "name": "managedArea", + "description": "Breakdown of the area of land actively managed with water management activities by the type of environmental benefit achieved. Note that a single water management action may achieve multiple benefits and therefore this metric should only be interpreted as proportional.", + "label": "Proportion of area (Ha) managed by environmental benefit type", + "groupBy": "output:waterMgtEnvironBenefit", + "listName": "", + "category": "Natural Resources Management" + }, + { + "aggregationType": "SUM", + "displayType": "piechart", + "name": "managedArea", + "description": "Breakdown of the area of land actively managed with water management activities by the type of water body managed.", + "label": "Proportion of area (Ha) managed by type of water body", + "groupBy": "output:waterbodyType", + "listName": "", + "category": "Natural Resources Management" + }, + { + "aggregationType": "SUM", + "displayType": "piechart", + "name": "managedArea", + "description": "Breakdown of the area of land actively managed with water management activities by the purpose for which water is being managed. Note that a single water management action may apply to multiple purposes and therefore this metric should only be interpreted as proportional.", + "label": "Proportion of area (Ha) managed by water use purpose", + "groupBy": "output:waterUsePurpose", + "listName": "", + "category": "Natural Resources Management" + } + ], + "name": "Water Management Details" }, { - "supportsSites": false, - "category": "Programme Reporting", - "name": "Green Army - End of Project Report", - "supportsPhotoPoints": false, - "type": "Report", - "outputs": ["End of Project Report Details"] + "template": "trainingDetails", + "scores": [ + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "TSD", + "name": "totalCompletingCourses", + "description": "Sum of the number of people who complete formal/accredited training courses.", + "label": "Total No. of people completing formal training courses", + "category": "Community Engagement and Capacity Building", + "isOutputTarget": true + }, + { + "aggregationType": "COUNT", + "displayType": "", + "name": "totalCompletingCourses", + "description": "Count of the total number of activities which recorded details of individuals completing formal/accredited training courses.", + "label": "No. of activities undertaken which involved formal training", + "listName": "", + "category": "Community Engagement and Capacity Building" + }, + { + "aggregationType": "COUNT", + "displayType": "", + "name": "courseTitle", + "description": "Count of the total number of formal/accredited training courses for which participation details have been recorded. Each class is counted as a a course.", + "label": "No. of courses attended by project participants", + "listName": "courseAttendance", + "category": "Community Engagement and Capacity Building" + }, + { + "aggregationType": "SUM", + "displayType": "piechart", + "name": "numberCompleted", + "description": "Breakdown of the total number of people who completed a formal/accredited training course by the type of course attended.", + "label": "No. completing courses by course type", + "groupBy": "output:typeOfCourse", + "listName": "courseAttendance", + "category": "Community Engagement and Capacity Building" + }, + { + "aggregationType": "SUM", + "displayType": "barchart", + "name": "numberCompleted", + "description": "Breakdown of the number of people who completed a formal/accredited training course by standard Australian qualification level.of courses.", + "label": "No. completing courses by qualification level", + "groupBy": "output:qualificationLevel", + "listName": "courseAttendance", + "category": "Community Engagement and Capacity Building" + } + ], + "name": "Training Details" }, { - "supportsSites": false, - "category": "Programme Reporting", - "name": "Green Army - Desktop Audit Checklist", - "supportsPhotoPoints": false, - "type": "Report", - "outputs": ["Desktop Audit Checklist Details"] + "template": "skillsDevelopment", + "scores": [ + { + "aggregationType": "COUNT", + "displayType": "", + "name": "skillsApplication", + "description": "Count of the number of activities which have recorded at least one application of skills developed as a result of project participation and/or project-based formal training.", + "label": "No. of activities indicating application of enhanced skills", + "listName": "", + "category": "Community Engagement and Capacity Building" + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "piechart", + "name": "skillsApplication", + "description": "Proportional breakdown of the ways in which skills developed as a result of project participation have been applied. This is a count of the number of occurrences recorded for each type of application.", + "label": "Application of enhanced skills by type", + "listName": "", + "category": "Community Engagement and Capacity Building" + } + ], + "name": "Skills Development" }, { - "supportsSites": false, - "category": "Programme Reporting", - "name": "Green Army - Change or Absence of Team Supervisor", - "supportsPhotoPoints": false, - "type": "Report", - "outputs": ["Change or Absence of Team Supervisor Report"] + "template": "riskAssessment", + "scores": [{ + "aggregationType": "COUNT", + "displayType": "barchart", + "name": "riskType", + "description": "Count of the number of times a particular issue has been recorded. Activities can have multiple threats and risks.", + "label": "No. of threat and risk issues by type of issue", + "groupBy": "output:riskType", + "listName": "riskTable", + "category": "Sites and Activity Planning" + }], + "name": "Threatening Processes and Site Condition Risks" }, { - "supportsSites": false, - "category": "Programme Reporting", - "name": "Green Army - Site Visit Checklist", - "supportsPhotoPoints": false, - "type": "Report", - "outputs": ["Site Visit Details"] - } - ], - "outputs": [ - { - "template": "revegetationDetails", + "template": "debrisRemovalDetails", "scores": [ { - "isOutputTarget": true, - "category": "Revegetation", - "listName": "", - "description": "The area of land actually revegetated with native species by the planting of seedlings, sowing of seed and managed native regeneration actions.", + "aggregationType": "COUNT", "displayType": "", - "name": "areaRevegHa", - "aggregationType": "SUM", - "label": "Area of revegetation works (Ha)", - "units": "Ha", - "gmsId": "RVA" + "name": "debrisRemovalMethod", + "description": "The number of activities which have recorded debris removal information.", + "label": "Total No. of debris removal activities", + "listName": "", + "category": "Natural Resources Management" }, { - "category": "Revegetation", + "aggregationType": "HISTOGRAM", + "displayType": "piechart", + "name": "debrisType", + "description": "Breakdown of the number of activities that have removed debris by the type of debris removed", + "label": "No. of activities removing debris by types of material", + "category": "Natural Resources Management" + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "piechart", + "name": "debrisRemovalMethod", + "description": "Proportional distribution of the number of activities that have removed debris by the removal methods. A single activity can use multiple methods.", + "label": "No. of activities removing debris by removal method", "listName": "", - "description": "The lineal length (longest axis) of waterways and coastline revegetated.", - "displayType": "", - "name": "lengthReveg", + "category": "Natural Resources Management" + }, + { "aggregationType": "SUM", - "label": "Length (kilometres) of waterway / coastline revegetated" + "displayType": "", + "name": "debrisActivityArea", + "description": "The area over which debris removal activities have been undertaken. Revisits to the same area will be double-counted.", + "label": "Area (Ha) covered by debris removal activities", + "units": "Ha", + "listName": "", + "category": "Natural Resources Management" }, { - "isOutputTarget": true, - "category": "Revegetation", - "description": "The total number of seedlings planted.", + "aggregationType": "SUM", "displayType": "", - "name": "totalNumberPlanted", + "gmsId": "DRW", + "name": "debrisWeightTonnes", + "description": "The total mass of debris removed.", + "label": "Weight of debris removed (Tonnes)", + "units": "Tonnes", + "category": "Natural Resources Management", + "isOutputTarget": true + }, + { "aggregationType": "SUM", - "label": "Number of plants planted", - "units": "", - "gmsId": "RVN" + "displayType": "piechart", + "name": "debrisWeightTonnes", + "description": "Breakdown of the mass of debris removed by the type of debris removed", + "label": "Weight of debris removed by type of material", + "units": "Tonnes", + "groupBy": "output:debrisType", + "listName": "", + "category": "Natural Resources Management", + "filterBy": "" }, { - "category": "Revegetation", - "listName": "planting", - "description": "The total number of species occurrence records as an aggregate of the number of species in each revegetation activity. Individual species may be multi-counted if the same species has been planted in multiple activities.", + "aggregationType": "SUM", "displayType": "", - "name": "species", - "aggregationType": "COUNT", - "label": "Total No. of species occurrence records" + "gmsId": "DRV", + "name": "debrisVolumeM3", + "description": "The total volume of debris removed.", + "label": "Volume of debris removed (m3)", + "units": "m3", + "category": "Natural Resources Management", + "isOutputTarget": true }, { - "groupBy": "output:species.name", - "category": "Revegetation", - "listName": "planting", - "description": "The number of seedlings of each species planted to establish native vegetation in revegetation sites.", - "displayType": "barchart", - "name": "numberPlanted", "aggregationType": "SUM", - "label": "No. of plants planted by species" - }, + "displayType": "piechart", + "name": "debrisVolumeM3", + "description": "Breakdown of the mass of debris removed by the type of debris removed", + "label": "Volume of debris removed by type of material", + "units": "m3", + "groupBy": "output:debrisType", + "listName": "", + "category": "Natural Resources Management", + "filterBy": "" + } + ], + "name": "Debris Removal Details" + }, + { + "template": "erosionManagementDetails", + "scores": [ { - "isOutputTarget": true, - "category": "Revegetation", - "description": "The total weight of seed sown in revegetation plots.", + "aggregationType": "COUNT", "displayType": "", - "name": "totalSeedSownKg", - "aggregationType": "SUM", - "label": "Kilograms of seed sown", - "units": "Kg", - "gmsId": "RVSS" + "gmsId": "", + "name": "erosionAreaTreated", + "description": "Count of the number of activities which have implemented erosion management actions.", + "label": "No. of activities undertaking erosion control works", + "listName": "", + "category": "Natural Resources Management" }, { - "groupBy": "output:species.name", - "isOutputTarget": false, - "category": "Revegetation", - "listName": "planting", - "description": "The weight of seed of each species sown to establish native vegetation in revegetation sites.", - "displayType": "barchart", - "name": "seedSownKg", "aggregationType": "SUM", - "label": "Kilograms of seed sown by species", - "units": "" - }, - { - "category": "Revegetation", + "displayType": "", + "name": "erosionStructuresInstalled", + "description": "The total number of structures installed to to control erosion.", + "label": "Total No. of erosion control structures installed", "listName": "", - "description": "The proportional distribution of environmental benefits being delivered by revegetation activities. Individual activities may be delivering multiple benefits.", - "displayType": "piechart", - "name": "environmentalBenefits", - "aggregationType": "HISTOGRAM", - "label": "Proportion of activities undertaking revegetation by environmental benefit type", - "units": "" + "category": "Natural Resources Management", + "isOutputTarget": true }, { - "category": "Revegetation", - "description": "The proportional distribution of methods used for revegetation by revegetation activities. Individual activities may be applying multiple methods..", - "displayType": "piechart", - "name": "revegMethod", - "aggregationType": "HISTOGRAM", - "label": "No. of activities undertaking revegetation by revegetation method" + "aggregationType": "SUM", + "displayType": "", + "gmsId": "EML", + "name": "erosionLength", + "description": "Total lineal length of stream frontage and/or coastline which has been treated with erosion management actions.", + "label": "Length of stream/coastline treated (Km)", + "units": "Km", + "category": "Natural Resources Management", + "isOutputTarget": true }, { - "category": "Revegetation", - "listName": "", - "description": "The proportional break-down of revegetation activities contributing to landscape connectivity by connectivity category.", - "displayType": "piechart", - "name": "connectivityIndex", - "aggregationType": "HISTOGRAM", - "label": "No. of activities increasing connectivity by type of connection" + "aggregationType": "SUM", + "displayType": "", + "gmsId": "EMA", + "name": "erosionAreaTreated", + "description": "The total area of erosion treated by management actions.", + "label": "Erosion area treated (Ha)", + "units": "Ha", + "category": "Natural Resources Management", + "isOutputTarget": true }, { - "groupBy": "output:matureHeight", - "isOutputTarget": true, - "category": "Revegetation", - "listName": "planting", - "description": "Total number of plants planted which will grow to a mature height of greater than 2 metres. This does not include natural regeneration or plants established from the sowing of seed.", - "displayType": "", - "name": "numberPlanted", "aggregationType": "SUM", - "label": "No. of plants planted > 2 metres in height", - "filterBy": "> 2 metres", - "gmsId": "RVT2A" + "displayType": "piechart", + "name": "erosionStructuresInstalled", + "description": "Count of the number of activities which installed structures to control erosion by the type of structure installed.", + "label": "No. of activities which installed erosion control structures by type of structure", + "groupBy": "output:erosionControlStructures", + "listName": "", + "category": "Natural Resources Management", + "isOutputTarget": false }, { - "groupBy": "output:matureHeight", - "isOutputTarget": true, - "category": "Revegetation", - "listName": "planting", - "description": "Kilograms of seed sown of species expected to grow < 2 metres in height", - "displayType": "", - "name": "seedSownKg", "aggregationType": "SUM", - "label": "Kilograms of seed sown of species expected to grow > 2 metres in height", - "filterBy": "< 2 metres", - "units": "Kg", - "gmsId": "RVS2B" + "displayType": "piechart", + "name": "erosionAreaTreated", + "description": "Proportional breakdown of the erosion area treated by the type of erosion treated. Note that a single treatment may apply to multiple types of erosion over the same area and therefore this metric should only be interpreted as a proportional breakdown.", + "label": "Proportion of erosion area treated (Ha) by the type of erosion treated", + "groupBy": "output:erosionType", + "listName": "", + "category": "Natural Resources Management" }, { - "groupBy": "output:matureHeight", - "isOutputTarget": true, - "category": "Revegetation", - "listName": "planting", - "description": "Total number of plants planted which will grow to a mature height of less than 2 metres. This does not include natural regeneration or plants established from the sowing of seed.", - "displayType": "", - "name": "numberPlanted", "aggregationType": "SUM", - "label": "No. of plants planted < 2 metres in height", - "filterBy": "< 2 metres", - "gmsId": "RVT2B" + "displayType": "piechart", + "name": "erosionAreaTreated", + "description": "Proportional breakdown of the erosion area treated by the type of erosion management/treatment method used. Note that a single treatment may apply multiple types of methods over the same area and therefore this metric should only be interpreted as a proportional breakdown.", + "label": "Proportion of erosion area treated (Ha) by the type of management method used", + "groupBy": "output:erosionTreatmentMethod", + "listName": "", + "category": "Natural Resources Management" } ], - "name": "Revegetation Details" + "name": "Erosion Management Details" }, { - "template": "seedCollectionDetails", + "template": "accessControlDetails", "scores": [ { - "isOutputTarget": true, - "category": "Revegetation", - "listName": "", - "description": "The total weight of seed collected for storage or propagation.", + "aggregationType": "COUNT", "displayType": "", - "name": "totalSeedCollectedKg", + "gmsId": "PAM", + "name": "structuresInstalled", + "description": "Count of the number of activities implementing access control works", + "label": "No. of activities implementing access control works", + "category": "Natural Resources Management", + "isOutputTarget": true + }, + { "aggregationType": "SUM", - "label": "Total seed collected (Kg)", - "units": "Kg", - "gmsId": "SDC" + "displayType": "", + "name": "numberOfInstallations", + "description": "Sum of the total number of structures installed for access management.", + "label": "Total No. of structures installed for access management", + "category": "Natural Resources Management", + "isOutputTarget": true }, { - "category": "Revegetation", - "listName": "seedsList", - "description": "The total number of species occurrence records as an aggregate of the number of species in each seed collection activity. Individual species may be multi-counted if seed has been collecteted from the same species in multiple activities.", + "aggregationType": "SUM", "displayType": "", - "name": "seedSourceSpecies", + "name": "accessAreaProtected", + "description": "Area in hectares that is being protected as a direct result of installing access control structures.", + "label": "Area protected by access control installations (Ha)", + "listName": "", + "category": "Natural Resources Management", + "isOutputTarget": true + }, + { "aggregationType": "COUNT", - "label": "Total No. of species records" + "displayType": "piechart", + "name": "numberOfInstallations", + "description": "Breakdown of the number of structures installed for access management by type of structure", + "label": "Proportion of structures installed for access management by type of structure", + "groupBy": "output:structuresInstalled", + "category": "Natural Resources Management" }, { - "groupBy": "output:seedSourceSpecies.name", - "category": "Revegetation", - "listName": "seedsList", - "description": "The total weight of seed collected from each recorded species.", - "displayType": "barchart", - "name": "seedCollectedKg", - "aggregationType": "SUM", - "label": "Kg of seed collected by species", - "units": "Kg" + "aggregationType": "COUNT", + "displayType": "piechart", + "name": "numberOfInstallations", + "description": "Breakdown of the number of access control actions undertaken by the purpose for which access control structures were installed. A single action may include more than one structure and address multiple purposes. Therefore this metric should only be interpreted as proportionally representative.", + "label": "Proportion of actions undertaken for access management by purpose", + "groupBy": "output:accessControlPurpose", + "category": "Natural Resources Management" + }, + { + "aggregationType": "COUNT", + "displayType": "piechart", + "name": "numberOfInstallations", + "description": "Breakdown of the number of access control actions undertaken by the broad method used to control the access. A single action may include more than one structure and address multiple purposes. Therefore this metric should only be interpreted as proportionally representative.", + "label": "Proportion of actions undertaken for access management by management method", + "groupBy": "output:accessManagementMethod", + "category": "Natural Resources Management" } ], - "name": "Seed Collection Details" + "name": "Access Control Details" }, { - "template": "sitePreparationActions", + "template": "plannedMonitoring", + "scores": [{ + "aggregationType": "HISTOGRAM", + "displayType": "piechart", + "name": "plannedActivityType", + "description": "Breakdown of the No. of planned monitoring action by the type of monitoring action", + "label": "No. of planned monitoring action by the type of monitoring action", + "listName": "plannedActions", + "category": "Sites and Activity Planning" + }], + "name": "Planned Monitoring Approach" + }, + { + "template": "practiceChangeDetails", "scores": [ { - "isOutputTarget": true, - "category": "Sites and Activity Planning", - "description": "Sum of the area of land specifically recorded as having preparatory works undertaken in advance of another associated activity. Site preparation works include activities such as fencing, weed or pest treatment, drainage or soil moisture management actions, etc.", + "aggregationType": "SUM", "displayType": "", - "name": "preparationAreaTotal", + "gmsId": "MPCFE", + "name": "totalEntitiesAdoptingChange", + "description": "The total number of unique/individual farming/fisher entities (farming/fishing businesses) that have made changes towards more sustainable management and primary production practices.", + "label": "Total No. of farming entities adopting sustainable practice change", + "category": "Farm Management Practices", + "isOutputTarget": true + }, + { "aggregationType": "SUM", - "label": "Total area prepared (Ha) for follow-up treatment actions", + "displayType": "", + "gmsId": "MPC", + "name": "totalChangePracticeTreatedArea", + "description": "The surface area of land/water over which improved management practices have been undertaken/implemented as a result of government funded projects. ", + "label": "Area of land (Ha) on which improved management practices have been implemented", "units": "Ha", - "gmsId": "STP" + "category": "Farm Management Practices", + "isOutputTarget": true }, { - "groupBy": "output:actionsList.groundPreparationWorks", - "category": "Sites and Activity Planning", - "listName": "", - "description": "Breakdown of the area prepared for a follow-up action by the type of preparation action.", + "aggregationType": "SUM", + "displayType": "", + "gmsId": "MPCSP", + "name": "benefitAreaHa", + "description": "The surface area of land/water which is now managed using sustainable practices and resulting from implementation of funded projects.", + "label": "Area of land (Ha) changed to sustainable practices", + "units": "Ha", + "category": "Farm Management Practices", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", "displayType": "piechart", - "name": "preparationAreaTotal", + "name": "benefitAreaHa", + "description": "Breakdown of area covered by changed management practices (resulting from government funded projects) by the type of industry.", + "label": "Area covered by changed management practices by industry type", + "groupBy": "output:practiceChange.industryType", + "listName": "", + "category": "Farm Management Practices" + }, + { "aggregationType": "SUM", - "label": "Area prepared (Ha) by type of preparation works", - "units": "Ha" + "displayType": "piechart", + "name": "entitiesAdoptingChange", + "description": "Breakdown of number of farm/fisher entities adopting changed management practices (resulting from government funded projects) by the type of industry.", + "label": "No. of farm/fisher entities adopting changed management practices by industry type", + "groupBy": "output:industryType", + "listName": "practiceChange", + "category": "Farm Management Practices" }, { - "groupBy": "output:associatedActivity", - "category": "Sites and Activity Planning", - "listName": "actionsList", - "description": "Count of the number of actions of each type associated with the site preparation activity. ", + "aggregationType": "SUM", "displayType": "piechart", - "name": "groundPreparationWorks", + "name": "noInfluenced", + "description": "Breakdown of the number of people influenced by changed management practices (resulting from government funded projects) by the type of industry.", + "label": "No. of people influenced by changed management practices by industry type", + "groupBy": "output:industryType", + "listName": "practiceChange", + "category": "Farm Management Practices" + }, + { "aggregationType": "COUNT", - "label": "Proportion of actions contributing to the preparation of land for subsequent actions by the type of subsequent action" - } - ], - "name": "Site Preparation Actions" - }, - { - "template": "participation", - "scores": [ + "displayType": "piechart", + "name": "industryType", + "description": "Breakdown of the number of management change actions by different types of facilitation strategies used to encourage change to more sustainable management practices. Individual activities can employ multiple strategies and this result should only be interpreted as a proportional breakdown and not actual figures.", + "label": "Proportion of actions implementing sustainable practices by type of change facilitation strategy.", + "groupBy": "output:practiceChangeAction", + "listName": "practiceChange", + "category": "Farm Management Practices" + }, { - "isOutputTarget": true, - "category": "Community Engagement and Capacity Building", - "listName": "", - "description": "The number of participants at activities and events who are not employed on projects. Individuals attending multiple activities will be counted for their attendance at each event.", - "displayType": "", - "name": "totalParticipantsNotEmployed", "aggregationType": "SUM", - "label": "No of volunteers participating in project activities", - "units": "" + "displayType": "piechart", + "name": "changePracticeTreatedArea", + "description": "Proportional breakdown of the area covered by practice changes (Ha) by the reasons for changing management practices. People can have multiple reasons for changing practices and therefore this should only be interpreted as proportional rather than actual figures.", + "label": "Proportional breakdown of the area covered by practice changes (Ha) by the reasons for changing management practices", + "groupBy": "output:changePurpose", + "listName": "practiceChange", + "category": "Farm Management Practices" + }, + { + "aggregationType": "SUM", + "displayType": "piechart", + "name": "entitiesAdoptingChange", + "description": "Proportional breakdown of the number of farming/fisher entities adopting practice change by the reasons for changing management practices. People can have multiple reasons for changing practices and therefore this should only be interpreted as proportional rather than actual figures.", + "label": "Proportional breakdown of the No. of entities adopting practice change by the reasons for changing management practices", + "groupBy": "output:changePurpose", + "listName": "practiceChange", + "category": "Farm Management Practices" }, { - "isOutputTarget": true, - "category": "Indigenous Capacity", - "description": "The number of Indigenous people attending and/or participating in activities and events. Individuals attending multiple activities will be counted for their attendance at each event.", - "displayType": "", - "name": "numberOfIndigenousParticipants", "aggregationType": "SUM", - "label": "No of Indigenous participants at project events. ", - "units": "" + "displayType": "piechart", + "name": "noInfluenced", + "description": "Proportional breakdown of the number of individual people influenced by the reasons for changing management practices. People can have multiple reasons for changing practices and therefore this should only be interpreted as proportional rather than actual figures.", + "label": "Proportional breakdown of the No. of people influenced by the reasons for changing management practices", + "groupBy": "output:changePurpose", + "listName": "practiceChange", + "category": "Farm Management Practices" }, { - "isOutputTarget": true, - "category": "Community Engagement and Capacity Building", - "description": "The total number of unique individuals who attended at least one project event. This measure is an attempt to determine new vs repeat participation as a measure of the effectiveness of projects/programmes in reaching out and engaging with their communities.", - "displayType": "", - "name": "totalParticipantsNew", "aggregationType": "SUM", - "label": "Total No. of new participants (attending project events for the first time)", - "units": "" + "displayType": "piechart", + "name": "changePracticeTreatedArea", + "description": "The sum of areas for each instance of each category of public good outcome recorded. Note that an activity may achieve more than one public good outcome and hence the area may be double-counted. Therefore this should be interpreted as a proportional breakdown only.", + "label": "Proportional breakdown of the area covered by practice changes by the public good outcomes from changing management practices", + "groupBy": "output:targetOutcomes", + "listName": "practiceChange", + "category": "Farm Management Practices" }, { - "isOutputTarget": false, - "category": "Farm Management Practices", - "description": "The total number of unique/individual farming entities (farm businesses) engaged in project activities. This data may double-count entities which participate in more than one activity/event in a given project.", - "displayType": "", - "name": "numberOfFarmingEntitiesNew", "aggregationType": "SUM", - "label": "Total No. of unique farming entities engaged", - "units": "" - } - ], - "name": "Participant Information" - }, - { - "template": "photoPoints", - "scores": [{ - "isOutputTarget": false, - "name": "numberOfPoints", - "aggregationType": "SUM", - "label": "No. of photo points", - "units": "" - }], - "name": "Photo Points" - }, - { - "template": "communityActivityDetails", - "scores": [ + "displayType": "piechart", + "name": "entitiesAdoptingChange", + "description": "Sum of the number of entities adopting practice change for each instance of each category of public good outcome recorded. Note that an activity may achieve more than one public good outcome and hence the number of entities may be double-counted. Therefore this should be interpreted as a proportional breakdown only.", + "label": "Proportional breakdown of the No. of entities adopting practice change by the public good outcomes from changing management practices", + "groupBy": "output:targetOutcomes", + "listName": "practiceChange", + "category": "Farm Management Practices" + }, { - "isOutputTarget": true, - "category": "Community Engagement and Capacity Building", - "listName": "events", - "description": "Count of the number of community participation and engagement events run.", - "displayType": "", - "name": "eventType", - "aggregationType": "COUNT", - "label": "Total No. of community participation and engagement events run", - "gmsId": "CPEE" + "aggregationType": "SUM", + "displayType": "piechart", + "name": "noInfluenced", + "description": "Sum of the number of individual people influenced by the reasons for changing management practices. People can have mu for changing practices and therefore this should only be interpreted as proportional rather than actual figures.", + "label": "Proportional breakdown of the No. of people influenced by the public good outcomes from changing management practices", + "groupBy": "output:targetOutcomes", + "listName": "practiceChange", + "category": "Farm Management Practices" }, { - "category": "Community Engagement and Capacity Building", - "listName": "", - "description": "Sum of the duration of events run", - "displayType": "", - "name": "totalEventHrs", "aggregationType": "SUM", - "label": "Total amount of time (Hrs) over which events have run", - "units": "" + "displayType": "piechart", + "name": "changePracticeTreatedArea", + "description": "The sum of areas for each instance of each category of change facilitation strategy used. Note that an activity may use more than one facilitation strategy and hence the area may be double-counted. Therefore this should be interpreted as a proportional breakdown only.", + "label": "Proportional breakdown of the area covered by practice changes by the type of change facilitation strategy", + "groupBy": "output:practiceChangeAction", + "listName": "practiceChange", + "category": "Farm Management Practices" }, { - "isOutputTarget": false, - "category": "Community Engagement and Capacity Building", - "listName": "events", - "description": "Breakdown of the number of events run for different purposes", + "aggregationType": "SUM", "displayType": "piechart", - "name": "eventPurpose", - "aggregationType": "HISTOGRAM", - "label": "No. of events run by purpose of event", - "units": "" + "name": "entitiesAdoptingChange", + "description": "Sum of the number of entities adopting practice change for each instance of each facilitation strategy used. Note that an activity may use more than one facilitation strategy and hence the number of entities may be double-counted. Therefore this should be interpreted as a proportional breakdown only.", + "label": "Proportional breakdown of the No. of entities adopting practice change by the types of change facilitation strategies used.", + "groupBy": "output:practiceChangeAction", + "listName": "practiceChange", + "category": "Farm Management Practices" }, { - "groupBy": "", - "category": "Community Engagement and Capacity Building", - "listName": "events", - "description": "Breakdown of the number of events run by the type of industry that they are targeted at.", + "aggregationType": "SUM", "displayType": "piechart", - "name": "industryType", - "aggregationType": "HISTOGRAM", - "label": "No. of events by type of industry" + "name": "noInfluenced", + "description": "Sum of the number of individual people influenced by the strategy used to facilitate change. Multiple strategies can be used to facilitate change and therefore this should only be interpreted as proportional rather than actual figures.", + "label": "Proportional breakdown of the No. of people influenced by the change facilitation strategy", + "groupBy": "output:practiceChangeAction", + "listName": "practiceChange", + "category": "Farm Management Practices" } ], - "name": "Event Details" + "name": "Management Practice Change Details" }, { - "template": "communicationMaterialsSupplied", + "template": "sustainablePracticeInitiatives", "scores": [], - "name": "Materials Provided to Participants" + "name": "Sustainable Practice Initiatives" }, { - "template": "fireInformation", + "template": "otherConservationWorks", "scores": [ { - "category": "Natural Resources Management", - "listName": "", - "description": "The total number of activities applying fire as a management tool. This figure may also include some activities undertaking wildfire management actions.", - "displayType": "", - "name": "areaOfFireHa", "aggregationType": "COUNT", - "label": "No. of activities undertaking fire management measures" - }, - { - "isOutputTarget": true, - "category": "Natural Resources Management", - "description": "The area of the fire ground actually burnt. This may be different to the total area managed.", "displayType": "", - "name": "areaOfFireHa", - "aggregationType": "SUM", - "label": "Burnt area (Ha)", - "units": "Ha", - "gmsId": "FMA" - }, - { - "isOutputTarget": false, - "category": "Natural Resources Management", + "gmsId": "CATS", + "name": "targetSpecies", + "description": "A simple count of the number of activities undertaking work which is targeted at protecting/conserving specific species.", + "label": "No. of activities undertaking species conservation actions", "listName": "", - "description": "Proportional breakdown of the number of fire management activities by the reason for using fire as a management tool. Activities may be undertaken for multiple reasons and therefore may be double-counted in the total figures. This graph should only be interpreted as a proportional breakdown.", - "displayType": "", - "name": "fireReason", - "aggregationType": "HISTOGRAM", - "label": "No. of activities by reason for burn", - "units": "" + "category": "Biodiversity Management" }, { - "category": "Natural Resources Management", - "description": "Breakdown of the number of fire management activities undertaken by the type of fire event.", - "displayType": "", - "name": "fireEventType", "aggregationType": "HISTOGRAM", - "label": "No. of activities by type of fire event", - "units": "" - } - ], - "name": "Fire Management Details" - }, - { - "template": "evidenceOfWeedTreatment", - "scores": [ - { - "isOutputTarget": false, - "category": "Invasive Species Management - Weeds", + "displayType": "barchart", + "name": "targetSpecies", + "description": "Breakdown of the number of activities undertaken to protect/conserve species by species.", + "label": "No. of activities implementing conservation actions by species", "listName": "", - "description": "Average effectiveness of previous treatment (% killed) as assessed from the evidence of previous treatment events during weed mapping and monitoring activities", - "displayType": "", - "name": "evidenceOfPreviousWeedTreatment", - "aggregationType": "AVERAGE", - "label": "Average effectiveness of Previous Treatment (% killed)", - "units": "%" + "category": "Biodiversity Management" }, { - "groupBy": "output:evidenceOfPreviousWeedTreatment", - "category": "Invasive Species Management - Weeds", - "listName": "", - "description": "Proportional breakdown of the number of reportings of different typs of evidence of previous weed treatment actions, as noted during weed mapping and monitoring activities.", - "displayType": "piechart", - "name": "effectivenessOfPreviousWeedTreatment", "aggregationType": "COUNT", - "label": "Proportional breakdown of the No. of reports of different types of previous treatment evidence" - } - ], - "name": "Evidence of Weed Treatment" - }, - { - "template": "weedObservationDetails", - "scores": [ - { - "isOutputTarget": true, - "category": "Invasive Species Management - Weeds", - "listName": "", - "description": "Count of the number of weed observation, mapping and monitoring activities undertaken.", "displayType": "", - "name": "weedObservationMonitoringDetails", + "name": "conservationActionType", + "description": "Count of the total number of species conservation actions undertaken", + "label": "Total No. of species conservation actions undertaken", + "listName": "conservationWorks", + "category": "Biodiversity Management" + }, + { "aggregationType": "COUNT", - "label": "No. of activities undertaking weed monitoring", - "gmsId": "WMM WSA" + "displayType": "piechart", + "name": "conservationActionType", + "description": "Breakdown of the number of conservation actions undertaken by species being protected. ", + "label": "No. of conservation actions undertaken by species protected. ", + "groupBy": "output:targetSpecies.name", + "listName": "conservationWorks", + "category": "Biodiversity Management" }, { - "isOutputTarget": false, - "category": "Invasive Species Management - Weeds", - "listName": "weedObservationMonitoringDetails", - "description": "Sum of the assessed area of all weed species reported in mapping and monitoring activities. Several species may occur on the same area of land and therefore this figure IS NOT representative of the net area of land on which weeds have been reported (ie. the total area covered by weeds)", + "aggregationType": "SUM", "displayType": "", - "name": "weedCoverHa", + "name": "animalBreedingNos", + "description": "The total number of individual animals in breeding programmes and plants in plant propagation programmes", + "label": "No. of individual animals in captive breeding programs", + "listName": "", + "category": "Biodiversity Management" + }, + { "aggregationType": "SUM", - "label": "Area (Ha) of weed cover monitored", - "units": "" + "displayType": "", + "name": "animalReleaseNumber", + "description": "The total number of plants and animals returned to the wild from ", + "label": "No. of individual animals released back into the wild from breeding and propagation programmes.", + "listName": "", + "category": "Biodiversity Management" }, { - "groupBy": "output:weedStatus", - "category": "Invasive Species Management - Weeds", - "listName": "weedObservationMonitoringDetails", - "description": "Frequency count of reported weed observation/monitoring records by different infestation status classes", + "aggregationType": "SUM", "displayType": "piechart", - "name": "weedSpecies", + "name": "areaImpactedByWorks", + "description": "The total area impacted by different types of species conservation actions.", + "label": "Area (Ha) impacted by conservation action type", + "groupBy": "output:conservationActionType", + "listName": "conservationWorks", + "category": "Biodiversity Management" + }, + { + "aggregationType": "SUM", + "displayType": "", + "name": "numberOfProtectionMechanisms", + "description": "The total number of agreements/protection mechanisms implemented to conserve/protect species.", + "label": "No. of protection mechanisms implemented", + "groupBy": "", + "listName": "protectionMechanisms", + "category": "Biodiversity Management", + "isOutputTarget": true + }, + { "aggregationType": "COUNT", - "label": "Frequency of reported weed observation/monitoring records by infestation status" + "displayType": "piechart", + "name": "numberOfProtectionMechanisms", + "description": "Breakdown of the number of species protection mechanisms implemented of each type.", + "label": "No. of protection mechanisms implemented by protection mechanism type", + "groupBy": "output:protectionMechanism", + "listName": "protectionMechanisms", + "category": "Biodiversity Management" + }, + { + "aggregationType": "SUM", + "displayType": "", + "name": "areaUnderAgreement", + "description": "Sum of the areas covered by all Agreement mechanisms. Multiple mechanisms covering the same area may result in area of coverage being double-counted.", + "label": "Area (Ha) covered by Agreement mechanisms", + "listName": "protectionMechanisms", + "category": "Biodiversity Management", + "isOutputTarget": true }, { - "groupBy": "output:weedSpecies.name", - "category": "Invasive Species Management - Weeds", - "listName": "weedObservationMonitoringDetails", - "description": "Total area of reported weed cover by species. Note that the sum of areas will likely be greater than the net total area of weed cover.", - "displayType": "barchart", - "name": "weedCoverHa", "aggregationType": "SUM", - "label": "Total area (Ha) of reported weed cover by species" + "displayType": "piechart", + "name": "areaUnderAgreement", + "description": "Breakdown of the total area covered by each different type of agreement/protection mechanism", + "label": "Area (Ha) under agreement by protection mechanism type", + "groupBy": "output:protectionMechanism", + "listName": "protectionMechanisms", + "category": "Biodiversity Management" } ], - "name": "Weed Observation and Monitoring Details" + "name": "Conservation Works Details" + }, + { + "template": "adminActivities", + "scores": [{ + "aggregationType": "SUM", + "displayType": "barchart", + "name": "hoursActionTotal", + "description": "Proportional distribution of the time (hrs) spent undertaking different kinds of project administration activities.", + "label": "Total hours spent undertaking different types of project administration tasks", + "groupBy": "output:adminActionType", + "listName": "adminActions", + "category": "Project Management, Planning and Research Outputs" + }], + "name": "Administration Activities" + }, + { + "template": "outcomes", + "scores": [], + "name": "Outcomes" }, { - "template": "Weed", + "template": "evaluation", + "scores": [], + "name": "Evaluation" + }, + { + "template": "lessonsLearned", + "scores": [], + "name": "Lessons Learned" + }, + { + "template": "knowledgeTransfer", "scores": [ { - "groupBy": "output:treatmentEventType", - "isOutputTarget": true, - "category": "Invasive Species Management - Weeds", - "description": "The total area of weeds for which an initial treatment was undertaken.", + "aggregationType": "COUNT", "displayType": "", - "name": "areaTreatedHa", - "aggregationType": "SUM", - "label": "Total new area treated (Ha)", - "filterBy": "Initial treatment", - "units": "Ha", - "gmsId": "WDT" - }, - { - "category": "Invasive Species Management - Weeds", + "name": "numberOnCountryVisits", + "description": "Sum of the activities which have included at least one aspect of the sharing and/or transfer of indigenous knowledge", + "label": "Total No. of activities involving the sharing of Indigenous knowledge", "listName": "", - "description": "Total lineal length of stream frontage and/or roadside treated for weeds.", - "displayType": "", - "name": "linearAreaTreated", - "aggregationType": "SUM", - "label": "Total lineal length (Km) of stream frontage and/or roadside treated for weeds." + "category": "Indigenous Capacity" }, { - "category": "Invasive Species Management - Weeds", - "description": "Average cost per hectare of weed treatment. This is a non-mandatory field and the calculated average may be skewed by incomplete data.", + "aggregationType": "COUNT", "displayType": "", - "aggregationType": "AVERAGE", - "label": "Average cost ($/Ha) of weed treatment" + "name": "numberOnCountryVisits", + "description": "Count of the number of activities which were organised or run by indigenous decision makers", + "label": "No. of activities organised or run by Indigenous people", + "listName": "", + "category": "Indigenous Capacity", + "filterBy": "indigenousDecisionMakers:Yes" }, { - "category": "Invasive Species Management - Weeds", - "listName": "weedsTreated", - "description": "The total number of occurrence records of reported weed species.", + "aggregationType": "SUM", "displayType": "", - "name": "targetSpecies", - "aggregationType": "COUNT", - "label": "Total No. of weed records reported" - }, - { - "category": "Invasive Species Management - Weeds", + "gmsId": "IKT", + "name": "numberOnCountryVisits", + "description": "Sum of indigenous on-country visit events recorded which involved both older and younger people together.", + "label": "No. of on-country visits involving both older and younger people together", "listName": "", - "description": "Breakdown of the number of activities treating weeds by type of treatment", - "displayType": "", - "name": "treatmentEventType", - "aggregationType": "HISTOGRAM", - "label": "Proportion of activities treating weeds by type of treatment event" + "category": "Indigenous Capacity" }, { - "groupBy": "output:targetSpecies.name", - "isOutputTarget": false, - "category": "Invasive Species Management - Weeds", - "listName": "weedsTreated", - "description": "Breakdown of the number of weed treatment actions undertaken by species.", - "displayType": "barchart", - "name": "treatmentMethod", "aggregationType": "COUNT", - "label": "No. of activities treating weeds by species treated", - "units": "" + "displayType": "", + "name": "numberOnCountryVisits", + "description": "Count of the number of activities recording the documentation of indigenous knowledge.", + "label": "No. of activities in which Indigenous knowledge was documented", + "listName": "", + "category": "Indigenous Capacity", + "filterBy": "indigenousKnowledgeDocumented:Yes" }, { - "groupBy": "output:weedsTreated.treatmentMethod", - "isOutputTarget": false, - "category": "Invasive Species Management - Weeds", + "aggregationType": "SUM", + "displayType": "", + "gmsId": "IKM", + "name": "datasetsShared", + "description": "Sum of the number of datasets recorded as having been shared into the public domain.", + "label": "Total No. of Indigenous datasets shared publicly", "listName": "", - "description": "Proportional breakdown of the number of activities treating weeds by treatment method. A single activity may include multiple treatment methods being applied to different species in the activity, but for any given species the count is valid.", - "displayType": "barchart", - "name": "treatmentObjective", - "aggregationType": "COUNT", - "label": "Proportion of activities treating weeds by treatment method" + "category": "Indigenous Capacity" }, { - "category": "Invasive Species Management - Weeds", + "aggregationType": "SUM", + "displayType": "", + "name": "formalPartnerships", + "description": "Sum of the number of formal partnerships established. These include MOUs, agreements, joint delivery, etc. which involve indigenous people in the design, delivery and/or monitoring and guidance of project implementation.", + "label": "Total No. of Indigenous partnerships formally established", "listName": "", - "description": "Breakdown of the number of activities treating weeds by treatment objective.", + "category": "Indigenous Capacity" + } + ], + "name": "Indigenous Knowledge Transfer Details" + }, + { + "template": "plantPropagationDetails", + "scores": [ + { + "aggregationType": "SUM", "displayType": "", - "name": "treatmentObjective", - "aggregationType": "HISTOGRAM", - "label": "No. of activities treating weeds by treatment objective" + "gmsId": "PPRP", + "name": "totalNumberGrown", + "description": "The total number of plants which have been propagated and nurtured to the point of being ready for planting out.", + "label": "Total No. of plants grown and ready for planting ", + "category": "Revegetation", + "isOutputTarget": true }, { - "category": "Invasive Species Management - Weeds", - "listName": "", - "description": "Breakdown of the number of activities undertaking weed treatment by the main type of partner undertaking the action.", + "aggregationType": "SUM", "displayType": "", - "name": "partnerType", - "aggregationType": "HISTOGRAM", - "label": "No. of activities treating weeds by type of delivery partner" + "name": "totalSeedWeight", + "description": "The total weight of seed which has been germinated and grown into plants ready for planting out.", + "label": "Total weight (Kg) of seed germinated to produce the finished stock", + "category": "Revegetation" }, { - "groupBy": "output:partnerType", - "category": "Invasive Species Management - Weeds", - "listName": "", - "description": "Total area of weed treatment undertaken grouped by the main type of partner undertaking actions.", + "aggregationType": "COUNT", "displayType": "piechart", - "name": "areaTreatedHa", - "aggregationType": "SUM", - "label": "Total area (Ha.) of weed treatment by main activity partner" + "name": "numberGrown", + "description": "Breakdown of the number of plants grown and ready for planting out by the type of finished stock.", + "label": "No. of plants grown by type of finished stock", + "groupBy": "output:finishedStockType", + "listName": "plantPropagation", + "category": "Revegetation" }, { - "groupBy": "output:treatmentObjective", - "category": "Invasive Species Management - Weeds", - "listName": "", - "description": "Total area of weed treatment undertaken grouped by the type of treatment objective.", - "displayType": "piechart", - "name": "areaTreatedHa", "aggregationType": "SUM", - "label": "Total area (Ha.) of weed treatment by treatment objective" + "displayType": "piechart", + "name": "numberGrown", + "description": "Breakdown of the number of plants germinated from seed by the type of seed preparation technique used.", + "label": "No. of plants germinated by type of preparation technique", + "groupBy": "output:germinationMethod", + "listName": "plantPropagation", + "category": "Revegetation" } ], - "name": "Weed Treatment Details" + "name": "Plant Propagation Details" }, { - "template": "stockManagementDetails", + "template": "biologicalSurveyInformation", + "scores": [], + "name": "Survey Information" + }, + { + "template": "faunaSurveyDetails", "scores": [ { - "category": "Natural Resources Management", - "listName": "", - "description": "Count of the total number of activities undertaken involving conservation grazing", - "displayType": "", - "name": "areaOfStockManagementHa", "aggregationType": "COUNT", - "label": "Total No. of activities undertaken involving conservation grazing" - }, - { - "isOutputTarget": true, - "category": "Natural Resources Management", - "listName": "", - "description": "Total area managed with conservation grazing", "displayType": "", - "name": "areaOfStockManagementHa", - "aggregationType": "SUM", - "label": "Area managed with conservation grazing (Ha)", - "units": "Ha", - "gmsId": "CGM" + "gmsId": "FBS", + "name": "totalNumberOfOrganisms", + "description": "The number of activities undertaken of the type 'Fauna Survey - general'.", + "label": "No. of fauna surveys undertaken", + "listName": "", + "category": "Biodiversity Management", + "isOutputTarget": true }, { - "isOutputTarget": false, - "category": "Natural Resources Management", - "description": "Breakdown of the number of activities undertaking conservation management actions by the reason for undertaking actions", + "aggregationType": "COUNT", "displayType": "", - "name": "stockManagementReason", - "aggregationType": "HISTOGRAM", - "label": "Proportion of activities undertaking conservation grazing by stock management reason", - "units": "" + "name": "species", + "description": "Count of the total number of rows in the fauna survey details table.(ie. each row is a record of a species occurrence).", + "label": "Total number of fauna species records", + "listName": "surveyResults", + "category": "Biodiversity Management" }, { - "groupBy": "output:stockingDetails.stockingManagementSpecies", - "category": "Natural Resources Management", - "listName": "", - "description": "Proportional breakdown of the area managed with conservation grazing by species used. Multiple species may be used concurrently and therefore area may be double-counted in such cases. This data should only be interpreted as proportional representation.", - "displayType": "barchart", - "name": "areaOfStockManagementHa", "aggregationType": "SUM", - "label": "Proportional breakdown of the area managed with conservation grazing by species used" + "displayType": "", + "name": "totalNumberOfOrganisms", + "description": "The sum of the number of organisms recorded in all general survey events. Note that this does not include individuals recorded in site assessment and monitoring activities.", + "label": "Total No. of individual animals recorded", + "listName": "", + "category": "Biodiversity Management" } ], - "name": "Stock Management Details" + "name": "Fauna Survey Details" }, { - "template": "infrastructureDetails", + "template": "floraSurveyDetails", "scores": [ { - "category": "Natural Resources Management", - "listName": "infrastructureInstallations", - "description": "The total number of activities undertaken to build/install infrastructure for the protection, enhancement or public appreciation of native species and natural environments.", - "displayType": "", - "name": "infrastructureType", "aggregationType": "COUNT", - "label": "No. of activities undertaking infrastructure works" + "displayType": "", + "gmsId": "FRBS", + "name": "totalNumberOfOrganisms", + "description": "The number of activities undertaken of the type 'Flora Survey - general'.", + "label": "No. of flora surveys undertaken", + "listName": "", + "category": "Biodiversity Management", + "isOutputTarget": true }, { - "category": "Natural Resources Management", - "description": "Total number of infrastructure installations / facilities established for the protection, enhancement or public appreciation of native species and natural environments.", + "aggregationType": "COUNT", "displayType": "", - "name": "noInstallationsTotal", - "aggregationType": "SUM", - "label": "No. of infrastructure installations / facilities established" + "name": "species", + "description": "Count of the total number of rows in the flora survey details table.(ie. each row is a record of a species occurrence).", + "label": "Total number of flora species records", + "listName": "surveyResultsFlora", + "category": "Biodiversity Management" }, { - "groupBy": "output:infrastructureType", - "category": "Natural Resources Management", - "listName": "infrastructureInstallations", - "description": "Total number of infrastructure installations / facilities established for the protection, enhancement or public appreciation of native species and natural environments by the type of facility built/installed.", - "displayType": "barchart", - "name": "noInstallations", "aggregationType": "SUM", - "label": "No. of installations by type of infrastructure", - "units": "" + "displayType": "", + "name": "totalNumberOfOrganisms", + "description": "The sum of the number of individual plants recorded in all general flora survey events. Note that this does not include individuals recorded in site assessment and monitoring activities.", + "label": "Total No. of individual plants recorded", + "listName": "", + "category": "Biodiversity Management" } ], - "name": "Infrastructure Details" + "name": "Flora Survey Details" }, { - "template": "planningActivityDetails", + "template": "employmentDetails", "scores": [ { - "category": "Project Management, Planning and Research Outputs", - "listName": "", - "description": "The total number of plans developed", + "aggregationType": "SUM", "displayType": "", - "name": "typeOfPlan", - "aggregationType": "COUNT", - "label": "No. of activities undertaking plan development work", - "gmsId": "MPD" + "gmsId": "IPE", + "name": "totalEmployees", + "description": "Sum of the number of indigenous people recorded as being employed on projects", + "label": "Total No. of Indigenous people employed", + "listName": "", + "category": "Indigenous Capacity" }, { - "groupBy": "output:versionOfPlan", - "category": "Project Management, Planning and Research Outputs", - "listName": "", - "description": "Count of the number of plans developed which have been classified as NEW plans (ie. not revisions of existing plans).", + "aggregationType": "SUM", "displayType": "", - "name": "typeOfPlan", - "aggregationType": "COUNT", - "label": "No. of new plans developed", - "filterBy": "New plan" + "name": "noOfIndigenousRangersPt", + "description": "No. of Indigenous people employed PT (rangers)", + "label": "No. of Indigenous people employed PT (rangers)", + "listName": "", + "category": "Indigenous Capacity", + "isOutputTarget": true }, { - "isOutputTarget": false, - "category": "Project Management, Planning and Research Outputs", - "description": "Total of the number of actions specified in plans which have been addressed by scheduled activities.", + "aggregationType": "SUM", "displayType": "", - "name": "noOfPlanActionsAddressed", + "name": "noOfIndigenousRangersFt", + "description": "No. of Indigenous people employed FT (rangers)", + "label": "No. of Indigenous people employed FT (rangers)", + "listName": "", + "category": "Indigenous Capacity", + "isOutputTarget": true + }, + { "aggregationType": "SUM", - "label": "No. of Plan actions addressed" + "displayType": "", + "name": "noOfIndigenousNonRangersPt", + "description": "No. of Indigenous people employed PT (non-rangers)", + "label": "No. of Indigenous people employed PT (non-rangers)", + "listName": "", + "category": "Indigenous Capacity", + "isOutputTarget": true }, { - "isOutputTarget": false, - "category": "Project Management, Planning and Research Outputs", - "description": "Breakdown of the number of different types of plans developed", - "displayType": "piechart", - "name": "typeOfPlan", - "aggregationType": "HISTOGRAM", - "label": "No. of plan development activities by type of plan" + "aggregationType": "SUM", + "displayType": "", + "name": "noOfIndigenousNonRangersFt", + "description": "No. of Indigenous people employed FT (non-rangers)", + "label": "No. of Indigenous people employed FT (non-rangers)", + "listName": "", + "category": "Indigenous Capacity", + "isOutputTarget": true } ], - "name": "Plan Development Details" + "name": "Indigenous Employment" }, { - "template": "researchInformation", + "template": "indigenousEnterprise", "scores": [ { - "category": "Project Management, Planning and Research Outputs", - "listName": "", - "description": "The total number of research activities undertaken which have recorded data.", + "aggregationType": "SUM", "displayType": "", - "name": "typeOfResearch", - "aggregationType": "COUNT", - "label": "Total No. of research activities undertaken" + "name": "totalNewEnterprises", + "description": "Count of the number of unique (new) Indigenous enterprises established as a result of project implementation", + "label": "No. of new enterprises established", + "category": "Indigenous Capacity", + "isOutputTarget": true }, { - "category": "Project Management, Planning and Research Outputs", - "description": "Breakdown of the number of research projects by type of project", + "aggregationType": "SUM", "displayType": "", - "name": "typeOfResearch", - "aggregationType": "HISTOGRAM", - "label": "No. of research activities by type of research" + "name": "totalIndigenousEnterprisesEngaged", + "description": "Count of the number of unique engagements of Indigenous enterprises which have been formalised in contracts/agreements.", + "label": "No. of formal (contractual) engagements with Indigenous enterprises", + "category": "Indigenous Capacity", + "isOutputTarget": true } ], - "name": "Research Information" + "name": "Indigenous Businesses" }, { - "template": "waterManagementDetails", + "template": "pestManagementDetails", "scores": [ { - "category": "Natural Resources Management", - "listName": "", - "description": "Simple count of the number of activities undertaking water management actions.", - "displayType": "", - "name": "isCurrentFlowNatural", "aggregationType": "COUNT", - "label": "No. of water management activities implemented", - "gmsId": "WMN" + "displayType": "", + "name": "partnerType", + "description": "Count of the number of activities which are undertaking pest management actions", + "label": "No. of activities undertaking pest management", + "listName": "", + "category": "Invasive Species Management - Pests & Diseases" }, { - "isOutputTarget": false, - "category": "Natural Resources Management", - "description": "The total number of hydrological structures installed", + "aggregationType": "HISTOGRAM", + "displayType": "piechart", + "name": "pestManagementMethod", + "description": "Breakdown of the number of activities undertaking pest management actions by the management method used. As a single activity can apply multiple methods for different species, the activity count may include duplicates. Therefore this should only be interpreted as a proportional breakdown.", + "label": "Proportion of activities undertaking pest management by management method", + "units": "", + "listName": "pestManagement", + "category": "Invasive Species Management - Pests & Diseases" + }, + { + "aggregationType": "SUM", "displayType": "", - "name": "hydrologicalStructuresInstalled", + "gmsId": "PMA", + "name": "areaTreatedHa", + "description": "The total area over which pest treatment activities have been undertaken. Note that re-treatments of the same area may be double-counted.", + "label": "Area covered (Ha) by pest treatment actions", + "units": "Ha", + "groupBy": "treatmentType", + "listName": "pestManagement", + "category": "Invasive Species Management - Pests & Diseases", + "filterBy": "Initial treatment", + "isOutputTarget": true + }, + { "aggregationType": "SUM", - "label": "No. of hydrological structures installed" + "displayType": "barchart", + "name": "areaTreatedHa", + "description": "Breakdown of the total area treated by species. Both initial and follow-up treatments are aggregated.", + "label": "Treated area (Ha) by species", + "units": "", + "groupBy": "output:targetSpecies.name", + "listName": "pestManagement", + "category": "Invasive Species Management - Pests & Diseases" }, { - "isOutputTarget": true, - "category": "Natural Resources Management", - "listName": "", - "description": "The area of land actively managed with water management activities for enhanced environmental values.", + "aggregationType": "SUM", "displayType": "", - "name": "managedArea", + "gmsId": "PMQ", + "name": "pestAnimalsTreatedNo", + "description": "The total number of individual pest animals killed and colonies (ants, wasps, etc.) destroyed.", + "label": "Total No. of individuals or colonies of pest animals destroyed", + "listName": "pestManagement", + "category": "Invasive Species Management - Pests & Diseases", + "isOutputTarget": true + }, + { "aggregationType": "SUM", - "label": "Area (Ha) managed for water values", - "units": "Ha", - "gmsId": "WMA" + "displayType": "barchart", + "gmsId": "", + "name": "pestAnimalsTreatedNo", + "description": "The total number of individual pest animals killed and colonies (ants, wasps, etc.) destroyed by species.", + "label": "No. of individual animals and colonies killed / removed by species", + "units": "", + "groupBy": "output:targetSpecies.name", + "listName": "pestManagement", + "category": "Invasive Species Management - Pests & Diseases", + "isOutputTarget": false }, { - "groupBy": "output:waterMgtEnvironBenefit", - "category": "Natural Resources Management", - "listName": "", - "description": "Breakdown of the area of land actively managed with water management activities by the type of environmental benefit achieved. Note that a single water management action may achieve multiple benefits and therefore this metric should only be interpreted as proportional.", - "displayType": "piechart", - "name": "managedArea", "aggregationType": "SUM", - "label": "Proportion of area (Ha) managed by environmental benefit type" + "displayType": "barchart", + "name": "pestAnimalsTreatedNo", + "description": "The total number of individual pest animals killed and colonies (ants, wasps, etc.) destroyed by treatment method used.", + "label": "No. of individual animals and colonies killed / removed by treatment method", + "groupBy": "output:pestManagementMethod", + "listName": "pestManagement", + "category": "Invasive Species Management - Pests & Diseases", + "isOutputTarget": false }, { - "groupBy": "output:waterbodyType", - "category": "Natural Resources Management", + "aggregationType": "AVERAGE", + "displayType": "", + "name": "treatmentCostPerHa", + "description": "The average per hectare cost of treating/managing pest species. This is a non-mandatory attribute and may therefore skew values.", + "label": "Average cost of treatment per hectare ($ / Ha.)", + "units": "", "listName": "", - "description": "Breakdown of the area of land actively managed with water management activities by the type of water body managed.", - "displayType": "piechart", - "name": "managedArea", - "aggregationType": "SUM", - "label": "Proportion of area (Ha) managed by type of water body" + "category": "Invasive Species Management - Pests & Diseases" }, { - "groupBy": "output:waterUsePurpose", - "category": "Natural Resources Management", + "aggregationType": "HISTOGRAM", + "displayType": "", + "name": "partnerType", + "description": "Breakdown of the number of pest management activities undertaken by the type of partner delivering the actions.", + "label": "Breakdown of pest management activities by type of partner", "listName": "", - "description": "Breakdown of the area of land actively managed with water management activities by the purpose for which water is being managed. Note that a single water management action may apply to multiple purposes and therefore this metric should only be interpreted as proportional.", - "displayType": "piechart", - "name": "managedArea", - "aggregationType": "SUM", - "label": "Proportion of area (Ha) managed by water use purpose" + "category": "Invasive Species Management - Pests & Diseases" + }, + { + "aggregationType": "COUNT", + "displayType": "", + "name": "targetSpecies", + "description": "Count of species records for all pest management activities undertaken. This represents the total number of pest animal occurrence records.", + "label": "Total No. of pest animal records reported", + "listName": "pestManagement", + "category": "Invasive Species Management - Pests & Diseases" } ], - "name": "Water Management Details" + "name": "Pest Management Details" }, { - "template": "trainingDetails", + "template": "diseaseManagementDetails", "scores": [ { - "isOutputTarget": true, - "category": "Community Engagement and Capacity Building", - "description": "Sum of the number of people who complete formal/accredited training courses.", + "aggregationType": "COUNT", "displayType": "", - "name": "totalCompletingCourses", - "aggregationType": "SUM", - "label": "Total No. of people completing formal training courses", - "gmsId": "TSD" + "name": "targetSpecies", + "description": "Total number of activities undertaken to manage diseases (includes outbreaks as well as experimental and research purposes).", + "label": "No. of activities undertaking disease management", + "listName": "", + "category": "Invasive Species Management - Pests & Diseases" }, { - "category": "Community Engagement and Capacity Building", - "listName": "", - "description": "Count of the total number of activities which recorded details of individuals completing formal/accredited training courses.", - "displayType": "", - "name": "totalCompletingCourses", "aggregationType": "COUNT", - "label": "No. of activities undertaken which involved formal training" + "displayType": "piechart", + "name": "targetSpecies", + "description": "Total number of activities undertaking disease management by the purpose for undertaking the activity (includes outbreaks as well as experimental and research purposes).", + "label": "No. of activities undertaking disease management by purpose", + "groupBy": "output:diseaseManagementPurpose", + "listName": "", + "category": "Invasive Species Management - Pests & Diseases" }, { - "category": "Community Engagement and Capacity Building", - "listName": "courseAttendance", - "description": "Count of the total number of formal/accredited training courses for which participation details have been recorded. Each class is counted as a a course.", - "displayType": "", - "name": "courseTitle", "aggregationType": "COUNT", - "label": "No. of courses attended by project participants" + "displayType": "piechart", + "name": "targetSpecies", + "description": "Proportion of activities undertaking disease management by method. An activity may apply multiple management methods and therefore this data should be interpreted as proportionally representative only.", + "label": "Proportion of activities undertaking disease management by method", + "groupBy": "output:diseaseManagementMethod", + "listName": "", + "category": "Invasive Species Management - Pests & Diseases" }, { - "groupBy": "output:typeOfCourse", - "category": "Community Engagement and Capacity Building", - "listName": "courseAttendance", - "description": "Breakdown of the total number of people who completed a formal/accredited training course by the type of course attended.", - "displayType": "piechart", - "name": "numberCompleted", "aggregationType": "SUM", - "label": "No. completing courses by course type" + "displayType": "", + "name": "numberTreated", + "description": "Total number of individuals or colonies treated / quarantined", + "label": "Total number of individuals or colonies treated / quarantined", + "listName": "", + "category": "Invasive Species Management - Pests & Diseases" }, { - "groupBy": "output:qualificationLevel", - "category": "Community Engagement and Capacity Building", - "listName": "courseAttendance", - "description": "Breakdown of the number of people who completed a formal/accredited training course by standard Australian qualification level.of courses.", - "displayType": "barchart", - "name": "numberCompleted", "aggregationType": "SUM", - "label": "No. completing courses by qualification level" - } - ], - "name": "Training Details" - }, - { - "template": "skillsDevelopment", - "scores": [ - { - "category": "Community Engagement and Capacity Building", - "listName": "", - "description": "Count of the number of activities which have recorded at least one application of skills developed as a result of project participation and/or project-based formal training.", "displayType": "", - "name": "skillsApplication", - "aggregationType": "COUNT", - "label": "No. of activities indicating application of enhanced skills" + "gmsId": "DMA", + "name": "areaTreatedHa", + "description": "Total area treated / quarantined", + "label": "Total area (Ha) treated / quarantined", + "groupBy": "", + "listName": "", + "category": "Invasive Species Management - Pests & Diseases", + "isOutputTarget": true }, { - "category": "Community Engagement and Capacity Building", + "aggregationType": "SUM", + "displayType": "barchart", + "name": "areaTreatedHa", + "description": "Total area treated / quarantined by species", + "label": "Total area (Ha) treated / quarantined by species", + "groupBy": "output:targetSpecies.name", "listName": "", - "description": "Proportional breakdown of the ways in which skills developed as a result of project participation have been applied. This is a count of the number of occurrences recorded for each type of application.", - "displayType": "piechart", - "name": "skillsApplication", - "aggregationType": "HISTOGRAM", - "label": "Application of enhanced skills by type" - } - ], - "name": "Skills Development" - }, - { - "template": "riskAssessment", - "scores": [{ - "groupBy": "output:riskType", - "category": "Sites and Activity Planning", - "listName": "riskTable", - "description": "Count of the number of times a particular issue has been recorded. Activities can have multiple threats and risks.", - "displayType": "barchart", - "name": "riskType", - "aggregationType": "COUNT", - "label": "No. of threat and risk issues by type of issue" - }], - "name": "Threatening Processes and Site Condition Risks" - }, - { - "template": "debrisRemovalDetails", - "scores": [ + "category": "Invasive Species Management - Pests & Diseases" + }, { - "category": "Natural Resources Management", + "aggregationType": "SUM", + "displayType": "piechart", + "name": "areaTreatedHa", + "description": "Total area covered by disease management actions by the purpose for undertaking the action.", + "label": "Area (Ha.) covered by disease management actions by purpose", + "groupBy": "output:diseaseManagementPurpose", "listName": "", - "description": "The number of activities which have recorded debris removal information.", - "displayType": "", - "name": "debrisRemovalMethod", - "aggregationType": "COUNT", - "label": "Total No. of debris removal activities" + "category": "Invasive Species Management - Pests & Diseases" }, { - "category": "Natural Resources Management", - "description": "Breakdown of the number of activities that have removed debris by the type of debris removed", + "aggregationType": "SUM", "displayType": "piechart", - "name": "debrisType", - "aggregationType": "HISTOGRAM", - "label": "No. of activities removing debris by types of material" + "name": "areaTreatedHa", + "description": "Breakdown of area treated / quarantined by management method. Note that multiple methods may be used in a single treatment event and therefore this data should only interpreted as proportionally representative.", + "label": "Proportion of area treated / quarantined (Ha.) by management method", + "groupBy": "output:diseaseManagementMethod", + "listName": "", + "category": "Invasive Species Management - Pests & Diseases" }, { - "category": "Natural Resources Management", - "listName": "", - "description": "Proportional distribution of the number of activities that have removed debris by the removal methods. A single activity can use multiple methods.", + "aggregationType": "SUM", "displayType": "piechart", - "name": "debrisRemovalMethod", - "aggregationType": "HISTOGRAM", - "label": "No. of activities removing debris by removal method" + "name": "numberTreated", + "description": "Total number of individuals or colonies treated / quarantined by management method. Note that multiple methods may be used in a single treatment event and therefore this data should only interpreted as proportionally representative.", + "label": "Total number of individuals or colonies treated / quarantined by management method", + "groupBy": "output:diseaseManagementMethod", + "listName": "", + "category": "Invasive Species Management - Pests & Diseases" }, { - "category": "Natural Resources Management", + "aggregationType": "AVERAGE", + "displayType": "piechart", + "name": "treatmentCostPerHa", + "description": "Average cost per hectare of undertaking disease treatment actions.", + "label": "Average cost of treatment per hectare ($ / Ha.) ($/Ha)", + "groupBy": "output:diseaseManagementPurpose", "listName": "", - "description": "The area over which debris removal activities have been undertaken. Revisits to the same area will be double-counted.", - "displayType": "", - "name": "debrisActivityArea", + "category": "Invasive Species Management - Pests & Diseases" + } + ], + "name": "Disease Management Details" + }, + { + "template": "evidenceOfPestManagement", + "scores": [], + "name": "Evidence of Pest Management Activity" + }, + { + "template": "pestMonitoringDetails", + "scores": [ + { "aggregationType": "SUM", - "label": "Area (Ha) covered by debris removal activities", - "units": "Ha" + "displayType": "", + "name": "pestSampledArea", + "description": "Sum of sampling/monitoring area for each pest species record. Different species may occur over the same area of land and therefore this figure IS NOT representative of the net area sampled/monitored for all species.", + "label": "Total area sampled (Ha) for pest animal monitoring", + "units": "", + "listName": "pestObservationMonitoringDetails", + "category": "Invasive Species Management - Pests & Diseases" }, { - "isOutputTarget": true, - "category": "Natural Resources Management", - "description": "The total mass of debris removed.", + "aggregationType": "COUNT", "displayType": "", - "name": "debrisWeightTonnes", - "aggregationType": "SUM", - "label": "Weight of debris removed (Tonnes)", - "units": "Tonnes", - "gmsId": "DRW" + "gmsId": "PSA", + "name": "assessmentMethod", + "description": "The total number of actions undertaken to monitor pest species.", + "label": "No. of pest species monitoring actions undertaken", + "listName": "pestObservationMonitoringDetails", + "category": "Invasive Species Management - Pests & Diseases", + "isOutputTarget": true }, { - "groupBy": "output:debrisType", - "category": "Natural Resources Management", - "listName": "", - "description": "Breakdown of the mass of debris removed by the type of debris removed", - "displayType": "piechart", - "name": "debrisWeightTonnes", - "aggregationType": "SUM", - "label": "Weight of debris removed by type of material", - "filterBy": "", - "units": "Tonnes" + "aggregationType": "COUNT", + "displayType": "barchart", + "name": "pestSpecies", + "description": "No. of pest monitoring actions by species", + "label": "No. of pest monitoring actions by species", + "groupBy": "output:pestSpecies.name", + "listName": "pestObservationMonitoringDetails", + "category": "Invasive Species Management - Pests & Diseases" }, { - "isOutputTarget": true, - "category": "Natural Resources Management", - "description": "The total volume of debris removed.", - "displayType": "", - "name": "debrisVolumeM3", "aggregationType": "SUM", - "label": "Volume of debris removed (m3)", - "units": "m3", - "gmsId": "DRV" + "displayType": "barchart", + "name": "pestSampledArea", + "description": "Area (Ha) sampled/monitored for pest animals by species. The value for any given species is valid, but the aggregate sum of all values will be greater than the net area actually sampled/monitored.", + "label": "Area (Ha) sampled/monitored for pest animals by species", + "units": "", + "groupBy": "output:pestSpecies.name", + "listName": "pestObservationMonitoringDetails", + "category": "Invasive Species Management - Pests & Diseases" }, { - "groupBy": "output:debrisType", - "category": "Natural Resources Management", - "listName": "", - "description": "Breakdown of the mass of debris removed by the type of debris removed", - "displayType": "piechart", - "name": "debrisVolumeM3", - "aggregationType": "SUM", - "label": "Volume of debris removed by type of material", - "filterBy": "", - "units": "m3" + "aggregationType": "HISTOGRAM", + "displayType": "", + "name": "assessmentMethod", + "description": "Total number of observation records by assessment method", + "label": "No. of observation records by population assessment methodology", + "listName": "pestObservationMonitoringDetails", + "category": "Invasive Species Management - Pests & Diseases" } ], - "name": "Debris Removal Details" + "name": "Pest Observation and Monitoring Details" }, { - "template": "erosionManagementDetails", + "template": "revegetationMonitoringResults", "scores": [ { - "category": "Natural Resources Management", - "listName": "", - "description": "Count of the number of activities which have implemented erosion management actions.", - "displayType": "", - "name": "erosionAreaTreated", "aggregationType": "COUNT", - "label": "No. of activities undertaking erosion control works", - "gmsId": "" + "displayType": "", + "gmsId": "PSS", + "name": "countingMethod", + "description": "The total number of follow-up activities undertaken to monitor the success of revegetation actions carried out under sponsored projects.", + "label": "Total number of revegetation monitoring activities undertaken", + "listName": "", + "category": "Revegetation", + "isOutputTarget": true }, { - "isOutputTarget": true, - "category": "Natural Resources Management", - "listName": "", - "description": "The total number of structures installed to to control erosion.", - "displayType": "", - "name": "erosionStructuresInstalled", - "aggregationType": "SUM", - "label": "Total No. of erosion control structures installed" + "aggregationType": "HISTOGRAM", + "displayType": "piechart", + "name": "countingMethod", + "description": "Breakdown of the number of follow-up monitoring activities by the type of counting method used.", + "label": "No. of activities monitoring revegetation works by counting method", + "category": "Revegetation" }, { - "isOutputTarget": true, - "category": "Natural Resources Management", - "description": "Total lineal length of stream frontage and/or coastline which has been treated with erosion management actions.", + "aggregationType": "HISTOGRAM", "displayType": "", - "name": "erosionLength", - "aggregationType": "SUM", - "label": "Length of stream/coastline treated (Km)", - "units": "Km", - "gmsId": "EML" + "name": "revegetationType", + "description": "Breakdown of the number of follow-up monitoring activities by the types of revegetation method used.", + "label": "No. of activities monitoring revegetation works by revegetation method", + "listName": "", + "category": "Revegetation" }, { - "isOutputTarget": true, - "category": "Natural Resources Management", - "description": "The total area of erosion treated by management actions.", - "displayType": "", - "name": "erosionAreaTreated", "aggregationType": "SUM", - "label": "Erosion area treated (Ha)", - "units": "Ha", - "gmsId": "EMA" + "displayType": "", + "gmsId": "", + "name": "totalNumberSurviving", + "description": "The total number of plants estimated to be surviving as an aggregate of all counting methods used.", + "label": "Total No. of plants surviving", + "category": "Revegetation", + "isOutputTarget": false }, { - "groupBy": "output:erosionControlStructures", - "isOutputTarget": false, - "category": "Natural Resources Management", - "listName": "", - "description": "Count of the number of activities which installed structures to control erosion by the type of structure installed.", - "displayType": "piechart", - "name": "erosionStructuresInstalled", "aggregationType": "SUM", - "label": "No. of activities which installed erosion control structures by type of structure" + "displayType": "", + "gmsId": "PSC", + "name": "numberSurviving", + "description": "Total No. of plants surviving with mature height > 2.", + "label": "Total No. of plants surviving with mature height > 2:", + "listName": "revegetationMonitoring", + "category": "Revegetation", + "filterBy": "matureHeight: > 2 metres", + "isOutputTarget": true }, { - "groupBy": "output:erosionType", - "category": "Natural Resources Management", - "listName": "", - "description": "Proportional breakdown of the erosion area treated by the type of erosion treated. Note that a single treatment may apply to multiple types of erosion over the same area and therefore this metric should only be interpreted as a proportional breakdown.", - "displayType": "piechart", - "name": "erosionAreaTreated", - "aggregationType": "SUM", - "label": "Proportion of erosion area treated (Ha) by the type of erosion treated" + "aggregationType": "AVERAGE", + "displayType": "", + "name": "survivalRate", + "description": "Estimate of the average survivability of both tubestock and seedstock expressed as a percentage of plants planted. For seedstock, this includes both counted and estimated germination establishment rates.", + "label": "Average survivability of tubestock and seedstock (%)", + "listName": "revegetationMonitoring", + "category": "Revegetation", + "isOutputTarget": true }, { - "groupBy": "output:erosionTreatmentMethod", - "category": "Natural Resources Management", - "listName": "", - "description": "Proportional breakdown of the erosion area treated by the type of erosion management/treatment method used. Note that a single treatment may apply multiple types of methods over the same area and therefore this metric should only be interpreted as a proportional breakdown.", - "displayType": "piechart", - "name": "erosionAreaTreated", - "aggregationType": "SUM", - "label": "Proportion of erosion area treated (Ha) by the type of management method used" + "aggregationType": "AVERAGE", + "displayType": "barchart", + "name": "survivalRate", + "description": "Breakdown of the estimated survival rate of plants by the species planted.", + "label": "Average survival rate by species for monitored activities", + "groupBy": "output:species.name", + "listName": "revegetationMonitoring", + "category": "Revegetation" } ], - "name": "Erosion Management Details" + "name": "Vegetation Monitoring Results" }, { - "template": "accessControlDetails", + "template": "waterQualityGeneralInfo", + "scores": [], + "name": "General information & Participants" + }, + { + "template": "waterQualityEnvironmentalInfo", + "scores": [], + "name": "Environmental Information at the Time of Sampling" + }, + { + "template": "waterQualityMeasurements", + "scores": [{ + "aggregationType": "COUNT", + "displayType": "", + "gmsId": "WQSA", + "name": "instrumentCalibration", + "description": "The number of water quality monitoring activities undertaken.", + "label": "No. of water quality monitoring events undertaken", + "listName": "", + "category": "Natural Resources Management", + "isOutputTarget": true + }], + "name": "Water Quality Measurements" + }, + { + "template": "bfOutcomesAndMonitoring", + "scores": [], + "name": "Biodiversity Fund Outcomes & Monitoring Methodology" + }, + { + "template": "siteAssessment", + "scores": [], + "name": "Vegetation Assessment" + }, + { + "template": "vicSurveyInfo", + "scores": [], + "name": "Vegetation Assessment - Survey Information" + }, + { + "template": "vicHabHaV2-nativeSpecies", + "scores": [], + "name": "Native Species" + }, + { + "template": "vicHabHaV2-weedSpecies", + "scores": [], + "name": "Weed Species" + }, + { + "template": "vicHabHaV2-trees", + "scores": [], + "name": "Trees" + }, + { + "template": "siteConditionComponents", + "scores": [], + "name": "Site Condition Components" + }, + { + "template": "landscapeContextComponents", + "scores": [], + "name": "Landscape Context Components" + }, + { + "template": "weedAbundanceAndThreatScore", + "scores": [], + "name": "Weed Abundance & Threat Score" + }, + { + "template": "feralAnimalAbundanceScore", + "scores": [], + "name": "Feral Animal Abundance Score" + }, + { + "template": "feralAnimalFrequencyScore", + "scores": [], + "name": "Feral Animal Frequency Score" + }, + { + "template": "bfSamplingSiteInfo", "scores": [ { - "isOutputTarget": true, - "category": "Natural Resources Management", - "description": "Count of the number of activities implementing access control works", - "displayType": "", - "name": "structuresInstalled", "aggregationType": "COUNT", - "label": "No. of activities implementing access control works", - "gmsId": "PAM" - }, - { - "category": "Natural Resources Management", - "description": "Sum of the total number of structures installed for access management.", "displayType": "", - "name": "numberOfInstallations", - "aggregationType": "SUM", - "label": "Total No. of structures installed for access management" - }, - { - "isOutputTarget": true, - "category": "Natural Resources Management", + "gmsId": "VAC", + "name": "assessmentEventType", + "description": "Total number of site assessments undertaken using the Commonwealth government vegetation assessment methodology.", + "label": "No. of site assessments undertaken using the Commonwealth government vegetation assessment methodology", "listName": "", - "description": "Area in hectares that is being protected as a direct result of installing access control structures.", - "displayType": "", - "name": "accessAreaProtected", - "aggregationType": "SUM", - "label": "Area protected by access control installations (Ha)" - }, - { - "groupBy": "output:structuresInstalled", - "category": "Natural Resources Management", - "description": "Breakdown of the number of structures installed for access management by type of structure", - "displayType": "piechart", - "name": "numberOfInstallations", - "aggregationType": "COUNT", - "label": "Proportion of structures installed for access management by type of structure" + "category": "Biodiversity - Site Condition Assessment", + "isOutputTarget": true }, { - "groupBy": "output:accessControlPurpose", - "category": "Natural Resources Management", - "description": "Breakdown of the number of access control actions undertaken by the purpose for which access control structures were installed. A single action may include more than one structure and address multiple purposes. Therefore this metric should only be interpreted as proportionally representative.", + "aggregationType": "HISTOGRAM", "displayType": "piechart", - "name": "numberOfInstallations", - "aggregationType": "COUNT", - "label": "Proportion of actions undertaken for access management by purpose" + "name": "assessmentEventType", + "description": "Breakdown of the number of vegetation assessments using the Commonwealth methodology by the type of assessment event.", + "label": "No. of vegetation assessments using the Commonwealth methodology by the type of assessment event", + "listName": "", + "category": "Biodiversity - Site Condition Assessment" }, { - "groupBy": "output:accessManagementMethod", - "category": "Natural Resources Management", - "description": "Breakdown of the number of access control actions undertaken by the broad method used to control the access. A single action may include more than one structure and address multiple purposes. Therefore this metric should only be interpreted as proportionally representative.", + "aggregationType": "HISTOGRAM", "displayType": "piechart", - "name": "numberOfInstallations", - "aggregationType": "COUNT", - "label": "Proportion of actions undertaken for access management by management method" + "name": "typeOfSite", + "description": "Breakdown of the number of vegetation assessments using the Commonwealth methodology by the type of site.", + "label": "No. of vegetation assessments using the Commonwealth methodology by the type of site", + "listName": "", + "category": "Biodiversity - Site Condition Assessment" } ], - "name": "Access Control Details" + "name": "Sampling Site Information" }, { - "template": "plannedMonitoring", + "template": "groundCover", + "scores": [], + "name": "Field Sheet 1 - Ground Cover" + }, + { + "template": "exoticFauna", "scores": [{ - "category": "Sites and Activity Planning", - "listName": "plannedActions", - "description": "Breakdown of the No. of planned monitoring action by the type of monitoring action", - "displayType": "piechart", - "name": "plannedActivityType", "aggregationType": "HISTOGRAM", - "label": "No. of planned monitoring action by the type of monitoring action" + "displayType": "piechart", + "name": "evidence", + "description": "Count of the number of occurrences of evidence of the presence of exotic fauna by the type of evidence, as identified using the Commonwealth government vegetation assessment methodology.", + "label": "No. of occurrences of evidence of the presence of exotic fauna by the type of evidence (using the Commonwealth government vegetation assessment methodology)", + "listName": "evidenceOfExoticFauna", + "category": "Biodiversity - Site Condition Assessment" }], - "name": "Planned Monitoring Approach" + "name": "Field Sheet 2 - Exotic Fauna" }, { - "template": "practiceChangeDetails", + "template": "crownCover", + "scores": [], + "name": "Field Sheet 3 - Overstorey and Midstorey Projected Crown Cover" + }, + { + "template": "crownType", + "scores": [], + "name": "Field Sheet 4 - Crown Type" + }, + { + "template": "speciesDiversityMeri", "scores": [ { - "isOutputTarget": true, - "category": "Farm Management Practices", - "description": "The total number of unique/individual farming/fisher entities (farming/fishing businesses) that have made changes towards more sustainable management and primary production practices.", - "displayType": "", - "name": "totalEntitiesAdoptingChange", - "aggregationType": "SUM", - "label": "Total No. of farming entities adopting sustainable practice change", - "gmsId": "MPCFE" - }, - { - "isOutputTarget": true, - "category": "Farm Management Practices", - "description": "The surface area of land/water over which improved management practices have been undertaken/implemented as a result of government funded projects. ", - "displayType": "", - "name": "totalChangePracticeTreatedArea", - "aggregationType": "SUM", - "label": "Area of land (Ha) on which improved management practices have been implemented", - "units": "Ha", - "gmsId": "MPC" - }, - { - "isOutputTarget": true, - "category": "Farm Management Practices", - "description": "The surface area of land/water which is now managed using sustainable practices and resulting from implementation of funded projects.", + "aggregationType": "COUNT", "displayType": "", - "name": "benefitAreaHa", - "aggregationType": "SUM", - "label": "Area of land (Ha) changed to sustainable practices", - "units": "Ha", - "gmsId": "MPCSP" - }, - { - "groupBy": "output:practiceChange.industryType", - "category": "Farm Management Practices", - "listName": "", - "description": "Breakdown of area covered by changed management practices (resulting from government funded projects) by the type of industry.", - "displayType": "piechart", - "name": "benefitAreaHa", - "aggregationType": "SUM", - "label": "Area covered by changed management practices by industry type" - }, - { - "groupBy": "output:industryType", - "category": "Farm Management Practices", - "listName": "practiceChange", - "description": "Breakdown of number of farm/fisher entities adopting changed management practices (resulting from government funded projects) by the type of industry.", - "displayType": "piechart", - "name": "entitiesAdoptingChange", - "aggregationType": "SUM", - "label": "No. of farm/fisher entities adopting changed management practices by industry type" - }, - { - "groupBy": "output:industryType", - "category": "Farm Management Practices", - "listName": "practiceChange", - "description": "Breakdown of the number of people influenced by changed management practices (resulting from government funded projects) by the type of industry.", - "displayType": "piechart", - "name": "noInfluenced", - "aggregationType": "SUM", - "label": "No. of people influenced by changed management practices by industry type" + "name": "species", + "description": "Total count of the number of rows across all species diversity tables. Represents the number of species occurrence records from site condition assessments using the Commonwealth government methodology.", + "label": "Total No. of species records (as identified using the Commonwealth government vegetation assessment methodology)", + "listName": "speciesList", + "category": "Biodiversity - Site Condition Assessment" }, { - "groupBy": "output:practiceChangeAction", - "category": "Farm Management Practices", - "listName": "practiceChange", - "description": "Breakdown of the number of management change actions by different types of facilitation strategies used to encourage change to more sustainable management practices. Individual activities can employ multiple strategies and this result should only be interpreted as a proportional breakdown and not actual figures.", - "displayType": "piechart", - "name": "industryType", "aggregationType": "COUNT", - "label": "Proportion of actions implementing sustainable practices by type of change facilitation strategy." - }, - { - "groupBy": "output:changePurpose", - "category": "Farm Management Practices", - "listName": "practiceChange", - "description": "Proportional breakdown of the area covered by practice changes (Ha) by the reasons for changing management practices. People can have multiple reasons for changing practices and therefore this should only be interpreted as proportional rather than actual figures.", - "displayType": "piechart", - "name": "changePracticeTreatedArea", - "aggregationType": "SUM", - "label": "Proportional breakdown of the area covered by practice changes (Ha) by the reasons for changing management practices" - }, - { - "groupBy": "output:changePurpose", - "category": "Farm Management Practices", - "listName": "practiceChange", - "description": "Proportional breakdown of the number of farming/fisher entities adopting practice change by the reasons for changing management practices. People can have multiple reasons for changing practices and therefore this should only be interpreted as proportional rather than actual figures.", - "displayType": "piechart", - "name": "entitiesAdoptingChange", - "aggregationType": "SUM", - "label": "Proportional breakdown of the No. of entities adopting practice change by the reasons for changing management practices" - }, - { - "groupBy": "output:changePurpose", - "category": "Farm Management Practices", - "listName": "practiceChange", - "description": "Proportional breakdown of the number of individual people influenced by the reasons for changing management practices. People can have multiple reasons for changing practices and therefore this should only be interpreted as proportional rather than actual figures.", - "displayType": "piechart", - "name": "noInfluenced", - "aggregationType": "SUM", - "label": "Proportional breakdown of the No. of people influenced by the reasons for changing management practices" - }, - { - "groupBy": "output:targetOutcomes", - "category": "Farm Management Practices", - "listName": "practiceChange", - "description": "The sum of areas for each instance of each category of public good outcome recorded. Note that an activity may achieve more than one public good outcome and hence the area may be double-counted. Therefore this should be interpreted as a proportional breakdown only.", - "displayType": "piechart", - "name": "changePracticeTreatedArea", - "aggregationType": "SUM", - "label": "Proportional breakdown of the area covered by practice changes by the public good outcomes from changing management practices" - }, - { - "groupBy": "output:targetOutcomes", - "category": "Farm Management Practices", - "listName": "practiceChange", - "description": "Sum of the number of entities adopting practice change for each instance of each category of public good outcome recorded. Note that an activity may achieve more than one public good outcome and hence the number of entities may be double-counted. Therefore this should be interpreted as a proportional breakdown only.", - "displayType": "piechart", - "name": "entitiesAdoptingChange", - "aggregationType": "SUM", - "label": "Proportional breakdown of the No. of entities adopting practice change by the public good outcomes from changing management practices" - }, - { - "groupBy": "output:targetOutcomes", - "category": "Farm Management Practices", - "listName": "practiceChange", - "description": "Sum of the number of individual people influenced by the reasons for changing management practices. People can have mu for changing practices and therefore this should only be interpreted as proportional rather than actual figures.", "displayType": "piechart", - "name": "noInfluenced", - "aggregationType": "SUM", - "label": "Proportional breakdown of the No. of people influenced by the public good outcomes from changing management practices" - }, + "name": "species", + "description": "Proportional breakdown of native vs exotic species recorded as identified using the Commonwealth government vegetation assessment methodology.", + "label": "Proportion of native : exotic species recorded (as identified using the Commonwealth government vegetation assessment methodology)", + "groupBy": "output:nativeOrExotic", + "listName": "speciesList", + "category": "Biodiversity - Site Condition Assessment" + } + ], + "name": "Field Sheet 5 - Species Diversity" + }, + { + "template": "habitatHectaresSiteCondition", + "scores": [], + "name": "Site Condition" + }, + { + "template": "habitatHectaresLandscapeContext", + "scores": [], + "name": "Landscape Context" + }, + { + "template": "tasVegSiteCondition", + "scores": [], + "name": "Site Condition - TasVeg" + }, + { + "template": "tasVegLandscaprContext", + "scores": [], + "name": "Landscape Context - TasVeg" + }, + { + "template": "tasVegNvaMethod_F", + "scores": [], + "name": "TasVeg Native Vegetation Assessment Method - Forest Vegetation" + }, + { + "template": "tasVegNvaMethod_NF", + "scores": [], + "name": "TasVeg Native Vegetation Assessment Method - Non-Forest Vegetation" + }, + { + "template": "tasVegFloristicComposition", + "scores": [], + "name": "Floristic Composition" + }, + { + "template": "bioCondition100x50m", + "scores": [], + "name": "100 x 50m area - Ecologically Dominant Layer" + }, + { + "template": "bioCondition50x10m", + "scores": [], + "name": "50 x 10m area" + }, + { + "template": "bioCondition50x20m", + "scores": [], + "name": "50 x 20m area - Coarse Woody Debris" + }, + { + "template": "bioCondition1x1m", + "scores": [], + "name": "Five 1 x 1m plots" + }, + { + "template": "bioCondition100mTransect", + "scores": [], + "name": "100m Transect" + }, + { + "template": "heritageConservationInformation", + "scores": [ { - "groupBy": "output:practiceChangeAction", - "category": "Farm Management Practices", - "listName": "practiceChange", - "description": "The sum of areas for each instance of each category of change facilitation strategy used. Note that an activity may use more than one facilitation strategy and hence the area may be double-counted. Therefore this should be interpreted as a proportional breakdown only.", - "displayType": "piechart", - "name": "changePracticeTreatedArea", - "aggregationType": "SUM", - "label": "Proportional breakdown of the area covered by practice changes by the type of change facilitation strategy" + "aggregationType": "COUNT", + "displayType": "", + "gmsId": "HC HSA", + "name": "siteName", + "description": "Count of the total number of activities undertaking heritage conservation actions", + "label": "Total No. of activities undertaking heritage conservation actions", + "listName": "", + "category": "Heritage Asset Management" }, { - "groupBy": "output:practiceChangeAction", - "category": "Farm Management Practices", - "listName": "practiceChange", - "description": "Sum of the number of entities adopting practice change for each instance of each facilitation strategy used. Note that an activity may use more than one facilitation strategy and hence the number of entities may be double-counted. Therefore this should be interpreted as a proportional breakdown only.", - "displayType": "piechart", - "name": "entitiesAdoptingChange", - "aggregationType": "SUM", - "label": "Proportional breakdown of the No. of entities adopting practice change by the types of change facilitation strategies used." + "aggregationType": "HISTOGRAM", + "displayType": "", + "name": "typeOfHeritage", + "description": "Breakdown of the total number of activities undertaking heritage conservation actions by type of heritage work", + "label": "No. of activities by type of heritage work", + "listName": "", + "category": "Heritage Asset Management" }, { - "groupBy": "output:practiceChangeAction", - "category": "Farm Management Practices", - "listName": "practiceChange", - "description": "Sum of the number of individual people influenced by the strategy used to facilitate change. Multiple strategies can be used to facilitate change and therefore this should only be interpreted as proportional rather than actual figures.", - "displayType": "piechart", - "name": "noInfluenced", - "aggregationType": "SUM", - "label": "Proportional breakdown of the No. of people influenced by the change facilitation strategy" + "aggregationType": "HISTOGRAM", + "displayType": "", + "name": "levelOfHeritageListing", + "description": "Breakdown of the total number of activities undertaking heritage conservation actions by level of heritage listing.", + "label": "No. of activities on sites by the level of heritage listing", + "listName": "", + "category": "Heritage Asset Management" } ], - "name": "Management Practice Change Details" + "name": "Heritage Conservation Information" }, { - "template": "sustainablePracticeInitiatives", + "template": "heritageExpectedOutcomes", "scores": [], - "name": "Sustainable Practice Initiatives" + "name": "Expected Heritage Outcomes" }, { - "template": "otherConservationWorks", + "template": "projectStageProgress", + "scores": [], + "name": "Overview of Project Progress" + }, + { + "template": "projectStageOutcomes", + "scores": [], + "name": "Environmental, Economic and Social Outcomes" + }, + { + "template": "projectStageUpdate", + "scores": [], + "name": "Implementation Update" + }, + { + "template": "projectStageLessons", + "scores": [], + "name": "Lessons Learned and Improvements" + }, + { + "template": "sitePlanningDetails", + "scores": [{ + "aggregationType": "COUNT", + "displayType": "", + "gmsId": "STA", + "name": "noOfWorksAreasTotal", + "description": "Represents the number of acitivities which have undertaken planning for intervention works.", + "label": "Number of site preparation actions undertaken", + "listName": "", + "category": "Project Management, Planning and Research Outputs" + }], + "name": "Site Planning Details" + }, + { + "template": "smallGrantProgressReport", + "scores": [], + "name": "Progress Report Details" + }, + { + "template": "smallGrantFinalReport", + "scores": [], + "name": "Final Report Details" + }, + { + "template": "smallGrantOutputs", "scores": [ { - "category": "Biodiversity Management", - "listName": "", - "description": "A simple count of the number of activities undertaking work which is targeted at protecting/conserving specific species.", + "aggregationType": "SUM", "displayType": "", - "name": "targetSpecies", - "aggregationType": "COUNT", - "label": "No. of activities undertaking species conservation actions", - "gmsId": "CATS" - }, - { - "category": "Biodiversity Management", + "gmsId": "RVA25ALG", + "name": "areaRevegHa", + "description": "The area of land actually revegetated with native species by the planting of seedlings, sowing of seed and managed native regeneration actions.", + "label": "Area of revegetation works (Ha) - 25th ALG", + "units": "Ha", "listName": "", - "description": "Breakdown of the number of activities undertaken to protect/conserve species by species.", - "displayType": "barchart", - "name": "targetSpecies", - "aggregationType": "HISTOGRAM", - "label": "No. of activities implementing conservation actions by species" + "category": "Revegetation", + "isOutputTarget": true }, { - "category": "Biodiversity Management", - "listName": "conservationWorks", - "description": "Count of the total number of species conservation actions undertaken", + "aggregationType": "SUM", "displayType": "", - "name": "conservationActionType", - "aggregationType": "COUNT", - "label": "Total No. of species conservation actions undertaken" + "gmsId": "RVN25ALG", + "name": "totalNumberPlanted", + "description": "The total number of seedlings planted.", + "label": "Number of plants planted - 25th ALG", + "listName": "", + "category": "Revegetation", + "isOutputTarget": true }, { - "groupBy": "output:targetSpecies.name", - "category": "Biodiversity Management", - "listName": "conservationWorks", - "description": "Breakdown of the number of conservation actions undertaken by species being protected. ", - "displayType": "piechart", - "name": "conservationActionType", - "aggregationType": "COUNT", - "label": "No. of conservation actions undertaken by species protected. " + "aggregationType": "SUM", + "displayType": "", + "gmsId": "RVSS25ALG", + "name": "totalSeedSownKg", + "description": "The total weight of seed sown in revegetation plots.", + "label": "Kilograms of seed sown - 25th ALG", + "units": "Kg", + "listName": "", + "category": "Revegetation", + "isOutputTarget": true }, { - "category": "Biodiversity Management", - "listName": "", - "description": "The total number of individual animals in breeding programmes and plants in plant propagation programmes", - "displayType": "", - "name": "animalBreedingNos", "aggregationType": "SUM", - "label": "No. of individual animals in captive breeding programs" + "displayType": "", + "gmsId": "SDC25ALG", + "name": "totalSeedCollectedKg", + "description": "The total weight of seed collected for storage or propagation.", + "label": "Total seed collected (Kg) - 25th ALG", + "units": "Kg", + "listName": "", + "category": "Revegetation", + "isOutputTarget": true }, { - "category": "Biodiversity Management", - "listName": "", - "description": "The total number of plants and animals returned to the wild from ", - "displayType": "", - "name": "animalReleaseNumber", "aggregationType": "SUM", - "label": "No. of individual animals released back into the wild from breeding and propagation programmes." + "displayType": "", + "gmsId": "PPRP25ALG", + "name": "totalNumberGrown", + "description": "The total number of plants which have been propagated and nurtured to the point of being ready for planting out.", + "label": "Total No. of plants grown and ready for planting - 25th ALG", + "listName": "", + "category": "Revegetation", + "isOutputTarget": true }, { - "groupBy": "output:conservationActionType", - "category": "Biodiversity Management", - "listName": "conservationWorks", - "description": "The total area impacted by different types of species conservation actions.", - "displayType": "piechart", - "name": "areaImpactedByWorks", "aggregationType": "SUM", - "label": "Area (Ha) impacted by conservation action type" + "displayType": "", + "name": "erosionAreaTreated", + "description": "Count of the number of activities which have implemented erosion management actions.", + "label": "No. of activities undertaking erosion control works - 25th ALG", + "units": "Ha", + "listName": "", + "category": "Natural Resources Management", + "isOutputTarget": true }, { - "groupBy": "", - "isOutputTarget": true, - "category": "Biodiversity Management", - "listName": "protectionMechanisms", - "description": "The total number of agreements/protection mechanisms implemented to conserve/protect species.", - "displayType": "", - "name": "numberOfProtectionMechanisms", "aggregationType": "SUM", - "label": "No. of protection mechanisms implemented" + "displayType": "", + "gmsId": "EML25ALG", + "name": "erosionLength", + "description": "Total lineal length of stream frontage and/or coastline which has been treated with erosion management actions.", + "label": "Length of stream/coastline treated (Km) - 25th ALG", + "units": "Km", + "listName": "", + "category": "Natural Resources Management", + "isOutputTarget": true }, { - "groupBy": "output:protectionMechanism", - "category": "Biodiversity Management", - "listName": "protectionMechanisms", - "description": "Breakdown of the number of species protection mechanisms implemented of each type.", - "displayType": "piechart", - "name": "numberOfProtectionMechanisms", - "aggregationType": "COUNT", - "label": "No. of protection mechanisms implemented by protection mechanism type" + "aggregationType": "SUM", + "displayType": "", + "gmsId": "STP25ALG", + "name": "preparationAreaTotal", + "description": "Sum of the area of land specifically recorded as having preparatory works undertaken in advance of another associated activity. Site preparation works include activities such as fencing, weed or pest treatment, drainage or soil moisture management actions, etc.", + "label": "Total area prepared (Ha) for follow-up treatment actions - 25th ALG", + "units": "Ha", + "listName": "", + "category": "Sites and Activity Planning", + "isOutputTarget": true }, { - "isOutputTarget": true, - "category": "Biodiversity Management", - "listName": "protectionMechanisms", - "description": "Sum of the areas covered by all Agreement mechanisms. Multiple mechanisms covering the same area may result in area of coverage being double-counted.", - "displayType": "", - "name": "areaUnderAgreement", "aggregationType": "SUM", - "label": "Area (Ha) covered by Agreement mechanisms" + "displayType": "", + "gmsId": "FMA25ALG", + "name": "areaOfFireHa", + "description": "The area of the fire ground actually burnt. This may be different to the total area managed.", + "label": "Burnt area (Ha) - 25th ALG", + "units": "Ha", + "listName": "", + "category": "Natural Resources Management", + "isOutputTarget": true }, { - "groupBy": "output:protectionMechanism", - "category": "Biodiversity Management", - "listName": "protectionMechanisms", - "description": "Breakdown of the total area covered by each different type of agreement/protection mechanism", - "displayType": "piechart", - "name": "areaUnderAgreement", "aggregationType": "SUM", - "label": "Area (Ha) under agreement by protection mechanism type" - } - ], - "name": "Conservation Works Details" - }, - { - "template": "adminActivities", - "scores": [{ - "groupBy": "output:adminActionType", - "category": "Project Management, Planning and Research Outputs", - "listName": "adminActions", - "description": "Proportional distribution of the time (hrs) spent undertaking different kinds of project administration activities.", - "displayType": "barchart", - "name": "hoursActionTotal", - "aggregationType": "SUM", - "label": "Total hours spent undertaking different types of project administration tasks" - }], - "name": "Administration Activities" - }, - { - "template": "outcomes", - "scores": [], - "name": "Outcomes" - }, - { - "template": "evaluation", - "scores": [], - "name": "Evaluation" - }, - { - "template": "lessonsLearned", - "scores": [], - "name": "Lessons Learned" - }, - { - "template": "knowledgeTransfer", - "scores": [ - { - "category": "Indigenous Capacity", - "listName": "", - "description": "Sum of the activities which have included at least one aspect of the sharing and/or transfer of indigenous knowledge", "displayType": "", - "name": "numberOnCountryVisits", - "aggregationType": "COUNT", - "label": "Total No. of activities involving the sharing of Indigenous knowledge" + "gmsId": "DRV25ALG", + "name": "debrisVolumeM3", + "description": "The total volume of debris removed.", + "label": "Volume of debris removed (m3) - 25th ALG", + "units": "m3", + "listName": "", + "category": "Natural Resources Management", + "isOutputTarget": true }, { - "category": "Indigenous Capacity", - "listName": "", - "description": "Count of the number of activities which were organised or run by indigenous decision makers", + "aggregationType": "SUM", "displayType": "", - "name": "numberOnCountryVisits", - "aggregationType": "COUNT", - "label": "No. of activities organised or run by Indigenous people", - "filterBy": "indigenousDecisionMakers:Yes" + "gmsId": "PMA25ALG", + "name": "totalAreaTreatedHa", + "description": "The total area over which pest treatment activities have been undertaken. Note that re-treatments of the same area may be double-counted.", + "label": "Area covered (Ha) by pest treatment actions - 25th ALG", + "units": "Ha", + "listName": "", + "category": "Invasive Species Management - Pests & Diseases", + "isOutputTarget": true }, { - "category": "Indigenous Capacity", - "listName": "", - "description": "Sum of indigenous on-country visit events recorded which involved both older and younger people together.", - "displayType": "", - "name": "numberOnCountryVisits", "aggregationType": "SUM", - "label": "No. of on-country visits involving both older and younger people together", - "gmsId": "IKT" + "displayType": "", + "gmsId": "PMQ25ALG", + "name": "totalPestAnimalsTreatedNo", + "description": "The total number of individual pest animals killed and colonies (ants, wasps, etc.) destroyed.", + "label": "Total No. of individuals or colonies of pest animals destroyed - 25th ALG", + "listName": "", + "category": "Invasive Species Management - Pests & Diseases", + "isOutputTarget": true }, { - "category": "Indigenous Capacity", - "listName": "", - "description": "Count of the number of activities recording the documentation of indigenous knowledge.", + "aggregationType": "SUM", "displayType": "", - "name": "numberOnCountryVisits", - "aggregationType": "COUNT", - "label": "No. of activities in which Indigenous knowledge was documented", - "filterBy": "indigenousKnowledgeDocumented:Yes" + "gmsId": "WDT25ALG", + "name": "areaTreatedHa", + "description": "The total area of weeds for which an initial treatment was undertaken.", + "label": "Total new area of weeds treated (Ha) - 25th ALG", + "units": "Ha", + "listName": "", + "category": "Invasive Species Management - Weeds", + "isOutputTarget": true }, { - "category": "Indigenous Capacity", - "listName": "", - "description": "Sum of the number of datasets recorded as having been shared into the public domain.", - "displayType": "", - "name": "datasetsShared", "aggregationType": "SUM", - "label": "Total No. of Indigenous datasets shared publicly", - "gmsId": "IKM" + "displayType": "", + "gmsId": "FNC25ALG", + "name": "lengthOfFence", + "description": "The total length of fencing erected.", + "label": "Total length of fence (Km) - 25th ALG", + "units": "kilometres", + "listName": "", + "category": "Biodiversity Management", + "isOutputTarget": true }, { - "category": "Indigenous Capacity", + "aggregationType": "SUM", + "displayType": "", + "gmsId": "CPEE25ALG", + "name": "numberOfEvents", + "description": "Count of the number of community participation and engagement events run.", + "label": "Total No. of community participation and engagement events run - 25th ALG", "listName": "", - "description": "Sum of the number of formal partnerships established. These include MOUs, agreements, joint delivery, etc. which involve indigenous people in the design, delivery and/or monitoring and guidance of project implementation.", + "category": "Community Engagement and Capacity Building", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", "displayType": "", - "name": "formalPartnerships", + "name": "numberOfPublications", + "description": "Number of different publications produced (NOT the number of copies of a publication produced). Includes: books, films/DVDs/CDs, guides, journal articles, pamphlets, report cards, management plans, media releases and/or similar.", + "label": "Community participation and engagement (publications) - 25th ALG", + "listName": "", + "category": "Community Engagement and Capacity Building", + "isOutputTarget": true + }, + { "aggregationType": "SUM", - "label": "Total No. of Indigenous partnerships formally established" - } - ], - "name": "Indigenous Knowledge Transfer Details" - }, - { - "template": "plantPropagationDetails", - "scores": [ + "displayType": "", + "name": "numberOfCommunityGroups", + "description": "The number of different community groups participating in the project that were not project delivery partners.", + "label": "No. of community groups that participated in delivery of the project - 25th ALG", + "listName": "", + "category": "Community Engagement and Capacity Building", + "isOutputTarget": true + }, { - "isOutputTarget": true, - "category": "Revegetation", - "description": "The total number of plants which have been propagated and nurtured to the point of being ready for planting out.", + "aggregationType": "SUM", "displayType": "", - "name": "totalNumberGrown", + "name": "numberOfVolunteers", + "description": "The number of participants at activities and events who are not employed on projects. Individuals attending multiple activities will be counted for their attendance at each event.", + "label": "No of volunteers participating in project activities - 25th ALG", + "listName": "", + "category": "Community Engagement and Capacity Building", + "isOutputTarget": true + }, + { "aggregationType": "SUM", - "label": "Total No. of plants grown and ready for planting ", - "gmsId": "PPRP" + "displayType": "", + "gmsId": "MPCFE25ALG", + "name": "entitiesAdoptingChange", + "description": "The number of farming/fisher entities that implemented management practice changes during the project. Excludes those intending to change practice.", + "label": "Total No. of farming entities adopting sustainable practice change - 25th ALG", + "listName": "", + "category": "Farm Management Practices", + "isOutputTarget": true }, { - "category": "Revegetation", - "description": "The total weight of seed which has been germinated and grown into plants ready for planting out.", + "aggregationType": "SUM", "displayType": "", - "name": "totalSeedWeight", + "name": "numberOfFarmingEntitiesNew", + "description": "The total number of unique farming/fisher entities participating in the project.", + "label": "Total No. of unique farming entities engaged - 25th ALG", + "listName": "", + "category": "Farm Management Practices", + "isOutputTarget": true + }, + { "aggregationType": "SUM", - "label": "Total weight (Kg) of seed germinated to produce the finished stock" + "displayType": "", + "name": "numberOfIndigenousParticipants", + "description": "The number of Indigenous people attending and/or participating in activities and events. Individuals attending multiple activities will be counted for their attendance at each event.", + "label": "No of Indigenous participants at project events. - 25th ALG", + "listName": "", + "category": "Indigenous Capacity", + "isOutputTarget": true }, { - "groupBy": "output:finishedStockType", - "category": "Revegetation", - "listName": "plantPropagation", - "description": "Breakdown of the number of plants grown and ready for planting out by the type of finished stock.", - "displayType": "piechart", - "name": "numberGrown", - "aggregationType": "COUNT", - "label": "No. of plants grown by type of finished stock" + "aggregationType": "SUM", + "displayType": "", + "name": "totalEmployees", + "description": "The number of Indigenous persons employed/sub-contracted during the project (measured in persons, not FTE). Includes ongoing, non-ongoing, casual, and contracted persons.", + "label": "Total No. of Indigenous people employed - 25th ALG", + "listName": "", + "category": "Indigenous Capacity", + "isOutputTarget": true }, { - "groupBy": "output:germinationMethod", - "category": "Revegetation", - "listName": "plantPropagation", - "description": "Breakdown of the number of plants germinated from seed by the type of seed preparation technique used.", - "displayType": "piechart", - "name": "numberGrown", "aggregationType": "SUM", - "label": "No. of plants germinated by type of preparation technique" - } - ], - "name": "Plant Propagation Details" - }, - { - "template": "biologicalSurveyInformation", - "scores": [], - "name": "Survey Information" - }, - { - "template": "faunaSurveyDetails", - "scores": [ + "displayType": "", + "name": "indigenousPlansCompleted", + "description": "The total number of Indigenous Land and Sea Plans developed by the project.", + "label": "No. of Indigenous Land and Sea Plans completed - 25th ALG", + "listName": "", + "category": "Project Management, Planning and Research Outputs", + "isOutputTarget": true + }, { - "isOutputTarget": true, - "category": "Biodiversity Management", + "aggregationType": "SUM", + "displayType": "", + "name": "indigenousProductsDeveloped", + "description": "The total number of publications and other products (eg. videos) developed by the project to facilitate the sharing of Indigenous Ecological Knowledge.", + "label": "Indigenous knowledge transfer (no. of activities) - 25th ALG", "listName": "", - "description": "The number of activities undertaken of the type 'Fauna Survey - general'.", + "category": "Indigenous Capacity" + }, + { + "aggregationType": "SUM", "displayType": "", - "name": "totalNumberOfOrganisms", - "aggregationType": "COUNT", - "label": "No. of fauna surveys undertaken", - "gmsId": "FBS" + "gmsId": "IKM25ALG", + "name": "datasetsShared", + "description": "Sum of the number of datasets recorded as having been shared into the public domain.", + "label": "Total No. of Indigenous datasets shared publicly - 25th ALG", + "listName": "", + "category": "Indigenous Capacity", + "isOutputTarget": true }, { - "category": "Biodiversity Management", - "listName": "surveyResults", - "description": "Count of the total number of rows in the fauna survey details table.(ie. each row is a record of a species occurrence).", + "aggregationType": "SUM", "displayType": "", - "name": "species", - "aggregationType": "COUNT", - "label": "Total number of fauna species records" + "gmsId": "PSA25ALG", + "name": "pestSurveyNo", + "description": "The total number of actions undertaken to monitor pest species.", + "label": "No. of pest species monitoring actions undertaken - 25th ALG", + "listName": "", + "category": "Invasive Species Management - Pests & Diseases", + "isOutputTarget": true }, { - "category": "Biodiversity Management", + "aggregationType": "SUM", + "displayType": "", + "gmsId": "FBS25ALG", + "name": "faunaSurveyNo", + "description": "The number of activities undertaken of the type 'Fauna Survey - general'.", + "label": "No. of fauna surveys undertaken - 25th ALG", "listName": "", - "description": "The sum of the number of organisms recorded in all general survey events. Note that this does not include individuals recorded in site assessment and monitoring activities.", + "category": "Biodiversity Management", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", "displayType": "", - "name": "totalNumberOfOrganisms", + "gmsId": "WMM25ALG WSA25ALG", + "name": "weedSurveyNo", + "description": "Count of the number of weed observation, mapping and monitoring activities undertaken.", + "label": "No. of activities undertaking weed monitoring - 25th ALG", + "listName": "", + "category": "Invasive Species Management - Weeds", + "isOutputTarget": true + }, + { "aggregationType": "SUM", - "label": "Total No. of individual animals recorded" - } - ], - "name": "Fauna Survey Details" - }, - { - "template": "floraSurveyDetails", - "scores": [ + "displayType": "", + "gmsId": "STA25ALG", + "name": "siteAssessmentNo", + "description": "Represents the number of acitivities which have undertaken planning for intervention works.", + "label": "Number of site preparation actions undertaken - 25th ALG", + "listName": "", + "category": "Project Management, Planning and Research Outputs", + "isOutputTarget": true + }, { - "isOutputTarget": true, - "category": "Biodiversity Management", + "aggregationType": "SUM", + "displayType": "", + "gmsId": "WQSA25ALG", + "name": "waterQualitySurveyNo", + "description": "The number of water quality monitoring activities undertaken.", + "label": "No. of water quality monitoring events undertaken - 25th ALG", "listName": "", - "description": "The number of activities undertaken of the type 'Flora Survey - general'.", + "category": "Natural Resources Management", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", "displayType": "", - "name": "totalNumberOfOrganisms", - "aggregationType": "COUNT", - "label": "No. of flora surveys undertaken", - "gmsId": "FRBS" + "gmsId": "HC25ALG HSA25ALG", + "name": "heritageSurveyNo", + "description": "Total No. of activities undertaking heritage conservation actions", + "label": "Heritage survey and assessment (no. of survey reports) - 25th ALG", + "listName": "", + "category": "Heritage Asset Management", + "isOutputTarget": true }, { - "category": "Biodiversity Management", - "listName": "surveyResultsFlora", - "description": "Count of the total number of rows in the flora survey details table.(ie. each row is a record of a species occurrence).", + "aggregationType": "SUM", "displayType": "", - "name": "species", - "aggregationType": "COUNT", - "label": "Total number of flora species records" + "name": "indigenousKnowledgeTransferActionsNo", + "description": "Sum of the activities which have included at least one aspect of the sharing and/or transfer of indigenous knowledge", + "label": "Total No. of activities involving the sharing of Indigenous knowledge - 25th ALG", + "listName": "", + "category": "Indigenous Capacity", + "isOutputTarget": true }, { - "category": "Biodiversity Management", + "aggregationType": "SUM", + "displayType": "", + "gmsId": "CGM25ALG", + "name": "conservationGrazingActionsArea", + "description": "Total area managed with conservation grazing", + "label": "Area managed with conservation grazing (Ha) - 25th ALG", + "units": "Ha", "listName": "", - "description": "The sum of the number of individual plants recorded in all general flora survey events. Note that this does not include individuals recorded in site assessment and monitoring activities.", + "category": "Natural Resources Management", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", "displayType": "", - "name": "totalNumberOfOrganisms", + "name": "managementPlansNo", + "description": "Count of the number of plans developed which have been classified as NEW plans (ie. not revisions of existing plans).", + "label": "No. of new plans developed - 25th ALG", + "listName": "", + "category": "Project Management, Planning and Research Outputs", + "isOutputTarget": true + }, + { "aggregationType": "SUM", - "label": "Total No. of individual plants recorded" + "displayType": "", + "gmsId": "VAC25ALG", + "name": "vegAssessmentCommNo", + "description": "Total number of site assessments undertaken using the Commonwealth government vegetation assessment methodology.", + "label": "No. of site assessments undertaken using the Commonwealth government vegetation assessment methodology - 25th ALG", + "listName": "", + "category": "Biodiversity - Site Condition Assessment", + "isOutputTarget": true } ], - "name": "Flora Survey Details" + "name": "Output Details" }, { - "template": "employmentDetails", + "template": "fencing", "scores": [ { - "category": "Indigenous Capacity", - "listName": "", - "description": "Sum of the number of indigenous people recorded as being employed on projects", + "aggregationType": "SUM", "displayType": "", - "name": "totalEmployees", + "gmsId": "FNC", + "name": "lengthOfFence", + "description": "The total length of fencing erected.", + "label": "Total length of fence (Km)", + "units": "kilometres", + "category": "Biodiversity Management", + "isOutputTarget": true + }, + { "aggregationType": "SUM", - "label": "Total No. of Indigenous people employed", - "gmsId": "IPE" + "displayType": "piechart", + "name": "lengthOfFence", + "description": "Breakdown of the length of fence erected by the type of fence.", + "label": "Total length of fence (Km) by the type of fence erected", + "units": "kilometres", + "groupBy": "output:fenceType", + "listName": "", + "category": "Biodiversity Management" + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "piechart", + "name": "fenceType", + "description": "Breakdown of the number of activities erecting fencing by the type of fence being erected.", + "label": "Proportion of activities by fence type", + "units": "", + "category": "Biodiversity Management" }, { - "isOutputTarget": true, - "category": "Indigenous Capacity", - "listName": "", - "description": "No. of Indigenous people employed PT (rangers)", - "displayType": "", - "name": "noOfIndigenousRangersPt", "aggregationType": "SUM", - "label": "No. of Indigenous people employed PT (rangers)" - }, - { - "isOutputTarget": true, - "category": "Indigenous Capacity", + "displayType": "piechart", + "name": "lengthOfFence", + "description": "Breakdown of the proportion of the length of fencing by purpose of fence. As a single fence can perform many purposes, the length may be multi-counted. Interpret only as length within a specific category or as a percentage of the whole.", + "label": "Length of fence (as a %) by fence purpose", + "units": "", + "groupBy": "output:purposeOfFence", "listName": "", - "description": "No. of Indigenous people employed FT (rangers)", - "displayType": "", - "name": "noOfIndigenousRangersFt", - "aggregationType": "SUM", - "label": "No. of Indigenous people employed FT (rangers)" + "category": "Biodiversity Management" }, { - "isOutputTarget": true, - "category": "Indigenous Capacity", - "listName": "", - "description": "No. of Indigenous people employed PT (non-rangers)", - "displayType": "", - "name": "noOfIndigenousNonRangersPt", "aggregationType": "SUM", - "label": "No. of Indigenous people employed PT (non-rangers)" + "displayType": "", + "name": "fenceAreaProtected", + "description": "The area in hectares enclosed within a protective fence", + "label": "Area protected by fencing (Ha)", + "listName": "", + "category": "Biodiversity Management", + "isOutputTarget": true }, { - "isOutputTarget": true, - "category": "Indigenous Capacity", + "aggregationType": "HISTOGRAM", + "displayType": "piechart", + "name": "purposeOfFence", + "description": "Breakdown of the proportion of the number of activities erecting fencing by purpose of fence. As a single fence can perform many purposes, the length may be multi-counted. Interpret only as length within a specific category or as a percentage of the whole.", + "label": "Proportion of activities by fence purpose", + "units": "", "listName": "", - "description": "No. of Indigenous people employed FT (non-rangers)", - "displayType": "", - "name": "noOfIndigenousNonRangersFt", - "aggregationType": "SUM", - "label": "No. of Indigenous people employed FT (non-rangers)" + "category": "Biodiversity Management", + "isOutputTarget": false } ], - "name": "Indigenous Employment" + "name": "Fence Details" }, { - "template": "indigenousEnterprise", + "template": "smallGrantAquittal", + "scores": [], + "name": "Project Acquittal" + }, + { + "template": "activityAttachments", + "scores": [], + "name": "Attachments" + }, + { + "template": "summaryReportDataUpload", "scores": [ { - "isOutputTarget": true, - "category": "Indigenous Capacity", - "description": "Count of the number of unique (new) Indigenous enterprises established as a result of project implementation", - "displayType": "", - "name": "totalNewEnterprises", "aggregationType": "SUM", - "label": "No. of new enterprises established" + "displayType": "", + "name": "score", + "label": "Number of plants planted", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Revegetation", + "filterBy": "Number of plants planted" }, { - "isOutputTarget": true, - "category": "Indigenous Capacity", - "description": "Count of the number of unique engagements of Indigenous enterprises which have been formalised in contracts/agreements.", - "displayType": "", - "name": "totalIndigenousEnterprisesEngaged", "aggregationType": "SUM", - "label": "No. of formal (contractual) engagements with Indigenous enterprises" - } - ], - "name": "Indigenous Businesses" - }, - { - "template": "pestManagementDetails", - "scores": [ + "displayType": "", + "name": "score", + "label": "Area of revegetation works (Ha)", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Revegetation", + "filterBy": "Area of revegetation works (Ha)" + }, { - "category": "Invasive Species Management - Pests & Diseases", - "listName": "", - "description": "Count of the number of activities which are undertaking pest management actions", + "aggregationType": "SUM", "displayType": "", - "name": "partnerType", - "aggregationType": "COUNT", - "label": "No. of activities undertaking pest management" + "name": "score", + "label": "Total seed collected (Kg)", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Revegetation", + "filterBy": "Total seed collected (Kg)" }, { - "category": "Invasive Species Management - Pests & Diseases", - "listName": "pestManagement", - "description": "Breakdown of the number of activities undertaking pest management actions by the management method used. As a single activity can apply multiple methods for different species, the activity count may include duplicates. Therefore this should only be interpreted as a proportional breakdown.", - "displayType": "piechart", - "name": "pestManagementMethod", - "aggregationType": "HISTOGRAM", - "label": "Proportion of activities undertaking pest management by management method", - "units": "" + "aggregationType": "SUM", + "displayType": "", + "name": "score", + "label": "Burnt area (Ha)", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Natural Resources Management", + "filterBy": "Burnt area (Ha) - may be different to the total area managed" }, { - "groupBy": "output:treatmentType", - "isOutputTarget": true, - "category": "Invasive Species Management - Pests & Diseases", - "listName": "pestManagement", - "description": "The total area over which pest treatment activities have been undertaken. Note that re-treatments of the same area may be double-counted.", + "aggregationType": "SUM", "displayType": "", - "name": "areaTreatedHa", + "name": "score", + "label": "Total length of fence (Km)", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Biodiversity Management", + "filterBy": "Total length of fence (Km)" + }, + { "aggregationType": "SUM", + "displayType": "", + "name": "score", "label": "Area covered (Ha) by pest treatment actions", - "filterBy": "Initial treatment", - "units": "Ha", - "gmsId": "PMA" + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Invasive Species Management - Pests & Diseases", + "filterBy": "Area covered (Ha) by pest treatment" }, { - "groupBy": "output:targetSpecies.name", - "category": "Invasive Species Management - Pests & Diseases", - "listName": "pestManagement", - "description": "Breakdown of the total area treated by species. Both initial and follow-up treatments are aggregated.", - "displayType": "barchart", - "name": "areaTreatedHa", "aggregationType": "SUM", - "label": "Treated area (Ha) by species", - "units": "" + "displayType": "", + "name": "score", + "label": "Kilograms of seed sown", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Revegetation", + "filterBy": "Kilograms of seed sown" }, { - "isOutputTarget": true, - "category": "Invasive Species Management - Pests & Diseases", - "listName": "pestManagement", - "description": "The total number of individual pest animals killed and colonies (ants, wasps, etc.) destroyed.", - "displayType": "", - "name": "pestAnimalsTreatedNo", "aggregationType": "SUM", - "label": "Total No. of individuals or colonies of pest animals destroyed", - "gmsId": "PMQ" + "displayType": "", + "name": "score", + "label": "Total area treated (Ha)", + "groupBy": "output:scoreLabel", + "listName": "scores", + "filterBy": "Total area treated (Ha)" }, { - "groupBy": "output:targetSpecies.name", - "isOutputTarget": false, - "category": "Invasive Species Management - Pests & Diseases", - "listName": "pestManagement", - "description": "The total number of individual pest animals killed and colonies (ants, wasps, etc.) destroyed by species.", - "displayType": "barchart", - "name": "pestAnimalsTreatedNo", "aggregationType": "SUM", - "label": "No. of individual animals and colonies killed / removed by species", - "units": "", - "gmsId": "" + "displayType": "", + "name": "score", + "label": "Total No. of Indigenous people employed", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Indigenous Capacity", + "filterBy": "Total No. of Indigenous people employed" }, { - "groupBy": "output:pestManagementMethod", - "isOutputTarget": false, - "category": "Invasive Species Management - Pests & Diseases", - "listName": "pestManagement", - "description": "The total number of individual pest animals killed and colonies (ants, wasps, etc.) destroyed by treatment method used.", - "displayType": "barchart", - "name": "pestAnimalsTreatedNo", "aggregationType": "SUM", - "label": "No. of individual animals and colonies killed / removed by treatment method" + "displayType": "", + "name": "score", + "label": "Total No. of unique farming entities engaged", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Farm Management Practices", + "filterBy": "Total No. of unique farming entities engaged" }, { - "category": "Invasive Species Management - Pests & Diseases", - "listName": "", - "description": "The average per hectare cost of treating/managing pest species. This is a non-mandatory attribute and may therefore skew values.", + "aggregationType": "SUM", "displayType": "", - "name": "treatmentCostPerHa", - "aggregationType": "AVERAGE", - "label": "Average cost of treatment per hectare ($ / Ha.)", - "units": "" + "name": "score", + "label": "Total No. of individuals or colonies of pest animals destroyed", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Invasive Species Management - Pests & Diseases", + "filterBy": "Total No. of individuals or colonies of pest animals destroyed" }, { - "category": "Invasive Species Management - Pests & Diseases", - "listName": "", - "description": "Breakdown of the number of pest management activities undertaken by the type of partner delivering the actions.", + "aggregationType": "SUM", "displayType": "", - "name": "partnerType", - "aggregationType": "HISTOGRAM", - "label": "Breakdown of pest management activities by type of partner" + "name": "score", + "label": "Total No. of Indigenous people employed", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Indigenous Capacity", + "filterBy": "Total No. of Indigenous people employed" }, { - "category": "Invasive Species Management - Pests & Diseases", - "listName": "pestManagement", - "description": "Count of species records for all pest management activities undertaken. This represents the total number of pest animal occurrence records.", + "aggregationType": "SUM", "displayType": "", - "name": "targetSpecies", - "aggregationType": "COUNT", - "label": "Total No. of pest animal records reported" + "name": "score", + "label": "Total No. of unique farming entities engaged", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Farm Management Practices", + "filterBy": "Total No. of unique farming entities engaged" } ], - "name": "Pest Management Details" + "name": "Upload of stage 1 and 2 reporting data" }, { - "template": "diseaseManagementDetails", - "scores": [ - { - "category": "Invasive Species Management - Pests & Diseases", - "listName": "", - "description": "Total number of activities undertaken to manage diseases (includes outbreaks as well as experimental and research purposes).", - "displayType": "", - "name": "targetSpecies", - "aggregationType": "COUNT", - "label": "No. of activities undertaking disease management" - }, + "template": "gaParticipantDetails", + "scores": [], + "name": "Participant Details" + }, + { + "template": "saStructuralDiversity", + "scores": [], + "name": "Indicator 1 - Plant Species Diversity" + }, + { + "template": "saWeedAbundanceAndThreat", + "scores": [], + "name": "Indicator 2 - Weed Abundance & Threat" + }, + { + "template": "bioConditionConsolidated", + "scores": [], + "name": "BioCondition Method" + }, + { + "template": "gaMonthlyReportData", + "scores": [ { - "groupBy": "output:diseaseManagementPurpose", - "category": "Invasive Species Management - Pests & Diseases", + "aggregationType": "SUM", + "displayType": "", + "name": "trainingCommencedAccredited", + "label": "No. participants starting accredited training", "listName": "", - "description": "Total number of activities undertaking disease management by the purpose for undertaking the activity (includes outbreaks as well as experimental and research purposes).", - "displayType": "piechart", - "name": "targetSpecies", - "aggregationType": "COUNT", - "label": "No. of activities undertaking disease management by purpose" + "category": "Green Army" }, { - "groupBy": "output:diseaseManagementMethod", - "category": "Invasive Species Management - Pests & Diseases", + "aggregationType": "SUM", + "displayType": "", + "name": "trainingNoExited", + "label": "No. of Participants who exited training", "listName": "", - "description": "Proportion of activities undertaking disease management by method. An activity may apply multiple management methods and therefore this data should be interpreted as proportionally representative only.", - "displayType": "piechart", - "name": "targetSpecies", - "aggregationType": "COUNT", - "label": "Proportion of activities undertaking disease management by method" + "category": "Green Army" }, { - "category": "Invasive Species Management - Pests & Diseases", - "listName": "", - "description": "Total number of individuals or colonies treated / quarantined", - "displayType": "", - "name": "numberTreated", "aggregationType": "SUM", - "label": "Total number of individuals or colonies treated / quarantined" + "displayType": "", + "name": "trainingNoCompleted", + "label": "No. of Participants who completed training", + "listName": "", + "category": "Green Army" }, { - "groupBy": "", - "isOutputTarget": true, - "category": "Invasive Species Management - Pests & Diseases", - "listName": "", - "description": "Total area treated / quarantined", - "displayType": "", - "name": "areaTreatedHa", "aggregationType": "SUM", - "label": "Total area (Ha) treated / quarantined", - "gmsId": "DMA" + "displayType": "", + "name": "totalParticipantsCommenced", + "label": "No. of Participants who commenced projects", + "listName": "", + "category": "Green Army" }, { - "groupBy": "output:targetSpecies.name", - "category": "Invasive Species Management - Pests & Diseases", - "listName": "", - "description": "Total area treated / quarantined by species", - "displayType": "barchart", - "name": "areaTreatedHa", "aggregationType": "SUM", - "label": "Total area (Ha) treated / quarantined by species" + "displayType": "", + "name": "totalParticipantsNotCompleted", + "label": "No. of Participants who did not complete projects", + "listName": "", + "category": "Green Army" }, { - "groupBy": "output:diseaseManagementPurpose", - "category": "Invasive Species Management - Pests & Diseases", - "listName": "", - "description": "Total area covered by disease management actions by the purpose for undertaking the action.", - "displayType": "piechart", - "name": "areaTreatedHa", "aggregationType": "SUM", - "label": "Area (Ha.) covered by disease management actions by purpose" + "displayType": "", + "name": "totalParticipantsCompleted", + "label": "No. of Participants who completed projects", + "listName": "", + "category": "Green Army" }, { - "groupBy": "output:diseaseManagementMethod", - "category": "Invasive Species Management - Pests & Diseases", - "listName": "", - "description": "Breakdown of area treated / quarantined by management method. Note that multiple methods may be used in a single treatment event and therefore this data should only interpreted as proportionally representative.", - "displayType": "piechart", - "name": "areaTreatedHa", "aggregationType": "SUM", - "label": "Proportion of area treated / quarantined (Ha.) by management method" + "displayType": "", + "name": "totalIndigenousParticipantsCommenced", + "label": "No. of Indigenous Participants who commenced projects", + "listName": "", + "category": "Green Army" }, { - "groupBy": "output:diseaseManagementMethod", - "category": "Invasive Species Management - Pests & Diseases", - "listName": "", - "description": "Total number of individuals or colonies treated / quarantined by management method. Note that multiple methods may be used in a single treatment event and therefore this data should only interpreted as proportionally representative.", - "displayType": "piechart", - "name": "numberTreated", "aggregationType": "SUM", - "label": "Total number of individuals or colonies treated / quarantined by management method" + "displayType": "", + "name": "reportingTimeTaken", + "label": "Time taken to fulfill reporting requirements", + "listName": "", + "category": "Green Army" }, { - "groupBy": "output:diseaseManagementPurpose", - "category": "Invasive Species Management - Pests & Diseases", - "listName": "", - "description": "Average cost per hectare of undertaking disease treatment actions.", + "aggregationType": "HISTOGRAM", "displayType": "piechart", - "name": "treatmentCostPerHa", - "aggregationType": "AVERAGE", - "label": "Average cost of treatment per hectare ($ / Ha.) ($/Ha)" + "name": "projectStatus", + "description": "Projects by status", + "label": "Count of projects by project status", + "groupBy": "", + "listName": "", + "category": "Green Army" } ], - "name": "Disease Management Details" - }, - { - "template": "evidenceOfPestManagement", - "scores": [], - "name": "Evidence of Pest Management Activity" + "name": "Monthly Status Report Data" }, { - "template": "pestMonitoringDetails", + "template": "gaQuarterlyProjectReport", "scores": [ { - "category": "Invasive Species Management - Pests & Diseases", - "listName": "pestObservationMonitoringDetails", - "description": "Sum of sampling/monitoring area for each pest species record. Different species may occur over the same area of land and therefore this figure IS NOT representative of the net area sampled/monitored for all species.", + "aggregationType": "SUM", "displayType": "", - "name": "pestSampledArea", + "name": "incidentCount", + "description": "Total number of incidents", + "label": "Total number of incidents recorded", + "groupBy": "", + "listName": "", + "category": "Green Army" + }, + { "aggregationType": "SUM", - "label": "Total area sampled (Ha) for pest animal monitoring", - "units": "" + "displayType": "", + "name": "complaintCount", + "description": "Total number of complaints", + "label": "Total number of complaints recorded", + "groupBy": "", + "listName": "", + "category": "Green Army" }, { - "isOutputTarget": true, - "category": "Invasive Species Management - Pests & Diseases", - "listName": "pestObservationMonitoringDetails", - "description": "The total number of actions undertaken to monitor pest species.", + "aggregationType": "SUM", "displayType": "", - "name": "assessmentMethod", - "aggregationType": "COUNT", - "label": "No. of pest species monitoring actions undertaken", - "gmsId": "PSA" + "name": "trainingActivityCount", + "description": "Total number of training activities", + "label": "Total number of training activities", + "groupBy": "", + "listName": "", + "category": "Green Army" }, { - "groupBy": "output:pestSpecies.name", - "category": "Invasive Species Management - Pests & Diseases", - "listName": "pestObservationMonitoringDetails", - "description": "No. of pest monitoring actions by species", - "displayType": "barchart", - "name": "pestSpecies", - "aggregationType": "COUNT", - "label": "No. of pest monitoring actions by species" + "aggregationType": "SUM", + "displayType": "", + "name": "participantWithdrawals", + "description": "Total number of participant withdrawals", + "label": "Total number of participant withdrawals", + "groupBy": "", + "listName": "", + "category": "Green Army" }, { - "groupBy": "output:pestSpecies.name", - "category": "Invasive Species Management - Pests & Diseases", - "listName": "pestObservationMonitoringDetails", - "description": "Area (Ha) sampled/monitored for pest animals by species. The value for any given species is valid, but the aggregate sum of all values will be greater than the net area actually sampled/monitored.", - "displayType": "barchart", - "name": "pestSampledArea", "aggregationType": "SUM", - "label": "Area (Ha) sampled/monitored for pest animals by species", - "units": "" + "displayType": "", + "name": "participantExits", + "description": "Total number of participant exits", + "label": "Total number of participant exits", + "groupBy": "", + "listName": "", + "category": "Green Army" }, { - "category": "Invasive Species Management - Pests & Diseases", - "listName": "pestObservationMonitoringDetails", - "description": "Total number of observation records by assessment method", + "aggregationType": "SUM", "displayType": "", - "name": "assessmentMethod", - "aggregationType": "HISTOGRAM", - "label": "No. of observation records by population assessment methodology" - } - ], - "name": "Pest Observation and Monitoring Details" - }, - { - "template": "revegetationMonitoringResults", - "scores": [ + "name": "participantTrainingNumber", + "description": "Total number of participants starting training", + "label": "Total number of participants starting training", + "groupBy": "", + "listName": "", + "category": "Green Army" + }, { - "isOutputTarget": true, - "category": "Revegetation", - "description": "The total number of follow-up activities undertaken to monitor the success of revegetation actions carried out under sponsored projects.", + "aggregationType": "SUM", "displayType": "", - "name": "revegetationType", - "aggregationType": "COUNT", - "label": "Total number of revegetation monitoring activities undertaken", - "gmsId": "PSS" + "name": "participantTrainingNcNumber", + "description": "Total number of participants exiting training", + "label": "Total number of participants exiting training", + "groupBy": "", + "listName": "", + "category": "Green Army" }, { - "category": "Revegetation", - "description": "Breakdown of the number of follow-up monitoring activities by the type of counting method used.", - "displayType": "piechart", - "name": "countingMethod", - "aggregationType": "HISTOGRAM", - "label": "No. of activities monitoring revegetation works by counting method" + "aggregationType": "SUM", + "displayType": "", + "name": "no17Years", + "description": "Total number of participants 17 years old", + "label": "Total number of participants 17 years old", + "groupBy": "", + "listName": "", + "category": "Green Army" }, { - "category": "Revegetation", + "aggregationType": "SUM", + "displayType": "", + "name": "no18Years", + "description": "Total number of participants 18 years old", + "label": "Total number of participants 18 years old", + "groupBy": "", "listName": "", - "description": "Breakdown of the number of follow-up monitoring activities by the types of revegetation method used.", + "category": "Green Army" + }, + { + "aggregationType": "SUM", "displayType": "", - "name": "revegetationType", - "aggregationType": "HISTOGRAM", - "label": "No. of activities monitoring revegetation works by revegetation method" + "name": "no19Years", + "description": "Total number of participants 19 years old", + "label": "Total number of participants 19 years old", + "groupBy": "", + "listName": "", + "category": "Green Army" }, { - "isOutputTarget": false, - "category": "Revegetation", - "description": "The total number of plants estimated to be surviving as an aggregate of all counting methods used.", + "aggregationType": "SUM", "displayType": "", - "name": "totalNumberSurviving", + "name": "no20Years", + "description": "Total number of participants 20 years old", + "label": "Total number of participants 20 years old", + "groupBy": "", + "listName": "", + "category": "Green Army" + }, + { "aggregationType": "SUM", - "label": "Total No. of plants surviving", - "gmsId": "" + "displayType": "", + "name": "no21Years", + "description": "Total number of participants 21 years old", + "label": "Total number of participants 21 years old", + "groupBy": "", + "listName": "", + "category": "Green Army" }, { - "groupBy": "output:matureHeight", - "isOutputTarget": true, - "category": "Revegetation", - "listName": "revegetationMonitoring", - "description": "Total No. of plants surviving with mature height > 2 metres", + "aggregationType": "SUM", "displayType": "", - "name": "numberSurviving", + "name": "no22Years", + "description": "Total number of participants 22 years old", + "label": "Total number of participants 22 years old", + "groupBy": "", + "listName": "", + "category": "Green Army" + }, + { "aggregationType": "SUM", - "label": "Total No. of plants surviving with mature height > 2 metres", - "filterBy": "> 2 metres", - "gmsId": "PSC" + "displayType": "", + "name": "no23Years", + "description": "Total number of participants 23 years old", + "label": "Total number of participants 23 years old", + "groupBy": "", + "listName": "", + "category": "Green Army" }, { - "isOutputTarget": true, - "category": "Revegetation", - "listName": "revegetationMonitoring", - "description": "Estimate of the average survivability of both tubestock and seedstock expressed as a percentage of plants planted. For seedstock, this includes both counted and estimated germination establishment rates.", + "aggregationType": "SUM", "displayType": "", - "name": "survivalRate", - "aggregationType": "AVERAGE", - "label": "Average survivability of tubestock and seedstock (%)" + "name": "no24Years", + "description": "Total number of participants 24 years old", + "label": "Total number of participants 24 years old", + "groupBy": "", + "listName": "", + "category": "Green Army" }, { - "groupBy": "output:species.name", - "category": "Revegetation", - "listName": "revegetationMonitoring", - "description": "Breakdown of the estimated survival rate of plants by the species planted.", - "displayType": "barchart", - "name": "survivalRate", - "aggregationType": "AVERAGE", - "label": "Average survival rate by species for monitored activities" + "aggregationType": "SUM", + "displayType": "", + "name": "totalParticipants", + "description": "Total number of participants", + "label": "Total number of participants", + "groupBy": "", + "listName": "", + "category": "Green Army" } ], - "name": "Vegetation Monitoring Results" + "name": "Three Monthly Report" }, { - "template": "waterQualityGeneralInfo", + "template": "gaTeamSupervisorAttendance", "scores": [], - "name": "General information & Participants" + "name": "Change or Absence of Team Supervisor Report" }, { - "template": "waterQualityEnvironmentalInfo", + "template": "gaDesktopAuditChecklist", "scores": [], - "name": "Environmental Information at the Time of Sampling" + "name": "Desktop Audit Checklist Details" }, { - "template": "waterQualityMeasurements", - "scores": [{ - "isOutputTarget": true, - "category": "Natural Resources Management", - "listName": "", - "description": "The number of water quality monitoring activities undertaken.", - "displayType": "", - "name": "instrumentCalibration", - "aggregationType": "COUNT", - "label": "No. of water quality monitoring events undertaken", - "gmsId": "WQSA" - }], - "name": "Water Quality Measurements" + "template": "gaEndOfProjectReport", + "scores": [], + "name": "End of Project Report Details" }, { - "template": "bfOutcomesAndMonitoring", + "template": "gaSiteVisitDetails", "scores": [], - "name": "Biodiversity Fund Outcomes & Monitoring Methodology" + "name": "Site Visit Details" + } + ], + "selectedActivity": { + "outputs": [ + "Progress Report Details", + "Attachments" + ], + "supportsPhotoPoints": false, + "gmsId": "PR25ALG", + "name": "25th Anniversary Landcare Grants - Progress Report", + "supportsSites": false, + "type": "Report", + "category": "Small Grants", + "status": "active" + }, + "activities": [ + { + "outputs": ["Biodiversity Fund Outcomes & Monitoring Methodology"], + "name": "Biodiversity Fund - Outcomes and Monitoring", + "type": "Assessment", + "status": "deleted" }, { - "template": "siteAssessment", - "scores": [], - "name": "Vegetation Assessment" + "outputs": [ + "Event Details", + "Participant Information", + "Materials Provided to Participants" + ], + "gmsId": "CPEE", + "name": "Community Participation and Engagement", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "vicSurveyInfo", - "scores": [], - "name": "Vegetation Assessment - Survey Information" + "outputs": [ + "Debris Removal Details", + "Participant Information" + ], + "gmsId": "DRV DRW", + "name": "Debris Removal", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "vicHabHaV2-nativeSpecies", - "scores": [], - "name": "Native Species" + "outputs": [ + "Disease Management Details", + "Participant Information" + ], + "gmsId": "DMA", + "name": "Disease Management", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "vicHabHaV2-weedSpecies", - "scores": [], - "name": "Weed Species" + "outputs": [ + "Erosion Management Details", + "Participant Information" + ], + "supportsPhotoPoints": true, + "gmsId": "EMA EML", + "name": "Erosion Management", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "vicHabHaV2-trees", - "scores": [], - "name": "Trees" + "outputs": [ + "Survey Information", + "Fauna Survey Details", + "Participant Information" + ], + "supportsPhotoPoints": true, + "gmsId": "FBS", + "name": "Fauna Survey - general", + "supportsSites": true, + "type": "Assessment", + "category": "Assessment & monitoring" }, { - "template": "siteConditionComponents", - "scores": [], - "name": "Site Condition Components" + "outputs": [ + "Fence Details", + "Participant Information" + ], + "gmsId": "FNC", + "name": "Fencing", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "landscapeContextComponents", - "scores": [], - "name": "Landscape Context Components" + "outputs": [ + "Stock Management Details", + "Photo Points" + ], + "supportsPhotoPoints": true, + "gmsId": "CGM", + "name": "Conservation Grazing Management", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "weedAbundanceAndThreatScore", - "scores": [], - "name": "Weed Abundance & Threat Score" + "outputs": [ + "Fire Management Details", + "Participant Information", + "Photo Points" + ], + "supportsPhotoPoints": true, + "gmsId": "FMA FML", + "name": "Fire Management", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "feralAnimalAbundanceScore", - "scores": [], - "name": "Feral Animal Abundance Score" + "outputs": [ + "Survey Information", + "Flora Survey Details", + "Participant Information" + ], + "supportsPhotoPoints": true, + "gmsId": "FRBS", + "name": "Flora Survey - general", + "supportsSites": true, + "type": "Assessment", + "category": "Assessment & monitoring" }, { - "template": "feralAnimalFrequencyScore", - "scores": [], - "name": "Feral Animal Frequency Score" + "outputs": [ + "Heritage Conservation Information", + "Expected Heritage Outcomes", + "Participant Information" + ], + "gmsId": "HC HSA", + "name": "Heritage Conservation", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "bfSamplingSiteInfo", - "scores": [ - { - "isOutputTarget": true, - "category": "Biodiversity - Site Condition Assessment", - "listName": "", - "description": "Total number of site assessments undertaken using the Commonwealth government vegetation assessment methodology.", - "displayType": "", - "name": "assessmentEventType", - "aggregationType": "COUNT", - "label": "No. of site assessments undertaken using the Commonwealth government vegetation assessment methodology", - "gmsId": "VAC" - }, - { - "category": "Biodiversity - Site Condition Assessment", - "listName": "", - "description": "Breakdown of the number of vegetation assessments using the Commonwealth methodology by the type of assessment event.", - "displayType": "piechart", - "name": "assessmentEventType", - "aggregationType": "HISTOGRAM", - "label": "No. of vegetation assessments using the Commonwealth methodology by the type of assessment event" - }, - { - "category": "Biodiversity - Site Condition Assessment", - "listName": "", - "description": "Breakdown of the number of vegetation assessments using the Commonwealth methodology by the type of site.", - "displayType": "piechart", - "name": "typeOfSite", - "aggregationType": "HISTOGRAM", - "label": "No. of vegetation assessments using the Commonwealth methodology by the type of site" - } + "outputs": [ + "Indigenous Employment", + "Indigenous Businesses" ], - "name": "Sampling Site Information" + "gmsId": "IPE", + "name": "Indigenous Employment and Businesses", + "type": "Activity", + "category": "Administration, management & reporting" }, { - "template": "groundCover", - "scores": [], - "name": "Field Sheet 1 - Ground Cover" + "outputs": ["Indigenous Knowledge Transfer Details"], + "gmsId": "IKM IKT", + "name": "Indigenous Knowledge Transfer", + "type": "Activity", + "category": "Training" }, { - "template": "exoticFauna", - "scores": [{ - "category": "Biodiversity - Site Condition Assessment", - "listName": "evidenceOfExoticFauna", - "description": "Count of the number of occurrences of evidence of the presence of exotic fauna by the type of evidence, as identified using the Commonwealth government vegetation assessment methodology.", - "displayType": "piechart", - "name": "evidence", - "aggregationType": "HISTOGRAM", - "label": "No. of occurrences of evidence of the presence of exotic fauna by the type of evidence (using the Commonwealth government vegetation assessment methodology)" - }], - "name": "Field Sheet 2 - Exotic Fauna" + "outputs": [ + "Plan Development Details", + "Participant Information" + ], + "gmsId": "MPD", + "name": "Management Plan Development", + "type": "Activity", + "category": "Implementation actions" }, { - "template": "crownCover", - "scores": [], - "name": "Field Sheet 3 - Overstorey and Midstorey Projected Crown Cover" + "outputs": ["Management Practice Change Details"], + "gmsId": "MPC MPCFE MPCSP", + "name": "Management Practice Change", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "crownType", - "scores": [], - "name": "Field Sheet 4 - Crown Type" + "outputs": [ + "Conservation Works Details", + "Participant Information" + ], + "gmsId": "CATS", + "name": "Conservation Actions for Species and Communities", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" + }, + { + "outputs": [ + "Outcomes", + "Evaluation", + "Lessons Learned" + ], + "name": "Outcomes, Evaluation and Learning - final report", + "type": "Activity", + "category": "Administration, management & reporting" + }, + { + "outputs": [ + "Evidence of Pest Management Activity", + "Pest Observation and Monitoring Details", + "Participant Information", + "Photo Points" + ], + "supportsPhotoPoints": true, + "gmsId": "PSA", + "name": "Pest Animal Survey", + "supportsSites": true, + "type": "Assessment", + "category": "Assessment & monitoring", + "status": "active" + }, + { + "outputs": [ + "Pest Management Details", + "Fence Details", + "Participant Information", + "Photo Points" + ], + "supportsPhotoPoints": true, + "gmsId": "PMA PMQ", + "name": "Pest Management", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "speciesDiversityMeri", - "scores": [ - { - "category": "Biodiversity - Site Condition Assessment", - "listName": "speciesList", - "description": "Total count of the number of rows across all species diversity tables. Represents the number of species occurrence records from site condition assessments using the Commonwealth government methodology.", - "displayType": "", - "name": "species", - "aggregationType": "COUNT", - "label": "Total No. of species records (as identified using the Commonwealth government vegetation assessment methodology)" - }, - { - "groupBy": "output:nativeOrExotic", - "category": "Biodiversity - Site Condition Assessment", - "listName": "speciesList", - "description": "Proportional breakdown of native vs exotic species recorded as identified using the Commonwealth government vegetation assessment methodology.", - "displayType": "piechart", - "name": "species", - "aggregationType": "COUNT", - "label": "Proportion of native : exotic species recorded (as identified using the Commonwealth government vegetation assessment methodology)" - } + "outputs": [ + "Plant Propagation Details", + "Participant Information" ], - "name": "Field Sheet 5 - Species Diversity" + "gmsId": "PPRP", + "name": "Plant Propagation", + "type": "Activity", + "category": "Implementation actions" }, { - "template": "habitatHectaresSiteCondition", - "scores": [], - "name": "Site Condition" + "outputs": [ + "Vegetation Monitoring Results", + "Participant Information", + "Photo Points" + ], + "supportsPhotoPoints": true, + "gmsId": "PSS PSC", + "name": "Plant Survival Survey", + "supportsSites": true, + "type": "Assessment", + "category": "Assessment & monitoring" }, { - "template": "habitatHectaresLandscapeContext", - "scores": [], - "name": "Landscape Context" + "outputs": [ + "Administration Activities", + "Participant Information" + ], + "name": "Project Administration", + "type": "Activity", + "category": "Administration, management & reporting" }, { - "template": "tasVegSiteCondition", - "scores": [], - "name": "Site Condition - TasVeg" + "outputs": [ + "Access Control Details", + "Infrastructure Details", + "Participant Information" + ], + "gmsId": "PAM", + "name": "Public Access and Infrastructure", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "tasVegLandscaprContext", - "scores": [], - "name": "Landscape Context - TasVeg" + "outputs": [ + "Research Information", + "Participant Information" + ], + "name": "Research", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "tasVegNvaMethod_F", - "scores": [], - "name": "TasVeg Native Vegetation Assessment Method - Forest Vegetation" + "outputs": [ + "Revegetation Details", + "Participant Information", + "Photo Points" + ], + "supportsPhotoPoints": true, + "gmsId": "RVA RVN RVSS RVT2A RVT2B RVS2B", + "name": "Revegetation", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "tasVegNvaMethod_NF", - "scores": [], - "name": "TasVeg Native Vegetation Assessment Method - Non-Forest Vegetation" + "outputs": [ + "Seed Collection Details", + "Participant Information" + ], + "gmsId": "SDC", + "name": "Seed Collection", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "tasVegFloristicComposition", - "scores": [], - "name": "Floristic Composition" + "outputs": ["Planned Monitoring Approach"], + "name": "Site Monitoring Plan", + "supportsSites": true, + "type": "Activity", + "category": "Assessment & monitoring" }, { - "template": "bioCondition100x50m", - "scores": [], - "name": "100 x 50m area - Ecologically Dominant Layer" + "outputs": [ + "Site Preparation Actions", + "Weed Treatment Details", + "Participant Information", + "Photo Points" + ], + "supportsPhotoPoints": true, + "gmsId": "STP", + "name": "Site Preparation", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "bioCondition50x10m", - "scores": [], - "name": "50 x 10m area" + "outputs": [ + "Training Details", + "Skills Development", + "Participant Information" + ], + "gmsId": "TSD", + "name": "Training and Skills Development", + "type": "Activity", + "category": "Training" }, { - "template": "bioCondition50x20m", - "scores": [], - "name": "50 x 20m area - Coarse Woody Debris" + "outputs": ["Water Management Details"], + "gmsId": "WMA WMN", + "name": "Water Management", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "bioCondition1x1m", - "scores": [], - "name": "Five 1 x 1m plots" + "outputs": [ + "General information & Participants", + "Environmental Information at the Time of Sampling", + "Water Quality Measurements" + ], + "gmsId": "WQSA", + "name": "Water Quality Survey", + "supportsSites": true, + "type": "Assessment", + "category": "Assessment & monitoring" }, { - "template": "bioCondition100mTransect", - "scores": [], - "name": "100m Transect" + "outputs": [ + "Evidence of Weed Treatment", + "Weed Observation and Monitoring Details", + "Participant Information", + "Photo Points" + ], + "supportsPhotoPoints": true, + "gmsId": "WMM WSA", + "name": "Weed Mapping & Monitoring", + "supportsSites": true, + "type": "Assessment", + "category": "Assessment & monitoring" }, { - "template": "heritageConservationInformation", - "scores": [ - { - "category": "Heritage Asset Management", - "listName": "", - "description": "Count of the total number of activities undertaking heritage conservation actions", - "displayType": "", - "name": "siteName", - "aggregationType": "COUNT", - "label": "Total No. of activities undertaking heritage conservation actions", - "gmsId": "HC HSA" - }, - { - "category": "Heritage Asset Management", - "listName": "", - "description": "Breakdown of the total number of activities undertaking heritage conservation actions by type of heritage work", - "displayType": "", - "name": "typeOfHeritage", - "aggregationType": "HISTOGRAM", - "label": "No. of activities by type of heritage work" - }, - { - "category": "Heritage Asset Management", - "listName": "", - "description": "Breakdown of the total number of activities undertaking heritage conservation actions by level of heritage listing.", - "displayType": "", - "name": "levelOfHeritageListing", - "aggregationType": "HISTOGRAM", - "label": "No. of activities on sites by the level of heritage listing" - } + "outputs": [ + "Weed Treatment Details", + "Participant Information", + "Photo Points" ], - "name": "Heritage Conservation Information" + "supportsPhotoPoints": true, + "gmsId": "WDT", + "name": "Weed Treatment", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "heritageExpectedOutcomes", - "scores": [], - "name": "Expected Heritage Outcomes" + "outputs": [ + "Site Planning Details", + "Threatening Processes and Site Condition Risks", + "Participant Information" + ], + "supportsPhotoPoints": true, + "gmsId": "STA", + "name": "Works Planning and Risk", + "supportsSites": true, + "type": "Activity", + "category": "Implementation actions" }, { - "template": "projectStageProgress", - "scores": [], - "name": "Overview of Project Progress" + "outputs": [ + "Overview of Project Progress", + "Environmental, Economic and Social Outcomes", + "Implementation Update", + "Lessons Learned and Improvements" + ], + "name": "Progress, Outcomes and Learning - stage report", + "type": "Activity", + "category": "Administration, management & reporting" }, { - "template": "projectStageOutcomes", - "scores": [], - "name": "Environmental, Economic and Social Outcomes" + "outputs": [ + "Sampling Site Information", + "Photo Points", + "Field Sheet 1 - Ground Cover", + "Field Sheet 2 - Exotic Fauna", + "Field Sheet 3 - Overstorey and Midstorey Projected Crown Cover", + "Field Sheet 4 - Crown Type", + "Field Sheet 5 - Species Diversity" + ], + "supportsPhotoPoints": true, + "gmsId": "VAC", + "name": "Vegetation Assessment - Commonwealth government methodology", + "supportsSites": true, + "type": "Assessment", + "category": "Assessment & monitoring" }, { - "template": "projectStageUpdate", - "scores": [], - "name": "Implementation Update" + "outputs": ["BioCondition Method"], + "name": "Vegetation Assessment - BioCondition (QLD)", + "type": "Assessment", + "category": "Assessment & monitoring", + "status": "deleted" }, { - "template": "projectStageLessons", - "scores": [], - "name": "Lessons Learned and Improvements" + "outputs": ["Floristic Composition"], + "supportsPhotoPoints": true, + "name": "Vegetation Assessment - BioMetric (NSW)", + "supportsSites": true, + "type": "Assessment", + "status": "deleted" }, { - "template": "sitePlanningDetails", - "scores": [{ - "category": "Project Management, Planning and Research Outputs", - "listName": "", - "description": "Represents the number of acitivities which have undertaken planning for intervention works.", - "displayType": "", - "name": "noOfWorksAreasTotal", - "aggregationType": "COUNT", - "label": "Number of site preparation actions undertaken", - "gmsId": "STA" - }], - "name": "Site Planning Details" + "outputs": [ + "Vegetation Assessment - Survey Information", + "Native Species", + "Weed Species", + "Trees" + ], + "name": "Vegetation Assessment - Habitat Hectares v2 (VIC)", + "type": "Assessment", + "category": "Assessment & monitoring" }, { - "template": "smallGrantProgressReport", - "scores": [], - "name": "Progress Report Details" + "outputs": ["Floristic Composition"], + "supportsPhotoPoints": true, + "name": "Vegetation Assessment - Native Vegetation Condition Assessment and Monitoring (WA)", + "supportsSites": true, + "type": "Assessment", + "status": "deleted" }, { - "template": "smallGrantFinalReport", - "scores": [], - "name": "Final Report Details" + "outputs": ["TasVeg Native Vegetation Assessment Method - Forest Vegetation"], + "name": "TasVeg - Native Vegetation Assessment - Forest Vegetation", + "type": "Assessment", + "category": "Assessment & monitoring", + "status": "active" }, { - "template": "smallGrantOutputs", - "scores": [], - "name": "Output Details" + "outputs": ["TasVeg Native Vegetation Assessment Method - Non-Forest Vegetation"], + "name": "TasVeg - Native Vegetation Assessment - Non-Forest Vegetation", + "type": "Assessment", + "category": "Assessment & monitoring", + "status": "deleted" }, { - "template": "fencing", - "scores": [ - { - "isOutputTarget": true, - "category": "Biodiversity Management", - "description": "The total length of fencing erected.", - "displayType": "", - "name": "lengthOfFence", - "aggregationType": "SUM", - "label": "Total length of fence (Km)", - "units": "kilometres", - "gmsId": "FNC" - }, - { - "groupBy": "output:fenceType", - "category": "Biodiversity Management", - "listName": "", - "description": "Breakdown of the length of fence erected by the type of fence.", - "displayType": "piechart", - "name": "lengthOfFence", - "aggregationType": "SUM", - "label": "Total length of fence (Km) by the type of fence erected", - "units": "kilometres" - }, - { - "category": "Biodiversity Management", - "description": "Breakdown of the number of activities erecting fencing by the type of fence being erected.", - "displayType": "piechart", - "name": "fenceType", - "aggregationType": "HISTOGRAM", - "label": "Proportion of activities by fence type", - "units": "" - }, - { - "groupBy": "output:purposeOfFence", - "category": "Biodiversity Management", - "listName": "", - "description": "Breakdown of the proportion of the length of fencing by purpose of fence. As a single fence can perform many purposes, the length may be multi-counted. Interpret only as length within a specific category or as a percentage of the whole.", - "displayType": "piechart", - "name": "lengthOfFence", - "aggregationType": "SUM", - "label": "Length of fence (as a %) by fence purpose", - "units": "" - }, - { - "isOutputTarget": true, - "category": "Biodiversity Management", - "listName": "", - "description": "The area in hectares enclosed within a protective fence", - "displayType": "", - "name": "fenceAreaProtected", - "aggregationType": "SUM", - "label": "Area protected by fencing (Ha)" - }, - { - "isOutputTarget": false, - "category": "Biodiversity Management", - "listName": "", - "description": "Breakdown of the proportion of the number of activities erecting fencing by purpose of fence. As a single fence can perform many purposes, the length may be multi-counted. Interpret only as length within a specific category or as a percentage of the whole.", - "displayType": "piechart", - "name": "purposeOfFence", - "aggregationType": "HISTOGRAM", - "label": "Proportion of activities by fence purpose", - "units": "" - } + "outputs": [ + "Feral Animal Abundance Score", + "Feral Animal Frequency Score" ], - "name": "Fence Details" - }, - { - "template": "smallGrantAquittal", - "scores": [], - "name": "Project Acquittal" - }, - { - "template": "activityAttachments", - "scores": [], - "name": "Attachments" + "name": "Feral animal assessment", + "type": "Assessment", + "status": "deleted" }, { - "template": "summaryReportDataUpload", - "scores": [ - { - "groupBy": "output:scoreLabel", - "category": "Revegetation", - "listName": "scores", - "displayType": "", - "name": "score", - "aggregationType": "SUM", - "label": "Number of plants planted", - "filterBy": "Number of plants planted" - }, - { - "groupBy": "output:scoreLabel", - "category": "Revegetation", - "listName": "scores", - "displayType": "", - "name": "score", - "aggregationType": "SUM", - "label": "Area of revegetation works (Ha)", - "filterBy": "Area of revegetation works (Ha)" - }, - { - "groupBy": "output:scoreLabel", - "category": "Revegetation", - "listName": "scores", - "displayType": "", - "name": "score", - "aggregationType": "SUM", - "label": "Total seed collected (Kg)", - "filterBy": "Total seed collected (Kg)" - }, - { - "groupBy": "output:scoreLabel", - "category": "Natural Resources Management", - "listName": "scores", - "displayType": "", - "name": "score", - "aggregationType": "SUM", - "label": "Burnt area (Ha)", - "filterBy": "Burnt area (Ha) - may be different to the total area managed" - }, - { - "groupBy": "output:scoreLabel", - "category": "Biodiversity Management", - "listName": "scores", - "displayType": "", - "name": "score", - "aggregationType": "SUM", - "label": "Total length of fence (Km)", - "filterBy": "Total length of fence (Km)" - }, - { - "groupBy": "output:scoreLabel", - "category": "Invasive Species Management - Pests & Diseases", - "listName": "scores", - "displayType": "", - "name": "score", - "aggregationType": "SUM", - "label": "Area covered (Ha) by pest treatment actions", - "filterBy": "Area covered (Ha) by pest treatment" - }, - { - "groupBy": "output:scoreLabel", - "category": "Revegetation", - "listName": "scores", - "displayType": "", - "name": "score", - "aggregationType": "SUM", - "label": "Kilograms of seed sown", - "filterBy": "Kilograms of seed sown" - }, - { - "groupBy": "output:scoreLabel", - "listName": "scores", - "displayType": "", - "name": "score", - "aggregationType": "SUM", - "label": "Total area treated (Ha)", - "filterBy": "Total area treated (Ha)" - }, - { - "groupBy": "output:scoreLabel", - "category": "Indigenous Capacity", - "listName": "scores", - "displayType": "", - "name": "score", - "aggregationType": "SUM", - "label": "Total No. of Indigenous people employed", - "filterBy": "Total No. of Indigenous people employed" - }, - { - "groupBy": "output:scoreLabel", - "category": "Farm Management Practices", - "listName": "scores", - "displayType": "", - "name": "score", - "aggregationType": "SUM", - "label": "Total No. of unique farming entities engaged", - "filterBy": "Total No. of unique farming entities engaged" - }, - { - "groupBy": "output:scoreLabel", - "category": "Invasive Species Management - Pests & Diseases", - "listName": "scores", - "displayType": "", - "name": "score", - "aggregationType": "SUM", - "label": "Total No. of individuals or colonies of pest animals destroyed", - "filterBy": "Total No. of individuals or colonies of pest animals destroyed" - }, - { - "groupBy": "output:scoreLabel", - "category": "Indigenous Capacity", - "listName": "scores", - "displayType": "", - "name": "score", - "aggregationType": "SUM", - "label": "Total No. of Indigenous people employed", - "filterBy": "Total No. of Indigenous people employed" - }, - { - "groupBy": "output:scoreLabel", - "category": "Farm Management Practices", - "listName": "scores", - "displayType": "", - "name": "score", - "aggregationType": "SUM", - "label": "Total No. of unique farming entities engaged", - "filterBy": "Total No. of unique farming entities engaged" - } + "outputs": [ + "Participant Information", + "Vegetation Assessment", + "Site Condition Components", + "Landscape Context Components", + "Threatening Processes and Site Condition Risks", + "Photo Points" ], - "name": "Upload of stage 1 and 2 reporting data" + "name": "Site assessment", + "type": "Assessment", + "status": "deleted" }, { - "template": "gaParticipantDetails", - "scores": [], - "name": "Participant Details" + "outputs": [ + "Bushland Condition - Site Health Summary", + "Indicator 1 - Plant Species Diversity", + "Indicator 2 - Weed Abundance & Threat", + "Indicator 3 - Structural Diversity", + "Indicator 4 - Regeneration", + "Indicator 5 - Tree and Shrub Health", + "Indicator 6 - Tree Habitat", + "Indicator 7 - Feral Animals", + "Indicator 8 - Total Grazing Pressure", + "Indicator 9 - Animal Species", + "Indicator 10 - Bushland Degradation Risk", + "Benchmarks - SA" + ], + "name": "Vegetation Assessment - Bushland Condition Monitoring (SA)", + "type": "Assessment", + "category": "Assessment & monitoring", + "status": "deleted" }, { - "template": "saStructuralDiversity", - "scores": [], - "name": "Indicator 1 - Plant Species Diversity" + "outputs": [ + "Progress Report Details", + "Attachments" + ], + "supportsPhotoPoints": false, + "gmsId": "PR25ALG", + "name": "25th Anniversary Landcare Grants - Progress Report", + "supportsSites": false, + "type": "Report", + "category": "Small Grants", + "status": "active" }, { - "template": "saWeedAbundanceAndThreat", - "scores": [], - "name": "Indicator 2 - Weed Abundance & Threat" + "outputs": [ + "Final Report Details", + "Output Details", + "Project Acquittal", + "Attachments" + ], + "supportsPhotoPoints": false, + "gmsId": "WDT25ALG FNC25ALG CPEE25ALG MPCFE25ALG IKM25ALG PSA25ALG FBS25ALG WMM25ALG WSA25ALG STA25ALG WQSA25ALG HC25ALG HSA25ALG CGM25ALG VAC25ALG", + "name": "25th Anniversary Landcare Grants - Final Report", + "supportsSites": false, + "type": "Report", + "category": "Small Grants", + "status": "active" }, { - "template": "bioConditionConsolidated", - "scores": [], - "name": "BioCondition Method" + "outputs": ["Upload of stage 1 and 2 reporting data"], + "gmsId": "", + "name": "Upload of stage 1 and 2 reporting data", + "type": "Activity", + "category": "None", + "status": "deleted" }, { - "template": "gaMonthlyReportData", - "scores": [ - { - "category": "Green Army", - "listName": "", - "displayType": "", - "name": "trainingCommencedAccredited", - "aggregationType": "SUM", - "label": "No. participants starting accredited training" - }, - { - "category": "Green Army", - "listName": "", - "displayType": "", - "name": "trainingNoExited", - "aggregationType": "SUM", - "label": "No. of Participants who exited training" - }, - { - "category": "Green Army", - "listName": "", - "displayType": "", - "name": "trainingNoCompleted", - "aggregationType": "SUM", - "label": "No. of Participants who completed training" - }, - { - "category": "Green Army", - "listName": "", - "displayType": "", - "name": "totalParticipantsCommenced", - "aggregationType": "SUM", - "label": "No. of Participants who commenced projects" - }, - { - "category": "Green Army", - "listName": "", - "displayType": "", - "name": "totalParticipantsNotCompleted", - "aggregationType": "SUM", - "label": "No. of Participants who did not complete projects" - }, - { - "category": "Green Army", - "listName": "", - "displayType": "", - "name": "totalParticipantsCompleted", - "aggregationType": "SUM", - "label": "No. of Participants who completed projects" - }, - { - "category": "Green Army", - "listName": "", - "displayType": "", - "name": "totalIndigenousParticipantsCommenced", - "aggregationType": "SUM", - "label": "No. of Indigenous Participants who commenced projects" - }, - { - "category": "Green Army", - "listName": "", - "displayType": "", - "name": "reportingTimeTaken", - "aggregationType": "SUM", - "label": "Time taken to fulfill reporting requirements" - }, - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Projects by status", - "displayType": "piechart", - "name": "projectStatus", - "aggregationType": "HISTOGRAM", - "label": "Count of projects by project status" - } - ], - "name": "Monthly Status Report Data" + "outputs": ["Monthly Status Report Data"], + "supportsPhotoPoints": false, + "name": "Green Army - Monthly project status report", + "supportsSites": false, + "type": "Report", + "category": "Programme Reporting" }, { - "template": "gaQuarterlyProjectReport", - "scores": [ - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Total number of incidents", - "displayType": "", - "name": "incidentCount", - "aggregationType": "SUM", - "label": "Total number of incidents recorded" - }, - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Total number of complaints", - "displayType": "", - "name": "complaintCount", - "aggregationType": "SUM", - "label": "Total number of complaints recorded" - }, - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Total number of training activities", - "displayType": "", - "name": "trainingActivityCount", - "aggregationType": "SUM", - "label": "Total number of training activities" - }, - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Total number of participant withdrawals", - "displayType": "", - "name": "participantWithdrawals", - "aggregationType": "SUM", - "label": "Total number of participant withdrawals" - }, - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Total number of participant exits", - "displayType": "", - "name": "participantExits", - "aggregationType": "SUM", - "label": "Total number of participant exits" - }, - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Total number of participants starting training", - "displayType": "", - "name": "participantTrainingNumber", - "aggregationType": "SUM", - "label": "Total number of participants starting training" - }, - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Total number of participants exiting training", - "displayType": "", - "name": "participantTrainingNcNumber", - "aggregationType": "SUM", - "label": "Total number of participants exiting training" - }, - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Total number of participants 17 years old", - "displayType": "", - "name": "no17Years", - "aggregationType": "SUM", - "label": "Total number of participants 17 years old" - }, - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Total number of participants 18 years old", - "displayType": "", - "name": "no18Years", - "aggregationType": "SUM", - "label": "Total number of participants 18 years old" - }, - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Total number of participants 19 years old", - "displayType": "", - "name": "no19Years", - "aggregationType": "SUM", - "label": "Total number of participants 19 years old" - }, - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Total number of participants 20 years old", - "displayType": "", - "name": "no20Years", - "aggregationType": "SUM", - "label": "Total number of participants 20 years old" - }, - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Total number of participants 21 years old", - "displayType": "", - "name": "no21Years", - "aggregationType": "SUM", - "label": "Total number of participants 21 years old" - }, - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Total number of participants 22 years old", - "displayType": "", - "name": "no22Years", - "aggregationType": "SUM", - "label": "Total number of participants 22 years old" - }, - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Total number of participants 23 years old", - "displayType": "", - "name": "no23Years", - "aggregationType": "SUM", - "label": "Total number of participants 23 years old" - }, - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Total number of participants 24 years old", - "displayType": "", - "name": "no24Years", - "aggregationType": "SUM", - "label": "Total number of participants 24 years old" - }, - { - "groupBy": "", - "category": "Green Army", - "listName": "", - "description": "Total number of participants", - "displayType": "", - "name": "totalParticipants", - "aggregationType": "SUM", - "label": "Total number of participants" - } - ], - "name": "Three Monthly Report" + "outputs": ["Three Monthly Report"], + "supportsPhotoPoints": false, + "name": "Green Army - Quarterly project report", + "supportsSites": false, + "type": "Report", + "category": "Programme Reporting" }, { - "template": "gaTeamSupervisorAttendance", - "scores": [], - "name": "Change or Absence of Team Supervisor Report" + "outputs": ["End of Project Report Details"], + "supportsPhotoPoints": false, + "name": "Green Army - End of Project Report", + "supportsSites": false, + "type": "Report", + "category": "Programme Reporting" }, { - "template": "gaDesktopAuditChecklist", - "scores": [], - "name": "Desktop Audit Checklist Details" + "outputs": ["Desktop Audit Checklist Details"], + "supportsPhotoPoints": false, + "name": "Green Army - Desktop Audit Checklist", + "supportsSites": false, + "type": "Report", + "category": "Programme Reporting" }, { - "template": "gaEndOfProjectReport", - "scores": [], - "name": "End of Project Report Details" + "outputs": ["Change or Absence of Team Supervisor Report"], + "supportsPhotoPoints": false, + "name": "Green Army - Change or Absence of Team Supervisor", + "supportsSites": false, + "type": "Report", + "category": "Programme Reporting" }, { - "template": "gaSiteVisitDetails", - "scores": [], - "name": "Site Visit Details" + "outputs": ["Site Visit Details"], + "supportsPhotoPoints": false, + "name": "Green Army - Site Visit Checklist", + "supportsSites": false, + "type": "Report", + "category": "Programme Reporting" } ] } \ No newline at end of file diff --git a/models/activityAttachments/dataModel.json b/models/activityAttachments/dataModel.json index cd1190fd5..20893900b 100644 --- a/models/activityAttachments/dataModel.json +++ b/models/activityAttachments/dataModel.json @@ -3,19 +3,37 @@ "dataModel": [ { "dataType": "document", - "description": "Please attach relevant supporting documents (e.g. photos, media clips, survey data, information products/publications, etc.) that provide evidence of the project's progress and / or impacts.", - "name": "supportingDocs" + "name": "supportingDocs1" }, { "dataType": "document", - "description": "You may attach other documents relevant to your project for the Department's information.", - "name": "additionalInfo" + "name": "supportingDocs2" + }, + { + "dataType": "document", + "name": "supportingDocs3" + }, + { + "dataType": "document", + "description": "", + "name": "additionalInfo1" + }, + { + "dataType": "document", + "description": "", + "name": "additionalInfo2" + }, + { + "dataType": "document", + "description": "", + "name": "additionalInfo3" } ], "viewModel": [ { "items": [{ "source": "Supporting documents are required (where available) to support the statements you have made regarding your progress/achievement.", + "computed": null, "type": "literal" }], "type": "row" @@ -23,24 +41,65 @@ { "items": [ { - "items": [{ - "source": "supportingDocs", - "preLabel": "Supporting documents:", - "type": "document" - }], + "items": [ + { + "source": "

Supporting Documents<\/h4>Please attach relevant supporting documents (e.g. photos, media clips, survey data, information products/publications, etc.) that provide evidence of the project's progress and / or impacts.<\/i>", + "type": "literal" + }, + { + "source": "supportingDocs1", + "preLabel": "", + "type": "document" + }, + { + "source": "supportingDocs2", + "preLabel": "", + "type": "document" + }, + { + "source": "supportingDocs3", + "preLabel": "", + "type": "document" + } + ], "type": "col" }, { - "items": [{ - "source": "additionalInfo", - "preLabel": "Additional information (optional):", - "type": "document" - }], + "items": [ + { + "source": "

Additional Information (optional)<\/h4>You may attach other documents relevant to your project for the Department's information.<\/i>", + "type": "literal" + }, + { + "source": "additionalInfo1", + "preLabel": "", + "type": "document" + }, + { + "source": "additionalInfo2", + "preLabel": "", + "type": "document" + }, + { + "source": "additionalInfo3", + "preLabel": "", + "type": "document" + } + ], + "computed": null, "type": "col" } ], "class": "output-section", "type": "row" + }, + { + "items": [{ + "source": "If you have additional documents, please add them via the Admin > Documents<\/b> tab.", + "computed": null, + "type": "literal" + }], + "type": "row" } ] } \ No newline at end of file diff --git a/models/communityActivityDetails/dataModel.json b/models/communityActivityDetails/dataModel.json index 85f68f7c1..be98cf921 100644 --- a/models/communityActivityDetails/dataModel.json +++ b/models/communityActivityDetails/dataModel.json @@ -120,6 +120,13 @@ } ], "viewModel": [ + { + "items": [{ + "source": "Note that the target measure for 'No. of events' is calculated as the number of rows in this table. Please enter a separate row for each event.", + "type": "literal" + }], + "type": "row" + }, { "footer": {"rows": [{"columns": [ { diff --git a/models/fireInformation/dataModel.json b/models/fireInformation/dataModel.json index 71161e03d..8b48c186e 100644 --- a/models/fireInformation/dataModel.json +++ b/models/fireInformation/dataModel.json @@ -3,8 +3,8 @@ "dataModel": [ { "dataType": "text", - "description": "The source of fire ignition", "name": "fireIgnitionSource", + "description": "The source of fire ignition", "constraints": [ "Lightning", "Drip torch", @@ -18,8 +18,8 @@ }, { "dataType": "text", - "description": "Type of fire event", "name": "fireEventType", + "description": "Type of fire event", "constraints": [ "Managed controlled burn", "Escaped controlled burn", @@ -30,8 +30,8 @@ }, { "dataType": "stringList", - "description": "Purpose of undertaking the fire management activity", "name": "fireReason", + "description": "Purpose of undertaking the fire management activity", "constraints": [ "Fire fuel reduction", "Asset protection", @@ -45,25 +45,37 @@ }, { "dataType": "number", - "description": "Area in hectares of the fire ground", "name": "areaOfFireHa", - "validate": "required" + "description": "Area in hectares of the fire ground", + "validate": "required,min[0]" }, { "dataType": "number", - "description": "Area of the fire ground actually burnt expressed as a percentage of the total fire ground area", "name": "areaBurntPercent", + "description": "Area of the fire ground actually burnt expressed as a percentage of the total fire ground area", "validate": "min[0],max[100]" }, + { + "computed": { + "expression": "areaOfFireHa*areaBurntPercent/100", + "dependents": {"source": [ + "areaOfFireHa", + "areaBurntPercent" + ]} + }, + "dataType": "number", + "name": "areaBurntHa", + "description": "The area in hectares of the fire ground actually burnt" + }, { "dataType": "date", - "description": "Date at which the last known fire occurred on the subject fire ground", - "name": "fireLastBurnDate" + "name": "fireLastBurnDate", + "description": "Date at which the last known fire occurred on the subject fire ground" }, { "dataType": "text", - "description": "Approximate time period since the last known fire occurred on the subject fire ground", "name": "fireTimeSinceLastBurn", + "description": "Approximate time period since the last known fire occurred on the subject fire ground", "constraints": [ "1-3 years", "4-6 years", @@ -73,13 +85,14 @@ }, { "dataType": "number", + "name": "eventDuration", "description": "The total time in whole hours over which this activity was conducted.", - "name": "eventDuration" + "validate": "min[0]" }, { "dataType": "stringList", - "description": "Actions implemented to prevent or better manage wildfire events", "name": "firePreventionAction", + "description": "Actions implemented to prevent or better manage wildfire events", "constraints": [ "Fire trail construction", "Fire break construction", @@ -92,8 +105,8 @@ }, { "dataType": "text", - "description": "Generalised indicator of the intensity of the fire event", "name": "fireBurnTemp", + "description": "Generalised indicator of the intensity of the fire event", "constraints": [ "Cool", "Moderately hot", @@ -103,8 +116,8 @@ }, { "dataType": "stringList", - "description": "Classes of machinery deployed onto the fire ground to manage the fire event", "name": "fireMachineryUsed", + "description": "Classes of machinery deployed onto the fire ground to manage the fire event", "constraints": [ "Light tanker", "Heavy tanker", @@ -116,23 +129,26 @@ }, { "dataType": "number", + "name": "totalMachineHours", "description": "Total aggregate number of hours for all machinery deployed onto the fire ground", - "name": "totalMachineHours" + "validate": "min[0]" }, { "dataType": "number", + "name": "controlLineKmMachine", "description": "Length in kilometres of fire breaks and back burn lines implemented by machinery to manage the fire event", - "name": "controlLineKmMachine" + "validate": "min[0]" }, { "dataType": "number", + "name": "controlLineKmHand", "description": "Length in kilometres of fire breaks and back burn lines implemented by hand tools and manual labor to manage the fire event", - "name": "controlLineKmHand" + "validate": "min[0]" }, { "dataType": "text", - "description": "Indicator as to whether the fire total fire ground was contained within the initial control lines", "name": "fireContainment", + "description": "Indicator as to whether the fire total fire ground was contained within the initial control lines", "constraints": [ "Yes", "No", @@ -141,137 +157,144 @@ }, { "dataType": "text", - "description": "General comments and notes about this management action, the subject site, etc.", - "name": "notes" + "name": "notes", + "description": "General comments and notes about this management action, the subject site, etc." } ], "viewModel": [ { + "type": "row", "items": [{ - "source": "Please enter as much information about this fire activity as possible. If the type of fire event is 'Fire prevention works' and fire was not used as a tool (eg. for fuel reduction), then please ignore any non-relevant questions.", "computed": null, + "source": "Please enter as much information about this fire activity as possible. If the type of fire event is 'Fire prevention works' and fire was not used as a tool (eg. for fuel reduction), then please ignore any non-relevant questions.", "type": "literal" - }], - "type": "row" + }] }, { + "type": "row", "items": [ { + "computed": null, + "type": "col", "items": [ { - "source": "fireIgnitionSource", - "computed": null, "preLabel": "Ignition source:", + "computed": null, + "source": "fireIgnitionSource", "type": "selectOne" }, { - "source": "fireEventType", - "computed": null, "preLabel": "Type of event:", + "computed": null, + "source": "fireEventType", "type": "selectOne" }, { - "source": "fireReason", - "computed": null, "preLabel": "Reason(s) for burn:", + "computed": null, + "source": "fireReason", "type": "selectMany" }, { - "source": "areaOfFireHa", - "computed": null, "preLabel": "Area of fire ground (Ha):", + "computed": null, + "source": "areaOfFireHa", "type": "number" }, { - "source": "areaBurntPercent", - "computed": null, "preLabel": "Actual burnt area (% of fire ground area):", + "computed": null, + "source": "areaBurntPercent", + "type": "number" + }, + { + "preLabel": "Actual burnt area (Ha)", + "computed": "{\"operation\":\"percent\",\"dependents\":[\"data.areaOfFireHa\",\"self.data.areaBurntPercent()\"]}", + "readonly": "readonly", + "source": "areaBurntHa", "type": "number" }, { - "source": "fireLastBurnDate", - "computed": null, "preLabel": "Previous burn date:", + "computed": null, + "source": "fireLastBurnDate", "type": "date" }, { - "source": "fireTimeSinceLastBurn", - "computed": null, "preLabel": "Time since last burn:", + "computed": null, + "source": "fireTimeSinceLastBurn", "type": "selectOne" }, { - "source": "fireBurnTemp", - "computed": null, "preLabel": "Temperature of burn:", + "computed": null, + "source": "fireBurnTemp", "type": "selectOne" }, { - "source": "eventDuration", - "computed": null, "preLabel": "Duration of this activity (Hrs):", + "computed": null, + "source": "eventDuration", "type": "number" } - ], - "computed": null, - "type": "col" + ] }, { + "computed": null, + "type": "col", "items": [ { - "source": "firePreventionAction", - "computed": null, "preLabel": "Fire prevention works (if applicable):", + "computed": null, + "source": "firePreventionAction", "type": "selectMany" }, { - "source": "fireMachineryUsed", - "computed": null, "preLabel": "Machinery used:", + "computed": null, + "source": "fireMachineryUsed", "type": "selectMany" }, { - "source": "totalMachineHours", - "computed": null, "preLabel": "Total machinery hours:", + "computed": null, + "source": "totalMachineHours", "type": "number" }, { - "source": "controlLineKmMachine", - "computed": null, "preLabel": "Length of control line - machinery (km):", + "computed": null, + "source": "controlLineKmMachine", "type": "number" }, { - "source": "controlLineKmHand", - "computed": null, "preLabel": "Length of control line - hand tools (km):", + "computed": null, + "source": "controlLineKmHand", "type": "number" }, { - "source": "fireContainment", - "computed": null, "preLabel": "Did the fire stay with initial control lines?:", + "computed": null, + "source": "fireContainment", "type": "selectOne" } - ], - "computed": null, - "type": "col" + ] } ], - "class": "output-section", - "type": "row" + "class": "output-section" }, { + "type": "row", "items": [{ - "source": "notes", - "computed": null, "preLabel": "Comments / Notes:", + "computed": null, "width": "90%", + "source": "notes", "type": "textarea" }], - "class": "output-section", - "type": "row" + "class": "output-section" } ] } \ No newline at end of file diff --git a/models/programs-model.json b/models/programs-model.json index 639f6596a..1843e0ee0 100644 --- a/models/programs-model.json +++ b/models/programs-model.json @@ -1,111 +1,100 @@ {"programs": [ { - "projectDatesContracted": false, "reportingPeriod": "6", - "isMeritProgramme": true, + "projectDatesContracted": false, + "activities": [], "name": "Biodiversity Fund", "subprograms": [ { - "startDate": "", - "name": "Round 1", - "endDate": "", "themes": [ {"name": "Biodiverse plantings"}, {"name": "Protecting and enhancing existing native vegetation"}, {"name": "Managing invasive species in a connected landscape"}, {"name": "Enabling technologies"} - ] + ], + "endDate": "", + "name": "Round 1", + "startDate": "" }, { - "startDate": "", - "name": "Round 2 - 2013/14", - "endDate": "", "themes": [ {"name": "Biodiverse plantings"}, {"name": "Protecting and enhancing existing native vegetation"}, {"name": "Managing invasive species in a connected landscape"}, {"name": "Enabling technologies"} - ] + ], + "endDate": "", + "name": "Round 2 - 2013/14", + "startDate": "" }, { - "startDate": "", - "name": "Round 2 - Northern Landscape Strategy", - "endDate": "", "themes": [ {"name": "Biodiverse plantings"}, {"name": "Protecting and enhancing existing native vegetation"}, {"name": "Managing invasive species in a connected landscape"}, {"name": "Enabling technologies"} - ] + ], + "endDate": "", + "name": "Round 2 - Northern Landscape Strategy", + "startDate": "" }, { - "startDate": "", - "name": "Tasmania's Native Forests 2013/14", - "endDate": "", "themes": [ {"name": "Biodiverse plantings"}, {"name": "Protecting and enhancing existing native vegetation"}, {"name": "Managing invasive species in a connected landscape"}, {"name": "Enabling technologies"} - ] + ], + "endDate": "", + "name": "Tasmania's Native Forests 2013/14", + "startDate": "" }, { - "startDate": "", - "name": "Round 2 - Expression of Interest 2013/14", - "endDate": "", "themes": [ {"name": "Biodiverse plantings"}, {"name": "Protecting and enhancing existing native vegetation"}, {"name": "Managing invasive species in a connected landscape"}, {"name": "Enabling technologies"} - ] + ], + "endDate": "", + "name": "Round 2 - Expression of Interest 2013/14", + "startDate": "" }, { - "startDate": "", - "name": "Reef Rescue 2013/14", - "endDate": "", "themes": [ {"name": "Biodiverse plantings"}, {"name": "Protecting and enhancing existing native vegetation"}, {"name": "Managing invasive species in a connected landscape"}, {"name": "Enabling technologies"} - ] + ], + "endDate": "", + "name": "Reef Rescue 2013/14", + "startDate": "" } ], - "activities": [], - "reportingPeriodAlignedToCalendar": true + "reportingPeriodAlignedToCalendar": true, + "isMeritProgramme": true }, { - "projectDatesContracted": true, "reportingPeriod": "6", - "isMeritProgramme": true, + "projectDatesContracted": true, + "activities": [], "name": "Caring for Our Country 2", "subprograms": [ { - "startDate": "", - "name": "Regional Delivery 1318", - "endDate": "", "themes": [ {"name": "Conserving and protecting species and ecosystems (matters of national environmental significance)"}, {"name": "Restoring and maintaining urban waterways and coastal environments"}, {"name": "Protecting Ramsar sites and values"}, {"name": "Protecting World Heritage sites’ outstanding universal value and integrity"}, {"name": "Building natural resource management community skills, knowledge and engagement"}, - {"name": "Enhancing Indigenous people’s capacity for natural resource management"}, - {"name": "Increase the adoption of sustainable land management practices"}, - {"name": "Increase the adoption of sustainable fishing practices"}, - {"name": "Increase trialling of innovative practices for improved NRM"}, - {"name": "Increase the knowledge and skills of NRM managers"}, - {"name": "Increase the capacity of leaders involved in NRM"}, - {"name": "Increase engagement and participation in NRM"}, - {"name": "Increase community awareness of natural resources"}, - {"name": "Regional Land care Facilitator position"} - ] + {"name": "Enhancing Indigenous people’s capacity for natural resource management"} + ], + "endDate": "", + "name": "Regional Delivery 1318", + "startDate": "" }, { - "startDate": "", - "name": "Target Area Grants - 2013/14", - "endDate": "", "themes": [ {"name": "Conserving and protecting species and ecosystems (matters of national environmental significance)"}, {"name": "Restoring and maintaining urban waterways and coastal environments"}, @@ -113,24 +102,24 @@ {"name": "Protecting World Heritage sites’ outstanding universal value and integrity"}, {"name": "Building natural resource management community skills, knowledge and engagement"}, {"name": "Enhancing Indigenous people’s capacity for natural resource management"} - ] + ], + "endDate": "", + "name": "Target Area Grants - 2013/14", + "startDate": "" }, { - "startDate": "", - "name": "Community Environment Grants 1314", + "themes": [], "endDate": "", - "themes": [] + "name": "Community Environment Grants 1314", + "startDate": "" }, { - "startDate": "", - "name": "Reef Rescue 2013/14", + "themes": [{"name": "Protecting the Great Barrier Reef"}], "endDate": "", - "themes": [{"name": "Protecting the Great Barrier Reef"}] + "name": "Reef Rescue 2013/14", + "startDate": "" }, { - "startDate": "", - "name": "Regional Delivery (sustainable agriculture)", - "endDate": "", "themes": [ {"name": "Increase the adoption of sustainable land management practices"}, {"name": "Increase the adoption of sustainable fishing practices"}, @@ -140,200 +129,258 @@ {"name": "Increase engagement and participation in NRM"}, {"name": "Increase community awareness of natural resources"}, {"name": "Regional Land care Facilitator position"} - ] + ], + "endDate": "", + "name": "Regional Delivery (sustainable agriculture)", + "startDate": "" }, { - "startDate": "", - "name": "Target Area Grants - Expression of Interest 2013/14", + "themes": [], "endDate": "", - "themes": [] + "name": "Target Area Grants - Expression of Interest 2013/14", + "startDate": "" }, { - "startDate": "", - "name": "0210 1318", + "themes": [], "endDate": "", - "themes": [] + "name": "0210 1318", + "startDate": "" } ], - "activities": [], - "reportingPeriodAlignedToCalendar": true + "reportingPeriodAlignedToCalendar": true, + "isMeritProgramme": true }, { - "projectDatesContracted": true, "reportingPeriod": "6", - "isMeritProgramme": true, + "projectDatesContracted": true, + "activities": [], "name": "Cumberland Plain", "subprograms": [{ - "startDate": "", - "name": "Cumberland Plain Projects", + "themes": [], "endDate": "", - "themes": [] + "name": "Cumberland Plain Projects", + "startDate": "" }], - "activities": [] + "isMeritProgramme": true }, { "reportingPeriod": "3", - "isMeritProgramme": true, + "activities": [ + "Green Army - Monthly project status report", + "Green Army - Quarterly project report", + "Debris Removal", + "Fencing", + "Pest Management", + "Weed Treatment", + "Site Preparation", + "Seed Collection", + "Revegetation", + "Public Access and Infrastructure", + "Plant Propagation", + "Heritage Conservation", + "Fire Management", + "Erosion Management", + "Water Management", + "Works Planning and Risk" + ], "name": "Green Army", "subprograms": [ { - "startDate": "2014-06-30T14:00:00Z", - "name": "Green Army Round 1", - "endDate": "", "themes": [ {"name": "Increase the area, linkages between (Connectivity) and condition of Australia’s native vegetation"}, {"name": "Protect and enhance aquatic ecosystems, including wetlands and sensitive coastal environments"}, {"name": "Protect and conserve threatened species or ecological communities, migratory species, regionally significant species and where they live"}, {"name": "Protect and conserve Australia’s natural, historic and Indigenous heritage"} - ] + ], + "endDate": "", + "name": "Green Army Round 1", + "startDate": "2014-06-30T14:00:00Z" }, { - "startDate": "2014-12-31T13:00:00Z", - "name": "Green Army Round 2", + "themes": [], "endDate": "", - "themes": [ - {"name": "Increase the area, linkages between (Connectivity) and condition of Australia’s native vegetation"}, - {"name": "Protect and enhance aquatic ecosystems, including wetlands and sensitive coastal environments"}, - {"name": "Protect and conserve threatened species or ecological communities, migratory species, regionally significant species and where they live"}, - {"name": "Protect and conserve Australia’s natural, historic and Indigenous heritage"} - ] + "name": "Green Army Round 2", + "startDate": "" } ], - "activities": [], - "reportingPeriodAlignedToCalendar": true + "reportingPeriodAlignedToCalendar": true, + "isMeritProgramme": true }, { + "reportingPeriod": "6", "projectDatesContracted": true, - "isMeritProgramme": true, - "name": "Environmental Stewardship", - "subprograms": [ - { - "startDate": "", - "name": "Environmental Stewardship 1319", - "endDate": "", - "themes": [] - }, - { - "startDate": "", - "name": "Environmental Stewardship 1318", - "endDate": "", - "themes": [] - } - ], - "activities": [] + "activities": [], + "name": "20 Million Trees (NLP)", + "subprograms": [{ + "themes": [], + "endDate": "", + "name": "Round One", + "startDate": "" + }], + "reportingPeriodAlignedToCalendar": true, + "isMeritProgramme": true }, { + "reportingPeriod": "3", "projectDatesContracted": true, - "reportingPeriod": "6", - "isMeritProgramme": true, - "name": "Reef Trust", + "activities": [], + "name": "Environmental Stewardship", "subprograms": [{ - "startDate": "", - "name": "Reef Trust Phase 1 Investment", + "themes": [], "endDate": "", - "themes": [] + "name": "Environmental Stewardship 1318", + "startDate": "" }], - "activities": [], - "reportingPeriodAlignedToCalendar": true + "reportingPeriodAlignedToCalendar": false, + "isMeritProgramme": true + }, + { + "activities": [ + "Fauna Survey - general", + "Flora Survey - general", + "Pest Animal Survey", + "Plant Survival Survey", + "Site Monitoring Plan", + "Water Quality Survey", + "Weed Mapping & Monitoring", + "Vegetation Assessment - Commonwealth government methodology", + "Vegetation Assessment - BioCondition (QLD)", + "Vegetation Assessment - Habitat Hectares v1 (VIC)", + "Vegetation Assessment - Habitat Hectares v2 (VIC)", + "TasVeg - Native Vegetation Assessment - Forest Vegetation", + "TasVeg - Native Vegetation Assessment - Non-Forest Vegetation", + "Vegetation Assessment - Bushland Condition Monitoring (SA)" + ], + "name": "None", + "subprograms": [] }, { - "projectDatesContracted": true, "reportingPeriod": "6", - "isMeritProgramme": true, + "projectDatesContracted": true, + "activities": [], "name": "National Landcare Programme", "subprograms": [ { - "startDate": "", - "name": "Regional Delivery", - "endDate": "", "themes": [ {"name": "Communities are managing landscapes to sustain long-term economic and social benefits from their environment"}, {"name": "Farmers and fishers are increasing their long term returns through better management of the natural resource base"}, {"name": "Communities are involved in caring for their environment"}, {"name": "Communities are protecting species and natural assets"} - ] + ], + "endDate": "", + "name": "Regional Delivery", + "startDate": "" }, { - "startDate": "", - "name": "Local Programmes", - "endDate": "", "themes": [ {"name": "Communities are managing landscapes to sustain long-term economic and social benefits from their environment"}, {"name": "Farmers and fishers are increasing their long term returns through better management of the natural resource base"}, {"name": "Communities are involved in caring for their environment"}, {"name": "Communities are protecting species and natural assets"} - ] + ], + "endDate": "", + "name": "Local Programmes", + "startDate": "" }, { - "startDate": "", - "name": "25th Anniversary Landcare Grants", - "endDate": "", "themes": [ {"name": "Communities are managing landscapes to sustain long-term economic and social benefits from their environment"}, {"name": "Farmers and fishers are increasing their long term returns through better management of the natural resource base"}, {"name": "Communities are involved in caring for their environment"}, {"name": "Communities are protecting species and natural assets"} - ] + ], + "endDate": "", + "name": "25th Anniversary Landcare Grants 2014-15", + "startDate": "" }, { - "startDate": "", - "name": "World Heritage", - "endDate": "", "themes": [ - {"name": "Communities are managing landscapes to sustain long-term economic and social benefits from their environment"}, - {"name": "Farmers and fishers are increasing their long term returns through better management of the natural resource base"}, {"name": "Communities are involved in caring for their environment"}, {"name": "Communities are protecting species and natural assets"} - ] + ], + "endDate": "", + "name": "20 Million Trees Grants", + "startDate": "" }, { - "startDate": "", - "name": "20 Million Trees Grants", - "endDate": "", "themes": [ + {"name": "Communities are managing landscapes to sustain long-term economic and social benefits from their environment"}, + {"name": "Farmers and fishers are increasing their long term returns through better management of the natural resource base"}, {"name": "Communities are involved in caring for their environment"}, {"name": "Communities are protecting species and natural assets"} - ] + ], + "endDate": "", + "name": "World Heritage", + "startDate": "" }, { - "startDate": "", - "name": "Regional Funding", - "endDate": "", "themes": [ {"name": "Communities are managing landscapes to sustain long-term economic and social benefits from their environment"}, {"name": "Farmers and fishers are increasing their long term returns through better management of the natural resource base"}, {"name": "Communities are involved in caring for their environment"}, {"name": "Communities are protecting species and natural assets"} - ] + ], + "endDate": "", + "name": "Regional Funding", + "startDate": "" }, { - "startDate": "", - "name": "Landcare Network Grants 2014-15", + "themes": [ + {"name": "Strategic Outcome 1. Maintain and improve ecosystem services through sustainable management of local and regional landscapes."}, + {"name": "Strategic Outcome 2. Increase in the number of farmers and fishers adopting practices that improve the quality of the natural resource base, and the area of land over which those practices are applied."}, + {"name": "Strategic Outcome 3. Increase engagement and participation of the community, including landcare, farmers and Indigenous people, in sustainable natural resource management."}, + {"name": "Strategic Outcome 4. Increase restoration and rehabilitation of the natural environment, including protecting and conserving nationally and internationally significant species, ecosystems, ecological communities, places and values."} + ], "endDate": "", - "themes": [] + "name": "Landcare Network Grants 2014-15", + "startDate": "" } ], - "activities": [], - "reportingPeriodAlignedToCalendar": true + "reportingPeriodAlignedToCalendar": true, + "isMeritProgramme": true }, { + "reportingPeriod": "6", "projectDatesContracted": true, - "reportingPeriod": "3", - "name": "No program", - "subprograms": [], - "activities": [] + "activities": [], + "name": "Reef Trust", + "subprograms": [{ + "themes": [], + "endDate": "", + "name": "Reef Trust Phase 1 Investment", + "startDate": "" + }], + "isMeritProgramme": true + }, + { + "activities": [ + "Weed Mapping & Monitoring", + "Weed Treatment" + ], + "name": "Weedwatcher", + "subprograms": [] }, { - "projectDatesContracted": true, "reportingPeriod": "6", - "isMeritProgramme": true, + "projectDatesContracted": true, + "activities": [], "name": "20 Million Trees Service Providers", - "subprograms": [{ - "startDate": "", - "name": "Round One", - "endDate": "", - "themes": [] - }], - "activities": [] + "subprograms": [], + "isMeritProgramme": true + }, + { + "activities": [ + "Fauna Survey - general", + "Flora Survey - general", + "Pest Animal Survey", + "Plant Survival Survey", + "Water Quality Survey", + "Weed Mapping & Monitoring", + "Vegetation Assessment - Commonwealth government methodology", + "Vegetation Assessment - Habitat Hectares v2 (VIC)", + "TasVeg - Native Vegetation Assessment - Forest Vegetation" + ], + "name": "Citizen Science Projects", + "subprograms": [] } ]} \ No newline at end of file diff --git a/models/revegetationMonitoringResults/dataModel.json b/models/revegetationMonitoringResults/dataModel.json index 42a2f5bd1..f2231db8a 100644 --- a/models/revegetationMonitoringResults/dataModel.json +++ b/models/revegetationMonitoringResults/dataModel.json @@ -43,7 +43,7 @@ "description": "The number of individual plants planted on the site during the revegetation works activity", "primaryResult": "true", "name": "numberPlanted", - "validate": "required, min[1]" + "validate": "required, min[0]" }, { "dataType": "number", diff --git a/models/smallGrantAquittal/dataModel.json b/models/smallGrantAquittal/dataModel.json index d07258f18..f0cb9c29f 100644 --- a/models/smallGrantAquittal/dataModel.json +++ b/models/smallGrantAquittal/dataModel.json @@ -3,8 +3,8 @@ "dataModel": [ { "dataType": "text", - "description": "Indicate whether your project fully achieved everything you expected it to achieve and also whether all of the project funds were spent.", "name": "projectAcquittal", + "description": "Indicate if: a) ALL activities, outputs and outcomes specified in your Funding Agreement have been undertaken/fully met, and b) whether ALL cash funds specified in your Funding Agreement Project Budget have been spent.", "constraints": [ "Yes", "No" @@ -13,123 +13,149 @@ }, { "dataType": "text", - "description": "If the project was undertaken by a group or a legal entity representing member individuals, indicate whether you have attached the required acquittal documentation.", "name": "groupAuditedDoco", + "description": "A Department template will be provided to you. If the project was undertaken by a sponsoring organisation, group legal entity or a legal entity representing member individuals, indicate whether you have attached or forwarded the completed acquittal documentation. If 'No', provide comments why at Q5.3.", "constraints": [ "Yes", "No", - "N / A" + "Not applicable" ], "validate": "required" }, { "dataType": "text", - "description": "If the project was undertaken in the name of an individual, indicate whether you have attached the required acquittal documentation.", "name": "individualAuditedDoco", + "description": "If the project was undertaken in the name of an individual, indicate whether you have attached or forwarded the required documentation. If 'No', provide comments why at Q5.3.", "constraints": [ "Yes", "No", - "N / A" + "Not applicable" ], "validate": "required" }, + { + "dataType": "document", + "name": "acquittalDocs", + "description": "If you have more than one document to attach, please add them via the Admin > Documents tab." + }, { "dataType": "text", "name": "individualStatDec", + "description": "A Department template will be provided to you. Indicate whether you have attached or forwarded the completed documentation. If 'No', provide comments why at Q5.3.", "constraints": [ "Yes", "No", - "N / A" + "Not applicable" ], "validate": "required" }, { "dataType": "text", "name": "individualFinStatement", + "description": "A Department Excel template will be provided to you. Indicate whether you have attached or forwarded the completed documentation. If 'No', provide comments why at Q5.3.", "constraints": [ "Yes", "No", - "N / A" + "Not applicable" ], "validate": "required" }, { "dataType": "text", - "description": "Please provide any additional comments on the project's income, expenditure or budget.", - "name": "acquittalNotes" + "name": "acquittalNotes", + "description": "These may include comments on aspects such as explanations of variances (e.g. underspends/overspends on budget items, unexpected additional funds brought to the project), comments on approval of budget variations, savings made, reasons why acquittal documentation has not been submitted with the report, etc." } ], "viewModel": [ { + "type": "row", "items": [{ + "computed": null, "source": "

5. Project Income and Expenditure<\/h4>", "type": "literal" - }], - "type": "row" + }] }, { + "type": "row", "items": [{ + "computed": null, + "type": "col", "items": [ { - "source": "Submission of financial acquittal documentation for the project is a Funding Agreement requirement and forms part of your final report submission. Templates are available from the Department.", + "computed": null, + "source": "Submission of financial acquittal documentation for the project is a Funding Agreement requirement and forms part of your final report submission.
Copies of completed and signed documents may be attached below, OR be emailed to the Department, OR may be forwarded as hard copies to the Department.<\/b>", "type": "literal" }, { - "source": "Scanned copies of completed and signed documents may be attached ( via the ADMIN > Project documents tab<\/b>) to this report or emailed to the Department. Alternatively, hard copies may forwarded to the Department.", + "computed": null, + "source": "", "type": "literal" }, { - "source": "projectAcquittal", "preLabel": "5.1 Has your project fully achieved the objectives for which it was funded and have all funds been spent?", + "computed": null, + "source": "projectAcquittal", "type": "selectOne" }, { + "computed": null, "source": "If 'No', please contact the Department prior to completing your acquittal documentation and submitting your final report.", "type": "literal" }, { + "computed": null, "source": "
5.2 Have you completed and attached (or emailed/posted):<\/h5>", "type": "literal" }, { + "computed": null, "source": "For group sponsors and group legal entities:<\/u>", "type": "literal" }, { - "source": "groupAuditedDoco", "preLabel": "A financial statement (Departmental template) signed by the Chief Executive Officer and Chief Financial Officer (or equivalent) of the legal entity?", + "computed": null, + "source": "groupAuditedDoco", "type": "selectOne" }, { + "computed": null, "source": "For individuals:<\/u>", "type": "literal" }, { + "preLabel": "A financial statement (covering all cash contributions to the project), prepared by an Independent Qualified Accountant?; AND", + "computed": null, "source": "individualAuditedDoco", - "preLabel": "A financial statement prepared by an Independent Qualified Accountant?; and", "type": "selectOne" }, { + "preLabel": "A Statutory Declaration (Departmental template)?; AND", + "computed": null, "source": "individualStatDec", - "preLabel": "A Statutory Declaration?", "type": "selectOne" }, { - "source": "individualFinStatement", "preLabel": "A financial statement (Departmental template) signed by the representative of the legal entity?", + "computed": null, + "source": "individualFinStatement", "type": "selectOne" }, { - "source": "acquittalNotes", + "computed": null, + "source": "", + "type": "literal" + }, + { "preLabel": "5.3 If you have additional comments on the project's income, expenditure or budget, please provide them here.", + "computed": null, "width": "95%", + "source": "acquittalNotes", "type": "textarea" } - ], - "type": "col" + ] }], - "class": "output-section", - "type": "row" + "class": "output-section" } ] } \ No newline at end of file diff --git a/models/smallGrantFinalReport/dataModel.json b/models/smallGrantFinalReport/dataModel.json index 96a7d3d09..007598714 100644 --- a/models/smallGrantFinalReport/dataModel.json +++ b/models/smallGrantFinalReport/dataModel.json @@ -3,8 +3,8 @@ "dataModel": [ { "dataType": "stringList", - "description": "Indicate which natural, agricultural and cultural features have been addressed and / or benefited by this project.", "name": "projectGoalsAddressed", + "description": "Only select those that have been addressed and/or benefited. In general, these will correspond to the ‘Project Goals’ stated in your application. If you select ‘Other’, please indicate at Q1.1b what other goals have been achieved.", "constraints": [ "Aquatic and coastal systems", "Remnant vegetation", @@ -27,215 +27,299 @@ }, { "dataType": "text", - "description": "If 'Other' was selected in 1.1a, describe what 'other' features have benefited from implementation of this project.", "name": "projectGoalsAddressed_Other", - "validate": "required" + "description": "For example, XXXX Indigenous protected area, XXXX Heritage site." }, { "dataType": "text", - "description": "State what this project has achieved (against the Activities and Outcomes stated in the Funding Agreement) and how it has contributed towards the Programme's Strategic Objectives and Outcomes.", "name": "achievementsSummary", + "description": "State what this project has achieved (against the Activities and Outcomes stated in the Funding Agreement) and how it has contributed towards the Programme's Strategic Objectives and Outcomes.", "validate": "required" }, { - "dataType": "list", - "name": "participatingOrganisations", "columns": [ { "dataType": "text", - "description": "Name of contributing organisation", "name": "organisationName", - "validate": "required" + "description": "Name of participating/contributing group(s)/organisation(s) and/or significant individual(s)." }, { "dataType": "text", - "description": "Type of contributing organisation", "name": "organisationType", - "validate": "required" + "description": "Select the most appropriate type. If 'Other', please indicate the type in the adjacent field.", + "constraints": [ + "Community group", + "Community service organisation", + "Educational institution – preschool", + "Educational institution – primary", + "Educational institution – secondary", + "Educational institution – tertiary", + "Environmental NGO - paid", + "Environmental NGO - volunteer", + "Government - local", + "Government - state (Non-regional NRM organisation", + "Individual", + "Medium-large business", + "Philanthropic organisation", + "Regional NRM organisation", + "Religious organisation", + "Small business - agribusiness", + "Small business - local", + "Small business - not local", + "Other (specify)" + ] }, { "dataType": "text", - "description": "Describe how this organisation contributed to the project outcomes.", "name": "organisationContribution", - "validate": "required" + "description": "A brief description (generally limited to a paragraph) on how the group/organisation participated in, and/or contributed to, the project and its outcomes." } - ] + ], + "dataType": "list", + "name": "participatingOrganisations" }, { "dataType": "text", - "description": "Describe the impact the grant has had on your own organisation (and if applicable), membership composition and membership numbers.", "name": "organisationImpact", + "description": "Individuals - please comment on the impact on you and/or your business and goals. Sponsors - please comment from your perspective as a Sponsor and from the sponsored Group's perspective. All - Consider aspects such as your organisation’s structure, membership, capacity, morale, continuation, relationships with others, and ability to reach your goals.", "validate": "required" }, { "dataType": "text", - "description": "Indicate any significant achievements delivered by or resulting from implementing the project.", - "name": "achievementsHighlights" + "name": "achievementsHighlights", + "description": "Non-mandatory. An opportunity to highlight what you consider are the most significant achievements delivered by, or resulting from, implementing the project." }, { "dataType": "text", - "description": "Provide a summary of a) what project monitoring and / or evaluation activities have been undertaken to date; b) any key findings and/or learnings gained from the project; and c) any changes you are making in response to these.(Detailed information, such as survey data, can be submitted as an attachment to the report).", "name": "monitoringEvaluationLearning", + "description": "Summarise the main monitoring and evaluation activities undertaken, demonstrate you have addressed those required of your project, draw out what has been learned in regard to appropriateness and effectiveness of activities, and comment on observed or expected environmental/ species/ attitudinal/ practice changes and any trends found. Data/reports may be added as attachments. Depending on your project, part c) may not be applicable.", "validate": "required" }, { "dataType": "text", - "description": "Provide any further comments you may wish to make on the project and / or programme here.", - "name": "notes" + "name": "notes", + "description": "Provide any further comments you may wish to make on the project and / or programme here." } ], "viewModel": [ { + "type": "row", "items": [{ - "source": "

1. Summary of the Project and its Outcomes<\/h4>", "computed": null, + "source": "

1. Summary of the Project and its Outcomes<\/h4>", "type": "literal" - }], - "type": "row" + }] }, { + "type": "row", "items": [ { + "computed": null, + "type": "col", "items": [{ - "source": "projectGoalsAddressed", + "preLabel": "1.1a Indicate which priority areas have been addressed and/or benefited by this project?", "computed": null, - "preLabel": "1.1a Identify the agricultural features the project has addressed / benefited?", + "source": "projectGoalsAddressed", "type": "selectMany" - }], - "computed": null, - "type": "col" + }] }, { - "items": [{ - "source": "projectGoalsAddressed_Other", - "computed": null, - "preLabel": "1.1b If 'Other', describe the features benefited by the project", - "type": "textarea" - }], "computed": null, - "type": "col" + "type": "col", + "items": [ + { + "computed": null, + "source": " ", + "type": "literal" + }, + { + "computed": null, + "source": " ", + "type": "literal" + }, + { + "computed": null, + "source": " ", + "type": "literal" + }, + { + "computed": null, + "source": " ", + "type": "literal" + }, + { + "computed": null, + "source": " ", + "type": "literal" + }, + { + "computed": null, + "source": " ", + "type": "literal" + }, + { + "computed": null, + "source": " ", + "type": "literal" + }, + { + "computed": null, + "source": " ", + "type": "literal" + }, + { + "computed": null, + "source": " ", + "type": "literal" + }, + { + "computed": null, + "source": " ", + "type": "literal" + }, + { + "computed": null, + "source": " ", + "type": "literal" + }, + { + "computed": null, + "source": " ", + "type": "literal" + }, + { + "computed": null, + "source": " ", + "type": "literal" + }, + { + "preLabel": "1.1b If 'Other' was selected in 1.1 describe what 'Other' priorities have benefited from implementation of this project", + "computed": null, + "source": "projectGoalsAddressed_Other", + "type": "textarea" + } + ] } ], - "class": "output-section", - "type": "row" + "class": "output-section" }, { + "type": "row", "items": [{ + "computed": null, + "type": "col", "items": [ { - "source": "achievementsSummary", - "computed": null, "preLabel": "1.2 Provide a summary of the project's overall achievements against the Activities and Outcomes stated in the Funding Agreement and its contribution towards the Programme's Strategic Objectives and Outcomes.", + "computed": null, "width": "95%", + "source": "achievementsSummary", "type": "textarea" }, { - "source": "

1.3 Provide the names of the various organisations that participated in your project and briefly describe how each contributed to the project.<\/h5>", "computed": null, + "source": "
1.3 Provide the names of the various groups/organisations that participated in your project and briefly describe how each contributed to the project.<\/h5>The intent of this section is to summarise the key groups/organisations (and in some cases, individuals) that were involved in the project and their main contributions to making the project a success.<\/i>", "type": "literal" }, { - "title": "
1.4 Provide the names of the various organisations that participated in your project and briefly describe how each contributed to the project.<\/h5>", - "source": "participatingOrganisations", - "computed": null, "allowHeaderWrap": "true", + "computed": null, "columns": [ { - "title": "Organisation Name", + "width": "30%", "source": "organisationName", - "width": "40%", + "title": "Organisation Name", "type": "text" }, { - "title": "Organisation Type", + "width": "20", "source": "organisationType", - "width": "15", + "title": "Organisation Type", "type": "selectOne" }, { - "title": "How the organisaton participated", + "width": "50%", "source": "organisationContribution", - "width": "40%", + "title": "How the group/organisation participated, and/or contributed", "type": "textarea" } ], "userAddedRows": true, - "class": "output-section", - "type": "table" + "source": "participatingOrganisations", + "title": "
1.4 Provide the names of the various organisations that participated in your project and briefly describe how each contributed to the project.<\/h5>", + "type": "table", + "class": "output-section" }, { - "source": "organisationImpact", + "preLabel": "1.4 As a Funding Recipient, describe the impact the grant has had on you/your own organisation and, if applicable, membership composition and numbers.", "computed": null, - "preLabel": "1.4 Describe the impact the grant has had on your own organisation and, if applicable, membership composition and numbers.", "width": "95%", + "source": "organisationImpact", "type": "textarea" }, { - "source": "achievementsHighlights", - "computed": null, "preLabel": "1.5 Are there any significant project achievements you would like to highlight?", + "computed": null, "width": "95%", + "source": "achievementsHighlights", "type": "textarea" } - ], - "computed": null, - "type": "col" + ] }], - "class": "output-section", - "type": "row" + "class": "output-section" }, { + "type": "row", "items": [{ - "source": "

2. Monitoring, Evaluation and Project Learnings<\/h4>", "computed": null, + "source": "

2. Monitoring, Evaluation and Project Learnings<\/h4>", "type": "literal" - }], - "type": "row" + }] }, { + "type": "row", "items": [{ + "computed": null, + "type": "col", "items": [{ - "source": "achievementsSummary", + "preLabel": "Provide a summary of a) what project monitoring and/or evaluation activities were undertaken; b) any key project findings and / or learnings gained; and c) any changes you are making in response to these.", "computed": null, - "preLabel": "Provide a summary of a) what project monitoring and/or evaluation activities have been undertaken to date; b) any key findings and / or learnings gained from the project; and c) any changes you are making in response to these.", "width": "100%", + "source": "monitoringEvaluationLearning", "type": "textarea" - }], - "computed": null, - "type": "col" + }] }], - "class": "output-section", - "type": "row" + "class": "output-section" }, { + "type": "row", "items": [{ - "source": "

3. Other Comments<\/h4>", "computed": null, + "source": "

3. Other Comments<\/h4>", "type": "literal" - }], - "type": "row" + }] }, { + "type": "row", "items": [{ + "computed": null, + "type": "col", "items": [ { - "source": "(Please provide any further comments you may wish to make on the project and / or programme here)", "computed": null, + "source": "(Please provide any further comments you may wish to make on the project and / or programme here)", "type": "literal" }, { - "source": "notes", - "computed": null, "preLabel": "", + "computed": null, "width": "100%", + "source": "notes", "type": "textarea" } - ], - "computed": null, - "type": "col" + ] }], - "class": "output-section", - "type": "row" + "class": "output-section" } ] } \ No newline at end of file diff --git a/models/smallGrantOutputs/dataModel.json b/models/smallGrantOutputs/dataModel.json index fbe051f91..dcba5b363 100644 --- a/models/smallGrantOutputs/dataModel.json +++ b/models/smallGrantOutputs/dataModel.json @@ -3,410 +3,664 @@ "dataModel": [ { "dataType": "number", - "description": "The area in hectares of the revegetation works area.", - "name": "areaRevegHa" + "name": "areaRevegHa", + "description": "The hectare area that was actually revegetated (i.e. hectares over which direct seeding, planting and/or natural regeneration techniques were employed).", + "validate": "min[0]" }, { "dataType": "number", - "description": "The total number of individual plants planted.", - "name": "totalNumberPlanted" + "name": "totalNumberPlanted", + "description": "The total number of individual plants actually planted (excludes direct seeding and natural regeneration).", + "validate": "min[0]" }, { "dataType": "number", - "description": "The percentage of individual seedlings surviving at the time of follow-up survey as a proportion of numbers planted. The follow-up survey should be undertaken at least 3 (preferably 6) months after planting.", - "name": "percentSurvivalRate" + "name": "percentSurvivalRate", + "description": "The percentage of individual plants surviving at the time of a follow-up survey as a proportion of the total number planted. The follow-up survey should be at least 3 months (preferably 6 months) after planting. If you have multiple sites, use an average figure here.", + "validate": "min[0]" }, { "dataType": "number", - "description": "The weight of seed collected in kilograms.", - "name": "totalSeedCollectedKg" + "name": "totalSeedCollectedKg", + "description": "The total kg weight of seed collected through the project for revegetation purposes.", + "validate": "min[0]" }, { "dataType": "number", - "description": "The total number of individual plants propagated.", - "name": "totalNumberGrown" + "name": "totalNumberGrown", + "description": "Total number of individual plants propagated.", + "validate": "min[0]" }, { "dataType": "number", - "description": "Area in hectares of erosion treated by this activity.", - "name": "erosionAreaTreated" + "name": "erosionAreaTreated", + "description": "The hectare area over which actual erosion reduction/prevention works have been undertaken. Note - it does not include those areas that are remote from the site(s) managed but that may potentially benefit from the works at the site(s).", + "validate": "min[0]" + }, + { + "dataType": "number", + "name": "erosionLength", + "description": "The km length of stream/coastline over which actual erosion reduction/prevention works have been undertaken. Note - it does not include those areas that are remote from the site(s) managed but that may potentially benefit from the works at the site(s).", + "validate": "min[0]" + }, + { + "dataType": "number", + "name": "preparationAreaTotal", + "description": "Hectare area over which preparatory works have been undertaken ready for a subsequent (and normally the main) intervention. E.g. Cultivation and/or removal of weeds/plant competition prior to revegetating with tubestock.", + "validate": "min[0]" + }, + { + "dataType": "number", + "name": "areaOfFireHa", + "description": "Actual hectare area over which a controlled burn has been undertaken. E.g. Ecological burn, hazard reduction burn.", + "validate": "min[0]" + }, + { + "dataType": "number", + "name": "debrisVolumeM3", + "description": "Number of cubic metres of rubbish/debris removed from the project area.", + "validate": "min[0]" + }, + { + "dataType": "number", + "name": "totalSeedSownKg", + "description": "Weight (in kilograms) of seed sown in the project area. Species can be listed in the 'Comments on outputs field'.", + "validate": "min[0]" + }, + { + "dataType": "number", + "name": "totalAreaTreatedHa", + "description": "The total hectare area where pest animal control has been undertaken (area includes all species controlled). For some species (such as foxes and rabbits), it includes the area of influence around the actual bait location/line.", + "validate": "min[0]" + }, + { + "dataType": "number", + "name": "totalPestAnimalsTreatedNo", + "description": "The total number of animals and/or insect colonies (inclusive of all species controlled) killed and/or removed from the area of control.", + "validate": "min[0]" }, { - "dataType": "list", - "name": "pestManagement", "columns": [ { "dataType": "species", - "description": "The pest species targeted for treatment (start typing a scientific or common name for a species).", - "name": "pestAnimalsTargetSpecies" + "name": "pestAnimalsTargetSpecies", + "description": "The pest species targeted for control (start typing a scientific or a common name for the species)." }, { "dataType": "number", - "description": "The number of target pest animals or colonies of insects removed during this activity.", - "name": "pestAnimalsTreatedNo" + "name": "pestAnimalsTreatedNo", + "description": "The total number of animals and/or insect colonies (of one particular species) killed and/or removed from the area of control.", + "validate": "min[0]" }, { "dataType": "number", - "description": "The area covered by treatment actions (Ha).", - "name": "pestAnimalsAreaTreatedHa" + "name": "pestAnimalsAreaTreatedHa", + "description": "The total hectare area where pest animal control has been undertaken (area is only for one particular species). For some species (such as foxes and rabbits), it includes the area of influence around the actual bait location/line.", + "validate": "min[0]" } - ] + ], + "dataType": "list", + "name": "pestManagement" + }, + { + "dataType": "number", + "name": "areaTreatedHa", + "description": "The total hectare area where weed control has been undertaken (inclusive of all species controlled).", + "validate": "min[0]" }, { - "dataType": "list", - "name": "weedManagement", "columns": [ { "dataType": "species", - "description": "The plant species being targeted for treatment (start typing a scientific or common name for a species).", - "name": "weedsTargetSpecies" + "name": "weedsTargetSpecies", + "description": "The plant species targeted for control (start typing a scientific or a common name for the species)." }, { "dataType": "number", - "description": "The area in hectares of the patch of the target species being treated.", - "name": "weedsAreaTreatedHa" + "name": "weedsAreaTreatedHa", + "description": "The total hectare area where weed control has been undertaken (of one particular species).", + "validate": "min[0]" } - ] + ], + "dataType": "list", + "name": "weedManagement" }, { "dataType": "number", - "description": "The area of land in hectares on which changed management practices are implemented.", - "name": "changePracticeTreatedArea" + "name": "totalChangePracticeTreatedArea", + "description": "The increased area of land (in hectares) over which improved management practices have been implemented. Note - Management practice change (area changed to sustainable practices) may be reported here, except if Management practice change (area implemented) is also in your Agreement. In such cases, report the 'area changed to sustainable practices' in the 'Comments on outputs' field.", + "validate": "min[0]" }, { "dataType": "text", - "description": "Indicate whether the project was undertaken on multiple (Yes) or single (No) tenures.", "name": "crossTenure", + "description": "If works only occurred on one land owners property (whether public or private land) answer 'No.' Otherwise, your answer will be 'Yes' unless it had no on-ground component, in which case it is ‘Not applicable’.", "constraints": [ "Yes", - "No" + "No", + "Not applicable" ] }, { "dataType": "number", - "description": "The number of skills development activities undertaken.", - "name": "skillsDevelopmentActivitiesNo" + "name": "lengthOfFence", + "description": "The km length of permanent fencing erected.", + "validate": "min[0]" }, { - "dataType": "stringList", - "description": "The general type(s) of formal training undertaken to develop skills.", - "name": "typeOfCourse", - "constraints": [ - "Vocational - Occupational Health & Safety", - "Vocational - First aid", - "Other vocational skills - short course", - "Science degree or higher" - ] + "dataType": "number", + "name": "numberOfEvents", + "description": "Number of events held with a focus on increasing community engagement, participation and knowledge/skills. E.g. Training sessions, workshops, planting days, field days, knowledge sharing/awareness raising events, etc.", + "validate": "min[0]" }, { "dataType": "number", - "description": "The length of fence erected in kilometres.", - "name": "lengthOfFence" + "name": "numberOfPublications", + "description": "Number of different publications produced (NOT the number of copies of a publication produced). Includes: books, films/DVDs/CDs, guides, journal articles, pamphlets, report cards, management plans, media releases and/or similar.", + "validate": "min[0]" }, { "dataType": "number", - "description": "The number of community, promotion and/or awareness raising/knowledge sharing events undertaken for the project.", - "name": "numberOfEvents" + "name": "numberOfCommunityGroups", + "description": "The number of different community groups participating in the project that were not project delivery partners.", + "validate": "min[0]" }, { "dataType": "number", - "description": "The number of surveys undertaken to inform understanding of public awareness, knowledge, opinions, etc.", - "name": "publicSurveysNo" + "name": "numberOfVolunteers", + "description": "The number of separate persons participating in delivery of the project in a voluntary, non-employed capacity.", + "validate": "min[0]" }, { "dataType": "number", - "description": "The number of surveys undertaken to monitor biodiversity and ecological assets.", - "name": "surveysNo" + "name": "entitiesAdoptingChange", + "description": "The number of farming/fisher entities that implemented management practice changes during the project. Excludes those intending to change practice.", + "validate": "min[0]" }, { "dataType": "number", - "description": "The number of different community groups (non delivery partners) participating in this project.", - "name": "numberOfCommunityGroups" + "name": "numberOfFarmingEntitiesNew", + "description": "The total number of unique farming/fisher entities participating in the project.", + "validate": "min[0]" }, { "dataType": "number", - "description": "The number of people involved in the project who are not delivery partners or employed in the project. These would typically be the volunteer participants.", - "name": "numberOfVolunteers" + "name": "numberOfIndigenousParticipants", + "description": "The number of separate/unique Indigenous persons participating in delivery of the project in a voluntary, non-employed capacity.", + "validate": "min[0]" }, { "dataType": "number", - "description": "The number of farming entities adopting the specified changed management practices.", - "name": "entitiesAdoptingChange" + "name": "totalEmployees", + "description": "The number of Indigenous persons employed/sub-contracted during the project (measured in persons, not FTE). Includes ongoing, non-ongoing, casual, and contracted persons.", + "validate": "min[0]" }, { "dataType": "number", - "description": "The total number of unique farming/fisher entities participating in the project.", - "name": "numberOfFarmingEntitiesParticipating" + "name": "indigenousPlansCompleted", + "description": "The total number of Indigenous Land and Sea Plans developed by the project.", + "validate": "min[0]" }, { "dataType": "number", - "description": "The number of Indigenous people participating in the project who are not delivery partners or employed in the project (ie. Indigenous volunteers).", - "name": "numberOfIndigenousParticipants" + "name": "indigenousProductsDeveloped", + "description": "The total number of publications and other products (eg. videos) developed by the project to facilitate the sharing of Indigenous Ecological Knowledge.", + "validate": "min[0]" }, { "dataType": "number", - "description": "The total number of Indigenous people employed on the project.", - "name": "totalIndigenousEmployees" + "name": "datasetsShared", + "description": "Number of datasets collected and/or shared that relate to Indigenous ecological knowledge. Excludes publications. E.g. Data on Indigenous sites, uses of plants, rock holes, etc.", + "validate": "min[0]" }, { "dataType": "number", - "description": "The total number of Indigenous Land and Sea Plans developed by the project.", - "name": "indigenousPlansCompleted" + "name": "pestSurveyNo", + "description": "Number of reports produced as a result of surveying/monitoring the status of pest animals and/or insect colonies.", + "validate": "min[0]" }, { "dataType": "number", - "description": "The total number of publications and other products (eg. videos) developed by the project to facilitate the sharing of Indigenous Ecological Knowledge.", - "name": "indigenousProductsDeveloped" + "name": "faunaSurveyNo", + "description": "Number of reports produced as a result of surveying/monitoring the status of fauna.", + "validate": "min[0]" + }, + { + "dataType": "number", + "name": "weedSurveyNo", + "description": "Number of reports produced as a result of surveying/monitoring the status of weed species.", + "validate": "min[0]" + }, + { + "dataType": "number", + "name": "siteAssessmentNo", + "description": "Number of reports produced on project sites as part of planning project works/interventions.", + "validate": "min[0]" + }, + { + "dataType": "number", + "name": "waterQualitySurveyNo", + "description": "Number of reports produced as a result of surveying/monitoring the status of water quality at a project site(s).", + "validate": "min[0]" + }, + { + "dataType": "number", + "name": "heritageSurveyNo", + "description": "Number of reports produced as a result of surveying/monitoring heritage site(s). May include natural, built and/or cultural heritage.", + "validate": "min[0]" + }, + { + "dataType": "number", + "name": "indigenousKnowledgeTransferActionsNo", + "description": "Number of discrete activities where Indigenous knowledge transfer occurs. It excludes datasets collected/shared. E.g. Number of indigenous on-country visits, cultural training sessions.", + "validate": "min[0]" + }, + { + "dataType": "number", + "name": "conservationGrazingActionsArea", + "description": "The hectare area over which the grazing management regime is changed to obtain primarily ecological benefits. E.g. crash grazing to reduce weeds, use of temporary/limiting grazing and/or a set level of ground cover/sward height to promote seeding/regeneration of native grass or other native species.", + "validate": "min[0]" + }, + { + "dataType": "number", + "name": "managementPlansNo", + "description": "The number of new management plan documents completed and/or the number of existing plans where revisions/updates have been completed. Management plans may include: conservation action plans; land and sea plans; property management plans; vegetation/weed/pest plans; threatened species/community plans; and/or similar. Names and types of plans should be included in your 'project summary' or 'comments on outputs'.", + "validate": "min[0]" + }, + { + "dataType": "number", + "name": "vegAssessmentCommNo", + "description": "Number of separately recorded assessments of vegetation condition undertaken.", + "validate": "min[0]" + }, + { + "dataType": "text", + "name": "otherOutputs", + "description": "Include here any additional and/or explanatory information relating to achievement of your project activities (see Project Activities Table, Item 3.5 in Part A of your Funding Agreement). If your Agreement lists activities that are not addressed in the above list, please indicate here the activity and the units achieved. You may also add to this field any other comments you have on your project that do not sit more appropriately elsewhere." } ], "viewModel": [ { + "type": "row", "items": [{ - "source": "

4. Total Project Outputs<\/h4> (Please only report on outputs relevant to your project as defined in your Funding Agreement. You are not required to complete those outputs that are not relevant to your project.)", "computed": null, + "source": "

4. Total Project Outputs<\/h4> (Please only report on outputs relevant to your project as defined in your Funding Agreement. You are not required to complete those outputs that are not relevant to your project.)<\/font>", "type": "literal" - }], - "type": "row" + }] + }, + { + "type": "row", + "class": "output-section", + "items": [{ + "preLabel": "Did the project work across tenure?:", + "computed": null, + "source": "crossTenure", + "type": "selectOne" + }] }, { + "type": "row", "items": [{ - "source": "
Actual Achievements - Physical Outputs<\/h5>", "computed": null, + "source": "
Actual Achievements - Community Engagement<\/h5>", "type": "literal" - }], - "type": "row" + }] }, { + "type": "row", "items": [ { + "computed": null, + "type": "col", "items": [ { - "source": "areaRevegHa", - "computed": null, - "preLabel": "Area of Revegetation (Ha):", - "type": "number" - }, - { - "source": "totalNumberPlanted", + "preLabel": "Community participation and engagement (events):", "computed": null, - "preLabel": "Plants planted (No.):", + "source": "numberOfEvents", "type": "number" }, { - "source": "percentSurvivalRate", + "preLabel": "Community participation and engagement (publications):", "computed": null, - "preLabel": "Survival rate (%):", + "source": "numberOfPublications", "type": "number" }, { - "source": "totalSeedCollectedKg", + "preLabel": "No. of volunteers who participated in the delivery of project activities:", "computed": null, - "preLabel": "Seed collected\t(Kg):", + "source": "numberOfVolunteers", "type": "number" }, { - "source": "totalNumberGrown", + "preLabel": "No. of community groups that participated in delivery of the project:", "computed": null, - "preLabel": "Plant propagation (No.):", + "source": "numberOfCommunityGroups", "type": "number" - }, - { - "title": "Pest Animals", - "source": "pestManagement", - "computed": null, - "allowHeaderWrap": "true", - "columns": [ - { - "title": "Pest species managed\t(name):", - "source": "pestAnimalsTargetSpecies", - "width": "65%", - "type": "autocomplete" - }, - { - "title": "Number of individuals/colonies treated:", - "source": "pestAnimalsTreatedNo", - "width": "15%", - "type": "number" - }, - { - "title": "Area of pest animal treatment (Ha):", - "source": "pestAnimalsAreaTreatedHa", - "width": "15%", - "type": "number" - } - ], - "userAddedRows": true, - "type": "table" } - ], - "computed": null, - "type": "col" + ] }, { + "computed": null, + "type": "col", "items": [ { - "source": "erosionAreaTreated", + "preLabel": "Indigenous people engaged as volunteers [not employed] (no. of people):", "computed": null, - "preLabel": "Erosion area treated (Ha):", + "source": "numberOfIndigenousParticipants", "type": "number" }, { - "source": "changePracticeTreatedArea", + "preLabel": "No. of Indigenous people employed/sub-contracted:", "computed": null, - "preLabel": "Area of land with improved management practices implemented (Ha):", + "source": "totalEmployees", "type": "number" }, { - "source": "crossTenure", + "preLabel": "No. of Indigenous Land and Sea Plans completed:", "computed": null, - "preLabel": "Did the project work across tenure?:", - "type": "selectOne" + "source": "indigenousPlansCompleted", + "type": "number" }, { - "source": "lengthOfFence", + "preLabel": "Indigenous knowledge transfer (no. of activities):", "computed": null, - "preLabel": "Length of fence erected (Km):", + "source": "indigenousKnowledgeTransferActionsNo", "type": "number" }, { - "title": "Weeds", - "source": "weedManagement", + "preLabel": "Indigenous knowledge transfer (datasets shared/collected):", "computed": null, - "allowHeaderWrap": "true", - "columns": [ - { - "title": "Weed species managed\t(name):", - "source": "weedsTargetSpecies", - "width": "80%", - "type": "autocomplete" - }, - { - "title": "Area of weed treatment (Ha):", - "source": "weedsAreaTreatedHa", - "width": "15%", - "type": "number" - } - ], - "userAddedRows": true, - "type": "table" + "source": "datasetsShared", + "type": "number" } - ], - "computed": null, - "type": "col" + ] } ], - "class": "output-section", - "type": "row" + "class": "output-section" }, { + "type": "row", "items": [{ - "source": "
Actual Achievements - Community, Social and Indigenous Outputs<\/h5>", "computed": null, + "source": "
Actual Achievements - Practice Change<\/h5>", "type": "literal" - }], - "type": "row" + }] }, { + "type": "row", + "class": "output-section", "items": [ { + "computed": null, + "type": "col", "items": [ { - "source": "skillsDevelopmentActivitiesNo", + "preLabel": "No. of farming/fisher entities involved in delivery of project activities:", "computed": null, - "preLabel": "Enhancing Community Skills and Knowledge (No.):", + "source": "numberOfFarmingEntitiesNew", "type": "number" }, { - "source": "typeOfCourse", + "preLabel": "No. of farming/fisher entities implementing management practice change:", "computed": null, - "preLabel": "Types of training undertaken:", - "type": "selectMany" + "source": "entitiesAdoptingChange", + "type": "number" + } + ] + }, + { + "computed": null, + "type": "col", + "items": [ + { + "preLabel": "Management practice change (area implemented, Ha):", + "computed": null, + "source": "totalChangePracticeTreatedArea", + "type": "number" }, { - "source": "entitiesAdoptingChange", + "preLabel": "Conservation grazing management (Ha.):", "computed": null, - "preLabel": "No. of farming/fisher entities adopting sustainable practice change:", + "source": "conservationGrazingActionsArea", "type": "number" }, { - "source": "numberOfFarmingEntitiesParticipating", + "preLabel": "Management plan development (No. of reports/plans):", "computed": null, - "preLabel": "No. of farming/fisher entities involved in delivery of project activities:", + "source": "managementPlansNo", "type": "number" } - ], - "computed": null, - "type": "col" - }, + ] + } + ] + }, + { + "type": "row", + "items": [{ + "computed": null, + "source": "
Actual Achievements - Biophysical and Other Outputs<\/h5>", + "type": "literal" + }] + }, + { + "type": "row", + "items": [ { + "computed": null, + "type": "col", "items": [ { - "source": "numberOfEvents", + "preLabel": "Area of Revegetation (Ha):", "computed": null, - "preLabel": "No. of Workshops/Field Days events:", + "source": "areaRevegHa", "type": "number" }, { - "source": "publicSurveysNo", + "preLabel": "Plants planted (No.):", "computed": null, - "preLabel": "No. of Public Surveys:", + "source": "totalNumberPlanted", "type": "number" }, { - "source": "surveysNo", + "preLabel": "Revegetation (seed sown Kg):", "computed": null, - "preLabel": "No. of Surveys:", + "source": "totalSeedSownKg", "type": "number" }, { - "source": "numberOfVolunteers", + "preLabel": "Survival rate (%):", "computed": null, - "preLabel": "No. of volunteers who participated in the delivery of project activities:", + "source": "percentSurvivalRate", "type": "number" }, { - "source": "numberOfCommunityGroups", + "preLabel": "Seed collected\t(Kg):", "computed": null, - "preLabel": "No. of community groups that participated in delivery of the project:", + "source": "totalSeedCollectedKg", + "type": "number" + }, + { + "preLabel": "Plant propagation (No.):", + "computed": null, + "source": "totalNumberGrown", + "type": "number" + }, + { + "preLabel": "Pest management (area treated Ha):", + "computed": null, + "source": "totalAreaTreatedHa", + "type": "number" + }, + { + "preLabel": "Total number of individuals/colonies treated:", + "computed": null, + "source": "totalPestAnimalsTreatedNo", "type": "number" + }, + { + "allowHeaderWrap": "true", + "computed": null, + "columns": [ + { + "width": "65%", + "source": "pestAnimalsTargetSpecies", + "title": "Pest species managed\t(name):", + "type": "autocomplete" + }, + { + "width": "15%", + "source": "pestAnimalsTreatedNo", + "title": "Number of individuals/colonies treated:", + "type": "number" + }, + { + "width": "15%", + "source": "pestAnimalsAreaTreatedHa", + "title": "Area of pest animal treatment (Ha):", + "type": "number" + } + ], + "userAddedRows": true, + "source": "pestManagement", + "title": "Pest Animals", + "type": "table" } - ], - "computed": null, - "type": "col" + ] }, { + "computed": null, + "type": "col", "items": [ { - "source": "numberOfIndigenousParticipants", + "preLabel": "Fire management (area Ha):", "computed": null, - "preLabel": "No. of Indigenous participants involved in delivery of project activities (excluding those employed):", + "source": "areaOfFireHa", "type": "number" }, { - "source": "totalIndigenousEmployees", + "preLabel": "Debris removal (volume m3):", "computed": null, - "preLabel": "No. of Indigenous people employed/sub-contracted:", + "source": "debrisVolumeM3", "type": "number" }, { - "source": "indigenousPlansCompleted", + "preLabel": "Erosion management (Ha):", "computed": null, - "preLabel": "No. of Indigenous Land and Sea Plans completed:", + "source": "erosionAreaTreated", + "type": "number" + }, + { + "preLabel": "Erosion management (length):", + "computed": null, + "source": "erosionLength", "type": "number" }, { - "source": "indigenousProductsDeveloped", + "preLabel": "Site preparation (area treated/prepared Ha):", "computed": null, - "preLabel": "Indigenous Ecological Knowledge (No. of publications/products developed):", + "source": "preparationAreaTotal", + "type": "number" + }, + { + "preLabel": "Length of fence erected (Km):", + "computed": null, + "source": "lengthOfFence", "type": "number" + }, + { + "preLabel": "Weed treatment (total area treated Ha):", + "computed": null, + "source": "areaTreatedHa", + "type": "number" + }, + { + "allowHeaderWrap": "true", + "computed": null, + "columns": [ + { + "width": "80%", + "source": "weedsTargetSpecies", + "title": "Weed species managed\t(name):", + "type": "autocomplete" + }, + { + "width": "15%", + "source": "weedsAreaTreatedHa", + "title": "Area of weed treatment (Ha):", + "type": "number" + } + ], + "userAddedRows": true, + "source": "weedManagement", + "title": "Weeds", + "type": "table" } - ], - "computed": null, - "type": "col" + ] } ], + "class": "output-section" + }, + { + "type": "row", + "items": [{ + "computed": null, + "type": "col", + "items": [ + { + "preLabel": "Pest survey & assessment (no. of survey reports):", + "computed": null, + "source": "pestSurveyNo", + "type": "number" + }, + { + "preLabel": "Weed survey & assessment (no. of survey reports):", + "computed": null, + "source": "weedSurveyNo", + "type": "number" + }, + { + "preLabel": "Fauna survey (no. of survey reports):", + "computed": null, + "source": "faunaSurveyNo", + "type": "number" + }, + { + "preLabel": "Vegetation assessment (no. of assessments):", + "computed": null, + "source": "vegAssessmentCommNo", + "type": "number" + }, + { + "preLabel": "Site assessment (no. of survey reports):", + "computed": null, + "source": "siteAssessmentNo", + "type": "number" + }, + { + "preLabel": "Water quality survey and assessment (no. of survey reports):", + "computed": null, + "source": "waterQualitySurveyNo", + "type": "number" + }, + { + "preLabel": "Heritage survey and assessment (no. of survey reports):", + "computed": null, + "source": "heritageSurveyNo", + "type": "number" + } + ] + }], + "class": "output-section" + }, + { + "type": "row", "class": "output-section", - "type": "row" + "items": [{ + "preLabel": "Details of other outputs not listed:", + "computed": null, + "source": "otherOutputs", + "type": "textarea" + }] } ] } \ No newline at end of file diff --git a/models/smallGrantProgressReport/dataModel.json b/models/smallGrantProgressReport/dataModel.json index eeb131291..b77d66e9b 100644 --- a/models/smallGrantProgressReport/dataModel.json +++ b/models/smallGrantProgressReport/dataModel.json @@ -3,8 +3,8 @@ "dataModel": [ { "dataType": "text", - "description": "Indicate whether there has been a change in the details of your organisation or key project personnel since the application or previous report. Changes may include: Organisation name, Trust Deed; name, position, role, email, telephone, or address of key contacts. If ‘Yes’, provide details to the Department by email prior to submitting your project report.", "name": "orgDetailsChange", + "description": "Indicate whether there has been a change in the details of your organisation or key project personnel since the application or previous report. Changes may include: Organisation name, Trust Deed; name, position, role, email, telephone, or address of key contacts. If ‘Yes’, provide details to the Department by email prior to submitting your project report.", "constraints": [ "Yes", "No" @@ -13,51 +13,51 @@ }, { "dataType": "text", - "description": "Please ensure you outline the extent to which you have addressed/achieved each activity and, where relevant, its unit of measure to date. Also comment on the extent of planning/preparation undertaken for activities to be completed in the next stage. Issues encountered are to be addressed in the next question. ", "name": "achievementsSummary", + "description": "a) May include activities such as photopoints, feedback surveys, flora/fauna/pest/weed surveys, mapping, analyses undertaken, etc.; b) comment on what the findings are revealing about the issue, trends, and progress or how aspects can be done better? (Attachments may be added to your project record); c) Is there a need to change your current approach? If so, what, when and how? ", "validate": "required" }, { - "dataType": "list", - "name": "issues", "columns": [ { "dataType": "number", - "description": "A sequential reference number for the issue (e.g. 1, 2, 3, etc.). Please do not duplicate reference numbers.", - "name": "issueReference" + "name": "issueReference", + "description": "A sequential reference number for the issue (e.g. 1, 2, 3, etc.). Please do not duplicate reference numbers." }, { "dataType": "text", - "description": "Describe the nature of the issue. (e.g. The order placed with our preferred supplier for tubestock and seed could not be fully met)", - "name": "issueDescription" + "name": "issueDescription", + "description": "Describe the nature of the issue. (e.g. The order placed with our preferred supplier for tubestock and seed could not be fully met)" }, { "dataType": "text", - "description": "Indicate how you are intending to manage, or are currently managing this issue (e.g. An alternate supplier has been found with seed and tubestock in stock. An order was placed on 10 April 2015.). Note – variations from what is contracted must first be approved by the Department.", - "name": "issueManagement" + "name": "issueManagement", + "description": "Indicate how you are intending to manage, or are currently managing this issue (e.g. An alternate supplier has been found with seed and tubestock in stock. An order was placed on 10 April 2015.). Note – variations from what is contracted must first be approved by the Department." }, { "dataType": "text", - "description": "Indicate what impacts (if any) the issue may have on the project – such as timeframes, feasibility, costs, ability to meet contracted deliverables. (e.g. This will cause a temporary delay of one month but seasonal conditions will still allow planting. Other project elements remain on-track and project objectives and outputs can still be met. The order will cost $60 more than originally budgeted, but costs will be met by savings gained in herbicide purchase). Note – Changes to budget line item expenditure of >10% are to first be approved by the Department.", - "name": "issuesImpacts" + "name": "issuesImpacts", + "description": "Indicate what impacts (if any) the issue may have on the project – such as timeframes, feasibility, costs, ability to meet contracted deliverables. (e.g. This will cause a temporary delay of one month but seasonal conditions will still allow planting. Other project elements remain on-track and project objectives and outputs can still be met. The order will cost $60 more than originally budgeted, but costs will be met by savings gained in herbicide purchase). Note – Changes to budget line item expenditure of >10% are to first be approved by the Department." } - ] + ], + "dataType": "list", + "name": "issues" }, { "dataType": "text", - "description": "May include: a) Photopoints, feedback surveys, flora/fauna/pest/weed surveys, mapping, analyses undertaken, etc.; b) Comments on what the findings are revealing about the issue, trends, and progress or how aspects can be done better? (Attachments may be added to your project record); and c) Whether there is a need to change your current approach? If so, what, when and how?", "name": "monitoringEvaluationLearning", + "description": "May include: a) Photopoints, feedback surveys, flora/fauna/pest/weed surveys, mapping, analyses undertaken, etc.; b) Comments on what the findings are revealing about the issue, trends, and progress or how aspects can be done better? (Attachments may be added to your project record); and c) Whether there is a need to change your current approach? If so, what, when and how?", "validate": "required" }, { "dataType": "text", - "description": "You may provide here: information on the project that does not fit more appropriately in other questions; notice of, or invitations to, important events (including those suitable for the Minister(s)); feedback to the Department on its programme and processes.", - "name": "notes" + "name": "notes", + "description": "You may provide here: information on the project that does not fit more appropriately in other questions; notice of, or invitations to, important events (including those suitable for the Minister(s)); feedback to the Department on its programme and processes." }, { "dataType": "text", - "description": "Note – variations of >10% to budget line items will require Departmental approval. If you answer ‘No’ an explanation is required at 5.3.", "name": "budgetTracking", + "description": "Note – variations of >10% to budget line items will require Departmental approval. If you answer ‘No’ an explanation is required at 5.3.", "constraints": [ "Yes", "No" @@ -66,8 +66,8 @@ }, { "dataType": "text", - "description": "This question is mandatory and seeks confirmation that these funds are being (or will be) provided to the project. If you have no CASH contributions (‘Recipient’ or ‘Other’) in your project budget, select “N/A”. If you answer ‘No’ an explanation is required at 5.3.", "name": "budgetReceiptsReceived", + "description": "This question is mandatory and seeks confirmation that these funds are being (or will be) provided to the project. If you have no CASH contributions (‘Recipient’ or ‘Other’) in your project budget, select “N/A”. If you answer ‘No’ an explanation is required at 5.3.", "constraints": [ "Yes", "No", @@ -76,246 +76,247 @@ "validate": "required" }, { - "dataType": "list", - "name": "budgetIssues", "columns": [ { "dataType": "text", - "description": "A sequential reference number for the issue (e.g. 1, 2, 3, etc.). Please do not duplicate reference numbers.", - "name": "budgetIssueReference" + "name": "budgetIssueReference", + "description": "A sequential reference number for the issue (e.g. 1, 2, 3, etc.). Please do not duplicate reference numbers." }, { "dataType": "text", - "description": "Please clearly identify whether ‘Department’, ‘Recipient’ and/or ‘Other’ cash is involved, the amounts of each and the budget line item(s) affected.", - "name": "budgetIssueDescription" + "name": "budgetIssueDescription", + "description": "Please clearly identify whether ‘Department’, ‘Recipient’ and/or ‘Other’ cash is involved, the amounts of each and the budget line item(s) affected." }, { "dataType": "text", - "description": "If already covered at Q2.2, you may enter - Refer to Q2.2.", - "name": "budgetIssueManagement" + "name": "budgetIssueManagement", + "description": "If already covered at Q2.2, you may enter - Refer to Q2.2." }, { "dataType": "text", - "description": "Indicate how this issue will impact on the project if left un-managed (include impacts on timeframes, feasibility, costs, ability to meet contracted deliverables).", - "name": "budgetIssueImpacts" + "name": "budgetIssueImpacts", + "description": "If already covered at Q2.2, you may enter 'Refer to Q2.2.' Otherwise, indicate what impacts (if any) the issue may have on the project – e.g. timeframes, feasibility, costs, ability to meet contracted contributions/deliverables." } - ] + ], + "dataType": "list", + "name": "budgetIssues" }, { "dataType": "text", - "description": "Optional. You may add here information related to the budget that does not fit more appropriately in other fields.", - "name": "budgetNotes" + "name": "budgetNotes", + "description": "Optional. You may add here information related to the budget that does not fit more appropriately in other fields." } ], "viewModel": [ { + "type": "row", "items": [{ - "source": "

1. Organisation and contact Details<\/h4>", "computed": null, + "source": "

1. Organisation and contact Details<\/h4>", "type": "literal" - }], - "type": "row" + }] }, { + "type": "row", "items": [{ + "computed": null, + "type": "col", "items": [{ - "source": "orgDetailsChange", + "preLabel": "1.1 Has there been a change in the details of your organisation or key project personnel that you have not yet advised the Department of the Environment?", "computed": null, - "preLabel": "1.1 Has there been a change in the details of your organisation or key project personnel that you have not yet advised the Department of Environment?", "width": "95%", + "source": "orgDetailsChange", "type": "selectOne" - }], - "computed": null, - "type": "col" + }] }], - "class": "output-section", - "type": "row" + "class": "output-section" }, { + "type": "row", "items": [{ - "source": "

2. Summary of Project Progress for the Period<\/h4>", "computed": null, + "source": "

2. Summary of Project Progress for the Period<\/h4>", "type": "literal" - }], - "type": "row" + }] }, { + "type": "row", "items": [{ + "computed": null, + "type": "col", "items": [ { - "source": "achievementsSummary", - "computed": null, "preLabel": "2.1 Provide a summary of what has been achieved to date against each Activity and the Outcomes identified in your Funding Agreement.", + "computed": null, "width": "95%", + "source": "achievementsSummary", "type": "textarea" }, { - "source": "

2.2 If you have encountered any issues or delays in delivering the project's Activities and / or Outcomes, please explain here: a) the nature of the issues, b) how you are managing (or proposing to manage) the issues, and c) implications for the project.<\/h5> (only complete this question if relevant)<\/i>", "computed": null, + "source": "
2.2 If you have encountered any issues or delays in delivering the project's Activities and / or Outcomes, please explain here: a) the nature of the issues, b) how you are managing (or proposing to manage) the issues, and c) implications for the project.<\/h5> (only complete this question if relevant)<\/i>", "type": "literal" }, { - "source": "issues", - "computed": null, "allowHeaderWrap": "true", + "computed": null, "columns": [ { - "title": "Issue No.", - "source": "issueReference", "width": "10%", + "source": "issueReference", + "title": "Issue No.", "type": "number" }, { - "title": "Nature of the Issue", - "source": "issueDescription", "width": "25%", + "source": "issueDescription", + "title": "Nature of the Issue", "type": "textarea" }, { - "title": "How you are managing, or proposing to manage, the issue?", - "source": "issueManagement", "width": "25%", + "source": "issueManagement", + "title": "How you are managing, or proposing to manage, the issue?", "type": "textarea" }, { - "title": "Implications for the project", - "source": "issuesImpacts", "width": "25%", + "source": "issuesImpacts", + "title": "Implications for the project", "type": "textarea" } ], "userAddedRows": true, - "class": "output-section", - "type": "table" + "source": "issues", + "type": "table", + "class": "output-section" } - ], - "computed": null, - "type": "col" + ] }], - "class": "output-section", - "type": "row" + "class": "output-section" }, { + "type": "row", "items": [{ - "source": "

3. Monitoring, Evaluation and Project Learnings<\/h4>", "computed": null, + "source": "

3. Monitoring, Evaluation and Project Learnings<\/h4>", "type": "literal" - }], - "type": "row" + }] }, { + "type": "row", "items": [{ + "computed": null, + "type": "col", "items": [{ - "source": "achievementsSummary", - "computed": null, "preLabel": "3.1 Provide a summary of a) what project monitoring and/or evaluation activities have been undertaken to date; b) any key findings and / or learnings gained from the project; and c) any changes you are making in response to these.", + "computed": null, "width": "100%", + "source": "achievementsSummary", "type": "textarea" - }], - "computed": null, - "type": "col" + }] }], - "class": "output-section", - "type": "row" + "class": "output-section" }, { + "type": "row", "items": [{ - "source": "

4. Other Comments<\/h4>", "computed": null, + "source": "

4. Other Comments<\/h4>", "type": "literal" - }], - "type": "row" + }] }, { + "type": "row", "items": [{ + "computed": null, + "type": "col", "items": [{ - "source": "notes", "preLabel": "Please provide any further comments you may wish to make on the project and / or programme.", + "computed": null, "width": "100%", + "source": "notes", "type": "textarea" - }], - "computed": null, - "type": "col" + }] }], - "class": "output-section", - "type": "row" + "class": "output-section" }, { + "type": "row", "items": [{ - "source": "

5. Project Income and Expenditure<\/h4>", "computed": null, + "source": "

5. Project Income and Expenditure<\/h4>", "type": "literal" - }], - "type": "row" + }] }, { + "type": "row", "items": [{ + "computed": null, + "type": "col", "items": [ { - "source": "budgetTracking", - "computed": null, "preLabel": "5.1 Is the project's expenditure proceeding in accordance with the budget, the expected rate of expenditure and within the total project budget?", + "computed": null, + "source": "budgetTracking", "type": "selectOne" }, { - "source": "budgetReceiptsReceived", - "computed": null, "preLabel": "5.2 If your project budget includes 'Recipient' or 'Other' cash contributions, have they been received and / or been contracted to be received?", + "computed": null, + "source": "budgetReceiptsReceived", "type": "selectOne" }, { - "source": "

5.3 If you answered 'No' to question 5.1 or 5.2, please explain here: a) the nature of the issues; b) how you are managing (or proposing to manage) the issues, and c) implications for the project.<\/h5>Only complete if applicable. Note - cash contributions are expected to be provided in line with the Funding Agreement, otherwise it constitutes a variation. The Government has a right under the Agreement (which it may or may not exercise) to reduce its contribution and recover some funds paid, or to terminate an Agreement.<\/i>", "computed": null, + "source": "
5.3 If you answered 'No' to question 5.1 or 5.2, please explain here: a) the nature of the issues; b) how you are managing (or proposing to manage) the issues, and c) implications for the project.<\/h5>Only complete if applicable. Note - cash contributions are expected to be provided in line with the Funding Agreement, otherwise it constitutes a variation. The Government has a right under the Agreement (which it may or may not exercise) to reduce its contribution and recover some funds paid, or to terminate an Agreement.<\/i>", "type": "literal" }, { - "title": "5.3 If you answered 'No' to question 5.1 or 5.2, please explain here: a) the nature of the issues, b) how you are managing (or proposing to manage) the issues, and c) implications for the project.", - "source": "budgetIssues", - "computed": null, "allowHeaderWrap": "true", + "computed": null, "columns": [ { - "title": "Issue No.", - "source": "budgetIssueReference", "width": "10%", + "source": "budgetIssueReference", + "title": "Issue No.", "type": "number" }, { - "title": "Nature of the budget issue", - "source": "budgetIssueDescription", "width": "30%", + "source": "budgetIssueDescription", + "title": "Nature of the budget issue", "type": "textarea" }, { - "title": "How you are managing, or proposing to manage, the issue?", - "source": "budgetIssueManagement", "width": "30%", + "source": "budgetIssueManagement", + "title": "How you are managing, or proposing to manage, the issue?", "type": "textarea" }, { - "title": "Implications for the project", - "source": "budgetIssueImpacts", "width": "30%", + "source": "budgetIssueImpacts", + "title": "Implications for the project", "type": "textarea" } ], "userAddedRows": true, - "class": "output-section", - "type": "table" + "source": "budgetIssues", + "title": "5.3 If you answered 'No' to question 5.1 or 5.2, please explain here: a) the nature of the issues, b) how you are managing (or proposing to manage) the issues, and c) implications for the project.", + "type": "table", + "class": "output-section" }, { - "source": "budgetNotes", - "computed": null, "preLabel": "5.4 If you have additional comments on the project's income, expenditure or budget, please provide them here.", + "computed": null, "width": "95%", + "source": "budgetNotes", "type": "textarea" } - ], - "computed": null, - "type": "col" + ] }], - "class": "output-section", - "type": "row" + "class": "output-section" } ] } \ No newline at end of file From 3411a44aa1baec6b5ddb064fa05f0458ed12adf1 Mon Sep 17 00:00:00 2001 From: chrisala Date: Tue, 2 Jun 2015 08:25:20 +1000 Subject: [PATCH 04/18] New ad hoc report. --- scripts/reports/threatenedSpecies.js | 46 ++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 scripts/reports/threatenedSpecies.js diff --git a/scripts/reports/threatenedSpecies.js b/scripts/reports/threatenedSpecies.js new file mode 100644 index 000000000..86452fb38 --- /dev/null +++ b/scripts/reports/threatenedSpecies.js @@ -0,0 +1,46 @@ +var projects = db.project.find({status:{$ne:'deleted'}, 'custom.details.objectives.rows1.assets':'Threatened Species'}); +//var projects = db.project.find({status:{$ne:'deleted'}, $or:[{'custom.details.objectives.rows1.assets':'Threatened Ecological Communities'}, {'custom.details.objectives.rows1.assets':'Threatened Species'}]}); +//var projects = db.project.find({status:{$ne:'deleted'}, 'custom.details.objectives.rows1.assets':'Threatened Ecological Communities'}); + +//print('Name, Grant ID, External ID, Organisation Name, Programme, Sub-Programme, Planned Start Date, Planned End Date, Funding, Status, Description, State, State, State'); + +var fundingByRegion = {}; +var regions = []; +var total = 0, count = 0; +while (projects.hasNext()) { + var project = projects.next(); + + var sites = db.site.find({projects:project.projectId}); + var nrm = 'unknown'; + while (sites.hasNext()) { + var site = sites.next(); + if (site.extent && site.extent.geometry) { + if (site.extent.geometry.nrm) { + nrm = site.extent.geometry.nrm; + break; + } + } + } + + if (fundingByRegion[nrm] === undefined) { + regions.push(nrm); + fundingByRegion[nrm] = {count:0, total:0}; + } + + fundingByRegion[nrm].count++; + count++; + if (project.custom.details.budget && project.custom.details.budget.overallTotal) { + total += project.custom.details.budget.overallTotal; + fundingByRegion[nrm].total += project.custom.details.budget.overallTotal; + } + + +} + + +print('NRM Region,Project Count,Total') +for (var i=0; i Date: Tue, 2 Jun 2015 11:50:15 +1000 Subject: [PATCH 05/18] Updated report to include sub-programme. --- scripts/reports/threatenedSpecies.js | 30 ++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/scripts/reports/threatenedSpecies.js b/scripts/reports/threatenedSpecies.js index 86452fb38..14a15ce30 100644 --- a/scripts/reports/threatenedSpecies.js +++ b/scripts/reports/threatenedSpecies.js @@ -1,10 +1,11 @@ -var projects = db.project.find({status:{$ne:'deleted'}, 'custom.details.objectives.rows1.assets':'Threatened Species'}); -//var projects = db.project.find({status:{$ne:'deleted'}, $or:[{'custom.details.objectives.rows1.assets':'Threatened Ecological Communities'}, {'custom.details.objectives.rows1.assets':'Threatened Species'}]}); +//var projects = db.project.find({status:{$ne:'deleted'}, 'custom.details.objectives.rows1.assets':'Threatened Species'}); +var projects = db.project.find({status:{$ne:'deleted'}, $or:[{'custom.details.objectives.rows1.assets':'Threatened Ecological Communities'}, {'custom.details.objectives.rows1.assets':'Threatened Species'}]}); //var projects = db.project.find({status:{$ne:'deleted'}, 'custom.details.objectives.rows1.assets':'Threatened Ecological Communities'}); //print('Name, Grant ID, External ID, Organisation Name, Programme, Sub-Programme, Planned Start Date, Planned End Date, Funding, Status, Description, State, State, State'); var fundingByRegion = {}; +var programs = []; var regions = []; var total = 0, count = 0; while (projects.hasNext()) { @@ -22,25 +23,34 @@ while (projects.hasNext()) { } } + var programSubProgram = project.associatedProgram+' - '+project.associatedSubProgram; if (fundingByRegion[nrm] === undefined) { regions.push(nrm); - fundingByRegion[nrm] = {count:0, total:0}; + fundingByRegion[nrm] = {}; + } + if (programs.indexOf(programSubProgram) < 0) { + programs.push(programSubProgram); + } + if (fundingByRegion[nrm][programSubProgram] === undefined) { + fundingByRegion[nrm][programSubProgram] = {count:0, total:0}; } - fundingByRegion[nrm].count++; + fundingByRegion[nrm][programSubProgram].count++; count++; if (project.custom.details.budget && project.custom.details.budget.overallTotal) { total += project.custom.details.budget.overallTotal; - fundingByRegion[nrm].total += project.custom.details.budget.overallTotal; + fundingByRegion[nrm][programSubProgram].total += project.custom.details.budget.overallTotal; } - - } -print('NRM Region,Project Count,Total') +print('NRM Region,Sub Programme,Project Count,Total') for (var i=0; i Date: Tue, 2 Jun 2015 12:13:43 +1000 Subject: [PATCH 06/18] Synced models from test. --- models/activities-model.json | 273 ++++++++++++++++++++++++----------- 1 file changed, 189 insertions(+), 84 deletions(-) diff --git a/models/activities-model.json b/models/activities-model.json index fa7ae508d..b7f84e118 100644 --- a/models/activities-model.json +++ b/models/activities-model.json @@ -2369,9 +2369,86 @@ }], "name": "Site Planning Details" }, + { + "template": "fencing", + "scores": [ + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "FNC", + "name": "lengthOfFence", + "description": "The total length of fencing erected.", + "label": "Total length of fence (Km)", + "units": "kilometres", + "category": "Biodiversity Management", + "isOutputTarget": true + }, + { + "aggregationType": "SUM", + "displayType": "piechart", + "name": "lengthOfFence", + "description": "Breakdown of the length of fence erected by the type of fence.", + "label": "Total length of fence (Km) by the type of fence erected", + "units": "kilometres", + "groupBy": "output:fenceType", + "listName": "", + "category": "Biodiversity Management" + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "piechart", + "name": "fenceType", + "description": "Breakdown of the number of activities erecting fencing by the type of fence being erected.", + "label": "Proportion of activities by fence type", + "units": "", + "category": "Biodiversity Management" + }, + { + "aggregationType": "SUM", + "displayType": "piechart", + "name": "lengthOfFence", + "description": "Breakdown of the proportion of the length of fencing by purpose of fence. As a single fence can perform many purposes, the length may be multi-counted. Interpret only as length within a specific category or as a percentage of the whole.", + "label": "Length of fence (as a %) by fence purpose", + "units": "", + "groupBy": "output:purposeOfFence", + "listName": "", + "category": "Biodiversity Management" + }, + { + "aggregationType": "SUM", + "displayType": "", + "name": "fenceAreaProtected", + "description": "The area in hectares enclosed within a protective fence", + "label": "Area protected by fencing (Ha)", + "listName": "", + "category": "Biodiversity Management", + "isOutputTarget": true + }, + { + "aggregationType": "HISTOGRAM", + "displayType": "piechart", + "name": "purposeOfFence", + "description": "Breakdown of the proportion of the number of activities erecting fencing by purpose of fence. As a single fence can perform many purposes, the length may be multi-counted. Interpret only as length within a specific category or as a percentage of the whole.", + "label": "Proportion of activities by fence purpose", + "units": "", + "listName": "", + "category": "Biodiversity Management", + "isOutputTarget": false + } + ], + "name": "Fence Details" + }, { "template": "smallGrantProgressReport", - "scores": [], + "scores": [{ + "aggregationType": "COUNT", + "displayType": "", + "gmsId": "PR25ALG", + "name": "achievementsSummary", + "label": "No. of 25th Anniversary Landcare Grant progress reports submitted", + "listName": "", + "category": "Project Management, Planning and Research Outputs" + }], "name": "Progress Report Details" }, { @@ -2770,75 +2847,6 @@ ], "name": "Output Details" }, - { - "template": "fencing", - "scores": [ - { - "aggregationType": "SUM", - "displayType": "", - "gmsId": "FNC", - "name": "lengthOfFence", - "description": "The total length of fencing erected.", - "label": "Total length of fence (Km)", - "units": "kilometres", - "category": "Biodiversity Management", - "isOutputTarget": true - }, - { - "aggregationType": "SUM", - "displayType": "piechart", - "name": "lengthOfFence", - "description": "Breakdown of the length of fence erected by the type of fence.", - "label": "Total length of fence (Km) by the type of fence erected", - "units": "kilometres", - "groupBy": "output:fenceType", - "listName": "", - "category": "Biodiversity Management" - }, - { - "aggregationType": "HISTOGRAM", - "displayType": "piechart", - "name": "fenceType", - "description": "Breakdown of the number of activities erecting fencing by the type of fence being erected.", - "label": "Proportion of activities by fence type", - "units": "", - "category": "Biodiversity Management" - }, - { - "aggregationType": "SUM", - "displayType": "piechart", - "name": "lengthOfFence", - "description": "Breakdown of the proportion of the length of fencing by purpose of fence. As a single fence can perform many purposes, the length may be multi-counted. Interpret only as length within a specific category or as a percentage of the whole.", - "label": "Length of fence (as a %) by fence purpose", - "units": "", - "groupBy": "output:purposeOfFence", - "listName": "", - "category": "Biodiversity Management" - }, - { - "aggregationType": "SUM", - "displayType": "", - "name": "fenceAreaProtected", - "description": "The area in hectares enclosed within a protective fence", - "label": "Area protected by fencing (Ha)", - "listName": "", - "category": "Biodiversity Management", - "isOutputTarget": true - }, - { - "aggregationType": "HISTOGRAM", - "displayType": "piechart", - "name": "purposeOfFence", - "description": "Breakdown of the proportion of the number of activities erecting fencing by purpose of fence. As a single fence can perform many purposes, the length may be multi-counted. Interpret only as length within a specific category or as a percentage of the whole.", - "label": "Proportion of activities by fence purpose", - "units": "", - "listName": "", - "category": "Biodiversity Management", - "isOutputTarget": false - } - ], - "name": "Fence Details" - }, { "template": "smallGrantAquittal", "scores": [], @@ -2984,6 +2992,109 @@ ], "name": "Upload of stage 1 and 2 reporting data" }, + { + "template": "uploadOfHistoricalReportingData", + "scores": [ + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "RVN-CEG", + "name": "score", + "description": "The total number of seedlings planted.", + "label": "Number of plants planted", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Revegetation", + "filterBy": "Number of plants planted" + }, + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "RVA-CEG", + "name": "score", + "description": "The area of land actually revegetated with native species by the planting of seedlings, sowing of seed and managed native regeneration actions.", + "label": "Area of revegetation works (Ha)", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Revegetation", + "filterBy": "Area of revegetation works (Ha)" + }, + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "RVSVL-CEG", + "name": "score", + "description": "Estimate of the average survivability of both tubestock and seedstock expressed as a percentage of plants planted. For seedstock, this includes both counted and estimated germination establishment rates.", + "label": "Average survivability of tubestock and seedstock (%)", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Revegetation", + "filterBy": "Average survivability of tubestock and seedstock (%)" + }, + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "WDT-CEG", + "name": "score", + "description": "The total area of weeds for which an initial treatment was undertaken.", + "label": "Total new area treated for weeds (Ha)", + "units": "Ha", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Invasive Species Management - Weeds", + "filterBy": "Total new area treated for weeds (Ha)" + }, + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "CPEE-CEG", + "name": "score", + "description": "No. of workshops/field day events held", + "label": "Total No. of community participation and engagement events run", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Community Engagement and Capacity Building", + "filterBy": "Total No. of community participation and engagement events run" + }, + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "VOL-CEG", + "name": "score", + "description": "The number of participants at activities and events who are not employed on projects. Individuals attending multiple activities will be counted for their attendance at each event.", + "label": "No of volunteers participating in project activities", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Community Engagement and Capacity Building", + "filterBy": "No of volunteers participating in project activities" + }, + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "GRP-CEG", + "name": "score", + "description": "No. of groups involved in project events", + "label": "No. of groups involved in project events", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Community Engagement and Capacity Building", + "filterBy": "No. of groups involved in project events" + }, + { + "aggregationType": "SUM", + "displayType": "", + "gmsId": "SGN-CEG", + "name": "score", + "description": "No. of signs permanently installed to manage public access and/or protect environmental assets", + "label": "No. of signs permanently installed", + "groupBy": "output:scoreLabel", + "listName": "scores", + "category": "Natural Resources Management", + "filterBy": "No. of signs permanently installed" + } + ], + "name": "Upload of historical summary reporting data" + }, { "template": "gaParticipantDetails", "scores": [], @@ -3271,19 +3382,6 @@ "name": "Site Visit Details" } ], - "selectedActivity": { - "outputs": [ - "Progress Report Details", - "Attachments" - ], - "supportsPhotoPoints": false, - "gmsId": "PR25ALG", - "name": "25th Anniversary Landcare Grants - Progress Report", - "supportsSites": false, - "type": "Report", - "category": "Small Grants", - "status": "active" - }, "activities": [ { "outputs": ["Biodiversity Fund Outcomes & Monitoring Methodology"], @@ -3805,7 +3903,7 @@ "Attachments" ], "supportsPhotoPoints": false, - "gmsId": "WDT25ALG FNC25ALG CPEE25ALG MPCFE25ALG IKM25ALG PSA25ALG FBS25ALG WMM25ALG WSA25ALG STA25ALG WQSA25ALG HC25ALG HSA25ALG CGM25ALG VAC25ALG", + "gmsId": "WDT25ALG FNC25ALG CPEE25ALG MPCFE25ALG IKM25ALG PSA25ALG FBS25ALG WMM25ALG WSA25ALG STA25ALG WQSA25ALG HC25ALG HSA25ALG CGM25ALG VAC25ALG RVA25ALG RVN25ALG EML25ALG ", "name": "25th Anniversary Landcare Grants - Final Report", "supportsSites": false, "type": "Report", @@ -3820,6 +3918,13 @@ "category": "None", "status": "deleted" }, + { + "outputs": ["Upload of historical summary reporting data"], + "gmsId": "RVN-CEG RVA-CEG RVSVL-CEG WDT-CEG CPEE-CEG VOL-CEG GRP-CEG SGN-CEG", + "name": "Upload of historical summary reporting data", + "type": "Activity", + "category": "None" + }, { "outputs": ["Monthly Status Report Data"], "supportsPhotoPoints": false, From 4af68724a4264300d0be067b16b817ff05529a83 Mon Sep 17 00:00:00 2001 From: chrisala Date: Wed, 3 Jun 2015 09:12:19 +1000 Subject: [PATCH 07/18] Removed old version of geb/spock. --- grails-app/conf/BuildConfig.groovy | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy index 4628d5230..61c650c55 100644 --- a/grails-app/conf/BuildConfig.groovy +++ b/grails-app/conf/BuildConfig.groovy @@ -36,14 +36,6 @@ grails.project.dependency.resolution = { dependencies { // specify dependencies here under either 'build', 'compile', 'runtime', 'test' or 'provided' scopes e.g. - test "org.gebish:geb-spock:0.9.3" - test("org.seleniumhq.selenium:selenium-htmlunit-driver:$seleniumVersion") { - exclude "xml-apis" - } - test("org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion") - test("org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion") - test "org.spockframework:spock-grails-support:0.7-groovy-2.0" - // ElasticSearch compile "org.elasticsearch:elasticsearch:1.5.2" @@ -95,8 +87,6 @@ grails.project.dependency.resolution = { build ":release:3.0.1" compile ':cache:1.1.8' compile ":cache-ehcache:1.0.5" - - test ":geb:0.9.3" } } From 1ca5df75a5afbeb7809c8156ebabe882d74dea22 Mon Sep 17 00:00:00 2001 From: chrisala Date: Wed, 3 Jun 2015 09:15:30 +1000 Subject: [PATCH 08/18] Synced models --- .../uploadOfCEGreportingData/dataModel.json | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 models/uploadOfCEGreportingData/dataModel.json diff --git a/models/uploadOfCEGreportingData/dataModel.json b/models/uploadOfCEGreportingData/dataModel.json new file mode 100644 index 000000000..b9b2866aa --- /dev/null +++ b/models/uploadOfCEGreportingData/dataModel.json @@ -0,0 +1,58 @@ +{ + "modelName": "Upload of summary CEG reporting data", + "dataModel": [{ + "columns": [ + { + "dataType": "text", + "name": "outputName", + "description": "The output the score is collected from", + "validate": "required" + }, + { + "dataType": "text", + "name": "scoreLabel", + "description": "The label of the score we are collecting", + "validate": "required" + }, + { + "dataType": "number", + "name": "score", + "description": "The value of the score", + "validate": "required" + } + ], + "dataType": "list", + "name": "scores" + }], + "viewModel": [{ + "columns": [ + { + "width": "30%", + "readOnly": true, + "source": "outputName", + "title": "Output", + "type": "text" + }, + { + "width": "50%", + "readOnly": true, + "source": "scoreLabel", + "title": "Score", + "type": "text" + }, + { + "computed": null, + "width": "10%", + "readOnly": true, + "source": "score", + "title": "Amount", + "type": "number" + } + ], + "userAddedRows": false, + "source": "scores", + "title": "Progress towards targets automatically uploaded for Community Environment Grants:", + "type": "table", + "class": "output-section" + }] +} \ No newline at end of file From 827ff098764b29da8808cd9f345cd4bb8ab9247a Mon Sep 17 00:00:00 2001 From: jamirali Date: Wed, 3 Jun 2015 13:04:19 +1000 Subject: [PATCH 09/18] synced with 1.2.4 --- .../au/org/ala/ecodata/AdminController.groovy | 4 +- .../org/ala/ecodata/DocumentController.groovy | 27 ++-- .../domain/au/org/ala/ecodata/Document.groovy | 5 + .../domain/au/org/ala/ecodata/Project.groovy | 4 +- .../org/ala/ecodata/CollectoryService.groovy | 116 +++++++++++++++++- .../au/org/ala/ecodata/DocumentService.groovy | 36 +++++- .../ala/ecodata/OrganisationService.groovy | 27 +--- .../au/org/ala/ecodata/ProjectService.groovy | 84 +++---------- .../org/ala/ecodata/ProjectServiceSpec.groovy | 94 ++++++++++++++ 9 files changed, 284 insertions(+), 113 deletions(-) create mode 100644 test/unit/au/org/ala/ecodata/ProjectServiceSpec.groovy diff --git a/grails-app/controllers/au/org/ala/ecodata/AdminController.groovy b/grails-app/controllers/au/org/ala/ecodata/AdminController.groovy index 479e199f2..3b86d0aeb 100644 --- a/grails-app/controllers/au/org/ala/ecodata/AdminController.groovy +++ b/grails-app/controllers/au/org/ala/ecodata/AdminController.groovy @@ -8,7 +8,7 @@ import org.springframework.core.io.support.PathMatchingResourcePatternResolver class AdminController { def outputService, activityService, siteService, projectService, authService, - organisationService, + collectoryService, commonService, cacheService, metadataService, elasticSearchService, documentService def beforeInterceptor = [action:this.&auth, only:['index','tools','settings','audit']] @@ -37,7 +37,7 @@ class AdminController { @RequireApiKey def syncCollectoryOrgs() { - def errors = organisationService.collectorySync() + def errors = collectoryService.syncOrganisations() if (errors) render (status: 503, text: errors) else diff --git a/grails-app/controllers/au/org/ala/ecodata/DocumentController.groovy b/grails-app/controllers/au/org/ala/ecodata/DocumentController.groovy index e82319f00..bbb58b82d 100644 --- a/grails-app/controllers/au/org/ala/ecodata/DocumentController.groovy +++ b/grails-app/controllers/au/org/ala/ecodata/DocumentController.groovy @@ -17,30 +17,39 @@ class DocumentController { } def index() { - log.debug "Total documents = ${Document.count()}" + log.debug "Total documents (including links) = ${Document.count()}" render "${Document.count()} documents" } def get(String id) { def detail = [] - if (!id) { - def list = documentService.getAll(params.includeDeleted as boolean, params.view) - list.sort {it.name} - //log.debug list - asJson([list: list]) - } else { + if (id) { def doc = documentService.get(id, detail) if (doc) { asJson doc } else { render status:404, text: 'No such id' } + } else if (params.links as boolean) { + def list = documentService.getAllLinks(params.includeDeleted as boolean, params.view) + //log.debug list + asJson([list: list]) + } else { + def list = documentService.getAll(params.includeDeleted as boolean, params.view) + list.sort {it.name} + //log.debug list + asJson([list: list]) } } def find(String entity, String id) { - def result = documentService.findAllByOwner(entity+'Id', id) - asJson([documents:result]) + if (params.links as boolean) { + def result = documentService.findAllLinksByOwner(entity+'Id', id) + asJson([documents:result]) + } else { + def result = documentService.findAllByOwner(entity+'Id', id) + asJson([documents:result]) + } } @RequireApiKey diff --git a/grails-app/domain/au/org/ala/ecodata/Document.groovy b/grails-app/domain/au/org/ala/ecodata/Document.groovy index 5cbdd5886..b025b7ce8 100644 --- a/grails-app/domain/au/org/ala/ecodata/Document.groovy +++ b/grails-app/domain/au/org/ala/ecodata/Document.groovy @@ -36,6 +36,7 @@ class Document { String siteId String activityId String outputId + String externalUrl boolean thirdPartyConsentDeclarationMade = false String thirdPartyConsentDeclarationText @@ -49,6 +50,9 @@ class Document { } def getUrl() { + if (externalUrl) + return externalUrl.encodeAsURL().replaceAll('\\+', '%20') + return urlFor(filepath, filename) } @@ -108,5 +112,6 @@ class Document { isPrimaryProjectImage nullable: true thirdPartyConsentDeclarationMade nullable: true thirdPartyConsentDeclarationText nullable: true + externalUrl nullable: true } } diff --git a/grails-app/domain/au/org/ala/ecodata/Project.groovy b/grails-app/domain/au/org/ala/ecodata/Project.groovy index c222f39cb..790cea314 100644 --- a/grails-app/domain/au/org/ala/ecodata/Project.groovy +++ b/grails-app/domain/au/org/ala/ecodata/Project.groovy @@ -28,7 +28,8 @@ class Project { } ObjectId id - String projectId // same as collectory dataProvider id + String projectId + String dataProviderId // collectory dataProvider id String dataResourceId // one collectory dataResource stores all sightings String status = 'active' String externalId @@ -147,6 +148,7 @@ class Project { promoteOnHomepage nullable:true organisationId nullable:true projectType nullable:true // nullable for backward compatibility; survey, works + dataProviderId nullable:true // nullable for backward compatibility dataResourceId nullable:true // nullable for backward compatibility aim nullable:true keywords nullable:true diff --git a/grails-app/services/au/org/ala/ecodata/CollectoryService.groovy b/grails-app/services/au/org/ala/ecodata/CollectoryService.groovy index deff14ce6..151255584 100644 --- a/grails-app/services/au/org/ala/ecodata/CollectoryService.groovy +++ b/grails-app/services/au/org/ala/ecodata/CollectoryService.groovy @@ -15,7 +15,7 @@ class CollectoryService { def institutionId = null try { - def collectoryProps = mapAttributesToCollectory(props) + def collectoryProps = mapOrganisationAttributesToCollectory(props) def result = webService.doPost(grailsApplication.config.collectory.baseURL + 'ws/institution/', collectoryProps) institutionId = webService.extractCollectoryIdFromResult(result) } @@ -25,7 +25,7 @@ class CollectoryService { return institutionId } - private def mapAttributesToCollectory(props) { + private def mapOrganisationAttributesToCollectory(props) { def mapKeyOrganisationDataToCollectory = [ orgType: 'institutionType', description: 'pubDescription', @@ -44,4 +44,116 @@ class CollectoryService { } collectoryProps } + + // create ecodata organisations for any institutions in collectory which are not yet in ecodata + // return null if sucessful, or errors + def syncOrganisations() { + def errors + def url = "${grailsApplication.config.collectory.baseURL}ws/institution/" + def institutions = webService.getJson(url) + if (institutions instanceof List) { + def orgs = Organisation.findAllByCollectoryInstitutionIdIsNotNull() + def map = orgs.collectEntries { + [it.collectoryInstitutionId, it] + } + institutions.each({it -> + if (!map[it.uid]) { + def inst = webService.getJson(url + it.uid) + def result = create([collectoryInstitutionId: inst.uid, + name: inst.name, + description: inst.pubDescription?:"", + url: inst.websiteUrl?:""]) + if (result.errors) errors = result.errors + } + }) + } + errors + } + + /** + * Creates a new Data Provider (=~ ecodata project) and Data Resource (=~ ecodata outputs) + * in the collectory using the supplied properties as input. Much of project meta data is + * stored in a 'hiddenJSON' field in collectory. + * @param id the project id in ecodata. + * @param props the properties for the new data provider and resource. + * @return a map containing the created data provider id and data resource id, or null. + */ + Map createDataProviderAndResource(id, props) { + + Map ids = [:] + + try { + def collectoryProps = mapProjectAttributesToCollectory(props) + def result = webService.doPost(grailsApplication.config.collectory.baseURL + 'ws/dataProvider/', collectoryProps) + ids.dataProviderId = webService.extractCollectoryIdFromResult(result) + if (ids.dataProviderId) { + // create a dataResource in collectory to hold project outputs + collectoryProps.remove('hiddenJSON') + collectoryProps.dataProvider = [uid: ids.dataProviderId] + if (props.collectoryInstitutionId) collectoryProps.institution = [uid: props.collectoryInstitutionId] + collectoryProps.licenseType = props.dataSharingLicense + result = webService.doPost(grailsApplication.config.collectory.baseURL + 'ws/dataResource/', collectoryProps) + ids.dataResourceId = webService.extractCollectoryIdFromResult(result) + } + } catch (Exception e) { + def error = "Error creating collectory info for project ${id} - ${e.message}" + log.error error + } + + return ids + } + + /** + * Updates the Data Provider (=~ ecodata project) and Data Resource (=~ ecodata outputs) + * in the collectory using the supplied properties as input. The 'hiddenJSON' field in + * collectory is recreated to reflect the latest project properties. + * @param project the UPDATED project in ecodata. + * @return void. + */ + def updateDataProviderAndResource(project) { + + def projectId = project.projectId + try { + project = ['id', 'dateCreated', 'documents', 'lastUpdated', 'organisationName', 'projectId', 'sites'].each { + project.remove(it) + } + webService.doPost(grailsApplication.config.collectory.baseURL + 'ws/dataProvider/' + project.dataProviderId, + mapProjectAttributesToCollectory(project)) + if (project.dataResourceId) + webService.doPost(grailsApplication.config.collectory.baseURL + 'ws/dataResource/' + project.dataResourceId, + [licenseType: project.dataSharingLicense]) + } catch (Exception e ) { + def error = "Error updating collectory info for project ${projectId} - ${e.message}" + log.error error + } + + } + + private def mapProjectAttributesToCollectory(props) { + def mapKeyProjectDataToCollectory = [ + description: 'pubDescription', + manager: 'email', + name: 'name', + dataSharingLicense: '', // ignore this property (mapped to dataResource) + organisation: '', // ignore this property + projectId: 'uid', + urlWeb: 'websiteUrl' + ] + def collectoryProps = [ + api_key: grailsApplication.config.api_key + ] + def hiddenJSON = [:] + props.each { k, v -> + if (v != null) { + def keyCollectory = mapKeyProjectDataToCollectory[k] + if (keyCollectory == null) // not mapped to first class collectory property + hiddenJSON[k] = v + else if (keyCollectory != '') // not to be ignored + collectoryProps[keyCollectory] = v + } + } + collectoryProps.hiddenJSON = hiddenJSON + collectoryProps + } + } diff --git a/grails-app/services/au/org/ala/ecodata/DocumentService.groovy b/grails-app/services/au/org/ala/ecodata/DocumentService.groovy index de5fc6b22..17f2c80c5 100644 --- a/grails-app/services/au/org/ala/ecodata/DocumentService.groovy +++ b/grails-app/services/au/org/ala/ecodata/DocumentService.groovy @@ -19,6 +19,7 @@ import java.text.SimpleDateFormat class DocumentService { static final ACTIVE = "active" + static final LINKTYPE = "link" static final FILE_LOCK = new Object() static final DIRECTORY_PARTITION_FORMAT = 'yyyy-MM' @@ -53,15 +54,25 @@ class DocumentService { def getAll(boolean includeDeleted = false, levelOfDetail = []) { includeDeleted ? - Document.list().collect { toMap(it, levelOfDetail) } : - Document.findAllByStatus(ACTIVE).collect { toMap(it, levelOfDetail) } + Document.findAllByNotType(LINKTYPE).collect { toMap(it, levelOfDetail) } : + Document.findAllByStatusAndNotType(ACTIVE, LINKTYPE).collect { toMap(it, levelOfDetail) } + } + + def getAllLinks(boolean includeDeleted = false, levelOfDetail = []) { + includeDeleted ? + Document.findAllByType(LINKTYPE).collect { toMap(it, levelOfDetail) } : + Document.findAllByStatusAndType(ACTIVE, LINKTYPE).collect { toMap(it, levelOfDetail) } } def findAllForProjectId(id, levelOfDetail = []) { - Document.findAllByProjectIdAndStatus(id, ACTIVE).collect { toMap(it, levelOfDetail) } + Document.findAllByProjectIdAndStatusAndNotType(id, ACTIVE, LINKTYPE).collect { toMap(it, levelOfDetail) } + } + + def findAllLinksForProjectId(id, levelOfDetail = []) { + Document.findAllByProjectIdAndStatusAndType(id, ACTIVE, LINKTYPE).collect { toMap(it, levelOfDetail) } } - - def findAllForProjectIdAndIsPrimaryProjectImage(id, levelOfDetail = []) { + + def findAllForProjectIdAndIsPrimaryProjectImage(id, levelOfDetail = []) { Document.findAllByProjectIdAndStatusAndIsPrimaryProjectImage(id, ACTIVE,true).collect { toMap(it, levelOfDetail) } } @@ -285,6 +296,7 @@ class DocumentService { def query = Document.createCriteria() def results = query { + ne('type', LINKTYPE) eq(ownerType, owner) if (!includeDeleted) { ne('status', 'deleted') @@ -293,4 +305,18 @@ class DocumentService { results.collect{toMap(it, 'flat')} } + + def findAllLinksByOwner(ownerType, owner, includeDeleted = true) { + def query = Document.createCriteria() + + def results = query { + eq('type', LINKTYPE) + eq(ownerType, owner) + if (!includeDeleted) { + ne('status', 'deleted') + } + } + + results.collect{toMap(it, 'flat')} + } } diff --git a/grails-app/services/au/org/ala/ecodata/OrganisationService.groovy b/grails-app/services/au/org/ala/ecodata/OrganisationService.groovy index 55bfe9949..ef8283c57 100644 --- a/grails-app/services/au/org/ala/ecodata/OrganisationService.groovy +++ b/grails-app/services/au/org/ala/ecodata/OrganisationService.groovy @@ -12,32 +12,7 @@ class OrganisationService { static transactional = 'mongo' - def grailsApplication, webService, commonService, projectService, userService, documentService, collectoryService, permissionService - - // create ecodata organisations for any institutions in collectory which are not yet in ecodata - // return null if sucessful, or errors - def collectorySync() { - def errors - def url = "${grailsApplication.config.collectory.baseURL}ws/institution/" - def institutions = webService.getJson(url) - if (institutions instanceof List) { - def orgs = Organisation.findAllByCollectoryInstitutionIdIsNotNull() - def map = orgs.collectEntries { - [it.collectoryInstitutionId, it] - } - institutions.each({it -> - if (!map[it.uid]) { - def inst = webService.getJson(url + it.uid) - def result = create([collectoryInstitutionId: inst.uid, - name: inst.name, - description: inst.pubDescription?:"", - url: inst.websiteUrl?:""]) - if (result.errors) errors = result.errors - } - }) - } - errors - } + def commonService, projectService, permissionService, documentService, collectoryService def get(String id, levelOfDetail = [], includeDeleted = false) { Organisation organisation diff --git a/grails-app/services/au/org/ala/ecodata/ProjectService.groovy b/grails-app/services/au/org/ala/ecodata/ProjectService.groovy index 76352d9f2..212958651 100644 --- a/grails-app/services/au/org/ala/ecodata/ProjectService.groovy +++ b/grails-app/services/au/org/ala/ecodata/ProjectService.groovy @@ -22,33 +22,7 @@ class ProjectService { def reportService def activityService def permissionService - - private def mapAttributesToCollectory(props) { - def mapKeyProjectDataToCollectory = [ - description: 'pubDescription', - manager: 'email', - name: 'name', - dataSharingLicense: '', // ignore this property (mapped to dataResource) - organisation: '', // ignore this property - projectId: 'uid', - urlWeb: 'websiteUrl' - ] - def collectoryProps = [ - api_key: grailsApplication.config.api_key - ] - def hiddenJSON = [:] - props.each { k, v -> - if (v != null) { - def keyCollectory = mapKeyProjectDataToCollectory[k] - if (keyCollectory == null) // not mapped to first class collectory property - hiddenJSON[k] = v - else if (keyCollectory != '') // not to be ignored - collectoryProps[keyCollectory] = v - } - } - collectoryProps.hiddenJSON = hiddenJSON - collectoryProps - } + def collectoryService def getCommonService() { grailsApplication.mainContext.commonService @@ -108,6 +82,13 @@ class ProjectService { mapOfProperties.remove("sites") mapOfProperties.sites = siteService.findAllForProjectId(prj.projectId, [SiteService.FLAT]) mapOfProperties.documents = documentService.findAllForProjectId(prj.projectId, levelOfDetail) + mapOfProperties.links = documentService.findAllLinksForProjectId(prj.projectId, levelOfDetail) + // TEMP until this stuff is folded into documents properly + if (mapOfProperties.urlAndroid) + mapOfProperties.links.push([role: "android", type:"link", url: mapOfProperties.urlAndroid ]) + if (mapOfProperties.urlITunes) + mapOfProperties.links.push([role: "iTunes", type:"link", url: mapOfProperties.urlITunes ]) + mapOfProperties.links.push([role: "facebook", type:"link", url: "fb" ]) if (levelOfDetail == ALL) { mapOfProperties.activities = activityService.findAllForProjectId(prj.projectId, levelOfDetail, includeDeletedActivites) @@ -157,7 +138,6 @@ class ProjectService { def create(props) { assert getCommonService() - def o try { if (props.projectId && Project.findByProjectId(props.projectId)) { // clear session to avoid exception when GORM tries to autoflush the changes @@ -165,12 +145,14 @@ class ProjectService { return [status:'error',error:'Duplicate project id for create ' + props.projectId] } // name is a mandatory property and hence needs to be set before dynamic properties are used (as they trigger validations) - o = new Project(projectId: props.projectId?: Identifiers.getNew(true,''), name:props.name) - o.save(failOnError: true) + def project = new Project(projectId: props.projectId?: Identifiers.getNew(true,''), name:props.name) + project.save(failOnError: true) props.remove('sites') props.remove('id') - getCommonService().updateProperties(o, props) + props << collectoryService.createDataProviderAndResource(project.projectId, props) + getCommonService().updateProperties(project, props) + return [status: 'ok', projectId: project.projectId] } catch (Exception e) { // clear session to avoid exception when GORM tries to autoflush the changes Project.withSession { session -> session.clear() } @@ -178,28 +160,6 @@ class ProjectService { log.error error return [status:'error',error:error] } - - // create a dataProvider in collectory to hold project meta data - try { - def collectoryProps = mapAttributesToCollectory(props) - def result = webService.doPost(grailsApplication.config.collectory.baseURL + 'ws/dataProvider/', collectoryProps) - def dataProviderId = webService.extractCollectoryIdFromResult(result) - if (dataProviderId) { - // create a dataResource in collectory to hold project outputs - props.dataProviderId = dataProviderId - collectoryProps.remove('hiddenJSON') - collectoryProps.dataProvider = [uid: dataProviderId] - if (props.collectoryInstitutionId) collectoryProps.institution = [uid: props.collectoryInstitutionId] - collectoryProps.licenseType = props.dataSharingLicense - result = webService.doPost(grailsApplication.config.collectory.baseURL + 'ws/dataResource/', collectoryProps) - props.dataResourceId = webService.extractCollectoryIdFromResult(result) - } - } catch (Exception e) { - def error = "Error creating collectory info for project ${o.projectId} - ${e.message}" - log.error error - } - - return [status:'ok',projectId:o.projectId] } def update(props, id) { @@ -207,27 +167,15 @@ class ProjectService { if (a) { try { getCommonService().updateProperties(a, props) + if (a.dataProviderId) + collectoryService.updateDataProviderAndResource(Project.findByProjectId(id)) + return [status: 'ok'] } catch (Exception e) { Project.withSession { session -> session.clear() } def error = "Error updating project ${id} - ${e.message}" log.error error return [status: 'error', error: error] } - if (a.dataProviderId) { // recreate 'hiddenJSON' in collectory every time (minus some attributes) - try { - a = Project.findByProjectId(id) - ['id', 'dateCreated', 'documents', 'lastUpdated', 'organisationName', 'projectId', 'sites'].each { - a.remove(it) - } - webService.doPost(grailsApplication.config.collectory.baseURL + 'ws/dataProvider/' + a.dataProviderId, mapAttributesToCollectory(a)) - if (a.dataResourceId) - webService.doPost(grailsApplication.config.collectory.baseURL + 'ws/dataResource/' + a.dataResourceId, [licenseType: a.dataSharingLicense]) - } catch (Exception e ) { - def error = "Error updating collectory info for project ${id} - ${e.message}" - log.error error - } - } - return [status: 'ok'] } else { def error = "Error updating project - no such id ${id}" log.error error diff --git a/test/unit/au/org/ala/ecodata/ProjectServiceSpec.groovy b/test/unit/au/org/ala/ecodata/ProjectServiceSpec.groovy new file mode 100644 index 000000000..a0280ffbf --- /dev/null +++ b/test/unit/au/org/ala/ecodata/ProjectServiceSpec.groovy @@ -0,0 +1,94 @@ +package au.org.ala.ecodata + +import com.github.fakemongo.Fongo +import grails.test.mixin.TestMixin +import grails.test.mixin.mongodb.MongoDbTestMixin +import spock.lang.Specification + +/** + * See the API for {@link grails.test.mixin.services.ServiceUnitTestMixin} for usage instructions + */ + +@TestMixin(MongoDbTestMixin) +class ProjectServiceSpec extends Specification { + + ProjectService service = new ProjectService() + def stubbedCollectoryService = Stub(CollectoryService) + + def setup() { + Fongo fongo = new Fongo("ecodata-test") + mongoDomain(fongo.mongo, [Project]) + + defineBeans { + commonService(CommonService) + } + grailsApplication.mainContext.commonService.grailsApplication = grailsApplication + service.grailsApplication = grailsApplication + service.collectoryService = stubbedCollectoryService + } + + def "test create and update project"() { + given: + def projData = [name:'test proj', description: 'test proj description', dynamicProperty: 'dynamicProperty'] + def dataProviderId = 'dp1' + def dataResourceId = 'dr1' + stubbedCollectoryService.createDataProviderAndResource(_,_) >> [dataProviderId: dataProviderId, dataResourceId: dataResourceId] + def updatedData = projData + [description: 'test proj updated description'] + + + def result, projectId + when: + Project.withNewTransaction { + result = service.create(projData) + projectId = result.projectId + } + then: "ensure the response contains the id of the new project" + result.status == 'ok' + projectId != null + + when: "select the new project back from the database" + def savedProj = Project.findByProjectId(projectId) + + + then: "ensure the properties are the same as the original" + savedProj.name == projData.name + savedProj.description == projData.description + savedProj.dataProviderId == dataProviderId + savedProj.dataResourceId == dataResourceId + //savedProj['dynamicProperty'] == projData.dynamicProperty The dbo property on the domain object appears to be missing during unit tests which prevents dynamic properties from being retreived. + + when: + Project.withNewTransaction { + result = service.update(updatedData, projectId) + } + then: "ensure the response status is ok and the project was updated" + result.status == 'ok' + + + when: "select the updated project back from the database" + savedProj = Project.findByProjectId(projectId) + + + then: "ensure the unchanged properties are the same as the original" + savedProj.name == projData.name + //savedProj['dynamicProperty'] == projData.dynamicProperty The dbo property on the domain object appears to be missing during unit tests which prevents dynamic properties from being retreived. + + then: "ensure the updated properties are the same as the change" + savedProj.description == updatedData.description + + } + + def "test project validation"() { + given: + def projData = [description: 'test proj description', dynamicProperty: 'dynamicProperty'] + stubbedCollectoryService.createDataProviderAndResource(_,_) >> "" + + when: + def result = service.create(projData) + + then: + result.status == 'error' + result.error != null + + } +} From 11f525b714f689fb5d18afa7c60165b96a503eee Mon Sep 17 00:00:00 2001 From: jamirali Date: Fri, 5 Jun 2015 13:45:32 +1000 Subject: [PATCH 10/18] added links handling - no tests yet --- .../org/ala/ecodata/DocumentController.groovy | 7 ++++--- .../domain/au/org/ala/ecodata/Document.groovy | 3 +-- .../au/org/ala/ecodata/DocumentService.groovy | 19 +++++++------------ .../au/org/ala/ecodata/ProjectService.groovy | 6 ------ 4 files changed, 12 insertions(+), 23 deletions(-) diff --git a/grails-app/controllers/au/org/ala/ecodata/DocumentController.groovy b/grails-app/controllers/au/org/ala/ecodata/DocumentController.groovy index bbb58b82d..3141af9ed 100644 --- a/grails-app/controllers/au/org/ala/ecodata/DocumentController.groovy +++ b/grails-app/controllers/au/org/ala/ecodata/DocumentController.groovy @@ -31,7 +31,7 @@ class DocumentController { render status:404, text: 'No such id' } } else if (params.links as boolean) { - def list = documentService.getAllLinks(params.includeDeleted as boolean, params.view) + def list = documentService.getAllLinks(params.view) //log.debug list asJson([list: list]) } else { @@ -56,10 +56,11 @@ class DocumentController { def delete(String id) { def a = Document.findByDocumentId(id) if (a) { - if (params.destroy) { + if (a.type == documentService.LINKTYPE) { + a.delete() + } else if (params.destroy) { documentService.deleteFile(a) a.delete() - } else { a.status = 'deleted' a.save(flush: true) diff --git a/grails-app/domain/au/org/ala/ecodata/Document.groovy b/grails-app/domain/au/org/ala/ecodata/Document.groovy index b025b7ce8..0ac13ae0b 100644 --- a/grails-app/domain/au/org/ala/ecodata/Document.groovy +++ b/grails-app/domain/au/org/ala/ecodata/Document.groovy @@ -50,8 +50,7 @@ class Document { } def getUrl() { - if (externalUrl) - return externalUrl.encodeAsURL().replaceAll('\\+', '%20') + if (externalUrl) return externalUrl return urlFor(filepath, filename) } diff --git a/grails-app/services/au/org/ala/ecodata/DocumentService.groovy b/grails-app/services/au/org/ala/ecodata/DocumentService.groovy index 17f2c80c5..1fb2b7a4f 100644 --- a/grails-app/services/au/org/ala/ecodata/DocumentService.groovy +++ b/grails-app/services/au/org/ala/ecodata/DocumentService.groovy @@ -54,22 +54,20 @@ class DocumentService { def getAll(boolean includeDeleted = false, levelOfDetail = []) { includeDeleted ? - Document.findAllByNotType(LINKTYPE).collect { toMap(it, levelOfDetail) } : - Document.findAllByStatusAndNotType(ACTIVE, LINKTYPE).collect { toMap(it, levelOfDetail) } + Document.findAllByTypeNotEqual(LINKTYPE).collect { toMap(it, levelOfDetail) } : + Document.findAllByStatusAndTypeNotEqual(ACTIVE, LINKTYPE).collect { toMap(it, levelOfDetail) } } - def getAllLinks(boolean includeDeleted = false, levelOfDetail = []) { - includeDeleted ? - Document.findAllByType(LINKTYPE).collect { toMap(it, levelOfDetail) } : - Document.findAllByStatusAndType(ACTIVE, LINKTYPE).collect { toMap(it, levelOfDetail) } + def getAllLinks(levelOfDetail = []) { + Document.findAllByType(LINKTYPE).collect { toMap(it, levelOfDetail) } } def findAllForProjectId(id, levelOfDetail = []) { - Document.findAllByProjectIdAndStatusAndNotType(id, ACTIVE, LINKTYPE).collect { toMap(it, levelOfDetail) } + Document.findAllByProjectIdAndStatusAndTypeNotEqual(id, ACTIVE, LINKTYPE).collect { toMap(it, levelOfDetail) } } def findAllLinksForProjectId(id, levelOfDetail = []) { - Document.findAllByProjectIdAndStatusAndType(id, ACTIVE, LINKTYPE).collect { toMap(it, levelOfDetail) } + Document.findAllByProjectIdAndType(id, LINKTYPE).collect { toMap(it, levelOfDetail) } } def findAllForProjectIdAndIsPrimaryProjectImage(id, levelOfDetail = []) { @@ -306,15 +304,12 @@ class DocumentService { results.collect{toMap(it, 'flat')} } - def findAllLinksByOwner(ownerType, owner, includeDeleted = true) { + def findAllLinksByOwner(ownerType, owner) { def query = Document.createCriteria() def results = query { eq('type', LINKTYPE) eq(ownerType, owner) - if (!includeDeleted) { - ne('status', 'deleted') - } } results.collect{toMap(it, 'flat')} diff --git a/grails-app/services/au/org/ala/ecodata/ProjectService.groovy b/grails-app/services/au/org/ala/ecodata/ProjectService.groovy index 212958651..a40f54b60 100644 --- a/grails-app/services/au/org/ala/ecodata/ProjectService.groovy +++ b/grails-app/services/au/org/ala/ecodata/ProjectService.groovy @@ -83,12 +83,6 @@ class ProjectService { mapOfProperties.sites = siteService.findAllForProjectId(prj.projectId, [SiteService.FLAT]) mapOfProperties.documents = documentService.findAllForProjectId(prj.projectId, levelOfDetail) mapOfProperties.links = documentService.findAllLinksForProjectId(prj.projectId, levelOfDetail) - // TEMP until this stuff is folded into documents properly - if (mapOfProperties.urlAndroid) - mapOfProperties.links.push([role: "android", type:"link", url: mapOfProperties.urlAndroid ]) - if (mapOfProperties.urlITunes) - mapOfProperties.links.push([role: "iTunes", type:"link", url: mapOfProperties.urlITunes ]) - mapOfProperties.links.push([role: "facebook", type:"link", url: "fb" ]) if (levelOfDetail == ALL) { mapOfProperties.activities = activityService.findAllForProjectId(prj.projectId, levelOfDetail, includeDeletedActivites) From 4100265b97c139fcf0e77e45444096836b370e6f Mon Sep 17 00:00:00 2001 From: jamirali Date: Fri, 5 Jun 2015 14:19:31 +1000 Subject: [PATCH 11/18] OrganisationService needs userService --- .../services/au/org/ala/ecodata/OrganisationService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grails-app/services/au/org/ala/ecodata/OrganisationService.groovy b/grails-app/services/au/org/ala/ecodata/OrganisationService.groovy index ef8283c57..20c1d9272 100644 --- a/grails-app/services/au/org/ala/ecodata/OrganisationService.groovy +++ b/grails-app/services/au/org/ala/ecodata/OrganisationService.groovy @@ -12,7 +12,7 @@ class OrganisationService { static transactional = 'mongo' - def commonService, projectService, permissionService, documentService, collectoryService + def commonService, projectService, userService, permissionService, documentService, collectoryService def get(String id, levelOfDetail = [], includeDeleted = false) { Organisation organisation From 941c21314f35addbab7234bc762f47f733fe7949 Mon Sep 17 00:00:00 2001 From: chrisala Date: Sat, 6 Jun 2015 11:07:29 +1000 Subject: [PATCH 12/18] Wrote scripts to import/export projects and associated entities. --- scripts/misc/exportProject.sh | 32 +++++++++++++++++++++++++++++ scripts/misc/loadExportedProject.sh | 14 +++++++++++++ 2 files changed, 46 insertions(+) create mode 100755 scripts/misc/exportProject.sh create mode 100755 scripts/misc/loadExportedProject.sh diff --git a/scripts/misc/exportProject.sh b/scripts/misc/exportProject.sh new file mode 100755 index 000000000..ff281c2d6 --- /dev/null +++ b/scripts/misc/exportProject.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +if [ -z "$1" ] + then + echo "Usage: exportProject.sh " + exit 1 +fi +PROJECT_ID=$1 +DB=ecodata +activityRegex=".*\"activityId\" : \"([a-z0-9-]+).*" + +mongoexport --db $DB --collection project --query "{projectId:'$PROJECT_ID'}" > project.json +mongoexport --db $DB --collection site --query "{projects:'$PROJECT_ID'}" > site.json +mongoexport --db $DB --collection activity --query "{projectId:'$PROJECT_ID'}" > activity.json +mongoexport --db $DB --collection document --query "{projectId:'$PROJECT_ID'}" > document.json +mongoexport --db $DB --collection userPermission --query "{entityId:'$PROJECT_ID'}" > userPermission.json + + +rm output.json + +while read activity; do + [[ $activity =~ $activityRegex ]] + mongoexport -db $DB --collection output --query "{activityId:'${BASH_REMATCH[1]}'}" >> output.json +done Date: Wed, 10 Jun 2015 16:48:32 +1000 Subject: [PATCH 13/18] Report scripts. --- scripts/data_migration/fixRectangles.js | 40 +++++++++++ scripts/reports/greenArmySites.js | 66 ++++++++++++++++++ scripts/reports/sitesWithThreatenedSpecies.js | 67 +++++++++++++++++++ 3 files changed, 173 insertions(+) create mode 100644 scripts/data_migration/fixRectangles.js create mode 100644 scripts/reports/greenArmySites.js create mode 100644 scripts/reports/sitesWithThreatenedSpecies.js diff --git a/scripts/data_migration/fixRectangles.js b/scripts/data_migration/fixRectangles.js new file mode 100644 index 000000000..54167153b --- /dev/null +++ b/scripts/data_migration/fixRectangles.js @@ -0,0 +1,40 @@ +function representsRectangle(arr) { + // must have 5 points + if (arr.length !== 5) { + return false; + } + + if (arr[0][0] != arr[1][0]) { + return false; + } + if (arr[2][0] != arr[3][0]) { + return false; + } + if (arr[0][1] != arr[3][1]) { + return false; + } + if (arr[1][1] != arr[2][1]) { + return false; + } + return true +} + +var sites = db.site.find({'extent.source':'drawn'}); +while (sites.hasNext()) { + var site = sites.next(); + var coordinates = site.extent.geometry.coordinates; + if (coordinates.length == 1) { + coordinates = coordinates[0]; + } + if (representsRectangle(coordinates)) { + if (coordinates[3][0] == coordinates[4][0] && coordinates[3][1] == coordinates[4][1]) { + print("incorrectly closed polygon for site: "+site.siteId); + coordinates[4][0] = coordinates[0][0]; + coordinates[4][1] = coordinates[0][1]; + + db.site.update({siteId:site.siteId}, {$set:{'extent.geometry.coordinates':[coordinates]}}); + } + + } + +} \ No newline at end of file diff --git a/scripts/reports/greenArmySites.js b/scripts/reports/greenArmySites.js new file mode 100644 index 000000000..8d4249aac --- /dev/null +++ b/scripts/reports/greenArmySites.js @@ -0,0 +1,66 @@ +//var projects = db.project.find({status:{$ne:'deleted'}, 'custom.details.objectives.rows1.assets':'Threatened Species'}); +var projects = db.project.find({status:{$ne:'deleted'}, associatedProgram:'Green Army'}); +//var projects = db.project.find({status:{$ne:'deleted'}, 'custom.details.objectives.rows1.assets':'Threatened Ecological Communities'}); + +//print('Name, Grant ID, External ID, Organisation Name, Programme, Sub-Programme, Planned Start Date, Planned End Date, Funding, Status, Description, State, State, State'); + +print('Project ID,Grant ID,External ID,Sub Programme,Site,lat,lon,WKT,pid,fid,source,type'); + +while (projects.hasNext()) { + var project = projects.next(); + + var sites = db.site.find({projects:project.projectId, status:{$ne:'deleted'}}); + while (sites.hasNext()) { + var site = sites.next(); + if (site.extent && site.extent.geometry && site.extent.geometry.fid != 'cl22') { + var programSubProgram = project.associatedProgram + ' - ' + project.associatedSubProgram; + var lat = site.extent.geometry.centre[1]; + var lon = site.extent.geometry.centre[0]; + + var source = site.extent.source; + var type = site.extent.geometry.type; + var WKT = ''; + switch (source) { + case 'point': + WKT = 'POINT('+lon+' '+lat+')'; + break; + case 'drawn': + switch (type) { + case 'Point': + WKT = 'POINT('+lon+' '+lat+')'; + break; + case 'Polygon': + + var WKT; + if (site.extent.geometry.coordinates[0].length < 4) { + WKT = 'MULTILINESTRING((' + } + else { + + WKT = 'MULTIPOLYGON((('; + } + + for (var i = 0; i < site.extent.geometry.coordinates[0].length; i++) { + if (i != 0) { + WKT+=',' + } + var point = site.extent.geometry.coordinates[0][i]; + WKT = WKT + point[0] + ' ' + point[1]; + } + if (site.extent.geometry.coordinates[0].length < 4) { + WKT += '))'; + } + else { + WKT += ')))'; + } + } + break; + } + var pid = site.extent.geometry.pid; + + + print(project.projectId+','+project.grantId+','+project.externalId+',"'+programSubProgram+'",https://fieldcapture.ala.org.au/site/index/'+site.siteId+','+lat+','+lon+',"'+WKT+'",'+pid+','+site.fid+','+source+','+site.extent.geometry.type); + + } + } +} diff --git a/scripts/reports/sitesWithThreatenedSpecies.js b/scripts/reports/sitesWithThreatenedSpecies.js new file mode 100644 index 000000000..956bdcc9b --- /dev/null +++ b/scripts/reports/sitesWithThreatenedSpecies.js @@ -0,0 +1,67 @@ +//var projects = db.project.find({status:{$ne:'deleted'}, 'custom.details.objectives.rows1.assets':'Threatened Species'}); +var projects = db.project.find({status:{$ne:'deleted'}, $or:[{'custom.details.objectives.rows1.assets':'Threatened Ecological Communities'}, {'custom.details.objectives.rows1.assets':'Threatened Species'}]}); +//var projects = db.project.find({status:{$ne:'deleted'}, 'custom.details.objectives.rows1.assets':'Threatened Ecological Communities'}); + +//print('Name, Grant ID, External ID, Organisation Name, Programme, Sub-Programme, Planned Start Date, Planned End Date, Funding, Status, Description, State, State, State'); + +print('Project ID,Grant ID,External ID,Sub Programme,Site,lat,lon,WKT,pid,fid,source,type'); + +while (projects.hasNext()) { + var project = projects.next(); + + var sites = db.site.find({projects:project.projectId, status:{$ne:'deleted'}}); + while (sites.hasNext()) { + var site = sites.next(); + if (site.extent && site.extent.geometry && site.extent.geometry.fid != 'cl22') { + var programSubProgram = project.associatedProgram + ' - ' + project.associatedSubProgram; + var lat = site.extent.geometry.centre[1]; + var lon = site.extent.geometry.centre[0]; + + var source = site.extent.source; + var type = site.extent.geometry.type; + var WKT = ''; + switch (source) { + case 'point': + WKT = 'POINT('+lon+' '+lat+')'; + break; + case 'drawn': + switch (type) { + case 'Point': + WKT = 'POINT('+lon+' '+lat+')'; + break; + case 'Polygon': + var WKT; + if (site.extent.geometry.coordinates[0].length < 4) { + WKT = 'MULTILINESTRING((' + } + else { + + WKT = 'MULTIPOLYGON((('; + } + + for (var i = 0; i < site.extent.geometry.coordinates[0].length; i++) { + if (i != 0) { + WKT+=',' + } + var point = site.extent.geometry.coordinates[0][i]; + WKT = WKT + point[0] + ' ' + point[1]; + } + if (site.extent.geometry.coordinates[0].length < 4) { + WKT += '))'; + } + else { + WKT += ')))'; + } + + break; + } + break; + } + var pid = site.extent.geometry.pid; + + + print(project.projectId+','+project.grantId+','+project.externalId+',"'+programSubProgram+'",https://fieldcapture.ala.org.au/site/index/'+site.siteId+','+lat+','+lon+',"'+WKT+'",'+pid+','+site.fid+','+source+','+site.extent.geometry.type); + + } + } +} From cf49b4de5e10b70088f2de92b765e0d9d3d096f7 Mon Sep 17 00:00:00 2001 From: chrisala Date: Wed, 10 Jun 2015 17:32:16 +1000 Subject: [PATCH 14/18] Improving shapefile export to include shapes other than multipolygons. --- .../au/org/ala/ecodata/GeometryUtils.groovy | 146 ++++++++++++++++++ 1 file changed, 146 insertions(+) create mode 100644 src/groovy/au/org/ala/ecodata/GeometryUtils.groovy diff --git a/src/groovy/au/org/ala/ecodata/GeometryUtils.groovy b/src/groovy/au/org/ala/ecodata/GeometryUtils.groovy new file mode 100644 index 000000000..32ea222bf --- /dev/null +++ b/src/groovy/au/org/ala/ecodata/GeometryUtils.groovy @@ -0,0 +1,146 @@ +package au.org.ala.ecodata + +import com.vividsolutions.jts.geom.Coordinate +import com.vividsolutions.jts.geom.Geometry +import com.vividsolutions.jts.geom.GeometryFactory +import com.vividsolutions.jts.geom.LineString +import com.vividsolutions.jts.geom.MultiLineString +import com.vividsolutions.jts.geom.MultiPolygon +import com.vividsolutions.jts.geom.Point +import com.vividsolutions.jts.geom.Polygon +import com.vividsolutions.jts.io.WKTReader +import com.vividsolutions.jts.io.WKTWriter +import org.geotools.referencing.GeodeticCalculator + +import java.awt.geom.Point2D +import org.geotools.referencing.CRS +import org.opengis.referencing.crs.CoordinateReferenceSystem + +/** + * Helper class for working with site geometry. + */ +class GeometryUtils { + + static CoordinateReferenceSystem sourceCRS = CRS.decode("EPSG:4326") + static GeometryFactory geometryFactory = new GeometryFactory() + + static String wktToMultiPolygonWkt(String wkt) { + MultiPolygon result + Geometry geom = new WKTReader().read(wkt) + + switch (geom.geometryType) { + case 'Point': + result = pointToMultipolygon(geom) + break + case 'Polygon': + result = polygonToMultiPolygon(geom) + break + case 'MultiLineString': + result = multiLineStringToMultiPolygon(geom) + break + case 'LineString': + result = lineStringToMultiPolygon(geom) + break + case 'MultiPolygon': + return wkt + default: + throw new IllegalArgumentException("Unsupported WKT: "+wkt) + } + new WKTWriter().write(result) + } + + /** + * Creates an equilateral triangle with sides of length 1 metre with the point at the centroid. + * The coordinates of the supplied geometry must be in WGS84. + */ + static MultiPolygon pointToMultipolygon(Point point) { + + GeodeticCalculator gc = new GeodeticCalculator(sourceCRS) + Coordinate[] triangleCoords = new Coordinate[4] + double distance = 1d/Math.sqrt(3) + gc.setStartingGeographicPoint(point.x, point.y) + gc.setDirection(0, distance) + Point2D n = gc.getDestinationGeographicPoint() + triangleCoords[0] = new Coordinate(n.x, n.y) + gc.setDirection(120, distance) + Point2D se = gc.getDestinationGeographicPoint() + triangleCoords[1] = new Coordinate(se.x, se.y) + gc.setDirection(-120, distance) + Point2D sw = gc.getDestinationGeographicPoint() + triangleCoords[2] = new Coordinate(sw.x, sw.y) + // Close the polygon. + triangleCoords[3] = new Coordinate(n.x, n.y) + + return polygonToMultiPolygon(geometryFactory.createPolygon(triangleCoords)) + } + + static MultiPolygon multiLineStringToMultiPolygon(MultiLineString multiLineString) { + + Geometry result = multiLineString.convexHull() + if (result.geometryType == 'Polygon') { + return polygonToMultiPolygon(result) + } + else if (result.geometryType == 'LineString') { + return lineStringToMultiPolygon(result) + } + } + + static MultiPolygon polygonToMultiPolygon(Polygon polygon) { + Polygon[] multiPolygon = new Polygon[1] + multiPolygon[0] = polygon + return geometryFactory.createMultiPolygon(multiPolygon) + } + + static MultiPolygon lineStringToMultiPolygon(LineString lineString) { + Coordinate[] coordinates = lineString.coordinates + + if (coordinates.length == 2) { + Polygon rectangle = lineToPolygon(coordinates) + return polygonToMultiPolygon(rectangle) + } + else { + Coordinate[] closedPolygon = new Coordinate[coordinates.length+1] + System.arraycopy(coordinates, 0, closedPolygon, 0, coordinates.length) + closedPolygon[coordinates.length] = new Coordinate(coordinates[0].x, coordinates[0].y) + + return polygonToMultiPolygon(geometryFactory.createPolygon(closedPolygon)) + } + } + + private static Polygon lineToPolygon(Coordinate[] coordinates) { + Coordinate[] rectangleCoords = new Coordinate[5] + GeodeticCalculator gc = new GeodeticCalculator(sourceCRS) + gc.setStartingGeographicPoint(coordinates[0].x, coordinates[0].y) + gc.setDestinationGeographicPoint(coordinates[1].x, coordinates[1].y) + double azimuth = gc.getAzimuth() + double rightAngle = azimuth - 90 + if (rightAngle < -180) { + rightAngle = -(rightAngle + 180) + } + gc.setDirection(rightAngle, 0.5) + Point2D point1 = gc.getDestinationGeographicPoint() + rectangleCoords[0] = new Coordinate(point1.x, point1.y) + + gc.setStartingGeographicPoint(coordinates[1].x, coordinates[1].y) + gc.setDirection(rightAngle, 0.5) + Point2D point2 = gc.getDestinationGeographicPoint() + rectangleCoords[1] = new Coordinate(point2.x, point2.y) + + rightAngle = azimuth + 90 + if (rightAngle > 180) { + rightAngle = -(rightAngle - 180) + } + gc.setDirection(rightAngle, 0.5) + Point2D point3 = gc.getDestinationGeographicPoint() + rectangleCoords[2] = new Coordinate(point3.x, point3.y) + + gc.setStartingGeographicPoint(coordinates[0].x, coordinates[0].y) + gc.setDirection(rightAngle, 0.5) + Point2D point4 = gc.getDestinationGeographicPoint() + rectangleCoords[3] = new Coordinate(point4.x, point4.y) + rectangleCoords[4] = new Coordinate(point1.x, point1.y) + + return geometryFactory.createPolygon(rectangleCoords) + } + +} From 18a99f2c5521029529722ed5c2c5868cb6867715 Mon Sep 17 00:00:00 2001 From: jamirali Date: Thu, 11 Jun 2015 09:15:56 +1000 Subject: [PATCH 15/18] Added Proj3ct difficulty, diy, hasParticipantCost, isSuitableForChildren, gear and task --- grails-app/domain/au/org/ala/ecodata/Project.groovy | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/grails-app/domain/au/org/ala/ecodata/Project.groovy b/grails-app/domain/au/org/ala/ecodata/Project.groovy index 790cea314..285e33e15 100644 --- a/grails-app/domain/au/org/ala/ecodata/Project.groovy +++ b/grails-app/domain/au/org/ala/ecodata/Project.groovy @@ -64,8 +64,11 @@ class Project { List activities boolean isCitizenScience, isDataSharing + boolean hasParticipantCost, hasTeachingMaterials, isDIY, isSuitableForChildren + String difficulty, gear, task String projectPrivacy, dataSharingLicense String projectType // survey, works + // TODO urlAndroid and urlITunes need to be phased out; replaced by link-type documente String aim, keywords, urlAndroid, urlITunes, urlWeb String getInvolved, scienceType, projectSiteId double funding @@ -152,8 +155,8 @@ class Project { dataResourceId nullable:true // nullable for backward compatibility aim nullable:true keywords nullable:true - urlAndroid nullable:true, url:true - urlITunes nullable:true, url:true + urlAndroid nullable:true, url:true // TODO phased out + urlITunes nullable:true, url:true // TODO phased out urlWeb nullable:true, url:true getInvolved nullable:true scienceType nullable:true @@ -162,6 +165,9 @@ class Project { orgIdSvcProvider nullable:true projectSiteId nullable:true // nullable for backward compatibility projectPrivacy nullable:true, inList: ['Open','Closed'] + difficulty nullable:true, inList: ['Easy','Medium','Hard'] + gear nullable:true + task nullable:true dataSharingLicense nullable:true, inList: collectoryLicenseTypes userCreated nullable:true userLastModified nullable:true From f7877a175a65cf35e7f00ca957255da451d0ecf3 Mon Sep 17 00:00:00 2001 From: chrisala Date: Thu, 11 Jun 2015 10:31:19 +1000 Subject: [PATCH 16/18] Fixed the geojson conversion for a drawn circle. --- .../au/org/ala/ecodata/SiteService.groovy | 9 +++- .../au/org/ala/ecodata/SiteServiceSpec.groovy | 45 +++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 test/unit/au/org/ala/ecodata/SiteServiceSpec.groovy diff --git a/grails-app/services/au/org/ala/ecodata/SiteService.groovy b/grails-app/services/au/org/ala/ecodata/SiteService.groovy index 0f16c90d7..507e6733f 100644 --- a/grails-app/services/au/org/ala/ecodata/SiteService.groovy +++ b/grails-app/services/au/org/ala/ecodata/SiteService.groovy @@ -211,8 +211,13 @@ class SiteService { def result switch (geometry.type) { case 'Circle': - // We support circles, but they are not officially supported. - result = [type:'Point', coordinates:geometry.centre] + // We support circles, but they are not valid geojson. The spatial portal does a conversion for us. + if (geometry.pid) { + result = geometryForPid(geometry.pid) + } + else { + result = [type: 'Point', coordinates: geometry.centre] + } break case 'Point': case 'point': diff --git a/test/unit/au/org/ala/ecodata/SiteServiceSpec.groovy b/test/unit/au/org/ala/ecodata/SiteServiceSpec.groovy new file mode 100644 index 000000000..be43b08f0 --- /dev/null +++ b/test/unit/au/org/ala/ecodata/SiteServiceSpec.groovy @@ -0,0 +1,45 @@ +package au.org.ala.ecodata + +import grails.test.mixin.TestFor +import spock.lang.Specification + +/** + * Specification / tests for the SiteService + */ +@TestFor(SiteService) +class SiteServiceSpec extends Specification { + + def webServiceMock = Mock(WebService) + void setup() { + service.webService = webServiceMock + service.grailsApplication = grailsApplication + } + + // We should be storing the extent geometry as geojson already to enable geographic searching using + // mongo / elastic search. But we aren't (at least not for all types), so the conversion is currently necessary. + def "The site extent can be converted to geojson"() { + + when: "The site is a drawn rectangle" + def coordinates = [ [ 148.260498046875, -37.26530995561874 ], [ 148.260498046875, -35.1288943410105 ], [ 149.710693359375, -35.1288943410105 ], [ 149.710693359375, -37.26530995561874 ], [ 149.710693359375, -37.26530995561874 ], [ 148.260498046875, -37.26530995561874 ] ] + def extent = buildExtent('drawn', 'Polygon', coordinates) + def geojson = service.geometryAsGeoJson([extent:extent]) + + then: "The site is already valid geojson" + geojson.type == 'Polygon' + geojson.coordinates == coordinates + + when: "The site is a drawn circle" + extent = [source:'drawn', geometry: [type:'Circle', centre: [134.82421875, -33.41310193384], radius:12700, pid:'1234']] + geojson = service.geometryAsGeoJson([extent:extent]) + + then: "Circles aren't valid geojson so we should ask the spatial portal for help" + 1 * webServiceMock.getJson("${grailsApplication.config.spatial.baseUrl}/ws/shape/geojson/1234") >> [type:'Polygon', coordinates: []] + geojson.type == 'Polygon' + geojson.coordinates == [] + } + + + private Map buildExtent(source, type, coordinates, pid = '') { + return [source:source, geometry:[type:type, coordinates: coordinates, pid:pid]] + } +} From c5bf0a6cd6cda0b5a4b3bb73bd330f7d8a0b6d85 Mon Sep 17 00:00:00 2001 From: chrisala Date: Tue, 16 Jun 2015 11:01:13 +1000 Subject: [PATCH 17/18] Added a schema generator for the document data type. --- src/groovy/au/org/ala/ecodata/SchemaBuilder.groovy | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/groovy/au/org/ala/ecodata/SchemaBuilder.groovy b/src/groovy/au/org/ala/ecodata/SchemaBuilder.groovy index b6d17d88f..193f1a49c 100644 --- a/src/groovy/au/org/ala/ecodata/SchemaBuilder.groovy +++ b/src/groovy/au/org/ala/ecodata/SchemaBuilder.groovy @@ -194,6 +194,9 @@ class SchemaBuilder { case 'boolean': typeGenerator = this.&booleanProperty break + case 'document': + typeGenerator = this.&documentProperty + break default: //typeGenerator = this.&error @@ -281,6 +284,10 @@ class SchemaBuilder { return [type:'boolean'] } + def documentProperty(property) { + return [type:'object', properties:[filename:[type:'string'], data:[type:'string', format:'base64']]] + } + def error(property) { return [type:'unsupported'] } From 3cce8a5913a584f2b09f591a08e5dc9384a915d6 Mon Sep 17 00:00:00 2001 From: chrisala Date: Wed, 17 Jun 2015 10:42:39 +1000 Subject: [PATCH 18/18] Added a couple of new facets. --- .../ala/ecodata/ElasticSearchService.groovy | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/grails-app/services/au/org/ala/ecodata/ElasticSearchService.groovy b/grails-app/services/au/org/ala/ecodata/ElasticSearchService.groovy index c341dac56..4125abccd 100644 --- a/grails-app/services/au/org/ala/ecodata/ElasticSearchService.groovy +++ b/grails-app/services/au/org/ala/ecodata/ElasticSearchService.groovy @@ -379,6 +379,50 @@ class ElasticSearchService { "publicationStatus":{ "type":"string", "index":"not_analyzed" + }, + "custom": { + "properties": { + "details": { + "properties": { + "objectives": { + "properties": { + "rows1": { + "properties": { + "assets": { + "type":"string", + "path":"just_name", + "fields": { + "meriPlanAssetFacet": { + "type":"string", + "index":"not_analyzed" + } + } + } + } + } + } + }, + "partnership": { + "properties": { + "rows": { + "properties": { + "data3": { + "type":"string", + "path":"just_name", + "fields": { + "partnerOrganisationTypeFacet": { + "type":"string", + "index":"not_analyzed" + } + } + } + } + } + } + } + } + } + } } },