Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/issue1001 #1002

Merged
merged 4 commits into from
Aug 28, 2024
Merged

Feature/issue1001 #1002

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22bd20c
update RLP Project
salomon-j Aug 26, 2024
a3d34dc
commit download fix #1001
salomon-j Aug 26, 2024
1ca2db5
removed comment #918
salomon-j Aug 26, 2024
241d8b4
commit update to not break the computed constraints #1001
salomon-j Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/groovy/au/org/ala/ecodata/metadata/OutputUploadTemplateBuilder.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ class ValidationHandler implements OutputModelProcessor.Processor<ExcelValidatio

@Override
def text(Object node, ExcelValidationContext context) {
if (node.constraints) {
if (node.constraints && node.constraints instanceof org.grails.web.json.JSONObject == false) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Introducing this condition will break the download of computed constraints with options (the next if statement on line 443).
As an aside, you should be using Map as a test, not JSONObject as the issue is casting a Map to a List, not the specific implementation of a Map.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing me that out, I just saw that the ESP SMU Reporting has a computed type constraints.
I've updated the validation for the pre-populated constraints type.

List constraints = []

if (node.constraints instanceof Map && node.constraints.type == 'computed') {
Expand Down
4 changes: 2 additions & 2 deletions src/main/groovy/au/org/ala/ecodata/reporting/ProjectXlsExporter.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@ class ProjectXlsExporter extends ProjectExporter {
List<String> rdpSTHeaders=commonProjectHeaders +["Service", "Target measure", "Project Outcome/s", "Total to be delivered","2023/2024","2024/2025","2025/2026","2026/2027","2027/2028","2028/2029","2029/2030"]
List<String> rdpSTProperties=commonProjectProperties +["service", "targetMeasure", "relatedOutcomes", "total", "2023/2024","2024/2025","2025/2026","2026/2027","2027/2028","2028/2029","2029/2030"]

List<String> rlpSTProperties=commonProjectProperties +["service", "targetMeasure", "total", "2018/2019","2019/2020", "2020/2021", "2021/2022", "2022/2023", "targetDate" ]
List<String> rlpSTHeaders=commonProjectHeaders +["Service", "Target measure", "Total to be delivered", "2018/2019","2019/2020", "2020/2021", "2021/2022", "2022/2023", "Target Date"]
List<String> rlpSTProperties=commonProjectProperties +["service", "targetMeasure", "relatedOutcomes", "total", "2018/2019","2019/2020", "2020/2021", "2021/2022", "2022/2023", "targetDate" ]
List<String> rlpSTHeaders=commonProjectHeaders +["Service", "Target measure", "Project Outcome/s", "Total to be delivered", "2018/2019","2019/2020", "2020/2021", "2021/2022", "2022/2023", "Target Date"]

List<String> rlpKeyThreatHeaders =commonProjectHeaders + ['Key threats and/or threatening processes', 'Interventions to address threats']
List<String> rlpKeyThreatProperties =commonProjectProperties + ['keyThreat', 'keyTreatIntervention']
Expand Down
Loading