diff --git a/forms/nht/savingNativeSpeciesGrantsFinalReport.json b/forms/nht/grantsAndOthersFinalReport.json similarity index 62% rename from forms/nht/savingNativeSpeciesGrantsFinalReport.json rename to forms/nht/grantsAndOthersFinalReport.json index f4c885868..125c38d25 100644 --- a/forms/nht/savingNativeSpeciesGrantsFinalReport.json +++ b/forms/nht/grantsAndOthersFinalReport.json @@ -1,21 +1,25 @@ { - "name": "Saving Native Species Grants Final Report", + "name": "Grants and Others Final Report", "type": "Report", "sections": [ { - "name": "Saving Native Species Grants Final Report", + "name": "Grants and Others Final Report", "optionalQuestionText": null, "optional": false, "collapsedByDefault": false, - "templateName": "sns_grants_final_report", + "templateName": "grants_and_others_final_report", "template": { - "modelName": "Saving Native Species Grants Final Report", + "modelName": "Grants and Others Final Report", "dataModel": [ { "dataType": "list", "name": "projectOutcomes", - "allowRowDelete": "false", + "allowRowDelete": true, "columns": [ + { + "dataType": "text", + "name": "code" + }, { "dataType": "text", "name": "outcomeStatement", @@ -39,22 +43,6 @@ "Unable to rate" ], "validate": "required" - }, - { - "name": "monitoringIndicator", - "dataType": "text", - "description": "", - "validate": "required", - "constraints": { - "textProperty": "data1", - "valueProperty": "data2", - "type": "pre-populated", - "config": { - "source": { - "context-path": "owner.custom.details.objectives.rows" - } - } - } } ] }, @@ -65,8 +53,23 @@ }, { "dataType": "text", - "name": "achievedOutcomesMaintained", - "validate": "required,maxSize[1250]" + "name": "howOutcomesMaintain", + "validate": "maxSize[400]" + }, + { + "dataType": "stringList", + "name": "achievementLevel", + "validate": "required", + "description": "A measure of the extent to which a program, project or initiative has attained, or is expected to attain, its relevant objectives efficiently and in a sustainable way.", + "constraints": [ + "Achieved (100%)", + "Significantly achieved (76-99%)", + "Satisfactorily achieved (51-75%)", + "Partially achieved (26-50%)", + "Inadequately achieved (1-25%)", + "Not achieved (0%)", + "Unable to rate" + ] }, { "dataType": "stringList", @@ -120,27 +123,104 @@ "type": "enable_and_clear" } ], - "validate": "required" + "validate": "required,maxSize[500]" } ], "dataType": "list", - "allowRowDelete": "false", + "allowRowDelete": true, "name": "projectTargets" }, + { + "dataType": "stringList", + "name": "projectEngagement", + "validate": "required", + "constraints": [ + "Yes", + "No", + "Not applicable" + ] + }, { "dataType": "text", - "description": "", - "name": "projectLearningsSummary", - "validate": "required,maxSize[1250]" + "name": "yesProjectEngagement", + "validate": "required,maxSize[300]", + "behaviour": [ + { + "condition": "projectEngagement == \"Yes\"", + "type": "enable" + } + ] + }, + { + "dataType": "stringList", + "name": "unexpectedChanges", + "validate": "required", + "constraints": [ + "Yes", + "No", + "Not applicable" + ] }, { "dataType": "text", - "description": "", - "name": "futureEffortLessons", - "validate": "required,maxSize[1250]" + "name": "yesUnexpectedChanges", + "validate": "required,maxSize[300]", + "behaviour": [ + { + "condition": "unexpectedChanges == \"Yes\"", + "type": "enable" + } + ] + }, + { + "dataType": "stringList", + "name": "outcomesMaintenance", + "validate": "required", + "constraints": [ + "Significantly", + "Satisfactorily", + "Partially", + "Not at all", + "Not applicable" + ] + }, + { + "columns": [ + { + "dataType": "stringList", + "name": "summaryName", + "validate": "required", + "constraints": [ + "Monitoring", + "Evaluation", + "Activity changes", + "Risk management", + "Lesson/s learnt" + ] + }, + { + "dataType": "text", + "name": "summaryProgress", + "description": "", + "validate": "required,maxSize[1250]" + } + ], + "dataType": "list", + "allowRowDelete": true, + "name": "projectLearningsSummary" } ], "viewModel": [ + { + "items": [ + { + "source": "achievementLevel", + "preLabel": "To what extent did you achieve your project outcomes and project services?
Please select the one of the levels of achievement you have reached e.g. Achieved (100%), Partially achieved (26-50%)", + "type": "selectOne" + } + ], + "type": "row" + }, { "items": [ { @@ -174,7 +254,7 @@ }, { "readonly": true, - "width": "13%", + "width": "20%", "source": "serviceName", "type": "textarea", "rows": 3, @@ -182,7 +262,7 @@ }, { "readonly": true, - "width": "15%", + "width": "20%", "source": "targetMeasure", "type": "textarea", "rows": 3, @@ -190,30 +270,30 @@ }, { "readonly": true, - "width": "13%", + "width": "15%", "source": "projectTarget", "type": "text", "title": "Total to be delivered" }, { "readonly": true, - "width": "12%", + "width": "15%", "source": "delivered", "type": "text", "title": "Total delivered", "helpText": "please refer to the Dashboard for your project for this figure. The dashboard automatically adds the figures from each of your progress reports (as a cumulative figure)." }, { - "width": "30%", + "width": "25%", "source": "reasonTargetNotMet", "type": "textarea", "rows": 3, - "title": "Explanation if target not fully delivered
No response is required if the target was reached or exceeded." + "title": "Explain why the target measure was not fully delivered or over delivered. (500 characters [approx. 100 words] limit)" } ], "userAddedRows": false, "source": "projectTargets", - "title": "If you have answered no¸ please list the activity, target measure and target, the amount you delivered and explain why the target was not reached.
Refer to the Activities and Targets Table in the MERI Plan.", + "title": "1.2 Report on and explain any activities that have been under or significantly over delivered (50% above target)", "type": "table" }, { @@ -228,7 +308,7 @@ { "items": [ { - "source": "2.1 Briefly describe the achievements that have been made against each outcome statement in the MERI Plan and how they align with and demonstrate achievement towards relevant actions and strategies in the 2022-2032 Threatened Species Action Plan Towards Zero Extinctions.

Where possible, please reference the project monitoring indicators that are listed in the MERI Plan to support your response. Please provide other supporting information (e.g. report, photos), where this has not been previously supplied, as attachments to this report via the Admin tab > Documents sub-tab of MERIT. Where supporting evidence contains sensitive or confidential information, please send to the department Project Manager (DCCEW) by email.", + "source": "2.1 Briefly describe the achievements that have been made against each outcome statement in the MERI Plan including details of any enablers and/or barriers throughout the life of the project.

Please provide supporting information (e.g. report, photos), where this has not been previously supplied, as attachments to this report via the Admin tab > Documents sub-tab of MERIT. Where supporting evidence contains sensitive or confidential information, please send to the department Project Manager (DCCEW) by email.", "type": "literal" } ], @@ -238,38 +318,30 @@ "source": "projectOutcomes", "type": "table", "userAddedRows": true, + "disableTableUpload": true, "columns": [ { - "source": "", - "type": "literal", - "width": "5%", - "preLabel": { - "computed": "\\'No. \\' || (index + 1)" - }, + "source": "code", + "type": "readonlyText", "title": "Outcome No." }, { "type": "textarea", + "readonly": true, "source": "outcomeStatement", "title": "Outcome", "rows": 5, - "width": "30%" - }, - { - "source": "monitoringIndicator", - "type": "selectOne", - "title": "Monitoring Indicator", - "width": "20%" + "width": "35%" }, { "type": "textarea", "source": "achievement", "title": "Achievement/s", "rows": 5, - "width": "30%" + "width": "35%" }, { - "width": "15%", + "width": "25%", "source": "basedRating", "title": "Rating based on the effectiveness evaluation criteria", "type": "select2" @@ -279,8 +351,9 @@ { "items": [ { - "source": "2.2 Provide a brief summary of other outcomes achieved for this project that you wish to highlight, such as other environmental or social outcomes (e.g. engagement with Traditional Owners, landholders and local community, the contribution of partners, the generation/use of new technology).", - "type": "literal" + "source": "projectEngagement", + "preLabel": "2.2 Did your project engage with traditional owners, landholders and local community?", + "type": "selectOne" } ], "type": "row" @@ -289,63 +362,94 @@ "type": "row", "items": [ { - "source": "achievedOutcomesSummary", + "source": "yesProjectEngagement", "type": "textarea", "rows": 5, - "preLabel": "As part of your response you may wish to describe any unexpected or unintended outcomes." + "preLabel": "2.2.1 If yes, which group/s and how?" } ] }, + { + "items": [ + { + "source": "unexpectedChanges", + "preLabel": "2.3 Were there any unexpected or unintended (positive or negative) changes or other outcomes delivered by this project?", + "type": "selectOne" + } + ], + "type": "row" + }, { "type": "row", "items": [ { - "source": "achievedOutcomesMaintained", + "source": "yesUnexpectedChanges", "type": "textarea", "rows": 5, - "preLabel": "2.3 In your view, how will the outcomes achieved by this project be maintained, and if relevant, who will do this?" + "preLabel": "2.3.1 If yes, what were they?" } ] }, { "items": [ { - "source": "

3. Monitoring, Evaluation and Project Learnings

", - "type": "literal" + "source": "outcomesMaintenance", + "preLabel": "2.4 To what extent will the outcomes achieved by this project be maintained after the project has been completed?", + "type": "selectOne" } ], "type": "row" }, + { + "type": "row", + "items": [ + { + "source": "howOutcomesMaintain", + "type": "textarea", + "rows": 5, + "preLabel": "2.5 If they will be maintained, how and who will do this?" + } + ] + }, { "items": [ { - "source": "3.1 Briefly describe how you applied adaptive management for this project. This should consider:", + "source": "

3. Monitoring, Evaluation and Project Learnings

", "type": "literal" } ], "type": "row" }, { - "type": "row", "items": [ { - "preLabel": "a) any key project-level monitoring and/or evaluation activities
b) any key findings or learnings that you gained during project implementation
c) any changes that you made in response to these during the project, including changes in methodology", - "source": "projectLearningsSummary", - "type": "textarea", - "rows": 3 + "source": "3.1 Summarise how the project progressed in the areas of Monitoring, Evaluation, Activity changes, Risk management and lessons learnt in project delivery towards the investment priority.", + "type": "literal" } - ] + ], + "type": "row" }, { - "type": "row", - "items": [ + "disableTableUpload": true, + "columns": [ { - "preLabel": "3.2 Provide a project summary highlighting achievements, including photos (with appropriate credits) that can be shared with the public.", - "source": "futureEffortLessons", - "type": "textarea", - "rows": 3 + "width": "25%", + "source": "summaryName", + "type": "selectOne", + "title": "Name" + }, + { + "width": "75%", + "source": "summaryProgress", + "type": "text", + "title": "Summarised progress", + "helpText": "" } - ] + ], + "userAddedRows": true, + "source": "projectLearningsSummary", + "title": "Monitoring/Evaluation/Activity changes/Risk management/Lesson/s learnt", + "type": "table" } ], "pre-populate": [ @@ -366,6 +470,10 @@ { "target": "projectOutcomes", "mapping": [ + { + "target": "code", + "source-path": "code" + }, { "target": "outcomeStatement", "source-path": "description" diff --git a/package-lock.json b/package-lock.json index f59009faa..d28c33c6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ }, "devDependencies": { "@metahub/karma-jasmine-jquery": "^2.0.1", - "chromedriver": "^128.0.0", + "chromedriver": "^130.0.2", "jasmine-core": "^3.5.0", "jasmine-jquery": "^2.0.0", "jquery": "3.6.2", @@ -1093,11 +1093,12 @@ } }, "node_modules/chromedriver": { - "version": "128.0.0", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-128.0.0.tgz", - "integrity": "sha512-Ggo21z/dFQxTOTgU0vm0V59Mi79yyR+9AUk/KiVAsRfbDRdVZQYQWfgxnIvD/x8KOKn0oB7haRzDO/KfrKyvOA==", + "version": "130.0.2", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-130.0.2.tgz", + "integrity": "sha512-QQ1KPHJH5IfD7NLYZiqSI8l9XQ6bpI0VErVBVWvhRGpi4JFUBb6vU9V9VPiXipG9im912bjEk3Xt9aep9ct7lg==", "dev": true, "hasInstallScript": true, + "license": "Apache-2.0", "dependencies": { "@testim/chrome-version": "^1.1.4", "axios": "^1.7.4", @@ -5420,9 +5421,9 @@ } }, "chromedriver": { - "version": "128.0.0", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-128.0.0.tgz", - "integrity": "sha512-Ggo21z/dFQxTOTgU0vm0V59Mi79yyR+9AUk/KiVAsRfbDRdVZQYQWfgxnIvD/x8KOKn0oB7haRzDO/KfrKyvOA==", + "version": "130.0.2", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-130.0.2.tgz", + "integrity": "sha512-QQ1KPHJH5IfD7NLYZiqSI8l9XQ6bpI0VErVBVWvhRGpi4JFUBb6vU9V9VPiXipG9im912bjEk3Xt9aep9ct7lg==", "dev": true, "requires": { "@testim/chrome-version": "^1.1.4", diff --git a/package.json b/package.json index 9ccde6792..a3728311f 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ }, "devDependencies": { "@metahub/karma-jasmine-jquery": "^2.0.1", - "chromedriver": "^128.0.0", + "chromedriver": "^130.0.2", "jasmine-core": "^3.5.0", "jasmine-jquery": "^2.0.0", "jquery": "3.6.2", diff --git a/src/integration-test/groovy/au/org/ala/fieldcapture/RlpReportingSpec.groovy b/src/integration-test/groovy/au/org/ala/fieldcapture/RlpReportingSpec.groovy index 19a3a2f88..df5094c05 100644 --- a/src/integration-test/groovy/au/org/ala/fieldcapture/RlpReportingSpec.groovy +++ b/src/integration-test/groovy/au/org/ala/fieldcapture/RlpReportingSpec.groovy @@ -2,6 +2,7 @@ package au.org.ala.fieldcapture import com.icegreen.greenmail.util.GreenMail import com.icegreen.greenmail.util.GreenMailUtil +import org.openqa.selenium.ElementClickInterceptedException import pages.ProjectDownloadReport import pages.ProjectIndex import pages.RlpProjectPage @@ -722,7 +723,18 @@ class RlpReportingSpec extends StubbedCasSpec { getFormSections().each { // Mark all sections except the Weed Distribution Survey as not applicable if (isOptional(it) && it != 'koRLP_-_Weed_distribution_survey') { - markAsNotApplicable(it) + try { + markAsNotApplicable(it) + } + catch (ElementClickInterceptedException e) { + println "ElementClickInterceptedException: $it" + String section = it + interact { + moveToElement(notApplicableCheckbox(section)) + } + markAsNotApplicable(it) + } + } } def section = $('#koRLP_-_Weed_distribution_survey') diff --git a/src/integration-test/groovy/pages/ReportPage.groovy b/src/integration-test/groovy/pages/ReportPage.groovy index d1f9c513b..2a5eecae7 100644 --- a/src/integration-test/groovy/pages/ReportPage.groovy +++ b/src/integration-test/groovy/pages/ReportPage.groovy @@ -78,8 +78,12 @@ class ReportPage extends Page { } def markAsNotApplicable(String sectionId) { + notApplicableCheckbox(sectionId).value(true) + } + + Navigator notApplicableCheckbox(String sectionId) { String sectionSelector = '#'+sectionId + " input[data-bind*=outputNotComplete]" - $(sectionSelector).value(true) + $(sectionSelector) } List getFormSections() { diff --git a/src/main/scripts/releases/3.2/adhoc/createUrbanRiversAndCatchmentsSubProgram.js b/src/main/scripts/releases/3.2/adhoc/createUrbanRiversAndCatchmentsSubProgram.js index e52f714db..54e610269 100644 --- a/src/main/scripts/releases/3.2/adhoc/createUrbanRiversAndCatchmentsSubProgram.js +++ b/src/main/scripts/releases/3.2/adhoc/createUrbanRiversAndCatchmentsSubProgram.js @@ -49,7 +49,9 @@ var config = "helpTextHeading": "If the project is not delivering additional benefits, delete the row using the 'x' in the right-most column.", "title": "Additional benefits", "priority": "Additional Investment Priorities", - "priorityHelpText": "Other investment priorities that will benefit from the project. Delete the row if there are no additional outcomes." + "priorityHelpText": "Other investment priorities that will benefit from the project. Delete the row if there are no additional outcomes.", + "maximumPriorities": 1000, + "maxAdditionalOutcomes": 15 } }, { @@ -85,7 +87,7 @@ var config = { "template": "projectMethodology", "model": { - "helpText": "Include all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic.", + "helpText": "In addition to listing your project assumptions, please list any nominated project services that will not be charged for.\nInclude all those conditions or factors that are sufficient to guarantee the success of the project, for example, on ground activities were not impacted by adverse weather conditions. Ensure what’s documented here aligns to those assumptions documented within the Project Logic.", "maxSize": "4000", "tableHeading": "Project delivery assumptions (4000 character limit [approx. 650 words])" } @@ -153,7 +155,7 @@ var config = ], "excludes": [], "programServiceConfig": { - "serviceFormName": "Priority Threatened Species Progress Report", + "serviceFormName": "Grants and Others Progress Report", "programServices": [ { "serviceTargets": [ @@ -406,6 +408,25 @@ var config = "b8304577-afd8-45e0-8ef4-b71ae10998f5" ], "serviceId": 44 + }, + { + "serviceTargets": [ + "9ed0ab84-6d04-4926-ae36-c75a8763e09b" + ], + "serviceId": 45 + }, + { + "serviceTargets": [ + "8113ab8a-17e6-43c9-be32-9ca72dd01454", + "9f6f06ac-b055-48c1-9d80-b305acdeae79" + ], + "serviceId": 6 + }, + { + "serviceTargets": [ + "0e887410-a3c5-49ca-a6f5-0f2f6fae30db" + ], + "serviceId": 46 } ] }, @@ -440,7 +461,7 @@ var config = "minimumReportDurationInDays": 3, "label": "Semester", "category": "12 Monthly Progress Reports", - "activityType": "Priority Threatened Species Progress Report", + "activityType": "Grants and Others Progress Report", "reportsAlignedToCalendar": true, "canSubmitDuringReportingPeriod": true }, @@ -464,13 +485,13 @@ var config = "Climate Change - Changed rainfall patterns", "Climate Change - Sea level rises", "Climate Change - Unexpected seasonal/temperature extremes", - "Disconnection from Country - Altered/disrupted connection with land and sea country", "Disconnection from Country - Altered or disrupted First Nations engagement/leadership in caring for land and sea country", "Disconnection from Country - Altered or disrupted transfer of First Nations knowledge systems", + "Disconnection from Country - Altered/disrupted connection with land and sea country", "Disconnection from Country - Inadequate recognition of Traditional knowledge and practices", - "Disengagement of community - Community are not informed and are not engaged in managing the environment", "Disease/pathogens - Areas that are infected", "Disease/pathogens - Possible infection of disease free areas", + "Disengagement of community - Community are not informed and are not engaged in managing the environment", "Fire - Inappropriate fire regime", "Fire - Lack of protection for ecological assets during fire control activities", "Genetics - Bottleneck/inbreeding", @@ -488,6 +509,8 @@ var config = "Human interference - Recreational fishing", "Human interference - Recreational pressures", "Human interference - Road/vehicle strike", + "Knowledge/Capacity - Inadequate scientific and/or technological capacity", + "Knowledge/Capacity - Insufficient knowledge to inform appropriate management or intervention actions", "Land management practices - Changes to hydrology and aquatic systems", "Land management practices - Domestic grazing/stock impacts", "Land management practices - Excess recharge of groundwater", @@ -527,7 +550,7 @@ var config = "Kangaroo Island – SA", "MacDonnell Ranges – NT", "Mallee Birds Ecological Community – VIC/SA/NSW", - "Midlands region of central Tasmania – TAS", + "Midlands region of central Tasmanian – TAS", "Norfolk Island – External Territory", "Raine Island – Queensland", "Remnant WA Wheatbelt Woodlands – WA", @@ -552,9 +575,52 @@ var outcomes = [ ], "targeted": true, "shortDescription": "Ecological health", + "type": "primary", "category": "Waterways", "outcome": "The ecological health and condition of waterways is improved and/or repaired to benefit native plants and animals (including threatened species), threatened ecological communities, and the ecological character of Ramsar sites, in urban, outer urban /peri-urban and regional centres" }, + { + "priorities": [ + { + "category": "Threatened Species" + } + ], + "targeted": true, + "shortDescription": "Threatened Species Strategy", + "category": "environment", + "type": "secondary", + "supportsMultiplePrioritiesAsPrimary": false, + "supportsMultiplePrioritiesAsSecondary": true, + "outcome": "By 30 June 2028, there is measurable repair of waterway habitats (in-stream and terrestrial) to benefit native plants and animals (including Threated Species) in urban, peri-urban and regional centres." + }, + { + "priorities": [ + { + "category": "Threatened Ecological Communities" + } + ], + "targeted": true, + "shortDescription": "Threatened Ecological Communities", + "category": "Threatened Ecological Communities", + "type": "secondary", + "supportsMultiplePrioritiesAsPrimary": false, + "supportsMultiplePrioritiesAsSecondary": true, + "outcome": "By 30 June 2028, there is measurable repair of waterway habitats (in-stream and terrestrial) to benefit native plants and animals and threated ecological communities in urban, peri-urban and regional centres." + }, + { + "priorities": [ + { + "category": "Ramsar" + } + ], + "targeted": true, + "shortDescription": "Ramsar Sites", + "category": "environment", + "type": "secondary", + "supportsMultiplePrioritiesAsPrimary": false, + "supportsMultiplePrioritiesAsSecondary": true, + "outcome": "By 30 June 2028, there is measurable repair of waterway habitats (in-stream and terrestrial) to benefit the ecological character of Ramsar sites in urban, outer urban /peri-urban and regional centres" + }, { "priorities": [ { @@ -562,9 +628,12 @@ var outcomes = [ } ], "targeted": true, - "shortDescription": "River health", - "category": "River health", - "outcome": "The health and qualities of waterways is improved and/or repaired to benefit local communities in urban, outer urban /peri-urban and regional centres." + "shortDescription": "Waterways", + "category": "Waterways", + "type": "secondary", + "supportsMultiplePrioritiesAsPrimary": false, + "supportsMultiplePrioritiesAsSecondary": true, + "outcome": "By 30 June 2028, there is measurable repair of water quality, hydrology and in stream connectivity to benefit native plants and animals (including threatened species and ecological communities), and the ecological character of Ramsar sites, in urban, peri-urban and regional centres." }, { "category": "Threatened Species", @@ -576,23 +645,18 @@ var outcomes = [ "type": "medium", "outcome": "By 30 June 2028, there is measurable repair of water quality, hydrology and in stream connectivity to benefit native plants and animals (including threatened species and ecological communities), and the ecological character of Ramsar sites, in urban, peri-urban and regional centres." }, - { - "category": "Threatened Species", - "type": "medium", - "outcome": "By June 2028 there is a measurable improvement to the services provided by urban green and blue space to benefit local communities in urban, outer urban /peri-urban and regional centres." - }, { "category": "River health", "type": "short", "outcome": "By 30 June 2025, there is measurable repair of waterway habitats (in-stream and terrestrial) to benefit native plants and animals (including threatened species and ecological communities), and the ecological character of Ramsar sites, in urban, peri-urban and regional centres." }, { - "category":"River health", + "category": "River health", "type": "short", "outcome": " By 30 June 2025, there is measurable repair of water quality, hydrology and in stream connectivity to benefit native plants and animals (including threatened species and ecological communities), and the ecological character of Ramsar sites, in urban, peri-urban and regional centres." }, { - "category":"River health", + "category": "River health", "type": "short", "outcome": "By June 2025 there is a measurable improvement to the services provided by urban green and blue space to benefit local communities in urban, outer urban /peri-urban and regional centres." } @@ -601,27 +665,43 @@ var outcomes = [ var priorities = [ { "category": "Waterways", - "priority": "Saltwater Creek, Cairns" + "priority": "Bremer River" + }, + { + "category": "Waterways", + "priority": "Brownhill Creek" }, { "category": "Waterways", "priority": "Bulimba Creek" }, + { + "category": "Waterways", + "priority": "Canberra Waterways" + }, + { + "category": "Waterways", + "priority": "Cooks River" + }, { "category": "Waterways", "priority": "Cubberla Creek" }, { "category": "Waterways", - "priority": "Bremer River" + "priority": "Darebin Creek" }, { "category": "Waterways", - "priority": "Saltwater Creek, Gold Coast" + "priority": "Darwin creeks (Rapid Creek, Mitchell Creek, Ludmilla Creek and Sandy Creek)" }, { "category": "Waterways", - "priority": "Fig Tree Creek, Yeppoon" + "priority": "Derwent River" + }, + { + "category": "Waterways", + "priority": "Diamond Creek" }, { "category": "Waterways", @@ -633,15 +713,15 @@ var priorities = [ }, { "category": "Waterways", - "priority": "McCready's Creek, Mackay" + "priority": "Elster Creek" }, { "category": "Waterways", - "priority": "Slacks Creek" + "priority": "Fig Tree Creek, Yeppoon" }, { "category": "Waterways", - "priority": "Lake Macquarie" + "priority": "Gardiners Creek" }, { "category": "Waterways", @@ -649,23 +729,23 @@ var priorities = [ }, { "category": "Waterways", - "priority": "Tuggerah Lakes" + "priority": "Karaaf Wetlands" }, { "category": "Waterways", - "priority": "Shoalhaven and Crookshaven Rivers" + "priority": "KooyongKoot (Tooronga Park wetland)" }, { "category": "Waterways", - "priority": "Cooks River" + "priority": "Lake Macquarie" }, { "category": "Waterways", - "priority": "Canberra Waterways" + "priority": "McCready's Creek, Mackay" }, { "category": "Waterways", - "priority": "Peter Hopper Lake" + "priority": "Merri Creek" }, { "category": "Waterways", @@ -673,47 +753,47 @@ var priorities = [ }, { "category": "Waterways", - "priority": "Karaaf Wetlands" + "priority": "Onkaparinga River" }, { "category": "Waterways", - "priority": "KooyongKoot (Tooronga Park wetland)" + "priority": "Pedler Creek" }, { "category": "Waterways", - "priority": "Diamond Creek" + "priority": "Peter Hopper Lake" }, { "category": "Waterways", - "priority": "Yarra Flats" + "priority": "Port River" }, { "category": "Waterways", - "priority": "Elster Creek" + "priority": "Redan Wetlands and Yarrowee River" }, { "category": "Waterways", - "priority": "Redan Wetlands and Yarrowee River" + "priority": "Saltwater Creek, Cairns" }, { "category": "Waterways", - "priority": "Werribee River" + "priority": "Saltwater Creek, Gold Coast" }, { "category": "Waterways", - "priority": "Darebin Creek" + "priority": "Shoalhaven and Crookshaven Rivers" }, { "category": "Waterways", - "priority": "Merri Creek" + "priority": "Slacks Creek" }, { "category": "Waterways", - "priority": "Gardiners Creek" + "priority": "Sturt River" }, { "category": "Waterways", - "priority": "Derwent River" + "priority": "Swan and Canning Rivers" }, { "category": "Waterways", @@ -721,31 +801,223 @@ var priorities = [ }, { "category": "Waterways", - "priority": "Onkaparinga River" + "priority": "Tuggerah Lakes" }, { "category": "Waterways", - "priority": "Pedler Creek" + "priority": "Werribee River" }, { "category": "Waterways", - "priority": "Brownhill Creek" + "priority": "Yarra Flats" }, { - "category": "Waterways", - "priority": "Port River" + "category": "Ramsar", + "priority": "Hunter Estuary Wetlands Ramsar site" }, { - "category": "Waterways", - "priority": "Sturt River" + "category": "Ramsar", + "priority": "Moreton Bay Ramsar site" }, { - "category": "Waterways", - "priority": "Swan and Canning Rivers" + "category": "Ramsar", + "priority": "Pitt Water-Orielton Lagoon Ramsar site" }, { - "category": "Waterways", - "priority": "Darwin creeks (Rapid Creek, Mitchell Creek, Ludmilla Creek and Sandy Creek)" + "category": "Ramsar", + "priority": "Port Phillip Bay & Bellerine Peninsula" + }, + { + "category": "Threatened Ecological Communities", + "priority": "Banksia Woodlands of the Swan Coastal Plain" + }, + { + "category": "Threatened Ecological Communities", + "priority": "Clay Pans of the Swan Coastal Plain" + }, + { + "category": "Threatened Ecological Communities", + "priority": "Coastal Swamp Oak (Casuarina glauca) Forest of New South Wales and South East Queensland" + }, + { + "category": "Threatened Ecological Communities", + "priority": "Coastal Swamp Sclerophyll Forest of New South Wales and South East Queensland" + }, + { + "category": "Threatened Ecological Communities", + "priority": "Grey Box (Eucalyptus microcarpa) Grassy Woodlands and Derived Native Grasslands of South-eastern Australia" + }, + { + "category": "Threatened Ecological Communities", + "priority": "Grey Box-Grey Gum Wet Forest of subtropical eastern Australia" + }, + { + "category": "Threatened Ecological Communities", + "priority": "Lowland Rainforest of Subtropical Australia" + }, + { + "category": "Threatened Ecological Communities", + "priority": "Natural Temperate Grassland of the Victorian Volcanic Plain" + }, + { + "category": "Threatened Ecological Communities", + "priority": "River-flat eucalypt forest on coastal floodplains of southern New South Wales and eastern Victoria" + }, + { + "category": "Threatened Ecological Communities", + "priority": "Subtropical and Temperate Coastal Saltmarsh" + }, + { + "category": "Threatened Ecological Communities", + "priority": "Subtropical eucalypt floodplain forest and woodland of the New South Wales North Coast and South East Queensland bioregions" + }, + { + "category": "Threatened Ecological Communities", + "priority": "Tuart (Eucalyptus gomphocephala) woodlands and forests of the Swan Coastal Plain ecological community" + }, + { + "category": "Threatened Species", + "priority": "Angle-stemmed Myrtle Gossia gonoclada" + }, + { + "category": "Threatened Species", + "priority": "Australasian Bittern Botaurus poiciloptilus" + }, + { + "category": "Threatened Species", + "priority": "Australian Grayling Prototroctes maraena" + }, + { + "category": "Threatened Species", + "priority": "Black swan Cygnus atratus" + }, + { + "category": "Threatened Species", + "priority": "Burnie Burrowing Crayfish Engaeus yabbimunna" + }, + { + "category": "Threatened Species", + "priority": "Carnaby’s Black Cockatoo Zanda latirostris" + }, + { + "category": "Threatened Species", + "priority": "Carter's Freshwater Mussel Westralunio carteri" + }, + { + "category": "Threatened Species", + "priority": "Cumberland Plain Land Snail Meridolum corneovirens" + }, + { + "category": "Threatened Species", + "priority": "Cunningham's Skink Egernia cunninghami" + }, + { + "category": "Threatened Species", + "priority": "Curlew Sandpiper Calidris ferruginea" + }, + { + "category": "Threatened Species", + "priority": "Eastern Curlew Numenius madagascariensis" + }, + { + "category": "Threatened Species", + "priority": "Eltham Copper Butterfly Paralucia pyrodiscus lucida" + }, + { + "category": "Threatened Species", + "priority": "Forest Red-tailed Black-Cockatoo Calyptorhynchus banksii naso" + }, + { + "category": "Threatened Species", + "priority": "Gang Gang Cockatoo Callocephalon fimbriatum" + }, + { + "category": "Threatened Species", + "priority": "Glossy Black Cockatoo Calyptorhynchus lathami lathami" + }, + { + "category": "Threatened Species", + "priority": "Grey-headed Flying-fox Pteropus poliocephalus" + }, + { + "category": "Threatened Species", + "priority": "Growling Grass Frog Litoria raniformis" + }, + { + "category": "Threatened Species", + "priority": "Koala Phascolarctos cinereus" + }, + { + "category": "Threatened Species", + "priority": "Latham’s Snipe Gallinago hardwickii" + }, + { + "category": "Threatened Species", + "priority": "Mary River Turtle Elusor macrurus" + }, + { + "category": "Threatened Species", + "priority": "Matted Flax-lily Dianella amoena" + }, + { + "category": "Threatened Species", + "priority": "Murray Cod Maccullochella peelii" + }, + { + "category": "Threatened Species", + "priority": "Narrow-leaf Wilsonia Wilsonia backhousei" + }, + { + "category": "Threatened Species", + "priority": "Native Guava Rhodomyrtus psidioides" + }, + { + "category": "Threatened Species", + "priority": "Ormeau Bottle Tree Brachychiton sp. Ormeau" + }, + { + "category": "Threatened Species", + "priority": "Paddys River Box Eucalyptus macarthurii" + }, + { + "category": "Threatened Species", + "priority": "Perameles gunnii gunnii" + }, + { + "category": "Threatened Species", + "priority": "Platypus Ornithorhynchus anatinus" + }, + { + "category": "Threatened Species", + "priority": "Rakali Hydromys chrysogaster" + }, + { + "category": "Threatened Species", + "priority": "Rock Logania Logania saxitilis" + }, + { + "category": "Threatened Species", + "priority": "Southern Brown Bandicoot Isoodon obesulus" + }, + { + "category": "Threatened Species", + "priority": "Scarlet Robin Petroica boodang boodang" + }, + { + "category": "Threatened Species", + "priority": "Southern Pink Underwing Moth Phyllodes imperialis" + }, + { + "category": "Threatened Species", + "priority": "Southern Pygmy Perch Nannoperca australis" + }, + { + "category": "Threatened Species", + "priority": "Western Ringtail Possum Pseudocheirus occidentalis" + }, + { + "category": "Threatened Species", + "priority": "Yarra Pygmy Perch Nannoperca obscura" } ]; diff --git a/src/main/scripts/runFunctionalTests.sh b/src/main/scripts/runFunctionalTests.sh index 801879c47..a58f61020 100755 --- a/src/main/scripts/runFunctionalTests.sh +++ b/src/main/scripts/runFunctionalTests.sh @@ -9,7 +9,7 @@ fi BRANCH=$3 if [ -z $BRANCH ]; then - BRANCH=feature/issue994 + BRANCH=dev fi ECODATA_LOCAL_DIR=$2 @@ -51,7 +51,7 @@ cd $MERIT_DIR chmod u+x src/main/scripts/loadFunctionalTestData.sh echo "Running functional tests" -GRADLE_OPTS="-Xmx1g" ./gradlew integrationTest "-Dorg.gradle.jvmargs=-Xmx1g" --stacktrace -Dgeb.env=$GEB_ENV -Dwebdriver.chrome.driver=/usr/bin/chromedriver +GRADLE_OPTS="-Xmx1g" ./gradlew integrationTest "-Dorg.gradle.jvmargs=-Xmx1g" --stacktrace -Dgeb.env=$GEB_ENV -Dwebdriver.chrome.driver=/usr/bin/chromedriver --tests "au.org.ala.fieldcapture.RlpReportingSpec" RETURN_VALUE=$?