-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2816 from AtlasOfLivingAustralia/2.10
v2.10
- Loading branch information
Showing
81 changed files
with
3,065 additions
and
858 deletions.
There are no files selected for viewing
1,331 changes: 820 additions & 511 deletions
1,331
forms/bushfires/Priority Species Grants Final Report.json
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,202 @@ | ||
| { | ||
| "name": "Habitat augmentation", | ||
| "description": null, | ||
| "type": "Activity", | ||
| "sections": [ | ||
| { | ||
| "name": "Habitat augmentation", | ||
| "description": null, | ||
| "optionalQuestionText": null, | ||
| "optional": false, | ||
| "collapsedByDefault": false, | ||
| "collapsibleHeading": null, | ||
| "templateName": "habitatAugmentation", | ||
| "template": { | ||
| "dataModel": [ | ||
| { | ||
| "columns": [ | ||
| { | ||
| "dataType": "text", | ||
| "name": "initialOrFollowup", | ||
| "constraints": [ | ||
| "Initial", | ||
| "Follow-up" | ||
| ], | ||
| "validate": "required" | ||
| }, | ||
| { | ||
| "dataType": "number", | ||
| "name": "areaAugmentedHa", | ||
| "units": "ha", | ||
| "decimalPlaces": 3, | ||
| "validate": "required,min[0]" | ||
| }, | ||
| { | ||
| "dataType": "number", | ||
| "name": "lengthAugmentedKm", | ||
| "units": "km", | ||
| "decimalPlaces": 3, | ||
| "validate": "required,min[0]" | ||
| }, | ||
| { | ||
| "dataType": "number", | ||
| "name": "numberOfStructuresInstalled", | ||
| "validate": "required,min[0]" | ||
| }, | ||
| { | ||
| "dataType": "text", | ||
| "name": "habitatAugmentationType", | ||
| "description": "", | ||
| "constraints": [ | ||
| "Artificial fauna movement devices", | ||
| "Artificial nesting or roosting habitat (incl. tiles, fence posts)", | ||
| "Environmental thinning", | ||
| "Improving fish passage", | ||
| "Natural features (rocks, logs)", | ||
| "Reef restoration/creation", | ||
| "Other" | ||
| ], | ||
| "validate": "required" | ||
| }, | ||
| { | ||
| "dataType": "text", | ||
| "name": "otherHabitatAugmentationType", | ||
| "description": "Please specify the habitat augmentation type if Other (specify in notes) was selected in the Type of habitat augmentation column.", | ||
| "behaviour": [ | ||
| { | ||
| "condition": "habitatAugmentationType == \"Other\"", | ||
| "type": "visible" | ||
| } | ||
| ], | ||
| "validate": "required,maxSize[100]" | ||
| }, | ||
| { | ||
| "dataType": "text", | ||
| "name": "habitatAugmentationObjective", | ||
| "description": "", | ||
| "validate": "required,maxSize[300]" | ||
| }, | ||
| { | ||
| "dataType": "number", | ||
| "name": "areaBenefittedByHabitatAugmentationHa", | ||
| "units": "ha", | ||
| "decimalPlaces": 3 | ||
| }, | ||
| { | ||
| "dataType": "text", | ||
| "name": "evidenceOfBenefit", | ||
| "validate": "maxSize[300]" | ||
| } | ||
| ], | ||
| "dataType": "list", | ||
| "name": "habitatAugmentationDetails" | ||
| }, | ||
| { | ||
| "dataType": "text", | ||
| "name": "comments", | ||
| "validate": "maxSize[1500]" | ||
| } | ||
| ], | ||
| "title": "Habitat augmentation", | ||
| "modelName": "habitatAugmentation", | ||
| "viewModel": [ | ||
| { | ||
| "type": "section", | ||
| "items": [ | ||
| { | ||
| "columns": [ | ||
| { | ||
| "width": "10%", | ||
| "source": "initialOrFollowup", | ||
| "title": "Initial or follow-up control?", | ||
| "type": "selectOne" | ||
| }, | ||
| { | ||
| "width": "10%", | ||
| "type": "col", | ||
| "title": "Actual area (ha) / length (km) of habitat augmentation", | ||
| "items": [ | ||
| { | ||
| "source": "areaAugmentedHa", | ||
| "type": "number", | ||
| "displayOptions": { | ||
| "displayUnits": true | ||
| } | ||
| }, | ||
| { | ||
| "source": "lengthAugmentedKm", | ||
| "type": "number", | ||
| "displayOptions": { | ||
| "displayUnits": true | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "width": "5%", | ||
| "source": "numberOfStructuresInstalled", | ||
| "type": "number", | ||
| "title": "Number of structures installed" | ||
| }, | ||
| { | ||
| "width": "15%", | ||
| "title": "Type of habitat augmentation / installed", | ||
| "type": "col", | ||
| "items": [ | ||
| { | ||
| "type": "row", | ||
| "items": [ | ||
| { | ||
| "source": "habitatAugmentationType", | ||
| "type": "select2" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "row", | ||
| "items": [ | ||
| { | ||
| "source": "otherHabitatAugmentationType", | ||
| "type": "textarea" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "width": "15%", | ||
| "source": "habitatAugmentationObjective", | ||
| "title": "Purpose of habitat augmentation", | ||
| "type": "textarea" | ||
| } | ||
| ], | ||
| "userAddedRows": true, | ||
| "source": "habitatAugmentationDetails", | ||
| "type": "table" | ||
| }, | ||
| { | ||
| "type": "row", | ||
| "items": [ | ||
| { | ||
| "preLabel": "Clarification, if needed", | ||
| "type": "textarea", | ||
| "rows": 4, | ||
| "css": "span8", | ||
| "source": "comments" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ], | ||
| "formVersion": 1, | ||
| "category": null, | ||
| "status": "active", | ||
| "gmsId": null, | ||
| "supportsSites": false, | ||
| "supportsPhotoPoints": false, | ||
| "minOptionalSectionsCompleted": 1 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| meritVersion=2.9 | ||
| meritVersion=2.10 | ||
| #gorm.version=7.0.8.RELEASE | ||
| grailsVersion=4.1.2 | ||
| gormVersion=7.0.2 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.