Skip to content

UAT Fixes #708

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

Merged
xzzy merged 7 commits into from
Mar 18, 2026
Merged

UAT Fixes #708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b06292b
feat: add ERD diagram for database schema visualization
oakdbca Mar 18, 2026
5d383a9
fix: Set approved_by when ORF is delined as we still need to track wh…
oakdbca Mar 18, 2026
48f5b98
fix: enhance geometry save function to only log that a geometry has b…
oakdbca Mar 18, 2026
16f81d7
fix: swap activated and created date columns in occurrence community …
oakdbca Mar 18, 2026
87903eb
fix: update column names to plural for consistency in community and s…
oakdbca Mar 18, 2026
9f29bc7
fix: restore 'WA Priority Category' column in community, species faun…
oakdbca Mar 18, 2026
5d3eb3f
npm update
oakdbca Mar 18, 2026
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
1 change: 1 addition & 0 deletions boranga/components/occurrence/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -963,6 +963,7 @@ def decline(self, request, details):
self.processing_status = OccurrenceReport.PROCESSING_STATUS_DECLINED
self.customer_status = OccurrenceReport.CUSTOMER_STATUS_DECLINED
self.occurrence = None
self.approved_by = request.user.id
self.save(version_user=request.user)

# Log proposal action
Expand Down
25 changes: 18 additions & 7 deletions boranga/components/spatial/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,10 @@ def save_geometry(
)
serializer = InstanceGeometrySaveSerializer(geometry, data=geometry_data)
is_new_geometry = False
# Capture existing state to detect whether geometry data actually changes
pre_save_geometry_wkb = geometry.geometry.ewkb if geometry.geometry else None
pre_save_original_ewkb = geometry.original_geometry_ewkb
pre_save_buffer_radius = geometry.buffer_radius
else:
logger.info(f"Creating new geometry for {instance_model_name}: {instance}")

Expand Down Expand Up @@ -598,14 +602,21 @@ def save_geometry(
request.user.id,
)
else:
OccurrenceUserAction.log_action(
instance,
OccurrenceUserAction.ACTION_UPDATE_GEOMETRY.format(
geometry_instance.id,
instance.occurrence_number,
),
request.user.id,
geometry_changed = (
(geometry_instance.geometry.ewkb if geometry_instance.geometry else None)
!= pre_save_geometry_wkb
or geometry_instance.original_geometry_ewkb != pre_save_original_ewkb
or geometry_instance.buffer_radius != pre_save_buffer_radius
)
if geometry_changed:
OccurrenceUserAction.log_action(
instance,
OccurrenceUserAction.ACTION_UPDATE_GEOMETRY.format(
geometry_instance.id,
instance.occurrence_number,
),
request.user.id,
)

geometry_id_intersect_data[geometry_instance.id] = intersect_data

Expand Down
6 changes: 3 additions & 3 deletions boranga/frontend/boranga/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions boranga/frontend/boranga/src/components/common/communities_dashboard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,10 +519,10 @@ export default {
'Number',
'Community Id',
'Community Name',
'WA Priority Category',
'WA Legislative Category',
'Regions',
'Districts',
'WA Priority Category',
'Region(s)',
'District(s)',
'WA Legislative List',
'Conservation Criteria',
'Commonwealth Conservation Category',
Expand All @@ -535,10 +535,10 @@ export default {
'Number',
'Community Id',
'Community Name',
'WA Priority Category',
'WA Legislative Category',
'Regions',
'Districts',
'WA Priority Category',
'Region(s)',
'District(s)',
'WA Legislative List',
'Conservation Criteria',
'Commonwealth Conservation Category',
Expand Down Expand Up @@ -772,8 +772,8 @@ export default {
vm.column_number,
vm.column_community_id,
vm.column_community_name,
vm.column_wa_priority_category,
vm.column_wa_legislative_category,
vm.column_wa_priority_category,
vm.column_region,
vm.column_district,
vm.column_wa_legislative_list,
Expand All @@ -790,8 +790,8 @@ export default {
vm.column_number,
vm.column_community_id,
vm.column_community_name,
vm.column_wa_priority_category,
vm.column_wa_legislative_category,
vm.column_wa_priority_category,
vm.column_region,
vm.column_district,
vm.column_wa_legislative_list,
Expand Down
16 changes: 8 additions & 8 deletions boranga/frontend/boranga/src/components/common/occurrence_community_dashboard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,8 +557,8 @@ export default {
'Review Due',
'Last Modified By',
'Last Modified Date',
'Activated Date',
'Created Date',
'Activated Date',
'Status',
'Action',
];
Expand Down Expand Up @@ -703,22 +703,22 @@ export default {
name: 'datetime_updated',
};
},
column_activated_date: function () {
column_created_date: function () {
return {
data: 'lodgement_date',
data: 'datetime_created',
orderable: true,
searchable: false,
visible: true,
name: 'lodgement_date',
name: 'datetime_created',
};
},
column_created_date: function () {
column_activated_date: function () {
return {
data: 'datetime_created',
data: 'lodgement_date',
orderable: true,
searchable: false,
visible: true,
name: 'datetime_created',
name: 'lodgement_date',
};
},
column_status: function () {
Expand Down Expand Up @@ -814,8 +814,8 @@ export default {
vm.column_review_due_date,
vm.column_last_modified_by,
vm.column_last_modified_date,
vm.column_activated_date,
vm.column_created_date,
vm.column_activated_date,
vm.column_status,
vm.column_action,
];
Expand Down
16 changes: 8 additions & 8 deletions boranga/frontend/boranga/src/components/common/species_fauna_dashboard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,10 +674,10 @@ export default {
'Number',
'Scientific Name',
'Common Name',
'WA Priority Category',
'WA Legislative Category',
'Region',
'District',
'WA Priority Category',
'Region(s)',
'District(s)',
'Fauna Group',
'Fauna Sub Group',
'Family',
Expand All @@ -695,10 +695,10 @@ export default {
'Number',
'Scientific Name',
'Common Name',
'WA Priority Category',
'WA Legislative Category',
'Region',
'District',
'WA Priority Category',
'Region(s)',
'District(s)',
'Fauna Group',
'Fauna Sub Group',
'Family',
Expand Down Expand Up @@ -980,8 +980,8 @@ export default {
vm.column_number,
vm.column_scientific_name,
vm.column_common_name,
vm.column_wa_priority_category,
vm.column_wa_legislative_category,
vm.column_wa_priority_category,
vm.column_region,
vm.column_district,
vm.column_fauna_group,
Expand All @@ -1003,8 +1003,8 @@ export default {
vm.column_number,
vm.column_scientific_name,
vm.column_common_name,
vm.column_wa_priority_category,
vm.column_wa_legislative_category,
vm.column_wa_priority_category,
vm.column_region,
vm.column_district,
vm.column_fauna_group,
Expand Down
8 changes: 4 additions & 4 deletions boranga/frontend/boranga/src/components/common/species_flora_dashboard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,8 +623,8 @@ export default {
'Number',
'Scientific Name',
'Common Name',
'WA Priority Category',
'WA Legislative Category',
'WA Priority Category',
'Region(s)',
'District(s)',
'Family',
Expand All @@ -642,8 +642,8 @@ export default {
'Number',
'Scientific Name',
'Common Name',
'WA Priority Category',
'WA Legislative Category',
'WA Priority Category',
'Region(s)',
'District(s)',
'Family',
Expand Down Expand Up @@ -913,8 +913,8 @@ export default {
vm.column_number,
vm.column_scientific_name,
vm.column_common_name,
vm.column_wa_priority_category,
vm.column_wa_legislative_category,
vm.column_wa_priority_category,
vm.column_region,
vm.column_district,
vm.column_family,
Expand All @@ -934,8 +934,8 @@ export default {
vm.column_number,
vm.column_scientific_name,
vm.column_common_name,
vm.column_wa_priority_category,
vm.column_wa_legislative_category,
vm.column_wa_priority_category,
vm.column_region,
vm.column_district,
vm.column_family,
Expand Down
Binary file added diagrams/erd/boranga-erd-20260318102904.pdf
View file
Open in desktop
Binary file not shown.
Loading