From 95b6924fb2949ef77e94a9f8d1b86a9ae59ed617 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 6 Nov 2024 10:08:27 +0800
Subject: [PATCH 01/83] Dev ops task 7149: UX CS Move Assessment & Referral
 Comments to bottom of form (and default to collapsed).

---
 .../conservation_status/community_status.vue  | 137 +++++++++---------
 .../conservation_status/species_status.vue    | 131 +++++++++--------
 2 files changed, 139 insertions(+), 129 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
index 5b2a3882..86f66252 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
@@ -1,66 +1,15 @@
 <template lang="html">
     <div id="communityStatus">
-        <FormSection :formCollapse="false" label="Conservation Status" Index="conservation_status">
-            <form @change="saveConservationStatus($event)">
-                <template v-if="!is_external && !conservation_status_obj.can_user_edit">
-                    <CollapsibleComponent component_title="Assessment Comments" ref="assessment_comments"
-                        :collapsed="false">
-                        <div class="row">
-                            <div class="col rounded">
-                                <div class="row" v-if="deficiencyVisibility">
-                                    <div class="col">
-                                        <div class="form-floating m-3">
-                                            <textarea :disabled="deficiency_readonly" class="form-control"
-                                                id="assessor_deficiencies" placeholder="Deficiency Comments"
-                                                v-model="conservation_status_obj.deficiency_data" />
-                                            <label for="assessor_deficiencies" class="form-label">Deficiency
-                                                Comments</label>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="row" v-if="assessorCommentVisibility">
-                                    <div class="col">
-                                        <div class="form-floating m-3 mt-1">
-                                            <textarea :disabled="assessor_comment_readonly" class="form-control"
-                                                rows="3" id="assessor_comment" placeholder="Assessor Comments"
-                                                v-model="conservation_status_obj.assessor_data" />
-                                            <label for="" class="col-sm-4 col-form-label">Assessor Comments</label>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div v-if="referral_comments_boxes.length > 0">
-                                    <div>
-                                        <div class="row mt-2">
-                                            <div class="col ms-3">
-                                                <h6 class="text-muted">Referral Comments</h6>
-                                            </div>
-                                        </div>
-                                        <div v-for="ref in referral_comments_boxes" class="row mb-3"
-                                            v-if="ref.box_view">
-                                            <div class="col">
-                                                <div class="form-floating m-3 mt-1">
-                                                    <textarea v-if='!ref.readonly' :disabled="true" :id="ref.name"
-                                                        :name="ref.name" class="form-control" :placeholder="ref.label"
-                                                        v-model="referral.referral_comment" />
-                                                    <textarea v-else :disabled="true" :name="ref.name"
-                                                        :value="ref.value || ''" class="form-control"
-                                                        :placeholder="ref.label" />
-                                                    <label :for="ref.name" class="form-label">{{ ref.label }}</label>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </CollapsibleComponent>
-                </template>
+        <FormSection :formCollapse="false" label="Conservation Status" Index="conservation_status" class="pb-0">
+            <form @change="saveConservationStatus($event)" class="pb-0">
                 <div class="row mb-3">
                     <label for="" class="col-sm-4 control-label fw-bold">Community Name <span
                             class="text-danger">*</span></label>
                     <div class="col-sm-8" :id="select_community_name">
-                        <select :disabled="conservation_status_obj.readonly || 'Unlocked' == conservation_status_obj.processing_status" :id="community_name_lookup"
-                            :name="community_name_lookup" :ref="community_name_lookup" class="form-control" />
+                        <select
+                            :disabled="conservation_status_obj.readonly || 'Unlocked' == conservation_status_obj.processing_status"
+                            :id="community_name_lookup" :name="community_name_lookup" :ref="community_name_lookup"
+                            class="form-control" />
                     </div>
                 </div>
                 <div class="row mb-3">
@@ -124,8 +73,8 @@
                         <template v-if="conservation_status_obj.effective_to">
                             <label for="effective_to" class="col-sm-3 col-form-label">Effective to:</label>
                             <div class="col-sm-3">
-                                <input type="date" placeholder="DD/MM/YYYY" class="form-control"
-                                    id="effective_to" v-model="conservation_status_obj.effective_to" :disabled="isReadOnly" />
+                                <input type="date" placeholder="DD/MM/YYYY" class="form-control" id="effective_to"
+                                    v-model="conservation_status_obj.effective_to" :disabled="isReadOnly" />
                             </div>
                         </template>
                     </div>
@@ -176,7 +125,7 @@
                             </template>
                             <template v-else>
                                 <input class="form-control" type="text" :disabled="true"
-                                :value="conservation_status_obj.wa_legislative_list ? conservation_status_obj.wa_legislative_list : 'N/A'" />
+                                    :value="conservation_status_obj.wa_legislative_list ? conservation_status_obj.wa_legislative_list : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -208,7 +157,7 @@
                             </template>
                             <template v-else>
                                 <input class="form-control" type="text" :disabled="true"
-                                :value="conservation_status_obj.wa_legislative_category ? conservation_status_obj.wa_legislative_category : 'N/A'" />
+                                    :value="conservation_status_obj.wa_legislative_category ? conservation_status_obj.wa_legislative_category : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -239,7 +188,7 @@
                             </template>
                             <template v-else>
                                 <input class="form-control" type="text" :disabled="true"
-                                :value="conservation_status_obj.wa_priority_list ? conservation_status_obj.wa_priority_list : 'N/A'" />
+                                    :value="conservation_status_obj.wa_priority_list ? conservation_status_obj.wa_priority_list : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -270,7 +219,7 @@
                             </template>
                             <template v-else>
                                 <input class="form-control" type="text" :disabled="true"
-                                :value="conservation_status_obj.wa_priority_category ? conservation_status_obj.wa_priority_category : 'N/A'" />
+                                    :value="conservation_status_obj.wa_priority_category ? conservation_status_obj.wa_priority_category : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -304,7 +253,7 @@
                             </template>
                             <template v-else>
                                 <input class="form-control" type="text" :disabled="true"
-                                :value="conservation_status_obj.commonwealth_conservation_list ? conservation_status_obj.commonwealth_conservation_list : 'N/A'" />
+                                    :value="conservation_status_obj.commonwealth_conservation_list ? conservation_status_obj.commonwealth_conservation_list : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -473,7 +422,7 @@
                     </div>
                 </template>
                 <template v-if="!is_external && isStatusApproved">
-                    <div class="row border-top pt-3">
+                    <div class="row border-top pt-3 pb-3">
                         <label for="" class="col-sm-4 col-form-label">Approval document:</label>
                         <div class="col-sm-8">
                             <p class="col-form-label">
@@ -489,6 +438,62 @@
                     </div>
                 </template>
             </form>
+            <template v-if="!is_external && !conservation_status_obj.can_user_edit">
+                <div class="row border-top pt-3 pb-0 mb-0">
+                    <CollapsibleComponent component_title="Assessment Comments" ref="assessment_comments"
+                        :collapsed="true">
+                        <div class="row pb-0 mb-0">
+                            <div class="col rounded">
+                                <div class="row" v-if="deficiencyVisibility">
+                                    <div class="col">
+                                        <div class="form-floating m-3">
+                                            <textarea :disabled="deficiency_readonly" class="form-control"
+                                                id="assessor_deficiencies" placeholder="Deficiency Comments"
+                                                v-model="conservation_status_obj.deficiency_data" />
+                                            <label for="assessor_deficiencies" class="form-label">Deficiency
+                                                Comments</label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row" v-if="assessorCommentVisibility">
+                                    <div class="col">
+                                        <div class="form-floating m-3 mt-1">
+                                            <textarea :disabled="assessor_comment_readonly" class="form-control"
+                                                rows="3" id="assessor_comment" placeholder="Assessor Comments"
+                                                v-model="conservation_status_obj.assessor_data" />
+                                            <label for="" class="col-sm-4 col-form-label">Assessor Comments</label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div v-if="referral_comments_boxes.length > 0">
+                                    <div>
+                                        <div class="row mt-2">
+                                            <div class="col ms-3">
+                                                <h6 class="text-muted">Referral Comments</h6>
+                                            </div>
+                                        </div>
+                                        <div v-for="ref in referral_comments_boxes" class="row mb-3"
+                                            v-if="ref.box_view">
+                                            <div class="col">
+                                                <div class="form-floating m-3 mt-1">
+                                                    <textarea v-if='!ref.readonly' :disabled="true" :id="ref.name"
+                                                        :name="ref.name" class="form-control" :placeholder="ref.label"
+                                                        v-model="referral.referral_comment" />
+                                                    <textarea v-else :disabled="true" :name="ref.name"
+                                                        :value="ref.value || ''" class="form-control"
+                                                        :placeholder="ref.label" />
+                                                    <label :for="ref.name" class="form-label">{{ ref.label
+                                                        }}</label>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </CollapsibleComponent>
+                </div>
+            </template>
         </FormSection>
     </div>
 </template>
@@ -765,7 +770,7 @@ export default {
             this.isShowComment = updatedShowComment;
         },
         saveConservationStatus: function (e) {
-            if(e.target.classList.contains('input.select2-search__field')){
+            if (e.target.classList.contains('input.select2-search__field')) {
                 // We will emit this save from the select 2 event instead
                 // as it requires some time to populate the selected value
                 // and we don't want to save the conservation status before the
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
index d07e7042..0e0a7863 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
@@ -2,66 +2,13 @@
     <div id="speciesStatus">
         <FormSection :formCollapse="false" label="Conservation Status" Index="conservation_status">
             <form @change="saveConservationStatus($event)">
-                <template v-if="!is_external && !conservation_status_obj.can_user_edit">
-                    <CollapsibleComponent component_title="Assessment Comments" ref="assessment_comments"
-                        :collapsed="false">
-                        <div class="row">
-                            <div class="col rounded">
-                                <div class="row" v-if="deficiencyVisibility">
-                                    <div class="col">
-                                        <div class="form-floating m-3">
-                                            <textarea :disabled="deficiency_readonly" class="form-control"
-                                                id="assessor_deficiencies" placeholder="Deficiency Comments"
-                                                v-model="conservation_status_obj.deficiency_data" />
-                                            <label for="assessor_deficiencies" class="form-label">Deficiency
-                                                Comments</label>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="row" v-if="assessorCommentVisibility">
-                                    <div class="col">
-                                        <div class="form-floating m-3 mt-1">
-                                            <textarea :disabled="assessor_comment_readonly" class="form-control"
-                                                rows="3" id="assessor_comment" placeholder="Assessor Comments"
-                                                v-model="conservation_status_obj.assessor_data" />
-                                            <label for="" class="col-sm-4 col-form-label">Assessor Comments</label>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div v-if="referral_comments_boxes.length > 0">
-                                    <div>
-                                        <div class="row mt-2">
-                                            <div class="col ms-3">
-                                                <h6 class="text-muted">Referral Comments</h6>
-                                            </div>
-                                        </div>
-                                        <div v-for="ref in referral_comments_boxes" class="row mb-3"
-                                            v-if="ref.box_view">
-                                            <div class="col">
-                                                <div class="form-floating m-3 mt-1">
-                                                    <textarea v-if='!ref.readonly' :disabled="true" :id="ref.name"
-                                                        :name="ref.name" class="form-control referral-comment-box"
-                                                        :placeholder="ref.label" v-model="referral.referral_comment" />
-                                                    <textarea v-else :disabled="ref.readonly" :name="ref.name"
-                                                        :value="ref.value || ''"
-                                                        class="form-control referral-comment-box"
-                                                        :placeholder="ref.label" />
-                                                    <label :for="ref.name" class="form-label">{{ ref.label }}</label>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </CollapsibleComponent>
-                </template>
                 <div class="row mb-3">
                     <label :for="scientific_name_lookup" class="col-sm-4 col-form-label fw-bold">Scientific Name: <span
                             class="text-danger">*</span></label>
                     <div class="col-sm-8" :id="select_scientific_name">
-                        <select :disabled="isReadOnly || 'Unlocked' == conservation_status_obj.processing_status" :id="scientific_name_lookup" :name="scientific_name_lookup"
-                            :ref="scientific_name_lookup" class="form-control" />
+                        <select :disabled="isReadOnly || 'Unlocked' == conservation_status_obj.processing_status"
+                            :id="scientific_name_lookup" :name="scientific_name_lookup" :ref="scientific_name_lookup"
+                            class="form-control" />
                     </div>
                 </div>
                 <div v-if="species_display" class="row mb-3">
@@ -132,8 +79,8 @@
                         <template v-if="conservation_status_obj.effective_to">
                             <label for="effective_to" class="col-sm-3 col-form-label">Effective to:</label>
                             <div class="col-sm-3">
-                                <input type="date" placeholder="DD/MM/YYYY" class="form-control"
-                                    id="effective_to" v-model="conservation_status_obj.effective_to" :disabled="isReadOnly" />
+                                <input type="date" placeholder="DD/MM/YYYY" class="form-control" id="effective_to"
+                                    v-model="conservation_status_obj.effective_to" :disabled="isReadOnly" />
                             </div>
                         </template>
                     </div>
@@ -216,7 +163,7 @@
                             </template>
                             <template v-else>
                                 <input class="form-control" type="text" :disabled="true"
-                                :value="conservation_status_obj.wa_legislative_category ? conservation_status_obj.wa_legislative_category : 'N/A'" />
+                                    :value="conservation_status_obj.wa_legislative_category ? conservation_status_obj.wa_legislative_category : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -278,7 +225,7 @@
                             </template>
                             <template v-else>
                                 <input class="form-control" type="text" :disabled="true"
-                                :value="conservation_status_obj.wa_priority_category ? conservation_status_obj.wa_priority_category : 'N/A'" />
+                                    :value="conservation_status_obj.wa_priority_category ? conservation_status_obj.wa_priority_category : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -312,7 +259,7 @@
                             </template>
                             <template v-else>
                                 <input class="form-control" type="text" :disabled="true"
-                                :value="conservation_status_obj.commonwealth_conservation_list ? conservation_status_obj.commonwealth_conservation_list : 'N/A'" />
+                                    :value="conservation_status_obj.commonwealth_conservation_list ? conservation_status_obj.commonwealth_conservation_list : 'N/A'" />
                             </template>
                         </div>
                     </div>
@@ -480,7 +427,7 @@
                     </div>
                 </template>
                 <template v-if="!is_external && isStatusApproved">
-                    <div class="row border-top pt-3">
+                    <div class="row border-top pt-3 pb-3">
                         <label for="" class="col-sm-4 col-form-label">Approval document:</label>
                         <div class="col-sm-8">
                             <p class="col-form-label">
@@ -495,6 +442,64 @@
                         </div>
                     </div>
                 </template>
+                <template v-if="!is_external && !conservation_status_obj.can_user_edit">
+                    <div class="row border-top pt-3 pb-0 mb-0">
+                        <CollapsibleComponent component_title="Assessment Comments" ref="assessment_comments"
+                            :collapsed="true" style="margin-bottom: 0">
+                            <div class="row mb-0 pb-0">
+                                <div class="col rounded">
+                                    <div class="row" v-if="deficiencyVisibility">
+                                        <div class="col">
+                                            <div class="form-floating m-3">
+                                                <textarea :disabled="deficiency_readonly" class="form-control"
+                                                    id="assessor_deficiencies" placeholder="Deficiency Comments"
+                                                    v-model="conservation_status_obj.deficiency_data" />
+                                                <label for="assessor_deficiencies" class="form-label">Deficiency
+                                                    Comments</label>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row" v-if="assessorCommentVisibility">
+                                        <div class="col">
+                                            <div class="form-floating m-3 mt-1">
+                                                <textarea :disabled="assessor_comment_readonly" class="form-control"
+                                                    rows="3" id="assessor_comment" placeholder="Assessor Comments"
+                                                    v-model="conservation_status_obj.assessor_data" />
+                                                <label for="" class="col-sm-4 col-form-label">Assessor Comments</label>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div v-if="referral_comments_boxes.length > 0">
+                                        <div>
+                                            <div class="row mt-2">
+                                                <div class="col ms-3">
+                                                    <h6 class="text-muted">Referral Comments</h6>
+                                                </div>
+                                            </div>
+                                            <div v-for="ref in referral_comments_boxes" class="row mb-3"
+                                                v-if="ref.box_view">
+                                                <div class="col">
+                                                    <div class="form-floating m-3 mt-1">
+                                                        <textarea v-if='!ref.readonly' :disabled="true" :id="ref.name"
+                                                            :name="ref.name" class="form-control referral-comment-box"
+                                                            :placeholder="ref.label"
+                                                            v-model="referral.referral_comment" />
+                                                        <textarea v-else :disabled="ref.readonly" :name="ref.name"
+                                                            :value="ref.value || ''"
+                                                            class="form-control referral-comment-box"
+                                                            :placeholder="ref.label" />
+                                                        <label :for="ref.name" class="form-label">{{ ref.label
+                                                            }}</label>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </CollapsibleComponent>
+                    </div>
+                </template>
             </form>
         </FormSection>
     </div>
@@ -763,7 +768,7 @@ export default {
             this.isShowComment = updatedShowComment;
         },
         saveConservationStatus: function (e) {
-            if(e.target.classList.contains('input.select2-search__field')){
+            if (e.target.classList.contains('input.select2-search__field')) {
                 // We will emit this save from the select 2 event instead
                 // as it requires some time to populate the selected value
                 // and we don't want to save the conservation status before the

From 7924e0d47023a1c1c146a3bbef6553d628793c89 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 6 Nov 2024 11:07:09 +0800
Subject: [PATCH 02/83] Remove unused constants.

---
 .../frontend/boranga/src/utils/constants.js   | 46 +------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

diff --git a/boranga/frontend/boranga/src/utils/constants.js b/boranga/frontend/boranga/src/utils/constants.js
index 0ca38983..bfe98fea 100755
--- a/boranga/frontend/boranga/src/utils/constants.js
+++ b/boranga/frontend/boranga/src/utils/constants.js
@@ -1,49 +1,17 @@
 module.exports = {
-    APPLICATION_TYPE: {
-        REGISTRATION_OF_INTEREST: 'registration_of_interest',
-        LEASE_LICENCE: 'lease_licence',
-    },
-    ROLES: {
-        ASSESSOR: { ID: 'assessor', TEXT: 'Assessor' },
-        APPROVER: { ID: 'approver', TEXT: 'Approver' },
-        REFERRAL: { ID: 'referral', TEXT: 'Referral' },
-    },
     PROPOSAL_STATUS: {
         DRAFT: { ID: 'draft', TEXT: 'Draft' },
         AMENDMENT_REQUIRED: { ID: 'amendment_required', TEXT: 'Amendment Required' },
         WITH_ASSESSOR: { ID: 'with_assessor', TEXT: 'With Assessor' },
-        WITH_APPROVER: { ID: 'with_approver', TEXT: 'With Approver' },
+        WITH_APPROVER: { ID: 'with_approver', TEXT: 'Proposed DeListed' },
         WITH_REFERRAL: { ID: 'with_referral', TEXT: 'With Referral' },
-        WITH_REFERRAL_CONDITIONS: { ID: 'with_referral_conditions', TEXT: 'With Referral (Conditions)' },
-        APPROVED_APPLICATION: { ID: 'approved_application', TEXT: 'Approved (Application)' },
-        APPROVED_COMPETITIVE_PROCESS: { ID: 'approved_competitive_process', TEXT: 'Approved (Competitive Process)' },
-        APPROVED_EDITING_INVOICING: { ID: 'approved_editing_invoicing', TEXT: 'Approved (Editing Invoicing)' },
         APPROVED: { ID: 'approved', TEXT: 'Approved' },
         DECLINED: { ID: 'declined', TEXT: 'Declined' },
         DISCARDED: { ID: 'discarded', TEXT: 'Discarded' },
     },
-    COMPETITIVE_PROCESS_STATUS: {
-        IN_PROGRESS: { ID: 'in_progress', TEXT: 'In Progress' },
-        COMPLETED: { ID: 'completed', TEXT: 'Completed' },
-        DISCARDED: { ID: 'discarded', TEXT: 'Discarded' },
-    },
-    APPROVAL_STATUS: {
-        CURRENT: { ID: 'current', TEXT: 'Current' },
-        CURRENT_BASE_FEE_REVIEW: { ID: 'current_base_fee_review', TEXT: 'Current (base fee review)' },
-        CURRENT_RENEWAL_REVIEW: { ID: 'current_renewal_review', TEXT: 'Current (renewal review)' },
-        CANCELLED: { ID: 'cancelled', TEXT: 'Cancelled' },
-        SURRENDERED: { ID: 'surrendered', TEXT: 'Surrendered' },
-        SUSPENDED: { ID: 'suspended', TEXT: 'Suspended' },
-        HOLD_OVER_LEASE_DEED_OF_LICENCE: { ID: 'hold_over_lease_deed_of_licence', TEXT: 'Hold-over (lease, deed of licence)' },
-        HOLD_OVER_BASE_FEE_REVIEW: { ID: 'hold_over_base_fee_review', TEXT: 'Hold-over (base fee review)' },
-        EXTENDED_LEASE_DEED_OF_LICENCE: { ID: 'extended_lease_deed_of_licence', TEXT: 'Extended (lease, deed of licence)' },
-        EXTENDED_BASE_FEE_REVIEW: { ID: 'extended_base_fee_review', TEXT: 'Extended (base fee review)' },
-        EXPIRED_LICENCE: { ID: 'expired_licence', TEXT: 'Expired (licence)' },
-    },
     GROUPS: {
         CONSERVATION_STATUS_ASSESSORS: 'Conservation Status Assessors',
         CONSERVATION_STATUS_APPROVERS: 'Conservation Status Approvers',
-        BORANGA_ADMIN: 'Boranga Admin',
         DJANGO_ADMIN: 'Django Admin',
         EXTERNAL_CONTRIBUTORS: 'External Contributors',
         INTERNAL_CONTRIBUTORS: 'Internal Contributors',
@@ -52,18 +20,6 @@ module.exports = {
         READ_ONLY_USERS: 'Read Only Users',
         SPECIES_AND_COMMUNITIES_APPROVERS: 'Species and Communities Approvers',
     },
-    DRAFT: 'Draft',
-    WITH_ASSESSOR: 'With Assessor',
-    WITH_APPROVER: 'With Approver',
-    WITH_REFERRAL: 'With Referral',
-    WITH_REFERRAL_CONDITIONS: 'With Referral (Conditions)',
-    APPROVED_APPLICATION: 'Approved (Application)',
-    APPROVED_COMPETITIVE_PROCESS: 'Approved (Competitive Process)',
-    APPROVED_EDITING_INVOICING: 'Approved (Editing Invoicing)',
-    APPROVED: 'Approved',
-    DECLINED: 'Declined',
-    DISCARDED: 'Discarded',
     DATATABLE_PROCESSING_HTML:
         '<div class="d-flex justify-content-center"><div class="d-flex spinner-border text-primary my-4" role="status"><span class="visually-hidden">Loading...</span></div></div>',
-
 }

From bebc7787f47655e87ceba11d9df33758a5c3a7a3 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 6 Nov 2024 11:07:26 +0800
Subject: [PATCH 03/83] Remove unused computed.

---
 .../frontend/boranga/src/components/common/add_comm_log.vue    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/common/add_comm_log.vue b/boranga/frontend/boranga/src/components/common/add_comm_log.vue
index c238bb8f..8eda1236 100755
--- a/boranga/frontend/boranga/src/components/common/add_comm_log.vue
+++ b/boranga/frontend/boranga/src/components/common/add_comm_log.vue
@@ -155,9 +155,6 @@ export default {
             var vm = this;
             return vm.errors;
         },
-        title: function () {
-            return this.processing_status == 'With Approver' ? 'Issue Comms' : 'Propose to issue approval';
-        }
     },
     watch: {
         isModalOpen: function (val) {

From 33879fa9db64c1f92a930bae22970622f98de2dc Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 6 Nov 2024 11:12:59 +0800
Subject: [PATCH 04/83] Dev ops task 7135: Change display value of 'With
 Approver' to 'Proposed DeListed' for conservation status.

---
 boranga/components/conservation_status/models.py |  2 +-
 .../conservation_status_community_dashboard.vue  |  2 +-
 .../conservation_status_fauna_dashboard.vue      |  2 +-
 .../conservation_status_flora_dashboard.vue      |  2 +-
 .../conservation_status/conservation_status.vue  | 16 ++++++++--------
 .../proposal_proposed_decline.vue                |  7 -------
 .../conservation_status/proposed_issuance.vue    |  2 +-
 7 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index 4237b531..fc6e18c2 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -403,7 +403,7 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
         (PROCESSING_STATUS_DRAFT, "Draft"),
         (PROCESSING_STATUS_WITH_ASSESSOR, "With Assessor"),
         (PROCESSING_STATUS_WITH_REFERRAL, "With Referral"),
-        (PROCESSING_STATUS_WITH_APPROVER, "With Approver"),
+        (PROCESSING_STATUS_WITH_APPROVER, "Proposed DeListed"),
         (PROCESSING_STATUS_READY_FOR_AGENDA, "Ready For Agenda"),
         (PROCESSING_STATUS_AWAITING_APPLICANT_RESPONSE, "Awaiting Applicant Response"),
         (PROCESSING_STATUS_AWAITING_ASSESSOR_RESPONSE, "Awaiting Assessor Response"),
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue b/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue
index 2b8949e3..79bef3d9 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue
@@ -388,7 +388,7 @@ export default {
             internal_status: [
                 { value: 'draft', name: 'Draft' },
                 { value: 'with_assessor', name: 'With Assessor' },
-                { value: 'with_approver', name: 'With Approver' },
+                { value: 'with_approver', name: 'Proposed DeListed' },
                 { value: 'ready_for_agenda', name: 'Ready For Agenda' },
                 { value: 'closed', name: 'Closed' },
                 { value: 'delisted', name: 'DeListed' },
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue b/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue
index c6420fc0..d2ec7e4e 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue
@@ -439,7 +439,7 @@ export default {
             internal_status: [
                 { value: 'draft', name: 'Draft' },
                 { value: 'with_assessor', name: 'With Assessor' },
-                { value: 'with_approver', name: 'With Approver' },
+                { value: 'with_approver', name: 'Proposed DeListed' },
                 { value: 'ready_for_agenda', name: 'Ready For Agenda' },
                 { value: 'closed', name: 'Closed' },
                 { value: 'delisted', name: 'DeListed' },
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue b/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue
index a48538b1..4e02f2c1 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue
@@ -430,7 +430,7 @@ export default {
             internal_status: [
                 { value: 'draft', name: 'Draft' },
                 { value: 'with_assessor', name: 'With Assessor' },
-                { value: 'with_approver', name: 'With Approver' },
+                { value: 'with_approver', name: 'Proposed DeListed' },
                 { value: 'ready_for_agenda', name: 'Ready For Agenda' },
                 { value: 'closed', name: 'Closed' },
                 { value: 'delisted', name: 'DeListed' },
diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
index 3ffa6c38..da826e1d 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
@@ -26,7 +26,7 @@
                                     <strong>Currently assigned to</strong><br />
                                     <div class="form-group">
                                         <template
-                                            v-if="['Ready For Agenda', 'With Approver', 'Unlocked', 'Approved', 'Closed', 'DeListed'].includes(conservation_status_obj.processing_status)">
+                                            v-if="['Ready For Agenda', 'Proposed DeListed', 'Unlocked', 'Approved', 'Closed', 'DeListed'].includes(conservation_status_obj.processing_status)">
                                             <select ref="assigned_officer" :disabled="!canAction || canLock"
                                                 class="form-control"
                                                 v-model="conservation_status_obj.assigned_approver">
@@ -292,7 +292,7 @@
                                             </div>
                                         </div>
                                     </template>
-                                    <template v-else-if="conservation_status_obj.processing_status == 'With Approver'">
+                                    <template v-else-if="conservation_status_obj.processing_status == 'Proposed DeListed'">
                                         <div class="row">
                                             <div class="col-sm-12">
                                                 <button style="width:90%;" class="btn btn-primary"
@@ -553,7 +553,7 @@ export default {
                     && (
                         this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_approver)
             }
-            else if (['Ready For Agenda', 'With Approver', 'Unlocked'].includes(this.conservation_status_obj.processing_status)) {
+            else if (['Ready For Agenda', 'Proposed DeListed', 'Unlocked'].includes(this.conservation_status_obj.processing_status)) {
                 return this.conservation_status_obj
                     && (
                         this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_approver)
@@ -1019,7 +1019,7 @@ export default {
             let vm = this;
             let unassign = true;
             let data = {};
-            if (['With Approver', 'Ready For Agenda', 'Approved', 'Closed', 'DeListed'].includes(vm.conservation_status_obj.processing_status)) {
+            if (['Proposed DeListed', 'Ready For Agenda', 'Approved', 'Closed', 'DeListed'].includes(vm.conservation_status_obj.processing_status)) {
                 unassign = vm.conservation_status_obj.assigned_approver != null && vm.conservation_status_obj.assigned_approver != 'undefined' ? false : true;
                 data = { 'assessor_id': vm.conservation_status_obj.assigned_approver };
             }
@@ -1070,7 +1070,7 @@ export default {
         },
         updateAssignedOfficerSelect: function () {
             let vm = this;
-            if (['With Approver', 'Ready For Agenda', 'Approved', 'Closed', 'DeListed'].includes(vm.conservation_status_obj.processing_status)) {
+            if (['Proposed DeListed', 'Ready For Agenda', 'Approved', 'Closed', 'DeListed'].includes(vm.conservation_status_obj.processing_status)) {
                 $(vm.$refs.assigned_officer).val(vm.conservation_status_obj.assigned_approver);
                 $(vm.$refs.assigned_officer).trigger('change');
             }
@@ -1116,7 +1116,7 @@ export default {
             }).
                 on("select2:select", function (e) {
                     var selected = $(e.currentTarget);
-                    if (['Ready For Agenda', 'With Approver', 'Approved', 'Closed', 'DeListed'].includes(vm.conservation_status_obj.processing_status)) {
+                    if (['Ready For Agenda', 'Proposed DeListed', 'Approved', 'Closed', 'DeListed'].includes(vm.conservation_status_obj.processing_status)) {
                         vm.conservation_status_obj.assigned_approver = selected.val();
                     }
                     else {
@@ -1130,7 +1130,7 @@ export default {
                     }, 0);
                 }).on("select2:unselect", function (e) {
                     var selected = $(e.currentTarget);
-                    if (['Ready For Agenda', 'With Approver', 'Approved', 'Closed', 'DeListed'].includes(vm.conservation_status_obj.processing_status)) {
+                    if (['Ready For Agenda', 'Proposed DeListed', 'Approved', 'Closed', 'DeListed'].includes(vm.conservation_status_obj.processing_status)) {
                         vm.conservation_status_obj.assigned_approver = null;
                     }
                     else {
@@ -1407,7 +1407,7 @@ export default {
         },
         switchStatus: function (status) {
             let vm = this;
-            if (vm.conservation_status_obj.processing_status == 'With Approver' && status == 'with_assessor') {
+            if (vm.conservation_status_obj.processing_status == 'Proposed DeListed' && status == 'with_assessor') {
                 let data = { 'status': status, 'approver_comment': vm.approver_comment }
                 vm.$http.post(helpers.add_endpoint_json(api_endpoints.conservation_status, (vm.conservation_status_obj.id + '/switch_status')), JSON.stringify(data), {
                     emulateJSON: true,
diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/proposal_proposed_decline.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/proposal_proposed_decline.vue
index d4de9cbf..f415cc25 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/proposal_proposed_decline.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/proposal_proposed_decline.vue
@@ -106,13 +106,6 @@ export default {
             this.errors = false;
             $('.has-error').removeClass('has-error');
         },
-        check_status: function () {
-            let vm = this;
-            if (vm.processing_status == 'With Approver')
-                return true;
-            else
-                return false;
-        },
         sendData: function () {
             let vm = this;
             vm.errors = false;
diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/proposed_issuance.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/proposed_issuance.vue
index 3e407608..43bd4946 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/proposed_issuance.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/proposed_issuance.vue
@@ -164,7 +164,7 @@ export default {
             return `Approve Conservation Status CS${this.conservation_status_id}`;
         },
         can_preview: function () {
-            return (this.processing_status == 'With Approver' || 'With Assessor (Requirements)') && this.approval.effective_from_date && this.approval.effective_to_date ? true : false;
+            return (this.processing_status == 'Proposed DeListed' || 'With Assessor (Requirements)') && this.approval.effective_from_date && this.approval.effective_to_date ? true : false;
         },
     },
     methods: {

From 94ec4622dd792b7c839bb2460c8e5d57a812bfda Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 6 Nov 2024 11:20:36 +0800
Subject: [PATCH 05/83] Dev ops task 7164: CS workflow changes - Disable final
 outcome + Deferred notification emails.

---
 boranga/components/conservation_status/models.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index fc6e18c2..191375a1 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -16,8 +16,6 @@
     send_approver_propose_delist_email_notification,
     send_assessor_ready_for_agenda_email_notification,
     send_conservation_status_amendment_email_notification,
-    send_conservation_status_approval_email_notification,
-    send_conservation_status_decline_email_notification,
     send_conservation_status_referral_complete_email_notification,
     send_conservation_status_referral_email_notification,
     send_conservation_status_referral_recall_email_notification,
@@ -1279,10 +1277,6 @@ def final_decline(self, request, details):
             request,
         )
 
-        send_conservation_status_decline_email_notification(
-            self, conservation_status_decline
-        )
-
     @transaction.atomic
     def proposed_approval(self, request, details):
         if not self.can_assess(request):
@@ -1483,9 +1477,6 @@ def final_approval(self, request, details):
                 request,
             )
 
-        # send Proposal approval email with attachment
-        send_conservation_status_approval_email_notification(self)
-
         self.save()
         self.documents.all().update(can_delete=False)
 

From fc9b857c9dc9c9306a586d9ee82e5f0583a69b7f Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 6 Nov 2024 11:34:01 +0800
Subject: [PATCH 06/83] Replace red text message 'Do not upload Management or
 Recovery Plans here' with bootstrap warning alert.

---
 .../components/common/conservation_status/cs_documents.vue    | 4 +++-
 .../src/components/common/occurrence/occ_documents.vue        | 4 +++-
 .../src/components/common/occurrence/ocr_documents.vue        | 4 +++-
 .../common/species_communities/community_documents.vue        | 4 +++-
 .../common/species_communities/species_documents.vue          | 4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/cs_documents.vue b/boranga/frontend/boranga/src/components/common/conservation_status/cs_documents.vue
index c2cea3a6..83db6380 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/cs_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/cs_documents.vue
@@ -1,7 +1,7 @@
 <template lang="html">
     <div id="cs_documents">
         <FormSection :formCollapse="false" label="Documents" Index="documents">
-            <small style="color: red;"><br>(Do not upload Management or Recovery Plans here)</small>
+            <alert type="warning">Do not upload Management or Recovery Plans here</alert>
             <form class="form-horizontal" action="index.html" method="post">
                 <div v-if="show_document_actions" class="col-sm-12">
                     <div class="text-end">
@@ -30,6 +30,7 @@
 </template>
 <script>
 import Vue from 'vue'
+import alert from '@vue-utils/alert.vue';
 import datatable from '@vue-utils/datatable.vue';
 import ViewDocument from '@/components/common/view_document.vue'
 import DocumentDetail from '@/components/common/add_document.vue'
@@ -224,6 +225,7 @@ export default {
         }
     },
     components: {
+        alert,
         FormSection,
         datatable,
         DocumentDetail,
diff --git a/boranga/frontend/boranga/src/components/common/occurrence/occ_documents.vue b/boranga/frontend/boranga/src/components/common/occurrence/occ_documents.vue
index d9eb9577..bdd9aaa5 100644
--- a/boranga/frontend/boranga/src/components/common/occurrence/occ_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/occurrence/occ_documents.vue
@@ -1,7 +1,7 @@
 <template lang="html">
     <div id="occ_documents">
         <FormSection :formCollapse="false" label="Documents" Index="documents">
-            <small style="color: red;"><br>(Do not upload Management or Recovery Plans here)</small>
+            <alert type="warning">Do not upload Management or Recovery Plans here</alert>
             <form class="form-horizontal" action="index.html" method="post">
                 <div class="col-sm-12">
                     <div class="text-end">
@@ -30,6 +30,7 @@
 </template>
 <script>
 import Vue from 'vue'
+import alert from '@vue-utils/alert.vue';
 import datatable from '@vue-utils/datatable.vue';
 import DocumentDetail from '@/components/common/add_document.vue'
 import FormSection from '@/components/forms/section_toggle.vue';
@@ -227,6 +228,7 @@ export default {
             }
         },
         components: {
+            alert,
             FormSection,
             datatable,
             DocumentDetail,
diff --git a/boranga/frontend/boranga/src/components/common/occurrence/ocr_documents.vue b/boranga/frontend/boranga/src/components/common/occurrence/ocr_documents.vue
index 6cf4d0a9..1873c205 100644
--- a/boranga/frontend/boranga/src/components/common/occurrence/ocr_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/occurrence/ocr_documents.vue
@@ -1,7 +1,7 @@
 <template lang="html">
     <div id="ocr_documents">
         <FormSection :formCollapse="false" label="Documents" Index="documents">
-            <small style="color: red;"><br>(Do not upload Management or Recovery Plans here)</small>
+            <alert type="warning">Do not upload Management or Recovery Plans here</alert>
             <form class="form-horizontal" action="index.html" method="post">
                 <div v-if="!isReadOnly" class="col-sm-12">
                     <div class="text-end">
@@ -30,6 +30,7 @@
 </template>
 <script>
 import Vue from 'vue'
+import alert from '@vue-utils/alert.vue';
 import datatable from '@vue-utils/datatable.vue';
 import ViewDocument from '@/components/common/view_document.vue'
 import DocumentDetail from '@/components/common/add_document.vue'
@@ -63,6 +64,7 @@ export default {
         },
     },
     components: {
+        alert,
         FormSection,
         datatable,
         DocumentDetail,
diff --git a/boranga/frontend/boranga/src/components/common/species_communities/community_documents.vue b/boranga/frontend/boranga/src/components/common/species_communities/community_documents.vue
index 86b955bf..2ce6546e 100644
--- a/boranga/frontend/boranga/src/components/common/species_communities/community_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/species_communities/community_documents.vue
@@ -1,7 +1,7 @@
 <template lang="html">
     <div id="community_documents">
         <FormSection :formCollapse="false" label="Documents" Index="documents">
-            <small style="color: red;"><br>(Do not upload Management or Recovery Plans here)</small>
+            <alert type="warning">Do not upload Management or Recovery Plans here</alert>
             <form class="form-horizontal" action="index.html" method="post">
                 <div v-if="!species_community.readonly" class="col-sm-12">
                     <div class="text-end">
@@ -27,6 +27,7 @@
 </template>
 <script>
 import Vue from 'vue'
+import alert from '@vue-utils/alert.vue';
 import datatable from '@vue-utils/datatable.vue';
 import DocumentDetail from '../add_document.vue'
 import FormSection from '@/components/forms/section_toggle.vue';
@@ -222,6 +223,7 @@ export default {
         }
     },
     components: {
+        alert,
         FormSection,
         datatable,
         DocumentDetail,
diff --git a/boranga/frontend/boranga/src/components/common/species_communities/species_documents.vue b/boranga/frontend/boranga/src/components/common/species_communities/species_documents.vue
index c7a05527..8151c1eb 100644
--- a/boranga/frontend/boranga/src/components/common/species_communities/species_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/species_communities/species_documents.vue
@@ -1,7 +1,7 @@
 <template lang="html">
     <div id="species_documents">
         <FormSection :formCollapse="false" label="Documents" :Index="documentBody">
-            <small style="color: red;"><br>(Do not upload Management or Recovery Plans here)</small>
+            <alert type="warning">Do not upload Management or Recovery Plans here</alert>
             <form class="form-horizontal" action="index.html" method="post">
                 <div v-if="!is_readonly" class="col-sm-12">
                     <div class="text-end">
@@ -28,6 +28,7 @@
 </template>
 <script>
 import Vue from 'vue'
+import alert from '@vue-utils/alert.vue';
 import datatable from '@vue-utils/datatable.vue';
 import DocumentDetail from '../add_document.vue'
 import FormSection from '@/components/forms/section_toggle.vue';
@@ -224,6 +225,7 @@ export default {
         }
     },
     components: {
+        alert,
         FormSection,
         datatable,
         DocumentDetail,

From 4bbea147b9364efa67e93ef57a5eea0ab9b3c5ee Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 6 Nov 2024 11:41:31 +0800
Subject: [PATCH 07/83] Dev ops task 7173: Bug: CS Regression - Add Document
 button missing for internal contributor.

---
 .../src/components/common/conservation_status/cs_documents.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/cs_documents.vue b/boranga/frontend/boranga/src/components/common/conservation_status/cs_documents.vue
index 83db6380..a2255f87 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/cs_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/cs_documents.vue
@@ -234,7 +234,7 @@ export default {
     },
     computed: {
         show_document_actions: function () {
-            return (!this.is_internal && this.conservation_status_obj.can_user_edit) || (
+            return this.conservation_status_obj.can_user_edit || (
                 this.is_internal &&
                 this.conservation_status_obj.assessor_mode &&
                 this.conservation_status_obj.assessor_mode.assessor_can_assess &&

From 91b40424e14c2d88f02338d1724803659875b272 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 6 Nov 2024 12:04:45 +0800
Subject: [PATCH 08/83] Add icon.

---
 .../src/components/common/conservation_status/cs_documents.vue  | 2 +-
 .../boranga/src/components/common/occurrence/occ_documents.vue  | 2 +-
 .../boranga/src/components/common/occurrence/ocr_documents.vue  | 2 +-
 .../common/species_communities/community_documents.vue          | 2 +-
 .../components/common/species_communities/species_documents.vue | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/cs_documents.vue b/boranga/frontend/boranga/src/components/common/conservation_status/cs_documents.vue
index a2255f87..a8721b0b 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/cs_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/cs_documents.vue
@@ -1,7 +1,7 @@
 <template lang="html">
     <div id="cs_documents">
         <FormSection :formCollapse="false" label="Documents" Index="documents">
-            <alert type="warning">Do not upload Management or Recovery Plans here</alert>
+            <alert type="warning"><i class="bi bi-ban fs-6 fw-bold me-2"></i>Do not upload Management or Recovery Plans here</alert>
             <form class="form-horizontal" action="index.html" method="post">
                 <div v-if="show_document_actions" class="col-sm-12">
                     <div class="text-end">
diff --git a/boranga/frontend/boranga/src/components/common/occurrence/occ_documents.vue b/boranga/frontend/boranga/src/components/common/occurrence/occ_documents.vue
index bdd9aaa5..4f2ad39a 100644
--- a/boranga/frontend/boranga/src/components/common/occurrence/occ_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/occurrence/occ_documents.vue
@@ -1,7 +1,7 @@
 <template lang="html">
     <div id="occ_documents">
         <FormSection :formCollapse="false" label="Documents" Index="documents">
-            <alert type="warning">Do not upload Management or Recovery Plans here</alert>
+            <alert type="warning"><i class="bi bi-ban fs-6 fw-bold me-2"></i>Do not upload Management or Recovery Plans here</alert>
             <form class="form-horizontal" action="index.html" method="post">
                 <div class="col-sm-12">
                     <div class="text-end">
diff --git a/boranga/frontend/boranga/src/components/common/occurrence/ocr_documents.vue b/boranga/frontend/boranga/src/components/common/occurrence/ocr_documents.vue
index 1873c205..3eef1eb2 100644
--- a/boranga/frontend/boranga/src/components/common/occurrence/ocr_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/occurrence/ocr_documents.vue
@@ -1,7 +1,7 @@
 <template lang="html">
     <div id="ocr_documents">
         <FormSection :formCollapse="false" label="Documents" Index="documents">
-            <alert type="warning">Do not upload Management or Recovery Plans here</alert>
+            <alert type="warning"><i class="bi bi-ban fs-6 fw-bold me-2"></i>Do not upload Management or Recovery Plans here</alert>
             <form class="form-horizontal" action="index.html" method="post">
                 <div v-if="!isReadOnly" class="col-sm-12">
                     <div class="text-end">
diff --git a/boranga/frontend/boranga/src/components/common/species_communities/community_documents.vue b/boranga/frontend/boranga/src/components/common/species_communities/community_documents.vue
index 2ce6546e..9c4aa81e 100644
--- a/boranga/frontend/boranga/src/components/common/species_communities/community_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/species_communities/community_documents.vue
@@ -1,7 +1,7 @@
 <template lang="html">
     <div id="community_documents">
         <FormSection :formCollapse="false" label="Documents" Index="documents">
-            <alert type="warning">Do not upload Management or Recovery Plans here</alert>
+            <alert type="warning"><i class="bi bi-ban fs-6 fw-bold me-2"></i>Do not upload Management or Recovery Plans here</alert>
             <form class="form-horizontal" action="index.html" method="post">
                 <div v-if="!species_community.readonly" class="col-sm-12">
                     <div class="text-end">
diff --git a/boranga/frontend/boranga/src/components/common/species_communities/species_documents.vue b/boranga/frontend/boranga/src/components/common/species_communities/species_documents.vue
index 8151c1eb..d0fc00b7 100644
--- a/boranga/frontend/boranga/src/components/common/species_communities/species_documents.vue
+++ b/boranga/frontend/boranga/src/components/common/species_communities/species_documents.vue
@@ -1,7 +1,7 @@
 <template lang="html">
     <div id="species_documents">
         <FormSection :formCollapse="false" label="Documents" :Index="documentBody">
-            <alert type="warning">Do not upload Management or Recovery Plans here</alert>
+            <alert type="warning"><i class="bi bi-ban fs-6 fw-bold me-2"></i>Do not upload Management or Recovery Plans here</alert>
             <form class="form-horizontal" action="index.html" method="post">
                 <div v-if="!is_readonly" class="col-sm-12">
                     <div class="text-end">

From 16419773bb90adaaadbd83af101260349d50afcd Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 6 Nov 2024 15:07:53 +0800
Subject: [PATCH 09/83] Dev ops task 7150: CS additional Administrative fields:
 CAM MOU + Date Sent (re sending for Commonwealth Listing).

---
 .../components/conservation_status/models.py  |  2 ++
 .../conservation_status/serializers.py        |  6 ++++
 .../conservation_status/community_status.vue  | 29 +++++++++++++++++++
 .../conservation_status/species_status.vue    | 28 ++++++++++++++++++
 ...487_conservationstatus_cam_mou_and_more.py | 26 +++++++++++++++++
 5 files changed, 91 insertions(+)
 create mode 100644 boranga/migrations/0487_conservationstatus_cam_mou_and_more.py

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index 191375a1..3294182c 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -521,6 +521,8 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
     )
     international_conservation = models.CharField(max_length=100, blank=True, null=True)
     conservation_criteria = models.CharField(max_length=100, blank=True, null=True)
+    cam_mou = models.BooleanField(null=True, blank=True)
+    cam_mou_date_sent = models.DateField(null=True, blank=True)
 
     APPROVAL_LEVEL_IMMEDIATE = "immediate"
     APPROVAL_LEVEL_MINISTER = "minister"
diff --git a/boranga/components/conservation_status/serializers.py b/boranga/components/conservation_status/serializers.py
index f0f65366..0a6e10fb 100644
--- a/boranga/components/conservation_status/serializers.py
+++ b/boranga/components/conservation_status/serializers.py
@@ -868,6 +868,8 @@ class Meta:
             "is_submitter",
             "can_add_log",
             "can_user_assign_to_self",
+            "cam_mou",
+            "cam_mou_date_sent",
         )
 
     def get_submitter(self, obj):
@@ -1086,6 +1088,8 @@ class Meta:
             "assessor_data",
             "change_code_id",
             "approval_level",
+            "cam_mou",
+            "cam_mou_date_sent",
         )
         read_only_fields = ("id",)
 
@@ -1230,6 +1234,8 @@ class Meta:
             "assessor_data",
             "change_code_id",
             "approval_level",
+            "cam_mou",
+            "cam_mou_date_sent",
         )
         read_only_fields = ("id",)
 
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
index 86f66252..a965956f 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
@@ -93,6 +93,35 @@
                                 :disabled="listing_and_review_due_date_disabled" />
                         </div>
                     </div>
+                    <div v-if="conservation_status_obj.approval_level == 'minister'" class="row mb-3 border-top pt-3">
+                        <label for="listing_date" class="col-sm-3 col-form-label">CAM MOU:</label>
+                        <div class="col-sm-3 d-flex align-items-center">
+                            <div class="form-check form-check-inline">
+                                Yes <input :disabled="listing_and_review_due_date_disabled" type="radio"
+                                    id="cam_mou_yes" class="form-check-input" name="cam_mou"
+                                    v-model="conservation_status_obj.cam_mou" :value="true" />
+                            </div>
+                            <div class="form-check form-check-inline">
+                                No <input :disabled="listing_and_review_due_date_disabled" type="radio"
+                                    id="conservation_status_under_review_no" class="form-check-input" name="cam_mou"
+                                    v-model="conservation_status_obj.cam_mou" :value="false" />
+                            </div>
+                            <div class="form-check form-check-inline">
+                                N/A <input :disabled="listing_and_review_due_date_disabled" type="radio"
+                                    id="conservation_status_under_review_no" class="form-check-input" name="cam_mou"
+                                    v-model="conservation_status_obj.cam_mou" :value="null" />
+                            </div>
+                        </div>
+                        <template v-if="conservation_status_obj.cam_mou">
+                            <label for="review_due_date" class="col-sm-3 col-form-label">Date Sent:</label>
+                            <div class="col-sm-3">
+                                <input type="date" placeholder="DD/MM/YYYY" class="form-control" id="cam_mou_date_sent"
+                                    v-model="conservation_status_obj.cam_mou_date_sent"
+                                    :disabled="listing_and_review_due_date_disabled"
+                                    :max="new Date().toISOString().split('T')[0]" />
+                            </div>
+                        </template>
+                    </div>
                 </template>
                 <template v-if="show_proposed_conservation_status">
                     <div class="row mb-3 border-top pt-3">
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
index 0e0a7863..ee453697 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
@@ -99,6 +99,34 @@
                                 :disabled="listing_and_review_due_date_disabled" />
                         </div>
                     </div>
+                    <div v-if="conservation_status_obj.approval_level=='minister'" class="row mb-3 border-top pt-3">
+                        <label for="listing_date" class="col-sm-3 col-form-label">CAM MOU:</label>
+                        <div class="col-sm-3 d-flex align-items-center">
+                            <div class="form-check form-check-inline">
+                                Yes <input :disabled="listing_and_review_due_date_disabled" type="radio" id="cam_mou_yes"
+                                    class="form-check-input" name="cam_mou"
+                                    v-model="conservation_status_obj.cam_mou" :value="true" />
+                            </div>
+                            <div class="form-check form-check-inline">
+                                No <input :disabled="listing_and_review_due_date_disabled" type="radio" id="conservation_status_under_review_no"
+                                    class="form-check-input" name="cam_mou"
+                                    v-model="conservation_status_obj.cam_mou" :value="false" />
+                            </div>
+                            <div class="form-check form-check-inline">
+                                N/A <input :disabled="listing_and_review_due_date_disabled" type="radio" id="conservation_status_under_review_no"
+                                    class="form-check-input" name="cam_mou"
+                                    v-model="conservation_status_obj.cam_mou" :value="null" />
+                            </div>
+                        </div>
+                        <template v-if="conservation_status_obj.cam_mou">
+                            <label for="review_due_date" class="col-sm-3 col-form-label">Date Sent:</label>
+                            <div class="col-sm-3">
+                                <input type="date" placeholder="DD/MM/YYYY" class="form-control" id="cam_mou_date_sent"
+                                    v-model="conservation_status_obj.cam_mou_date_sent"
+                                    :disabled="listing_and_review_due_date_disabled" :max="new Date().toISOString().split('T')[0]" />
+                            </div>
+                        </template>
+                    </div>
                 </template>
                 <template v-if="show_proposed_conservation_status">
                     <div class="row mb-3 border-top pt-3">
diff --git a/boranga/migrations/0487_conservationstatus_cam_mou_and_more.py b/boranga/migrations/0487_conservationstatus_cam_mou_and_more.py
new file mode 100644
index 00000000..e50353ae
--- /dev/null
+++ b/boranga/migrations/0487_conservationstatus_cam_mou_and_more.py
@@ -0,0 +1,26 @@
+# Generated by Django 5.0.9 on 2024-11-06 05:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "boranga",
+            "0486_occurrencereportbulkimporttask__associated_files_zip_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="conservationstatus",
+            name="cam_mou",
+            field=models.BooleanField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="conservationstatus",
+            name="cam_mou_date_sent",
+            field=models.DateField(blank=True, null=True),
+        ),
+    ]

From 49ae707063b8a805d4c4f0d3fb90c3b3fa290900 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 6 Nov 2024 15:58:32 +0800
Subject: [PATCH 10/83] Dev ops task 7147: UX CS - Add Scientific
 Name/Community ID to Header.

---
 .../conservation_status/serializers.py        |  8 +++++++
 .../conservation_status.vue                   | 24 +++++++++++++++----
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/boranga/components/conservation_status/serializers.py b/boranga/components/conservation_status/serializers.py
index 0a6e10fb..a2104368 100644
--- a/boranga/components/conservation_status/serializers.py
+++ b/boranga/components/conservation_status/serializers.py
@@ -805,6 +805,12 @@ class InternalConservationStatusSerializer(BaseConservationStatusSerializer):
     )
     can_add_log = serializers.SerializerMethodField(read_only=True)
     can_user_assign_to_self = serializers.SerializerMethodField(read_only=True)
+    scientific_name = serializers.CharField(
+        source="species_taxonomy.scientific_name", allow_null=True
+    )
+    community_name = serializers.CharField(
+        source="community.taxonomy.community_name", allow_null=True
+    )
 
     class Meta:
         model = ConservationStatus
@@ -813,8 +819,10 @@ class Meta:
             "group_type",
             "group_type_id",
             "species_taxonomy_id",
+            "scientific_name",
             "species_id",
             "community_id",
+            "community_name",
             "conservation_status_number",
             "wa_legislative_list_id",
             "wa_legislative_list",
diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
index da826e1d..7d9fecca 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
@@ -2,7 +2,9 @@
     <div v-if="conservation_status_obj" class="container" id="internalConservationStatus">
         <div class="row" style="padding-bottom: 50px;">
             <h3><span class="text-capitalize">{{ conservation_status_obj.group_type }}</span> {{
-                conservation_status_obj.conservation_status_number }}</h3>
+                conservation_status_obj.conservation_status_number }} <span class="text-capitalize" v-if="identifier"> - {{ identifier
+                    }}</span>
+            </h3>
             <div class="col-md-3">
                 <CommsLogs :comms_url="comms_url" :logs_url="logs_url" :comms_add_url="comms_add_url"
                     :disable_add_entry="!conservation_status_obj.can_add_log" />
@@ -292,7 +294,8 @@
                                             </div>
                                         </div>
                                     </template>
-                                    <template v-else-if="conservation_status_obj.processing_status == 'Proposed DeListed'">
+                                    <template
+                                        v-else-if="conservation_status_obj.processing_status == 'Proposed DeListed'">
                                         <div class="row">
                                             <div class="col-sm-12">
                                                 <button style="width:90%;" class="btn btn-primary"
@@ -441,9 +444,9 @@ export default {
     data: function () {
         let vm = this;
         return {
-            "conservation_status_obj": null,
-            "original_conservation_status_obj": null,
-            "loading": [],
+            conservation_status_obj: null,
+            original_conservation_status_obj: null,
+            loading: [],
             form: null,
             savingConservationStatus: false,
             saveExitConservationStatus: false,
@@ -487,6 +490,17 @@ export default {
         }
     },
     computed: {
+        identifier: function () {
+            if (this.conservation_status_obj) {
+                if (this.conservation_status_obj.group_type == 'community') {
+                    return this.conservation_status_obj.community_name ? this.conservation_status_obj.community_name : '';
+                } else {
+                    return this.conservation_status_obj.scientific_name ? this.conservation_status_obj.scientific_name : '';
+                }
+            }
+
+            return '';
+        },
         csrf_token: function () {
             return helpers.getCookie('csrftoken')
         },

From 37358f66e1245f01ab77996e77718adf89d69e58 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Thu, 7 Nov 2024 10:58:35 +0800
Subject: [PATCH 11/83] Dev ops task 7128: OCR and CS - Decide what to do with
 unused approved_by field. The field is now used to store the user id of the
 original approver. This is not utilised in the application anywhere at this
 stage but may be used in future.

---
 boranga/components/conservation_status/models.py | 1 +
 boranga/components/occurrence/models.py          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index 3294182c..e9666876 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -1397,6 +1397,7 @@ def final_approval(self, request, details):
         self.processing_status = ConservationStatus.PROCESSING_STATUS_APPROVED
         self.customer_status = ConservationStatus.CUSTOMER_STATUS_APPROVED
         self.assigned_officer = None
+        self.approved_by = request.user.id
 
         if effective_from:
             self.effective_from = effective_from
diff --git a/boranga/components/occurrence/models.py b/boranga/components/occurrence/models.py
index eee0c1df..1372157b 100644
--- a/boranga/components/occurrence/models.py
+++ b/boranga/components/occurrence/models.py
@@ -990,6 +990,7 @@ def approve(self, request):
 
         self.processing_status = OccurrenceReport.PROCESSING_STATUS_APPROVED
         self.customer_status = OccurrenceReport.CUSTOMER_STATUS_APPROVED
+        self.approved_by = request.user.id
 
         if self.approval_details.occurrence:
             occurrence = self.approval_details.occurrence

From 113435c836c6c09fb873f4dfee7998c39a8eed7d Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Thu, 7 Nov 2024 11:34:10 +0800
Subject: [PATCH 12/83] Add public_consultation, public_consultation_start_date
 and public_consultation_end_date to CS model.

---
 .../components/conservation_status/models.py  |  3 ++
 ...tionstatus_public_consultation_and_more.py | 28 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 boranga/migrations/0488_conservationstatus_public_consultation_and_more.py

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index e9666876..f179051c 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -523,6 +523,9 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
     conservation_criteria = models.CharField(max_length=100, blank=True, null=True)
     cam_mou = models.BooleanField(null=True, blank=True)
     cam_mou_date_sent = models.DateField(null=True, blank=True)
+    public_consultation = models.BooleanField(default=False, blank=True)
+    public_consultation_start_date = models.DateField(null=True, blank=True)
+    public_consultation_end_date = models.DateField(null=True, blank=True)
 
     APPROVAL_LEVEL_IMMEDIATE = "immediate"
     APPROVAL_LEVEL_MINISTER = "minister"
diff --git a/boranga/migrations/0488_conservationstatus_public_consultation_and_more.py b/boranga/migrations/0488_conservationstatus_public_consultation_and_more.py
new file mode 100644
index 00000000..d2edce40
--- /dev/null
+++ b/boranga/migrations/0488_conservationstatus_public_consultation_and_more.py
@@ -0,0 +1,28 @@
+# Generated by Django 5.0.9 on 2024-11-07 03:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0487_conservationstatus_cam_mou_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="conservationstatus",
+            name="public_consultation",
+            field=models.BooleanField(blank=True, default=False),
+        ),
+        migrations.AddField(
+            model_name="conservationstatus",
+            name="public_consultation_end_date",
+            field=models.DateField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="conservationstatus",
+            name="public_consultation_start_date",
+            field=models.DateField(blank=True, null=True),
+        ),
+    ]

From fb7ebfac7907466f9ea7db606a6dbd8eff8a79e4 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Thu, 7 Nov 2024 12:12:48 +0800
Subject: [PATCH 13/83] Dev ops task 7151: CS additional Administrative fields:
 Public Consultation set of three new fields.

---
 .../conservation_status/serializers.py        |  9 +++
 .../conservation_status/community_status.vue  | 34 ++++++++++++
 .../conservation_status/species_status.vue    | 55 +++++++++++++++----
 3 files changed, 88 insertions(+), 10 deletions(-)

diff --git a/boranga/components/conservation_status/serializers.py b/boranga/components/conservation_status/serializers.py
index a2104368..2a71f65c 100644
--- a/boranga/components/conservation_status/serializers.py
+++ b/boranga/components/conservation_status/serializers.py
@@ -878,6 +878,9 @@ class Meta:
             "can_user_assign_to_self",
             "cam_mou",
             "cam_mou_date_sent",
+            "public_consultation",
+            "public_consultation_start_date",
+            "public_consultation_end_date",
         )
 
     def get_submitter(self, obj):
@@ -1098,6 +1101,9 @@ class Meta:
             "approval_level",
             "cam_mou",
             "cam_mou_date_sent",
+            "public_consultation",
+            "public_consultation_start_date",
+            "public_consultation_end_date",
         )
         read_only_fields = ("id",)
 
@@ -1244,6 +1250,9 @@ class Meta:
             "approval_level",
             "cam_mou",
             "cam_mou_date_sent",
+            "public_consultation",
+            "public_consultation_start_date",
+            "public_consultation_end_date",
         )
         read_only_fields = ("id",)
 
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
index a965956f..0c4dcfa7 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
@@ -61,6 +61,40 @@
                             </select>
                         </div>
                     </div>
+                    <div class="row mb-3 border-top pt-3">
+                        <label for="listing_date" class="col-sm-3 col-form-label">Public Consultation:</label>
+                        <div class="col-sm-9 d-flex align-items-center">
+                            <div class="form-check form-check-inline">
+                                Yes <input :disabled="listing_and_review_due_date_disabled" type="radio"
+                                    id="public_consultation_yes" class="form-check-input" name="public_consultation"
+                                    v-model="conservation_status_obj.public_consultation" :value="true" />
+                            </div>
+                            <div class="form-check form-check-inline">
+                                No <input :disabled="listing_and_review_due_date_disabled" type="radio"
+                                    id="public_consultation_no" class="form-check-input" name="public_consultation"
+                                    v-model="conservation_status_obj.public_consultation" :value="false" />
+                            </div>
+                        </div>
+                    </div>
+                    <div v-if="conservation_status_obj.public_consultation" class="row mb-3 pt-1">
+                        <label for="review_due_date" class="col-sm-3 col-form-label">Start Date:</label>
+                        <div class="col-sm-3">
+                            <input type="date" placeholder="DD/MM/YYYY" class="form-control"
+                                id="public_consultation_start_date"
+                                v-model="conservation_status_obj.public_consultation_start_date"
+                                :disabled="listing_and_review_due_date_disabled" />
+                        </div>
+                        <template v-if="conservation_status_obj.public_consultation_start_date">
+                            <label for="review_due_date" class="col-sm-3 col-form-label">End Date:</label>
+                            <div class="col-sm-3">
+                                <input type="date" placeholder="DD/MM/YYYY" class="form-control"
+                                    id="public_consultation_end_date"
+                                    v-model="conservation_status_obj.public_consultation_end_date"
+                                    :disabled="listing_and_review_due_date_disabled"
+                                    :min="conservation_status_obj.public_consultation_start_date ? new Date(conservation_status_obj.public_consultation_start_date).toISOString().split('T')[0] : null" />
+                            </div>
+                        </template>
+                    </div>
                     <div v-if="conservation_status_obj.effective_from || conservation_status_obj.effective_to"
                         class="row mb-3 border-top pt-3">
                         <template v-if="conservation_status_obj.effective_from">
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
index ee453697..be0320b9 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
@@ -67,6 +67,40 @@
                             </select>
                         </div>
                     </div>
+                    <div class="row mb-3 border-top pt-3">
+                        <label for="listing_date" class="col-sm-3 col-form-label">Public Consultation:</label>
+                        <div class="col-sm-9 d-flex align-items-center">
+                            <div class="form-check form-check-inline">
+                                Yes <input :disabled="listing_and_review_due_date_disabled" type="radio"
+                                    id="public_consultation_yes" class="form-check-input" name="public_consultation"
+                                    v-model="conservation_status_obj.public_consultation" :value="true" />
+                            </div>
+                            <div class="form-check form-check-inline">
+                                No <input :disabled="listing_and_review_due_date_disabled" type="radio"
+                                    id="public_consultation_no" class="form-check-input" name="public_consultation"
+                                    v-model="conservation_status_obj.public_consultation" :value="false" />
+                            </div>
+                        </div>
+                    </div>
+                    <div v-if="conservation_status_obj.public_consultation" class="row mb-3 pt-1">
+                        <label for="review_due_date" class="col-sm-3 col-form-label">Start Date:</label>
+                        <div class="col-sm-3">
+                            <input type="date" placeholder="DD/MM/YYYY" class="form-control"
+                                id="public_consultation_start_date"
+                                v-model="conservation_status_obj.public_consultation_start_date"
+                                :disabled="listing_and_review_due_date_disabled" />
+                        </div>
+                        <template v-if="conservation_status_obj.public_consultation_start_date">
+                            <label for="review_due_date" class="col-sm-3 col-form-label">End Date:</label>
+                            <div class="col-sm-3">
+                                <input type="date" placeholder="DD/MM/YYYY" class="form-control"
+                                    id="public_consultation_end_date"
+                                    v-model="conservation_status_obj.public_consultation_end_date"
+                                    :disabled="listing_and_review_due_date_disabled"
+                                    :min="conservation_status_obj.public_consultation_start_date ? new Date(conservation_status_obj.public_consultation_start_date).toISOString().split('T')[0] : null" />
+                            </div>
+                        </template>
+                    </div>
                     <div v-if="conservation_status_obj.effective_from || conservation_status_obj.effective_to"
                         class="row mb-3 border-top pt-3">
                         <template v-if="conservation_status_obj.effective_from">
@@ -99,23 +133,23 @@
                                 :disabled="listing_and_review_due_date_disabled" />
                         </div>
                     </div>
-                    <div v-if="conservation_status_obj.approval_level=='minister'" class="row mb-3 border-top pt-3">
+                    <div v-if="conservation_status_obj.approval_level == 'minister'" class="row mb-3 border-top pt-3">
                         <label for="listing_date" class="col-sm-3 col-form-label">CAM MOU:</label>
                         <div class="col-sm-3 d-flex align-items-center">
                             <div class="form-check form-check-inline">
-                                Yes <input :disabled="listing_and_review_due_date_disabled" type="radio" id="cam_mou_yes"
-                                    class="form-check-input" name="cam_mou"
+                                Yes <input :disabled="listing_and_review_due_date_disabled" type="radio"
+                                    id="cam_mou_yes" class="form-check-input" name="cam_mou"
                                     v-model="conservation_status_obj.cam_mou" :value="true" />
                             </div>
                             <div class="form-check form-check-inline">
-                                No <input :disabled="listing_and_review_due_date_disabled" type="radio" id="conservation_status_under_review_no"
-                                    class="form-check-input" name="cam_mou"
-                                    v-model="conservation_status_obj.cam_mou" :value="false" />
+                                No <input :disabled="listing_and_review_due_date_disabled" type="radio" id="cam_mou_no"
+                                    class="form-check-input" name="cam_mou" v-model="conservation_status_obj.cam_mou"
+                                    :value="false" />
                             </div>
                             <div class="form-check form-check-inline">
-                                N/A <input :disabled="listing_and_review_due_date_disabled" type="radio" id="conservation_status_under_review_no"
-                                    class="form-check-input" name="cam_mou"
-                                    v-model="conservation_status_obj.cam_mou" :value="null" />
+                                N/A <input :disabled="listing_and_review_due_date_disabled" type="radio" id="cam_mou_na"
+                                    class="form-check-input" name="cam_mou" v-model="conservation_status_obj.cam_mou"
+                                    :value="null" />
                             </div>
                         </div>
                         <template v-if="conservation_status_obj.cam_mou">
@@ -123,7 +157,8 @@
                             <div class="col-sm-3">
                                 <input type="date" placeholder="DD/MM/YYYY" class="form-control" id="cam_mou_date_sent"
                                     v-model="conservation_status_obj.cam_mou_date_sent"
-                                    :disabled="listing_and_review_due_date_disabled" :max="new Date().toISOString().split('T')[0]" />
+                                    :disabled="listing_and_review_due_date_disabled"
+                                    :max="new Date().toISOString().split('T')[0]" />
                             </div>
                         </template>
                     </div>

From 3830938231f32c07bc2fc15b378b1c2ff23d39e3 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Thu, 7 Nov 2024 16:38:04 +0800
Subject: [PATCH 14/83] Only show the public consultation section when the
 approval level is ministerial.

---
 .../conservation_status/community_status.vue  | 60 ++++++++++---------
 .../conservation_status/species_status.vue    | 60 ++++++++++---------
 2 files changed, 62 insertions(+), 58 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
index 0c4dcfa7..cac497aa 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
@@ -61,40 +61,42 @@
                             </select>
                         </div>
                     </div>
-                    <div class="row mb-3 border-top pt-3">
-                        <label for="listing_date" class="col-sm-3 col-form-label">Public Consultation:</label>
-                        <div class="col-sm-9 d-flex align-items-center">
-                            <div class="form-check form-check-inline">
-                                Yes <input :disabled="listing_and_review_due_date_disabled" type="radio"
-                                    id="public_consultation_yes" class="form-check-input" name="public_consultation"
-                                    v-model="conservation_status_obj.public_consultation" :value="true" />
-                            </div>
-                            <div class="form-check form-check-inline">
-                                No <input :disabled="listing_and_review_due_date_disabled" type="radio"
-                                    id="public_consultation_no" class="form-check-input" name="public_consultation"
-                                    v-model="conservation_status_obj.public_consultation" :value="false" />
+                    <template v-if="conservation_status_obj.approval_level == 'minister'">
+                        <div class="row mb-3 border-top pt-3">
+                            <label for="listing_date" class="col-sm-3 col-form-label">Public Consultation:</label>
+                            <div class="col-sm-9 d-flex align-items-center">
+                                <div class="form-check form-check-inline">
+                                    Yes <input :disabled="listing_and_review_due_date_disabled" type="radio"
+                                        id="public_consultation_yes" class="form-check-input" name="public_consultation"
+                                        v-model="conservation_status_obj.public_consultation" :value="true" />
+                                </div>
+                                <div class="form-check form-check-inline">
+                                    No <input :disabled="listing_and_review_due_date_disabled" type="radio"
+                                        id="public_consultation_no" class="form-check-input" name="public_consultation"
+                                        v-model="conservation_status_obj.public_consultation" :value="false" />
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    <div v-if="conservation_status_obj.public_consultation" class="row mb-3 pt-1">
-                        <label for="review_due_date" class="col-sm-3 col-form-label">Start Date:</label>
-                        <div class="col-sm-3">
-                            <input type="date" placeholder="DD/MM/YYYY" class="form-control"
-                                id="public_consultation_start_date"
-                                v-model="conservation_status_obj.public_consultation_start_date"
-                                :disabled="listing_and_review_due_date_disabled" />
-                        </div>
-                        <template v-if="conservation_status_obj.public_consultation_start_date">
-                            <label for="review_due_date" class="col-sm-3 col-form-label">End Date:</label>
+                        <div v-if="conservation_status_obj.public_consultation" class="row mb-3 pt-1">
+                            <label for="review_due_date" class="col-sm-3 col-form-label">Start Date:</label>
                             <div class="col-sm-3">
                                 <input type="date" placeholder="DD/MM/YYYY" class="form-control"
-                                    id="public_consultation_end_date"
-                                    v-model="conservation_status_obj.public_consultation_end_date"
-                                    :disabled="listing_and_review_due_date_disabled"
-                                    :min="conservation_status_obj.public_consultation_start_date ? new Date(conservation_status_obj.public_consultation_start_date).toISOString().split('T')[0] : null" />
+                                    id="public_consultation_start_date"
+                                    v-model="conservation_status_obj.public_consultation_start_date"
+                                    :disabled="listing_and_review_due_date_disabled" />
                             </div>
-                        </template>
-                    </div>
+                            <template v-if="conservation_status_obj.public_consultation_start_date">
+                                <label for="review_due_date" class="col-sm-3 col-form-label">End Date:</label>
+                                <div class="col-sm-3">
+                                    <input type="date" placeholder="DD/MM/YYYY" class="form-control"
+                                        id="public_consultation_end_date"
+                                        v-model="conservation_status_obj.public_consultation_end_date"
+                                        :disabled="listing_and_review_due_date_disabled"
+                                        :min="conservation_status_obj.public_consultation_start_date ? new Date(conservation_status_obj.public_consultation_start_date).toISOString().split('T')[0] : null" />
+                                </div>
+                            </template>
+                        </div>
+                    </template>
                     <div v-if="conservation_status_obj.effective_from || conservation_status_obj.effective_to"
                         class="row mb-3 border-top pt-3">
                         <template v-if="conservation_status_obj.effective_from">
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
index be0320b9..60baf594 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
@@ -67,40 +67,42 @@
                             </select>
                         </div>
                     </div>
-                    <div class="row mb-3 border-top pt-3">
-                        <label for="listing_date" class="col-sm-3 col-form-label">Public Consultation:</label>
-                        <div class="col-sm-9 d-flex align-items-center">
-                            <div class="form-check form-check-inline">
-                                Yes <input :disabled="listing_and_review_due_date_disabled" type="radio"
-                                    id="public_consultation_yes" class="form-check-input" name="public_consultation"
-                                    v-model="conservation_status_obj.public_consultation" :value="true" />
-                            </div>
-                            <div class="form-check form-check-inline">
-                                No <input :disabled="listing_and_review_due_date_disabled" type="radio"
-                                    id="public_consultation_no" class="form-check-input" name="public_consultation"
-                                    v-model="conservation_status_obj.public_consultation" :value="false" />
+                    <template v-if="conservation_status_obj.approval_level == 'minister'">
+                        <div class="row mb-3 border-top pt-3">
+                            <label for="listing_date" class="col-sm-3 col-form-label">Public Consultation:</label>
+                            <div class="col-sm-9 d-flex align-items-center">
+                                <div class="form-check form-check-inline">
+                                    Yes <input :disabled="listing_and_review_due_date_disabled" type="radio"
+                                        id="public_consultation_yes" class="form-check-input" name="public_consultation"
+                                        v-model="conservation_status_obj.public_consultation" :value="true" />
+                                </div>
+                                <div class="form-check form-check-inline">
+                                    No <input :disabled="listing_and_review_due_date_disabled" type="radio"
+                                        id="public_consultation_no" class="form-check-input" name="public_consultation"
+                                        v-model="conservation_status_obj.public_consultation" :value="false" />
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    <div v-if="conservation_status_obj.public_consultation" class="row mb-3 pt-1">
-                        <label for="review_due_date" class="col-sm-3 col-form-label">Start Date:</label>
-                        <div class="col-sm-3">
-                            <input type="date" placeholder="DD/MM/YYYY" class="form-control"
-                                id="public_consultation_start_date"
-                                v-model="conservation_status_obj.public_consultation_start_date"
-                                :disabled="listing_and_review_due_date_disabled" />
-                        </div>
-                        <template v-if="conservation_status_obj.public_consultation_start_date">
-                            <label for="review_due_date" class="col-sm-3 col-form-label">End Date:</label>
+                        <div v-if="conservation_status_obj.public_consultation" class="row mb-3 pt-1">
+                            <label for="review_due_date" class="col-sm-3 col-form-label">Start Date:</label>
                             <div class="col-sm-3">
                                 <input type="date" placeholder="DD/MM/YYYY" class="form-control"
-                                    id="public_consultation_end_date"
-                                    v-model="conservation_status_obj.public_consultation_end_date"
-                                    :disabled="listing_and_review_due_date_disabled"
-                                    :min="conservation_status_obj.public_consultation_start_date ? new Date(conservation_status_obj.public_consultation_start_date).toISOString().split('T')[0] : null" />
+                                    id="public_consultation_start_date"
+                                    v-model="conservation_status_obj.public_consultation_start_date"
+                                    :disabled="listing_and_review_due_date_disabled" />
                             </div>
-                        </template>
-                    </div>
+                            <template v-if="conservation_status_obj.public_consultation_start_date">
+                                <label for="review_due_date" class="col-sm-3 col-form-label">End Date:</label>
+                                <div class="col-sm-3">
+                                    <input type="date" placeholder="DD/MM/YYYY" class="form-control"
+                                        id="public_consultation_end_date"
+                                        v-model="conservation_status_obj.public_consultation_end_date"
+                                        :disabled="listing_and_review_due_date_disabled"
+                                        :min="conservation_status_obj.public_consultation_start_date ? new Date(conservation_status_obj.public_consultation_start_date).toISOString().split('T')[0] : null" />
+                                </div>
+                            </template>
+                        </div>
+                    </template>
                     <div v-if="conservation_status_obj.effective_from || conservation_status_obj.effective_to"
                         class="row mb-3 border-top pt-3">
                         <template v-if="conservation_status_obj.effective_from">

From 3002d5388ea402cdc8dc8d523dcd695ef492a578 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 09:19:56 +0800
Subject: [PATCH 15/83] Remove unused processing statuses.

---
 boranga/components/occurrence/models.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/boranga/components/occurrence/models.py b/boranga/components/occurrence/models.py
index 1372157b..c4f0a1d2 100644
--- a/boranga/components/occurrence/models.py
+++ b/boranga/components/occurrence/models.py
@@ -198,14 +198,10 @@ class OccurrenceReport(SubmitterInformationModelMixin, RevisionedMixin):
         "closed",
     ]
 
-    PROCESSING_STATUS_TEMP = "temp"
     PROCESSING_STATUS_DRAFT = "draft"
     PROCESSING_STATUS_WITH_ASSESSOR = "with_assessor"
     PROCESSING_STATUS_WITH_REFERRAL = "with_referral"
     PROCESSING_STATUS_WITH_APPROVER = "with_approver"
-    PROCESSING_STATUS_AWAITING_APPLICANT_RESPONSE = "awaiting_applicant_respone"
-    PROCESSING_STATUS_AWAITING_ASSESSOR_RESPONSE = "awaiting_assessor_response"
-    PROCESSING_STATUS_AWAITING_RESPONSES = "awaiting_responses"
     PROCESSING_STATUS_APPROVED = "approved"
     PROCESSING_STATUS_DECLINED = "declined"
     PROCESSING_STATUS_UNLOCKED = "unlocked"
@@ -216,9 +212,6 @@ class OccurrenceReport(SubmitterInformationModelMixin, RevisionedMixin):
         (PROCESSING_STATUS_WITH_ASSESSOR, "With Assessor"),
         (PROCESSING_STATUS_WITH_REFERRAL, "With Referral"),
         (PROCESSING_STATUS_WITH_APPROVER, "With Approver"),
-        (PROCESSING_STATUS_AWAITING_APPLICANT_RESPONSE, "Awaiting Applicant Response"),
-        (PROCESSING_STATUS_AWAITING_ASSESSOR_RESPONSE, "Awaiting Assessor Response"),
-        (PROCESSING_STATUS_AWAITING_RESPONSES, "Awaiting Responses"),
         (PROCESSING_STATUS_APPROVED, "Approved"),
         (PROCESSING_STATUS_DECLINED, "Declined"),
         (PROCESSING_STATUS_UNLOCKED, "Unlocked"),

From 115cbe979c4333d2bb506691fa310255d4f251b8 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 09:24:09 +0800
Subject: [PATCH 16/83] Remove unused processing statuses. Add in new required
 processing statuses. Add in new filtering groups for processing statuses.

---
 .../components/conservation_status/models.py  | 59 +++++++++++++------
 1 file changed, 40 insertions(+), 19 deletions(-)

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index f179051c..8f750392 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -381,38 +381,60 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
         "closed",
     ]
 
-    PROCESSING_STATUS_TEMP = "temp"
-    PROCESSING_STATUS_DRAFT = "draft"
-    PROCESSING_STATUS_WITH_ASSESSOR = "with_assessor"
-    PROCESSING_STATUS_WITH_REFERRAL = "with_referral"
-    PROCESSING_STATUS_WITH_APPROVER = "with_approver"
-    PROCESSING_STATUS_READY_FOR_AGENDA = "ready_for_agenda"
-    PROCESSING_STATUS_AWAITING_APPLICANT_RESPONSE = "awaiting_applicant_respone"
-    PROCESSING_STATUS_AWAITING_ASSESSOR_RESPONSE = "awaiting_assessor_response"
-    PROCESSING_STATUS_AWAITING_RESPONSES = "awaiting_responses"
     PROCESSING_STATUS_APPROVED = "approved"
+    PROCESSING_STATUS_CLOSED = "closed"
     PROCESSING_STATUS_DECLINED = "declined"
-    PROCESSING_STATUS_UNLOCKED = "unlocked"
+    PROCESSING_STATUS_DEFERRED = "deferred"
+    PROCESSING_STATUS_DELISTED = "delisted"
     PROCESSING_STATUS_DISCARDED = "discarded"
     PROCESSING_STATUS_DISCARDED_INTERNALLY = "discarded_internally"
-    PROCESSING_STATUS_CLOSED = "closed"
-    PROCESSING_STATUS_DELISTED = "delisted"
+    PROCESSING_STATUS_DRAFT = "draft"
+    PROCESSING_STATUS_ON_AGENDA = "on_agenda"
+    PROCESSING_STATUS_PROPOSED_FOR_AGENDA = "proposed_for_agenda"
+    PROCESSING_STATUS_READY_FOR_AGENDA = "ready_for_agenda"
+    PROCESSING_STATUS_UNLOCKED = "unlocked"
+    PROCESSING_STATUS_WITH_APPROVER = "with_approver"
+    PROCESSING_STATUS_WITH_ASSESSOR = "with_assessor"
+    PROCESSING_STATUS_WITH_REFERRAL = "with_referral"
+
     PROCESSING_STATUS_CHOICES = (
         (PROCESSING_STATUS_DRAFT, "Draft"),
+        (PROCESSING_STATUS_DISCARDED, "Discarded"),
         (PROCESSING_STATUS_WITH_ASSESSOR, "With Assessor"),
         (PROCESSING_STATUS_WITH_REFERRAL, "With Referral"),
-        (PROCESSING_STATUS_WITH_APPROVER, "Proposed DeListed"),
+        (PROCESSING_STATUS_DEFERRED, "Deferred"),
+        (PROCESSING_STATUS_PROPOSED_FOR_AGENDA, "Proposed For Agenda"),
         (PROCESSING_STATUS_READY_FOR_AGENDA, "Ready For Agenda"),
-        (PROCESSING_STATUS_AWAITING_APPLICANT_RESPONSE, "Awaiting Applicant Response"),
-        (PROCESSING_STATUS_AWAITING_ASSESSOR_RESPONSE, "Awaiting Assessor Response"),
-        (PROCESSING_STATUS_AWAITING_RESPONSES, "Awaiting Responses"),
+        (PROCESSING_STATUS_ON_AGENDA, "On Agenda"),
+        (PROCESSING_STATUS_WITH_APPROVER, "Proposed DeListed"),
         (PROCESSING_STATUS_APPROVED, "Approved"),
         (PROCESSING_STATUS_DECLINED, "Declined"),
-        (PROCESSING_STATUS_UNLOCKED, "Unlocked"),
-        (PROCESSING_STATUS_DISCARDED, "Discarded"),
         (PROCESSING_STATUS_DELISTED, "DeListed"),
         (PROCESSING_STATUS_CLOSED, "Closed"),
+        (PROCESSING_STATUS_UNLOCKED, "Unlocked"),
     )
+
+    # The following tuples of statuses are only user for filtering purposes
+    PROCESSING_STATUSES_WAITING_ASSESSOR_ACTION = (
+        PROCESSING_STATUS_WITH_ASSESSOR,
+        PROCESSING_STATUS_WITH_REFERRAL,
+        PROCESSING_STATUS_DEFERRED,
+    )
+
+    PROCESSING_STATUSES_WAITING_APPROVER_ACTION = (
+        PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
+        PROCESSING_STATUS_READY_FOR_AGENDA,
+        PROCESSING_STATUS_ON_AGENDA,
+        PROCESSING_STATUS_DEFERRED,
+        PROCESSING_STATUS_WITH_APPROVER,
+    )
+
+    PROCESSING_STATUSES_INACTIVE = (
+        PROCESSING_STATUS_DECLINED,
+        PROCESSING_STATUS_CLOSED,
+        PROCESSING_STATUS_DELISTED,
+    )
+
     # This status is used as a front end filter but shouldn't be used in most cases
     # So it is deliberately not included in PROCESSING_STATUS_CHOICES
     PROCESSING_STATUS_DISCARDED_BY_ME = "discarded_by_me"
@@ -676,7 +698,6 @@ def can_officer_process(self):
             ConservationStatus.PROCESSING_STATUS_DRAFT,
             ConservationStatus.PROCESSING_STATUS_APPROVED,
             ConservationStatus.PROCESSING_STATUS_DECLINED,
-            ConservationStatus.PROCESSING_STATUS_TEMP,
             ConservationStatus.PROCESSING_STATUS_DISCARDED,
             ConservationStatus.PROCESSING_STATUS_CLOSED,
             ConservationStatus.PROCESSING_STATUS_DELISTED,

From 36b576a5fe72cda02684d75a2c5ad1a187af113d Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 09:25:32 +0800
Subject: [PATCH 17/83] Migrations for processing status changes to Occurrence
 Report and Conservation Status.

---
 ..._alter_communitydocument__file_and_more.py | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 boranga/migrations/0489_alter_communitydocument__file_and_more.py

diff --git a/boranga/migrations/0489_alter_communitydocument__file_and_more.py b/boranga/migrations/0489_alter_communitydocument__file_and_more.py
new file mode 100644
index 00000000..05627d60
--- /dev/null
+++ b/boranga/migrations/0489_alter_communitydocument__file_and_more.py
@@ -0,0 +1,58 @@
+# Generated by Django 5.0.9 on 2024-11-08 01:24
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0488_conservationstatus_public_consultation_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="conservationstatus",
+            name="processing_status",
+            field=models.CharField(
+                choices=[
+                    ("draft", "Draft"),
+                    ("discarded", "Discarded"),
+                    ("with_assessor", "With Assessor"),
+                    ("with_referral", "With Referral"),
+                    ("deferred", "Deferred"),
+                    ("proposed_for_agenda", "Proposed For Agenda"),
+                    ("ready_for_agenda", "Ready For Agenda"),
+                    ("on_agenda", "On Agenda"),
+                    ("with_approver", "Proposed DeListed"),
+                    ("approved", "Approved"),
+                    ("declined", "Declined"),
+                    ("delisted", "DeListed"),
+                    ("closed", "Closed"),
+                    ("unlocked", "Unlocked"),
+                ],
+                default="draft",
+                max_length=30,
+                verbose_name="Processing Status",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="occurrencereport",
+            name="processing_status",
+            field=models.CharField(
+                choices=[
+                    ("draft", "Draft"),
+                    ("with_assessor", "With Assessor"),
+                    ("with_referral", "With Referral"),
+                    ("with_approver", "With Approver"),
+                    ("approved", "Approved"),
+                    ("declined", "Declined"),
+                    ("unlocked", "Unlocked"),
+                    ("discarded", "Discarded"),
+                    ("closed", "DeListed"),
+                ],
+                default="draft",
+                max_length=30,
+                verbose_name="Processing Status",
+            ),
+        ),
+    ]

From 38c1747eebdd34b07f7d0a72209b5ee77802c730 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 09:56:12 +0800
Subject: [PATCH 18/83] Change labels for 'International Conservation' to
 'Other Conservation Assessment'.

---
 .../common/conservation_status/community_status.vue    | 10 +++++-----
 .../common/conservation_status/species_status.vue      | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
index cac497aa..e959b877 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
@@ -323,12 +323,12 @@
                         </div>
                     </div>
                     <div class="row mb-3">
-                        <label for="proposed_international_conservation" class="col-sm-4 col-form-label">International
-                            Conservation:</label>
+                        <label for="proposed_international_conservation" class="col-sm-4 col-form-label">Other
+                            Conservation Assessment:</label>
                         <div class="col-sm-8">
                             <input :disabled="isReadOnly" type="text" class="form-control"
                                 id="proposed_international_conservation"
-                                :placeholder="isReadOnly ? 'N/A' : 'Enter International Conservation Details if Applicable'"
+                                :placeholder="isReadOnly ? 'N/A' : 'Enter Other Conservation Assessment Details if Applicable'"
                                 v-model="conservation_status_obj.international_conservation" />
                         </div>
                     </div>
@@ -468,8 +468,8 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.international_conservation"
                         class="row mb-3">
-                        <label for="current_international_conservation" class="col-sm-4 col-form-label">International
-                            Conservation:</label>
+                        <label for="current_international_conservation" class="col-sm-4 col-form-label">Other
+                            Conservation Assessment:</label>
                         <div class="col-sm-8">
                             <input :disabled="true" type="text" class="form-control"
                                 id="current_international_conservation"
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
index 60baf594..9e3dd7dc 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
@@ -329,12 +329,12 @@
                         </div>
                     </div>
                     <div class="row mb-3">
-                        <label for="proposed_international_conservation" class="col-sm-4 col-form-label">International
-                            Conservation:</label>
+                        <label for="proposed_international_conservation" class="col-sm-4 col-form-label">Other
+                            Conservation Assessment:</label>
                         <div class="col-sm-8">
                             <input :disabled="isReadOnly" type="text" class="form-control"
                                 id="proposed_international_conservation"
-                                :placeholder="isReadOnly ? 'N/A' : 'Enter International Conservation Details if Applicable'"
+                                :placeholder="isReadOnly ? 'N/A' : 'Enter Other Conservation Assessment Details if Applicable'"
                                 v-model="conservation_status_obj.international_conservation" />
                         </div>
                     </div>
@@ -473,8 +473,8 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.international_conservation"
                         class="row mb-3">
-                        <label for="current_international_conservation" class="col-sm-4 col-form-label">International
-                            Conservation:</label>
+                        <label for="current_international_conservation" class="col-sm-4 col-form-label">Other
+                            Conservation Assessment:</label>
                         <div class="col-sm-8">
                             <input :disabled="true" type="text" class="form-control"
                                 id="current_international_conservation"

From a0d1dd4c77e245740e3e9e1064df7a9e903465fd Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 09:57:09 +0800
Subject: [PATCH 19/83] Change WAITING TO AWAITING in processing status filter
 groups.

---
 boranga/components/conservation_status/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index 8f750392..1bb03a78 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -415,13 +415,13 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
     )
 
     # The following tuples of statuses are only user for filtering purposes
-    PROCESSING_STATUSES_WAITING_ASSESSOR_ACTION = (
+    PROCESSING_STATUSES_AWAITING_ASSESSOR_ACTION = (
         PROCESSING_STATUS_WITH_ASSESSOR,
         PROCESSING_STATUS_WITH_REFERRAL,
         PROCESSING_STATUS_DEFERRED,
     )
 
-    PROCESSING_STATUSES_WAITING_APPROVER_ACTION = (
+    PROCESSING_STATUSES_AWAITING_APPROVER_ = (
         PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
         PROCESSING_STATUS_READY_FOR_AGENDA,
         PROCESSING_STATUS_ON_AGENDA,

From 664f631be553cb68943f578800d19729072e925d Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 09:57:55 +0800
Subject: [PATCH 20/83] Update processing status drop down to include new
 processing status filter groups.

---
 ...onservation_status_community_dashboard.vue | 38 ++++++++++--------
 .../conservation_status_fauna_dashboard.vue   | 39 ++++++++++---------
 .../conservation_status_flora_dashboard.vue   | 37 ++++++++++--------
 boranga/static/boranga/css/base.css           |  6 +++
 4 files changed, 68 insertions(+), 52 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue b/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue
index 79bef3d9..56563f15 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue
@@ -83,7 +83,7 @@
                         <label for="">Status:</label>
                         <select class="form-select" v-model="filterCSCommunityApplicationStatus">
                             <option value="all">All</option>
-                            <option v-for="status in processing_statuses" :value="status.value">{{ status.name }}
+                            <option v-for="status in processing_statuses" :value="status.value" :class="status.className"><template v-if="status.className == 'optionChild'">&nbsp;&nbsp;</template>{{ status.name }}
                             </option>
                         </select>
                     </div>
@@ -385,19 +385,26 @@ export default {
             wa_legislative_categories: [],
             wa_priority_categories: [],
 
-            internal_status: [
-                { value: 'draft', name: 'Draft' },
-                { value: 'with_assessor', name: 'With Assessor' },
-                { value: 'with_approver', name: 'Proposed DeListed' },
-                { value: 'ready_for_agenda', name: 'Ready For Agenda' },
-                { value: 'closed', name: 'Closed' },
-                { value: 'delisted', name: 'DeListed' },
-                { value: 'with_referral', name: 'With Referral' },
-                { value: 'approved', name: 'Approved' },
-                { value: 'declined', name: 'Declined' },
-                { value: 'discarded', name: 'Discarded' },
+            processing_statuses: [
+            { value: 'draft', name: 'Draft', className: '' },
+                { value: 'discarded', name: 'Discarded', className: '' },
+                { value: 'awaiting_assessor_action', name: 'Awaiting Assessor Action', className: 'optionGroup' },
+                { value: 'with_assessor', name: 'With Assessor', className: 'optionChild' },
+                { value: 'with_referral', name: 'With Referral', className: 'optionChild' },
+                { value: 'deferred', name: 'Deferred', className: 'optionChild' },
+                { value: 'awaiting_approver_action', name: 'Awaiting Approver Action', className: 'optionGroup' },
+                { value: 'proposed_for_agenda', name: 'Proposed For Agenda', className: 'optionChild' },
+                { value: 'ready_for_agenda', name: 'Ready For Agenda', className: 'optionChild' },
+                { value: 'on_agenda', name: 'On Agenda', className: 'optionChild' },
+                { value: 'deferred', name: 'Deferred', className: 'optionChild' },
+                { value: 'with_approver', name: 'Proposed DeListed', className: 'optionChild' },
+                { value: 'inactive', name: 'Inactive', className: 'optionGroup' },
+                { value: 'declined', name: 'Declined', className: 'optionChild' },
+                { value: 'closed', name: 'Closed', className: 'optionChild' },
+                { value: 'delisted', name: 'DeListed', className: 'optionChild' },
+                { value: 'approved', name: 'Approved', className: '' },
+
             ],
-            processing_statuses: [],
         }
     },
     components: {
@@ -1121,9 +1128,6 @@ export default {
                 vm.wa_legislative_categories = vm.filterListsCommunities.wa_legislative_categories;
                 vm.wa_priority_lists = vm.filterListsCommunities.wa_priority_lists;
                 vm.wa_priority_categories = vm.filterListsCommunities.wa_priority_categories;
-                vm.processing_statuses = vm.internal_status.slice().sort((a, b) => {
-                    return a.name.trim().localeCompare(b.name.trim());
-                });
                 vm.change_codes = vm.filterListsCommunities.change_codes;
                 vm.submitter_categories = vm.filterListsCommunities.submitter_categories;
             }, (error) => {
@@ -1504,7 +1508,7 @@ export default {
     mounted: function () {
         let vm = this;
         if (vm.profile && vm.profile.groups && vm.profile.groups.includes(constants.GROUPS.INTERNAL_CONTRIBUTORS)) {
-            vm.internal_status.push({ value: 'discarded_by_me', name: 'Discarded By Me' },);
+            vm.processing_statuses.push({ value: 'discarded_by_me', name: 'Discarded By Me' },);
         }
         vm.fetchFilterLists();
         $('a[data-toggle="collapse"]').on('click', function () {
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue b/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue
index d2ec7e4e..ed8e35e1 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue
@@ -101,7 +101,7 @@
                         <label for="">Status:</label>
                         <select class="form-select" v-model="filterCSFaunaApplicationStatus">
                             <option value="all">All</option>
-                            <option v-for="status in processing_statuses" :value="status.value">{{ status.name }}
+                            <option v-for="status in processing_statuses" :value="status.value" :class="status.className"><template v-if="status.className == 'optionChild'">&nbsp;&nbsp;</template>{{ status.name }}
                             </option>
                         </select>
                     </div>
@@ -436,20 +436,25 @@ export default {
                 { value: 'discarded', name: 'Discarded' },
                 { value: 'awaiting_payment', name: 'Awaiting Payment' },
             ],
-            internal_status: [
-                { value: 'draft', name: 'Draft' },
-                { value: 'with_assessor', name: 'With Assessor' },
-                { value: 'with_approver', name: 'Proposed DeListed' },
-                { value: 'ready_for_agenda', name: 'Ready For Agenda' },
-                { value: 'closed', name: 'Closed' },
-                { value: 'delisted', name: 'DeListed' },
-                { value: 'with_referral', name: 'With Referral' },
-                { value: 'approved', name: 'Approved' },
-                { value: 'declined', name: 'Declined' },
-                { value: 'discarded', name: 'Discarded' },
+            processing_statuses: [
+                { value: 'draft', name: 'Draft', className: '' },
+                { value: 'discarded', name: 'Discarded', className: '' },
+                { value: 'awaiting_assessor_action', name: 'Awaiting Assessor Action', className: 'optionGroup' },
+                { value: 'with_assessor', name: 'With Assessor', className: 'optionChild' },
+                { value: 'with_referral', name: 'With Referral', className: 'optionChild' },
+                { value: 'deferred', name: 'Deferred', className: 'optionChild' },
+                { value: 'awaiting_approver_action', name: 'Awaiting Approver Action', className: 'optionGroup' },
+                { value: 'proposed_for_agenda', name: 'Proposed For Agenda', className: 'optionChild' },
+                { value: 'ready_for_agenda', name: 'Ready For Agenda', className: 'optionChild' },
+                { value: 'on_agenda', name: 'On Agenda', className: 'optionChild' },
+                { value: 'deferred', name: 'Deferred', className: 'optionChild' },
+                { value: 'with_approver', name: 'Proposed DeListed', className: 'optionChild' },
+                { value: 'inactive', name: 'Inactive', className: 'optionGroup' },
+                { value: 'declined', name: 'Declined', className: 'optionChild' },
+                { value: 'closed', name: 'Closed', className: 'optionChild' },
+                { value: 'delisted', name: 'DeListed', className: 'optionChild' },
+                { value: 'approved', name: 'Approved', className: '' },
             ],
-
-            processing_statuses: [],
         }
     },
     components: {
@@ -1325,9 +1330,7 @@ export default {
                 vm.wa_legislative_categories = vm.filterListsSpecies.wa_legislative_categories;
                 vm.wa_priority_lists = vm.filterListsSpecies.wa_priority_lists;
                 vm.wa_priority_categories = vm.filterListsSpecies.wa_priority_categories;
-                vm.processing_statuses = vm.internal_status.slice().sort((a, b) => {
-                    return a.name.trim().localeCompare(b.name.trim());
-                });
+                vm.processing_statuses = vm.processing_statuses;
                 vm.change_codes = vm.filterListsSpecies.change_codes;
                 vm.submitter_categories = vm.filterListsSpecies.submitter_categories;
 
@@ -1700,7 +1703,7 @@ export default {
     mounted: function () {
         let vm = this;
         if (vm.profile && vm.profile.groups && vm.profile.groups.includes(constants.GROUPS.INTERNAL_CONTRIBUTORS)) {
-            vm.internal_status.push({ value: 'discarded_by_me', name: 'Discarded By Me' },);
+            vm.processing_statuses.push({ value: 'discarded_by_me', name: 'Discarded By Me' },);
         }
         vm.fetchFilterLists();
         $('a[data-toggle="collapse"]').on('click', function () {
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue b/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue
index 4e02f2c1..abad9d4a 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue
@@ -101,7 +101,7 @@
                         <label for="">Status:</label>
                         <select class="form-select" v-model="filterCSFloraApplicationStatus">
                             <option value="all">All</option>
-                            <option v-for="status in processing_statuses" :value="status.value">{{ status.name }}
+                            <option v-for="status in processing_statuses" :value="status.value" :class="status.className"><template v-if="status.className == 'optionChild'">&nbsp;&nbsp;</template>{{ status.name }}
                             </option>
                         </select>
                     </div>
@@ -427,19 +427,25 @@ export default {
             wa_legislative_categories: [],
             wa_priority_categories: [],
 
-            internal_status: [
-                { value: 'draft', name: 'Draft' },
-                { value: 'with_assessor', name: 'With Assessor' },
-                { value: 'with_approver', name: 'Proposed DeListed' },
-                { value: 'ready_for_agenda', name: 'Ready For Agenda' },
-                { value: 'closed', name: 'Closed' },
-                { value: 'delisted', name: 'DeListed' },
-                { value: 'with_referral', name: 'With Referral' },
-                { value: 'approved', name: 'Approved' },
-                { value: 'declined', name: 'Declined' },
-                { value: 'discarded', name: 'Discarded' },
+            processing_statuses: [
+                { value: 'draft', name: 'Draft', className: '' },
+                { value: 'discarded', name: 'Discarded', className: '' },
+                { value: 'awaiting_assessor_action', name: 'Awaiting Assessor Action', className: 'optionGroup' },
+                { value: 'with_assessor', name: 'With Assessor', className: 'optionChild' },
+                { value: 'with_referral', name: 'With Referral', className: 'optionChild' },
+                { value: 'deferred', name: 'Deferred', className: 'optionChild' },
+                { value: 'awaiting_approver_action', name: 'Awaiting Approver Action', className: 'optionGroup' },
+                { value: 'proposed_for_agenda', name: 'Proposed For Agenda', className: 'optionChild' },
+                { value: 'ready_for_agenda', name: 'Ready For Agenda', className: 'optionChild' },
+                { value: 'on_agenda', name: 'On Agenda', className: 'optionChild' },
+                { value: 'deferred', name: 'Deferred', className: 'optionChild' },
+                { value: 'with_approver', name: 'Proposed DeListed', className: 'optionChild' },
+                { value: 'inactive', name: 'Inactive', className: 'optionGroup' },
+                { value: 'declined', name: 'Declined', className: 'optionChild' },
+                { value: 'closed', name: 'Closed', className: 'optionChild' },
+                { value: 'delisted', name: 'DeListed', className: 'optionChild' },
+                { value: 'approved', name: 'Approved', className: '' },
             ],
-            processing_statuses: [],
         }
     },
     components: {
@@ -1315,9 +1321,6 @@ export default {
                 vm.wa_legislative_categories = vm.filterListsSpecies.wa_legislative_categories;
                 vm.wa_priority_lists = vm.filterListsSpecies.wa_priority_lists;
                 vm.wa_priority_categories = vm.filterListsSpecies.wa_priority_categories;
-                vm.processing_statuses = vm.internal_status.slice().sort((a, b) => {
-                    return a.name.trim().localeCompare(b.name.trim());
-                });
                 vm.change_codes = vm.filterListsSpecies.change_codes;
                 vm.submitter_categories = vm.filterListsSpecies.submitter_categories;
             }, (error) => {
@@ -1688,7 +1691,7 @@ export default {
     mounted: function () {
         let vm = this;
         if (vm.profile && vm.profile.groups && vm.profile.groups.includes(constants.GROUPS.INTERNAL_CONTRIBUTORS)) {
-            vm.internal_status.push({ value: 'discarded_by_me', name: 'Discarded By Me' },);
+            vm.processing_statuses.push({ value: 'discarded_by_me', name: 'Discarded By Me' },);
         }
         vm.fetchFilterLists();
         $('a[data-toggle="collapse"]').on('click', function () {
diff --git a/boranga/static/boranga/css/base.css b/boranga/static/boranga/css/base.css
index 4ae2181d..f5bb403a 100755
--- a/boranga/static/boranga/css/base.css
+++ b/boranga/static/boranga/css/base.css
@@ -228,3 +228,9 @@ table.dataTable a:hover {
 .swal2-container {
     z-index: 9999;
 }
+
+
+.optionGroup {
+    font-weight: bold;
+    font-style: italic;
+}

From 61c387e9f92d456bb19424981d90251a3546821c Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 10:08:30 +0800
Subject: [PATCH 21/83] Add variables to hold the values for the new processing
 status filter group names.

---
 boranga/components/conservation_status/models.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index 1bb03a78..ed6fe23c 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -421,7 +421,7 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
         PROCESSING_STATUS_DEFERRED,
     )
 
-    PROCESSING_STATUSES_AWAITING_APPROVER_ = (
+    PROCESSING_STATUSES_AWAITING_APPROVER_ACTION = (
         PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
         PROCESSING_STATUS_READY_FOR_AGENDA,
         PROCESSING_STATUS_ON_AGENDA,
@@ -435,9 +435,13 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
         PROCESSING_STATUS_DELISTED,
     )
 
-    # This status is used as a front end filter but shouldn't be used in most cases
+    # These statuses are used as front end filters but shouldn't be used in most cases
     # So it is deliberately not included in PROCESSING_STATUS_CHOICES
     PROCESSING_STATUS_DISCARDED_BY_ME = "discarded_by_me"
+    PROCESSING_STATUS_AWAITING_ASSESSOR_ACTION = "awaiting_assessor_action"
+    PROCESSING_STATUS_AWAITING_APPROVER_ACTION = "awaiting_approver_action"
+    PROCESSING_STATUS_INACTIVE = "inactive"
+
     customer_status = models.CharField(
         "Customer Status",
         max_length=40,

From d78f9219c96cb09cdbc4f0c47c8e26eea3503792 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 10:08:53 +0800
Subject: [PATCH 22/83] Add backend filtering for new filter group options.

---
 boranga/components/conservation_status/api.py | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/boranga/components/conservation_status/api.py b/boranga/components/conservation_status/api.py
index e2d598b1..359ec351 100644
--- a/boranga/components/conservation_status/api.py
+++ b/boranga/components/conservation_status/api.py
@@ -414,6 +414,27 @@ def filter_queryset(self, request, queryset, view):
                         submitter=request.user.id,
                         processing_status=ConservationStatus.PROCESSING_STATUS_DISCARDED,
                     )
+                elif (
+                    filter_application_status
+                    == ConservationStatus.PROCESSING_STATUS_AWAITING_ASSESSOR_ACTION
+                ):
+                    queryset = queryset.filter(
+                        processing_status__in=ConservationStatus.PROCESSING_STATUSES_AWAITING_ASSESSOR_ACTION
+                    )
+                elif (
+                    filter_application_status
+                    == ConservationStatus.PROCESSING_STATUS_AWAITING_APPROVER_ACTION
+                ):
+                    queryset = queryset.filter(
+                        processing_status__in=ConservationStatus.PROCESSING_STATUSES_AWAITING_APPROVER_ACTION
+                    )
+                elif (
+                    filter_application_status
+                    == ConservationStatus.PROCESSING_STATUS_INACTIVE
+                ):
+                    queryset = queryset.filter(
+                        processing_status__in=ConservationStatus.PROCESSING_STATUSES_INACTIVE
+                    )
                 else:
                     queryset = queryset.filter(
                         processing_status=filter_application_status
@@ -1000,6 +1021,27 @@ def filter_queryset(self, request, queryset, view):
                         submitter=request.user.id,
                         processing_status=ConservationStatus.PROCESSING_STATUS_DISCARDED,
                     )
+                elif (
+                    filter_application_status
+                    == ConservationStatus.PROCESSING_STATUS_AWAITING_ASSESSOR_ACTION
+                ):
+                    queryset = queryset.filter(
+                        processing_status__in=ConservationStatus.PROCESSING_STATUSES_AWAITING_ASSESSOR_ACTION
+                    )
+                elif (
+                    filter_application_status
+                    == ConservationStatus.PROCESSING_STATUS_AWAITING_APPROVER_ACTION
+                ):
+                    queryset = queryset.filter(
+                        processing_status__in=ConservationStatus.PROCESSING_STATUSES_AWAITING_APPROVER_ACTION
+                    )
+                elif (
+                    filter_application_status
+                    == ConservationStatus.PROCESSING_STATUS_INACTIVE
+                ):
+                    queryset = queryset.filter(
+                        processing_status__in=ConservationStatus.PROCESSING_STATUSES_INACTIVE
+                    )
                 else:
                     queryset = queryset.filter(
                         processing_status=filter_application_status

From a3fde35ac94f99ea2af02042a6593a66be12861f Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 10:14:13 +0800
Subject: [PATCH 23/83] Update label for International Conservation to Other
 Conservation Assessment.

---
 .../common/species_communities/basic_conservation_status.vue  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/common/species_communities/basic_conservation_status.vue b/boranga/frontend/boranga/src/components/common/species_communities/basic_conservation_status.vue
index 044374ee..1030186c 100644
--- a/boranga/frontend/boranga/src/components/common/species_communities/basic_conservation_status.vue
+++ b/boranga/frontend/boranga/src/components/common/species_communities/basic_conservation_status.vue
@@ -43,8 +43,8 @@
                     </div>
                 </div>
                 <div class="row mb-3" v-if="conservation_status.international_conservation">
-                    <label for="international_conservation" class="col-sm-4 col-form-label">International
-                        Conservation</label>
+                    <label for="international_conservation" class="col-sm-4 col-form-label">Other
+                        Conservation Assessment</label>
                     <div class="col-sm-8">
                         <input class="form-control" id="international_conservation"
                             :value="conservation_status.international_conservation" />

From 5ac458b02ba7b8bd90db3ba39436dec08e1fd064 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 11:00:01 +0800
Subject: [PATCH 24/83] Update CS processing statuses.

---
 boranga/frontend/boranga/src/utils/constants.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/boranga/frontend/boranga/src/utils/constants.js b/boranga/frontend/boranga/src/utils/constants.js
index bfe98fea..c890a231 100755
--- a/boranga/frontend/boranga/src/utils/constants.js
+++ b/boranga/frontend/boranga/src/utils/constants.js
@@ -1,13 +1,19 @@
 module.exports = {
     PROPOSAL_STATUS: {
         DRAFT: { ID: 'draft', TEXT: 'Draft' },
-        AMENDMENT_REQUIRED: { ID: 'amendment_required', TEXT: 'Amendment Required' },
+        DISCARDED: { ID: 'discarded', TEXT: 'Discarded' },
         WITH_ASSESSOR: { ID: 'with_assessor', TEXT: 'With Assessor' },
-        WITH_APPROVER: { ID: 'with_approver', TEXT: 'Proposed DeListed' },
         WITH_REFERRAL: { ID: 'with_referral', TEXT: 'With Referral' },
+        DEFERRED: { ID: 'deferred', TEXT: 'Deferred' },
+        WITH_APPROVER: { ID: 'proposed_for_agenda', TEXT: 'Proposed for Agenda' },
+        WITH_APPROVER: { ID: 'ready_for_agenda', TEXT: 'Ready for Agenda' },
+        WITH_APPROVER: { ID: 'on_agenda', TEXT: 'On Agenda' },
+        WITH_APPROVER: { ID: 'with_approver', TEXT: 'Proposed DeListed' },
         APPROVED: { ID: 'approved', TEXT: 'Approved' },
         DECLINED: { ID: 'declined', TEXT: 'Declined' },
-        DISCARDED: { ID: 'discarded', TEXT: 'Discarded' },
+        DELISTED: { ID: 'delisted', TEXT: 'DeListed' },
+        CLOSED: { ID: 'closed', TEXT: 'Closed' },
+        UNLOCKED: { ID: 'unlocked', TEXT: 'Unlocked' },
     },
     GROUPS: {
         CONSERVATION_STATUS_ASSESSORS: 'Conservation Status Assessors',

From eb4575ecb3e1be402f444a795db5fdf0296a350f Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 11:01:08 +0800
Subject: [PATCH 25/83] Removed unused processing status.

---
 .../components/conservation_status/models.py  |  2 -
 boranga/components/occurrence/models.py       |  2 -
 ..._alter_communitydocument__file_and_more.py | 49 +++++++++++++++++++
 3 files changed, 49 insertions(+), 4 deletions(-)
 create mode 100644 boranga/migrations/0490_alter_communitydocument__file_and_more.py

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index ed6fe23c..f6ec963f 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -349,7 +349,6 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
     CUSTOMER_STATUS_DRAFT = "draft"
     CUSTOMER_STATUS_WITH_ASSESSOR = "with_assessor"
     CUSTOMER_STATUS_READY_FOR_AGENDA = "ready_for_agenda"
-    CUSTOMER_STATUS_AMENDMENT_REQUIRED = "amendment_required"
     CUSTOMER_STATUS_APPROVED = "approved"
     CUSTOMER_STATUS_DECLINED = "declined"
     CUSTOMER_STATUS_DISCARDED = "discarded"
@@ -358,7 +357,6 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
         (CUSTOMER_STATUS_DRAFT, "Draft"),
         (CUSTOMER_STATUS_WITH_ASSESSOR, "Under Review"),
         (CUSTOMER_STATUS_READY_FOR_AGENDA, "In Meeting"),
-        (CUSTOMER_STATUS_AMENDMENT_REQUIRED, "Amendment Required"),
         (CUSTOMER_STATUS_APPROVED, "Approved"),
         (CUSTOMER_STATUS_DECLINED, "Declined"),
         (CUSTOMER_STATUS_DISCARDED, "Discarded"),
diff --git a/boranga/components/occurrence/models.py b/boranga/components/occurrence/models.py
index c4f0a1d2..f158135c 100644
--- a/boranga/components/occurrence/models.py
+++ b/boranga/components/occurrence/models.py
@@ -165,7 +165,6 @@ class OccurrenceReport(SubmitterInformationModelMixin, RevisionedMixin):
     CUSTOMER_STATUS_DRAFT = "draft"
     CUSTOMER_STATUS_WITH_ASSESSOR = "with_assessor"
     CUSTOMER_STATUS_WITH_APPROVER = "with_approver"
-    CUSTOMER_STATUS_AMENDMENT_REQUIRED = "amendment_required"
     CUSTOMER_STATUS_APPROVED = "approved"
     CUSTOMER_STATUS_DECLINED = "declined"
     CUSTOMER_STATUS_DISCARDED = "discarded"
@@ -174,7 +173,6 @@ class OccurrenceReport(SubmitterInformationModelMixin, RevisionedMixin):
         (CUSTOMER_STATUS_DRAFT, "Draft"),
         (CUSTOMER_STATUS_WITH_ASSESSOR, "Under Review"),
         (CUSTOMER_STATUS_WITH_APPROVER, "Under Review"),
-        (CUSTOMER_STATUS_AMENDMENT_REQUIRED, "Amendment Required"),
         (CUSTOMER_STATUS_APPROVED, "Approved"),
         (CUSTOMER_STATUS_DECLINED, "Declined"),
         (CUSTOMER_STATUS_DISCARDED, "Discarded"),
diff --git a/boranga/migrations/0490_alter_communitydocument__file_and_more.py b/boranga/migrations/0490_alter_communitydocument__file_and_more.py
new file mode 100644
index 00000000..0bc6a9b1
--- /dev/null
+++ b/boranga/migrations/0490_alter_communitydocument__file_and_more.py
@@ -0,0 +1,49 @@
+# Generated by Django 5.0.9 on 2024-11-08 02:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0489_alter_communitydocument__file_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="conservationstatus",
+            name="customer_status",
+            field=models.CharField(
+                choices=[
+                    ("draft", "Draft"),
+                    ("with_assessor", "Under Review"),
+                    ("ready_for_agenda", "In Meeting"),
+                    ("approved", "Approved"),
+                    ("declined", "Declined"),
+                    ("discarded", "Discarded"),
+                    ("closed", "DeListed"),
+                ],
+                default="draft",
+                max_length=40,
+                verbose_name="Customer Status",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="occurrencereport",
+            name="customer_status",
+            field=models.CharField(
+                choices=[
+                    ("draft", "Draft"),
+                    ("with_assessor", "Under Review"),
+                    ("with_approver", "Under Review"),
+                    ("approved", "Approved"),
+                    ("declined", "Declined"),
+                    ("discarded", "Discarded"),
+                    ("closed", "DeListed"),
+                ],
+                default="draft",
+                max_length=40,
+                verbose_name="Customer Status",
+            ),
+        ),
+    ]

From b5dc50128ba5ff1ca55fe946b0b5f3ff0043eada Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 11:32:35 +0800
Subject: [PATCH 26/83] Update proposal status keys.

---
 boranga/frontend/boranga/src/utils/constants.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/boranga/frontend/boranga/src/utils/constants.js b/boranga/frontend/boranga/src/utils/constants.js
index c890a231..f2efedf0 100755
--- a/boranga/frontend/boranga/src/utils/constants.js
+++ b/boranga/frontend/boranga/src/utils/constants.js
@@ -5,9 +5,9 @@ module.exports = {
         WITH_ASSESSOR: { ID: 'with_assessor', TEXT: 'With Assessor' },
         WITH_REFERRAL: { ID: 'with_referral', TEXT: 'With Referral' },
         DEFERRED: { ID: 'deferred', TEXT: 'Deferred' },
-        WITH_APPROVER: { ID: 'proposed_for_agenda', TEXT: 'Proposed for Agenda' },
-        WITH_APPROVER: { ID: 'ready_for_agenda', TEXT: 'Ready for Agenda' },
-        WITH_APPROVER: { ID: 'on_agenda', TEXT: 'On Agenda' },
+        PROPOSED_FOR_AGENDA: { ID: 'proposed_for_agenda', TEXT: 'Proposed for Agenda' },
+        READY_FOR_AGENDA: { ID: 'ready_for_agenda', TEXT: 'Ready for Agenda' },
+        ON_AGENDA: { ID: 'on_agenda', TEXT: 'On Agenda' },
         WITH_APPROVER: { ID: 'with_approver', TEXT: 'Proposed DeListed' },
         APPROVED: { ID: 'approved', TEXT: 'Approved' },
         DECLINED: { ID: 'declined', TEXT: 'Declined' },

From 293a83ab2da4ee64e56f5560ea0e465a37c0fbb3 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 11:41:24 +0800
Subject: [PATCH 27/83] Correct case.

---
 boranga/frontend/boranga/src/utils/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boranga/frontend/boranga/src/utils/constants.js b/boranga/frontend/boranga/src/utils/constants.js
index f2efedf0..3bf05868 100755
--- a/boranga/frontend/boranga/src/utils/constants.js
+++ b/boranga/frontend/boranga/src/utils/constants.js
@@ -6,7 +6,7 @@ module.exports = {
         WITH_REFERRAL: { ID: 'with_referral', TEXT: 'With Referral' },
         DEFERRED: { ID: 'deferred', TEXT: 'Deferred' },
         PROPOSED_FOR_AGENDA: { ID: 'proposed_for_agenda', TEXT: 'Proposed for Agenda' },
-        READY_FOR_AGENDA: { ID: 'ready_for_agenda', TEXT: 'Ready for Agenda' },
+        READY_FOR_AGENDA: { ID: 'ready_for_agenda', TEXT: 'Ready For Agenda' },
         ON_AGENDA: { ID: 'on_agenda', TEXT: 'On Agenda' },
         WITH_APPROVER: { ID: 'with_approver', TEXT: 'Proposed DeListed' },
         APPROVED: { ID: 'approved', TEXT: 'Approved' },

From 39ed3613865d286ba499b3c25a074e44884fa4f0 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 11:41:45 +0800
Subject: [PATCH 28/83] Update condition for when to display the back to
 assessor action button.

---
 .../conservation_status.vue                   | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
index 7d9fecca..d2b9f62e 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
@@ -2,7 +2,8 @@
     <div v-if="conservation_status_obj" class="container" id="internalConservationStatus">
         <div class="row" style="padding-bottom: 50px;">
             <h3><span class="text-capitalize">{{ conservation_status_obj.group_type }}</span> {{
-                conservation_status_obj.conservation_status_number }} <span class="text-capitalize" v-if="identifier"> - {{ identifier
+                conservation_status_obj.conservation_status_number }} <span class="text-capitalize" v-if="identifier"> -
+                    {{ identifier
                     }}</span>
             </h3>
             <div class="col-md-3">
@@ -275,7 +276,7 @@
                                         </div>
                                     </template>
                                     <template
-                                        v-if="conservation_status_obj.processing_status == 'Ready For Agenda' && conservation_status_obj.approval_level == 'minister'">
+                                        v-if="canSendBackToAssessor">
                                         <div class="row">
                                             <div class="col-sm-12">
                                                 <button style="width:90%;" class="btn btn-primary"
@@ -436,6 +437,7 @@ import CSMoreReferrals from '@common-utils/conservation_status/cs_more_referrals
 import ProposalConservationStatus from '@/components/form_conservation_status.vue'
 import {
     api_endpoints,
+    constants,
     helpers
 }
     from '@/utils/hooks'
@@ -597,6 +599,25 @@ export default {
                 this.conservation_status_obj.assessor_mode.assessor_can_assess ||
                 this.conservation_status_obj.approver_process;
         },
+        canSendBackToAssessor: function () {
+            console.log([
+                    constants.PROPOSAL_STATUS.PROPOSED_FOR_AGENDA.TEXT,
+                    constants.PROPOSAL_STATUS.READY_FOR_AGENDA.TEXT,
+                    constants.PROPOSAL_STATUS.DEFERRED.TEXT,
+                ].includes(this.conservation_status_obj.processing_status))
+            return this.conservation_status_obj &&
+                this.conservation_status_obj.approval_level == 'minister' &&
+                [
+                    constants.PROPOSAL_STATUS.PROPOSED_FOR_AGENDA.TEXT,
+                    constants.PROPOSAL_STATUS.READY_FOR_AGENDA.TEXT,
+                    constants.PROPOSAL_STATUS.DEFERRED.TEXT,
+                ].includes(this.conservation_status_obj.processing_status) &&
+                this.conservation_status_obj.assessor_mode.assessor_can_assess &&
+                (
+                    this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_officer ||
+                    this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_approver
+                );
+        },
         hasAssessorMode: function () {
             return this.conservation_status_obj && (
                 this.conservation_status_obj.assessor_mode.has_assessor_mode ||

From 2cd3ba46b1a9d9b1383e7019b5cd902d696fef2d Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 15:29:32 +0800
Subject: [PATCH 29/83] New defer email templates.

---
 .../cs_proposals/send_defer_notification.html | 21 +++++++++++++++++++
 .../cs_proposals/send_defer_notification.txt  | 13 ++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_defer_notification.html
 create mode 100644 boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_defer_notification.txt

diff --git a/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_defer_notification.html b/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_defer_notification.html
new file mode 100644
index 00000000..7920dcf0
--- /dev/null
+++ b/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_defer_notification.html
@@ -0,0 +1,21 @@
+{%  extends 'boranga/emails/base_email.html' %}
+
+{%  block content %}
+    <p>
+	    The Conservation Status Proposal {{ cs_proposal.conservation_status_number }} has been deferred.
+    </p>
+
+    <p>
+        Reason:
+    </p>
+
+    <p>
+        {{ reason }}
+    </p>
+
+    <p>
+        You can action this Proposal using the following link:
+    </p>
+
+    <a href="{{url}}">Conservation Status Proposal {{ cs_proposal.conservation_status_number }}</a>
+{%  endblock %}
diff --git a/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_defer_notification.txt b/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_defer_notification.txt
new file mode 100644
index 00000000..74d4f264
--- /dev/null
+++ b/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_defer_notification.txt
@@ -0,0 +1,13 @@
+{%  extends 'boranga/emails/base_email.txt' %}
+
+{%  block content %}
+	    The Conservation Status Proposal {{ cs_proposal.conservation_status_number }} has been deferred.
+
+        Reason:
+
+        {{ reason }}
+
+        You can action this Proposal using the following link:
+
+        {{url}}
+{%  endblock %}

From d7070f65aa69edc9269bd21ab09a6edb4ab2d7f2 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 15:29:44 +0800
Subject: [PATCH 30/83] Add defer_cs_proposal endpoint.

---
 boranga/frontend/boranga/src/api.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/boranga/frontend/boranga/src/api.js b/boranga/frontend/boranga/src/api.js
index 84507f55..de6c1887 100644
--- a/boranga/frontend/boranga/src/api.js
+++ b/boranga/frontend/boranga/src/api.js
@@ -170,6 +170,9 @@ module.exports = {
     reinstate_cs_proposal: function (id) {
         return `/api/conservation_status/${id}/reinstate/`;
     },
+    defer_cs_proposal: function (id) {
+        return `/api/conservation_status/${id}/defer/`;
+    },
     delist_cs_proposal: function (id) {
         return `/api/conservation_status/${id}/delist/`;
     },

From 758b69a23e8c74dd4f3891eff94f5202e32769db Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 15:30:00 +0800
Subject: [PATCH 31/83] Add send_approver_defer_email_notification function.

---
 .../components/conservation_status/email.py   | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/boranga/components/conservation_status/email.py b/boranga/components/conservation_status/email.py
index 0f2986bd..5d44e5e7 100644
--- a/boranga/components/conservation_status/email.py
+++ b/boranga/components/conservation_status/email.py
@@ -118,6 +118,12 @@ class ApproverSendBackNotificationEmail(TemplateEmailBase):
     txt_template = "boranga/emails/cs_proposals/send_approver_sendback_notification.txt"
 
 
+class ConservationStatusDeferNotificationEmail(TemplateEmailBase):
+    subject = "A Proposal has been deferred."
+    html_template = "boranga/emails/cs_proposals/send_defer_notification.html"
+    txt_template = "boranga/emails/cs_proposals/send_defer_notification.txt"
+
+
 class ConservationStatusDeclineSendNotificationEmail(TemplateEmailBase):
     subject = "Your Proposal has been declined."
     html_template = "boranga/emails/cs_proposals/send_decline_notification.html"
@@ -523,6 +529,32 @@ def send_proposal_approver_sendback_email_notification(request, conservation_sta
     return msg
 
 
+def send_approver_defer_email_notification(request, conservation_status, reason):
+    """Recipient: Always internal users"""
+
+    email = ConservationStatusDeferNotificationEmail()
+    url = request.build_absolute_uri(
+        reverse(
+            "internal-conservation-status-detail",
+            kwargs={"cs_proposal_pk": conservation_status.id},
+        )
+    )
+
+    context = {
+        "cs_proposal": conservation_status,
+        "url": url,
+        "reason": reason,
+    }
+
+    msg = email.send(conservation_status.assessor_recipients, context=context)
+
+    sender = get_sender_user()
+
+    _log_conservation_status_email(msg, conservation_status, sender=sender)
+
+    return msg
+
+
 def send_conservation_status_decline_email_notification(
     conservation_status, conservation_status_decline
 ):

From a5f5844def7a874b3b13111709efff707c85fc27 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 15:30:22 +0800
Subject: [PATCH 32/83] Add defer cs endpoint.

---
 boranga/components/conservation_status/api.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/boranga/components/conservation_status/api.py b/boranga/components/conservation_status/api.py
index 359ec351..f91b95ee 100644
--- a/boranga/components/conservation_status/api.py
+++ b/boranga/components/conservation_status/api.py
@@ -2054,6 +2054,17 @@ def reinstate(self, request, *args, **kwargs):
         serializer = self.get_serializer(instance)
         return Response(serializer.data)
 
+    @detail_route(methods=["patch"], detail=True)
+    def defer(self, request, *args, **kwargs):
+        instance = self.get_object()
+        reason = request.data.get("reason")
+        if not reason:
+            raise serializers.ValidationError("Reason is required")
+        instance.defer(request, reason)
+        serializer_class = self.internal_serializer_class()
+        serializer = serializer_class(instance, context={"request": request})
+        return Response(serializer.data)
+
     @detail_route(
         methods=["patch"],
         detail=True,

From e07bc61ded4c2ee05e0670701435599a19afb8b2 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 15:31:08 +0800
Subject: [PATCH 33/83] Add defer method to CS model.

---
 .../components/conservation_status/models.py  | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index f6ec963f..3b93002f 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -13,6 +13,7 @@
 from boranga.components.conservation_status.email import (
     send_approver_approve_email_notification,
     send_approver_decline_email_notification,
+    send_approver_defer_email_notification,
     send_approver_propose_delist_email_notification,
     send_assessor_ready_for_agenda_email_notification,
     send_conservation_status_amendment_email_notification,
@@ -1715,6 +1716,48 @@ def delist(self, request):
             request,
         )
 
+    @transaction.atomic
+    def defer(self, request, reason):
+        if self.processing_status not in [
+            ConservationStatus.PROCESSING_STATUS_WITH_ASSESSOR,
+            ConservationStatus.PROCESSING_STATUS_WITH_REFERRAL,
+            ConservationStatus.PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
+            ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA,
+        ]:
+            raise ValidationError(
+                "You cannot defer a conservation status when the "
+                f"processing status is {self.get_processing_status_display}"
+            )
+
+        if not is_conservation_status_assessor(
+            request
+        ) and not is_conservation_status_approver(request):
+            raise ValidationError(
+                "You cannot defer a conservation status unless you are a member "
+                "of the conservation status assessor or approver group"
+            )
+
+        self.processing_status = ConservationStatus.PROCESSING_STATUS_DEFERRED
+        self.save()
+
+        # Log proposal action
+        self.log_user_action(
+            ConservationStatusUserAction.ACTION_DEFER_PROPOSAL.format(
+                self.conservation_status_number, reason
+            ),
+            request,
+        )
+
+        # Create a log entry for the user
+        request.user.log_user_action(
+            ConservationStatusUserAction.ACTION_DEFER_PROPOSAL.format(
+                self.conservation_status_number, reason
+            ),
+            request,
+        )
+
+        send_approver_defer_email_notification(request, self, reason)
+
     def get_related_items(self, filter_type, **kwargs):
         return_list = []
         if filter_type == "all":
@@ -1945,6 +1988,7 @@ class ConservationStatusUserAction(UserAction):
         "is ready for agenda. Assessor Comment: {}"
     )
     ACTION_DELIST_PROPOSAL = "Delist conservation status proposal {}"
+    ACTION_DEFER_PROPOSAL = "Defer conservation status proposal {}. Reason: {}"
     ACTION_DISCARD_PROPOSAL_INTERNALLY = (
         "Discard conservation status proposal internally {}"
     )

From 2e2c332dbb39709a3bae54274346d8ad963fefc7 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 15:31:23 +0800
Subject: [PATCH 34/83] Add new defer CS modal component.

---
 .../internal/conservation_status/defer.vue    | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 boranga/frontend/boranga/src/components/internal/conservation_status/defer.vue

diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/defer.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/defer.vue
new file mode 100644
index 00000000..fe168f40
--- /dev/null
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/defer.vue
@@ -0,0 +1,103 @@
+<template lang="html">
+    <div id="internal-conservation-status-proposal-defer">
+        <modal id="defer-cs-modal" transition="modal fade" @ok="ok()" @cancel="close()"
+            :title="`Defer CS${conservation_status_id} `" okText="Defer" large>
+            <div class="container-fluid">
+                <div class="row">
+                    <form class="form-horizontal needs-validation" id="defer-form" name="defer-form" novalidate>
+                        <alert v-if="errors" type="danger"><strong>{{ errors }}</strong></alert>
+                        <div class="col-sm-12">
+                            <div class="row mb-3">
+                                <div class="col">
+                                    <div class="form-group">
+                                        <label class="control-label mb-3" for="Name">Reason / Comments</label>
+                                        <textarea class="form-control" name="reason" ref="reason" required
+                                            v-model="reason"></textarea>
+                                        <div class="invalid-feedback">
+                                            Please enter the reason for deferring the Conservation Status Proposal.
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </modal>
+    </div>
+</template>
+
+<script>
+import modal from '@vue-utils/bootstrap-modal.vue'
+import alert from '@vue-utils/alert.vue'
+import { helpers, api_endpoints } from "@/utils/hooks.js"
+
+export default {
+    name: 'defer',
+    components: {
+        modal,
+        alert,
+    },
+    props: {
+        conservation_status_id: {
+            type: Number,
+        },
+    },
+    data: function () {
+        return {
+            reason: null,
+            isModalOpen: false,
+            errors: null,
+        }
+    },
+    emits: ['refreshFromResponse'],
+    watch: {
+        isModalOpen: function (val) {
+            if (val) {
+                this.$nextTick(() => {
+                    $(this.$refs.reason).focus();
+                });
+            }
+        }
+    },
+    methods: {
+        ok: function () {
+            let vm = this;
+            var form = document.getElementById('defer-form');
+            if (form.checkValidity()) {
+                vm.defer();
+            } else {
+                form.classList.add('was-validated');
+                $('#defer-form').find(':invalid').first().focus();
+            }
+            return false;
+        },
+        close: function () {
+            this.reason = null;
+            this.errors = null;
+            this.isModalOpen = false;
+        },
+        defer: function () {
+            let vm = this;
+            vm.errors = null;
+            let data = { 'reason': vm.reason }
+            vm.$http.patch(api_endpoints.defer_cs_proposal(vm.conservation_status_id), JSON.stringify(data), {
+                emulateJSON: true,
+            })
+                .then((response) => {
+                    vm.$emit('refreshFromResponse', response);
+                    this.close();
+                }, (error) => {
+                    swal.fire({
+                        title: 'Application Error',
+                        text: helpers.apiVueResourceError(error),
+                        icon: 'error',
+                        customClass: {
+                            confirmButton: 'btn btn-primary',
+                        },
+                    });
+                });
+        },
+    },
+}
+</script>

From 7abf8b1abcb348916a79a640833b6d3ad9d4c111 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Fri, 8 Nov 2024 15:31:55 +0800
Subject: [PATCH 35/83] Incorporate new defer action.

---
 .../conservation_status.vue                   | 43 ++++++++++++++++---
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
index d2b9f62e..830854bc 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
@@ -275,15 +275,17 @@
                                             </div>
                                         </div>
                                     </template>
-                                    <template
-                                        v-if="canSendBackToAssessor">
+                                    <template v-if="canSendBackToAssessor">
                                         <div class="row">
                                             <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary"
+                                                <button style="width:90%;" class="btn btn-primary top-buffer-s"
                                                     @click.prevent="backToAssessor">Back To
                                                     Assessor</button><br />
                                             </div>
                                         </div>
+                                    </template>
+                                    <template
+                                        v-if="conservation_status_obj.processing_status == 'Ready For Agenda' && conservation_status_obj.approval_level == 'minister'">
                                         <div class="row">
                                             <div class="col-sm-12">
                                                 <button style="width:90%;" class="btn btn-primary top-buffer-s"
@@ -295,6 +297,14 @@
                                             </div>
                                         </div>
                                     </template>
+                                    <template v-if="canDefer">
+                                        <div class="row">
+                                            <div class="col-sm-12">
+                                                <button style="width:90%;" class="btn btn-primary top-buffer-s"
+                                                    @click.prevent="deferProposal()">Defer</button><br />
+                                            </div>
+                                        </div>
+                                    </template>
                                     <template
                                         v-else-if="conservation_status_obj.processing_status == 'Proposed DeListed'">
                                         <div class="row">
@@ -406,6 +416,8 @@
             @refreshFromResponse="refreshFromResponse"></AmendmentRequest>
         <BackToAssessor ref="back_to_assessor_modal" :conservation_status_id="conservation_status_obj.id"
             @refreshFromResponse="refreshFromResponse"></BackToAssessor>
+        <Defer ref="defer_modal" :conservation_status_id="conservation_status_obj.id"
+            @refreshFromResponse="refreshFromResponse"></Defer>
         <ProposeReadyForAgenda ref="propose_ready_for_agenda_modal" :conservation_status_id="conservation_status_obj.id"
             @refreshFromResponse="refreshFromResponse"></ProposeReadyForAgenda>
         <ProposedDecline ref="proposed_decline" :processing_status="conservation_status_obj.processing_status"
@@ -428,6 +440,7 @@ import CommsLogs from '@common-utils/comms_logs.vue'
 import Submission from '@common-utils/submission.vue'
 import AmendmentRequest from './amendment_request.vue'
 import BackToAssessor from './back_to_assessor.vue'
+import Defer from './defer.vue'
 import ProposeReadyForAgenda from './propose_ready_for_agenda.vue'
 import ProposedDecline from './proposal_proposed_decline'
 import ProposeDelist from './proposal_propose_delist'
@@ -475,6 +488,7 @@ export default {
     components: {
         datatable,
         CommsLogs,
+        Defer,
         Submission,
         ProposalConservationStatus,
         AmendmentRequest,
@@ -601,16 +615,29 @@ export default {
         },
         canSendBackToAssessor: function () {
             console.log([
+                constants.PROPOSAL_STATUS.PROPOSED_FOR_AGENDA.TEXT,
+                constants.PROPOSAL_STATUS.READY_FOR_AGENDA.TEXT,
+                constants.PROPOSAL_STATUS.DEFERRED.TEXT,
+            ].includes(this.conservation_status_obj.processing_status))
+            return this.conservation_status_obj &&
+                this.conservation_status_obj.approval_level == 'minister' &&
+                [
                     constants.PROPOSAL_STATUS.PROPOSED_FOR_AGENDA.TEXT,
                     constants.PROPOSAL_STATUS.READY_FOR_AGENDA.TEXT,
                     constants.PROPOSAL_STATUS.DEFERRED.TEXT,
-                ].includes(this.conservation_status_obj.processing_status))
+                ].includes(this.conservation_status_obj.processing_status) &&
+                this.conservation_status_obj.assessor_mode.assessor_can_assess &&
+                (
+                    this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_officer ||
+                    this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_approver
+                );
+        },
+        canDefer: function () {
             return this.conservation_status_obj &&
-                this.conservation_status_obj.approval_level == 'minister' &&
                 [
+                    constants.PROPOSAL_STATUS.WITH_ASSESSOR.TEXT,
                     constants.PROPOSAL_STATUS.PROPOSED_FOR_AGENDA.TEXT,
                     constants.PROPOSAL_STATUS.READY_FOR_AGENDA.TEXT,
-                    constants.PROPOSAL_STATUS.DEFERRED.TEXT,
                 ].includes(this.conservation_status_obj.processing_status) &&
                 this.conservation_status_obj.assessor_mode.assessor_can_assess &&
                 (
@@ -1411,7 +1438,6 @@ export default {
         },
         resendReferral: function (r) {
             let vm = this;
-
             vm.$http.get(helpers.add_endpoint_json(api_endpoints.cs_referrals, r.id + '/resend')).then(response => {
                 vm.original_conservation_status_obj = helpers.copyObject(response.body);
                 vm.conservation_status_obj = response.body;
@@ -1437,6 +1463,9 @@ export default {
                     });
                 });
         },
+        deferProposal: function () {
+            this.$refs.defer_modal.isModalOpen = true;
+        },
         backToAssessor: function () {
             this.$refs.back_to_assessor_modal.isModalOpen = true;
         },

From b5767700bbfcf9438770426081a1c293a26aafd1 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Mon, 11 Nov 2024 09:55:05 +0800
Subject: [PATCH 36/83] Allow user to enter a review due date in the defer
 modal.

---
 boranga/components/conservation_status/api.py |  3 +-
 .../components/conservation_status/models.py  |  4 ++-
 .../conservation_status/serializers.py        |  7 ++++
 .../conservation_status.vue                   |  2 +-
 .../internal/conservation_status/defer.vue    | 34 +++++++++++++++----
 5 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/boranga/components/conservation_status/api.py b/boranga/components/conservation_status/api.py
index f91b95ee..6e56d9e5 100644
--- a/boranga/components/conservation_status/api.py
+++ b/boranga/components/conservation_status/api.py
@@ -2058,9 +2058,10 @@ def reinstate(self, request, *args, **kwargs):
     def defer(self, request, *args, **kwargs):
         instance = self.get_object()
         reason = request.data.get("reason")
+        review_due_date = request.data.get("review_due_date", None)
         if not reason:
             raise serializers.ValidationError("Reason is required")
-        instance.defer(request, reason)
+        instance.defer(request, reason, review_due_date)
         serializer_class = self.internal_serializer_class()
         serializer = serializer_class(instance, context={"request": request})
         return Response(serializer.data)
diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index 3b93002f..4e889f29 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -1717,7 +1717,7 @@ def delist(self, request):
         )
 
     @transaction.atomic
-    def defer(self, request, reason):
+    def defer(self, request, reason, review_due_date):
         if self.processing_status not in [
             ConservationStatus.PROCESSING_STATUS_WITH_ASSESSOR,
             ConservationStatus.PROCESSING_STATUS_WITH_REFERRAL,
@@ -1738,6 +1738,8 @@ def defer(self, request, reason):
             )
 
         self.processing_status = ConservationStatus.PROCESSING_STATUS_DEFERRED
+        if review_due_date:
+            self.review_due_date = datetime.strptime(review_due_date, "%Y-%m-%d").date()
         self.save()
 
         # Log proposal action
diff --git a/boranga/components/conservation_status/serializers.py b/boranga/components/conservation_status/serializers.py
index 2a71f65c..0b9a135e 100644
--- a/boranga/components/conservation_status/serializers.py
+++ b/boranga/components/conservation_status/serializers.py
@@ -1072,6 +1072,11 @@ class SaveSpeciesConservationStatusSerializer(BaseConservationStatusSerializer):
         required=False, allow_null=True, write_only=True
     )
 
+    def to_internal_value(self, data):
+        if data.get("review_due_date") == "":
+            data["review_due_date"] = None
+        return super().to_internal_value(data)
+
     class Meta:
         model = ConservationStatus
         fields = (
@@ -1238,6 +1243,8 @@ class Meta:
             "conservation_criteria",
             "comment",
             "lodgement_date",
+            "listing_date",
+            "review_due_date",
             "applicant_type",
             "submitter",
             "readonly",
diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
index 830854bc..2ec911a7 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
@@ -416,7 +416,7 @@
             @refreshFromResponse="refreshFromResponse"></AmendmentRequest>
         <BackToAssessor ref="back_to_assessor_modal" :conservation_status_id="conservation_status_obj.id"
             @refreshFromResponse="refreshFromResponse"></BackToAssessor>
-        <Defer ref="defer_modal" :conservation_status_id="conservation_status_obj.id"
+        <Defer ref="defer_modal" :conservation_status="conservation_status_obj"
             @refreshFromResponse="refreshFromResponse"></Defer>
         <ProposeReadyForAgenda ref="propose_ready_for_agenda_modal" :conservation_status_id="conservation_status_obj.id"
             @refreshFromResponse="refreshFromResponse"></ProposeReadyForAgenda>
diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/defer.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/defer.vue
index fe168f40..63ee675c 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/defer.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/defer.vue
@@ -1,7 +1,7 @@
 <template lang="html">
     <div id="internal-conservation-status-proposal-defer">
         <modal id="defer-cs-modal" transition="modal fade" @ok="ok()" @cancel="close()"
-            :title="`Defer CS${conservation_status_id} `" okText="Defer" large>
+            :title="`Defer CS${conservation_status.id} `" okText="Defer" large>
             <div class="container-fluid">
                 <div class="row">
                     <form class="form-horizontal needs-validation" id="defer-form" name="defer-form" novalidate>
@@ -10,8 +10,8 @@
                             <div class="row mb-3">
                                 <div class="col">
                                     <div class="form-group">
-                                        <label class="control-label mb-3" for="Name">Reason / Comments</label>
-                                        <textarea class="form-control" name="reason" ref="reason" required
+                                        <label class="control-label mb-3" for="reason">Reason / Comments</label>
+                                        <textarea class="form-control" id="reason" name="reason" ref="reason" required
                                             v-model="reason"></textarea>
                                         <div class="invalid-feedback">
                                             Please enter the reason for deferring the Conservation Status Proposal.
@@ -19,6 +19,24 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="row mb-3">
+                                <div class="col">
+                                    <alert type="warning">
+                                        Entering a review date is not mandatory but is
+                                        highly recommended
+                                        to ensure that the Conservation Status Proposal is reviewed in a timely manner.
+                                    </alert>
+                                </div>
+                            </div>
+                            <div class=" row mb-3">
+                                <div class="col">
+                                    <div class="form-group">
+                                        <label class="control-label mb-3" for="review-due-date">Review Due Date</label>
+                                        <input type="date" class="form-control" id="review-due-date" name="review-due-date"
+                                            ref="review-due-date" v-model="reviewDueDate" />
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </form>
                 </div>
@@ -39,13 +57,14 @@ export default {
         alert,
     },
     props: {
-        conservation_status_id: {
-            type: Number,
+        conservation_status: {
+            type: Object,
         },
     },
     data: function () {
         return {
             reason: null,
+            reviewDueDate: null,
             isModalOpen: false,
             errors: null,
         }
@@ -56,6 +75,7 @@ export default {
             if (val) {
                 this.$nextTick(() => {
                     $(this.$refs.reason).focus();
+                    this.reviewDueDate = this.conservation_status.review_due_date;
                 });
             }
         }
@@ -80,8 +100,8 @@ export default {
         defer: function () {
             let vm = this;
             vm.errors = null;
-            let data = { 'reason': vm.reason }
-            vm.$http.patch(api_endpoints.defer_cs_proposal(vm.conservation_status_id), JSON.stringify(data), {
+            let data = { 'review_due_date': vm.reviewDueDate, 'reason': vm.reason }
+            vm.$http.patch(api_endpoints.defer_cs_proposal(vm.conservation_status.id), JSON.stringify(data), {
                 emulateJSON: true,
             })
                 .then((response) => {

From 05460eed6a9a8aaa3cf003bb1688ffa36531d2c5 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Mon, 11 Nov 2024 11:57:34 +0800
Subject: [PATCH 37/83] New proposed for agenda email templates.

---
 ...over_proposed_for_agenda_notification.html | 21 +++++++++++++++++++
 ...rover_proposed_for_agenda_notification.txt | 13 ++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_approver_proposed_for_agenda_notification.html
 create mode 100644 boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_approver_proposed_for_agenda_notification.txt

diff --git a/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_approver_proposed_for_agenda_notification.html b/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_approver_proposed_for_agenda_notification.html
new file mode 100644
index 00000000..bfee6f03
--- /dev/null
+++ b/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_approver_proposed_for_agenda_notification.html
@@ -0,0 +1,21 @@
+{%  extends 'boranga/emails/base_email.html' %}
+
+{%  block content %}
+    <p>
+	    The Conservation Status Proposal {{ cs_proposal.conservation_status_number }} has been 'Proposed for Agenda'.
+    </p>
+
+    <p>
+        Assessor Recommended Action / Comments:
+    </p>
+
+    <p>
+        {{ assessor_comment }}
+    </p>
+
+    <p>
+        You can action this Proposal using the following link:
+    </p>
+
+    <a href="{{url}}">Conservation Status Proposal {{ cs_proposal.conservation_status_number }}</a>
+{%  endblock %}
diff --git a/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_approver_proposed_for_agenda_notification.txt b/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_approver_proposed_for_agenda_notification.txt
new file mode 100644
index 00000000..bdc2167e
--- /dev/null
+++ b/boranga/components/conservation_status/templates/boranga/emails/cs_proposals/send_approver_proposed_for_agenda_notification.txt
@@ -0,0 +1,13 @@
+{%  extends 'boranga/emails/base_email.txt' %}
+
+{%  block content %}
+    The Conservation Status Proposal {{ cs_proposal.conservation_status_number }} has been 'Proposed for Agenda'.
+
+    Assessor Recommended Action / Comments:
+
+    {{ assessor_comment }}
+
+    You can action this Proposal using the following link:
+
+    {{url}}
+{%  endblock %}

From 5074d59a7fa7cde550d7a6868895597e5c05b257 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Mon, 11 Nov 2024 11:58:06 +0800
Subject: [PATCH 38/83] Rename proposed_ready_for_agenda call to
 proposed_for_agenda.

---
 boranga/components/conservation_status/api.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boranga/components/conservation_status/api.py b/boranga/components/conservation_status/api.py
index 6e56d9e5..5b8ada33 100644
--- a/boranga/components/conservation_status/api.py
+++ b/boranga/components/conservation_status/api.py
@@ -1982,9 +1982,9 @@ def switch_status(self, request, *args, **kwargs):
         detail=True,
         permission_classes=[ConservationStatusPermission],
     )
-    def proposed_ready_for_agenda(self, request, *args, **kwargs):
+    def proposed_for_agenda(self, request, *args, **kwargs):
         instance = self.get_object()
-        instance.proposed_ready_for_agenda(request)
+        instance.proposed_for_agenda(request)
         serializer_class = self.internal_serializer_class()
         serializer = serializer_class(instance, context={"request": request})
         return Response(serializer.data)

From 6fe57fe96136fe6849838ff9c1a0a252a4af36eb Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Mon, 11 Nov 2024 11:59:40 +0800
Subject: [PATCH 39/83] Change wording from Proposed Ready for Agenda to
 Proposed for Agenda.

---
 .../internal/conservation_status/propose_ready_for_agenda.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/propose_ready_for_agenda.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/propose_ready_for_agenda.vue
index 2b5d2157..2fccee2f 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/propose_ready_for_agenda.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/propose_ready_for_agenda.vue
@@ -1,7 +1,7 @@
 <template lang="html">
     <div id="internal-conservation-status-proposal-propose-ready-for-agenda">
         <modal id="myModal" transition="modal fade" @ok="ok()" @cancel="close()"
-            :title="`Propose CS${conservation_status_id} Ready for Agenda`" okText="Ready for Agenda" large>
+            :title="`Propose CS${conservation_status_id} for Agenda`" okText="Propose for Agenda" large>
             <div class="container-fluid">
                 <div class="row">
                     <form class="form-horizontal needs-validation" id="propose-ready-for-agenda-form"

From 03ddfb307d1cd23321d5203a45657277f1b97c1b Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Mon, 11 Nov 2024 12:00:11 +0800
Subject: [PATCH 40/83] Add new
 send_approver_proposed_for_agenda_email_notification function.

---
 .../components/conservation_status/email.py   | 50 +++++++++++++++----
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/boranga/components/conservation_status/email.py b/boranga/components/conservation_status/email.py
index 5d44e5e7..b2b07879 100644
--- a/boranga/components/conservation_status/email.py
+++ b/boranga/components/conservation_status/email.py
@@ -37,13 +37,15 @@ def get_sender_user():
 
 
 class SubmitSendNotificationEmail(TemplateEmailBase):
-    subject = "A new Proposal has been submitted."
+    subject = "A new conservation status proposal has been submitted."
     html_template = "boranga/emails/cs_proposals/send_submit_notification.html"
     txt_template = "boranga/emails/cs_proposals/send_submit_notification.txt"
 
 
 class ExternalSubmitSendNotificationEmail(TemplateEmailBase):
-    subject = f"{settings.DEP_NAME} - Confirmation - Proposal submitted."
+    subject = (
+        f"{settings.DEP_NAME} - confirmation - conservation status proposal submitted."
+    )
     html_template = "boranga/emails/cs_proposals/send_external_submit_notification.html"
     txt_template = "boranga/emails/cs_proposals/send_external_submit_notification.txt"
 
@@ -75,7 +77,7 @@ class ConservationStatusAmendmentRequestSendNotificationEmail(TemplateEmailBase)
 
 
 class ApproverDeclineSendNotificationEmail(TemplateEmailBase):
-    subject = "A Proposal has been recommended for decline."
+    subject = "A conservation status proposal has been recommended for decline."
     html_template = (
         "boranga/emails/cs_proposals/send_approver_decline_notification.html"
     )
@@ -93,15 +95,23 @@ class ApproverProposeDelistNotificationEmail(TemplateEmailBase):
 
 
 class ApproverApproveSendNotificationEmail(TemplateEmailBase):
-    subject = "A Proposal has been recommended for approval."
+    subject = "A conservation status proposal has been recommended for approval."
     html_template = (
         "boranga/emails/cs_proposals/send_approver_approve_notification.html"
     )
     txt_template = "boranga/emails/cs_proposals/send_approver_approve_notification.txt"
 
 
+class ApproverProposedForAgendaSendNotificationEmail(TemplateEmailBase):
+    subject = "A conservation status proposal has been proposed for agenda."
+    html_template = "boranga/emails/cs_proposals/send_assessor_proposed_for_agenda_notification.html"
+    txt_template = (
+        "boranga/emails/cs_proposals/send_assessor_proposed_for_agenda_notification.txt"
+    )
+
+
 class AssessorReadyForAgendaSendNotificationEmail(TemplateEmailBase):
-    subject = "A Proposal has been proposed ready for agenda."
+    subject = "A conservation status proposal is ready for agenda."
     html_template = (
         "boranga/emails/cs_proposals/send_assessor_ready_for_agenda_notification.html"
     )
@@ -111,7 +121,7 @@ class AssessorReadyForAgendaSendNotificationEmail(TemplateEmailBase):
 
 
 class ApproverSendBackNotificationEmail(TemplateEmailBase):
-    subject = "A Proposal has been sent back by approver."
+    subject = "A conservation status proposal has been sent back by approver."
     html_template = (
         "boranga/emails/cs_proposals/send_approver_sendback_notification.html"
     )
@@ -119,19 +129,19 @@ class ApproverSendBackNotificationEmail(TemplateEmailBase):
 
 
 class ConservationStatusDeferNotificationEmail(TemplateEmailBase):
-    subject = "A Proposal has been deferred."
+    subject = "A conservation status proposal has been deferred."
     html_template = "boranga/emails/cs_proposals/send_defer_notification.html"
     txt_template = "boranga/emails/cs_proposals/send_defer_notification.txt"
 
 
 class ConservationStatusDeclineSendNotificationEmail(TemplateEmailBase):
-    subject = "Your Proposal has been declined."
+    subject = "Your conservation status proposal has been declined."
     html_template = "boranga/emails/cs_proposals/send_decline_notification.html"
     txt_template = "boranga/emails/cs_proposals/send_decline_notification.txt"
 
 
 class ConservationStatusApprovalSendNotificationEmail(TemplateEmailBase):
-    subject = "Your Proposal has been approved."
+    subject = "Your conservation status proposal has been approved."
     html_template = "boranga/emails/cs_proposals/send_approval_notification.html"
     txt_template = "boranga/emails/cs_proposals/send_approval_notification.txt"
 
@@ -476,6 +486,28 @@ def send_approver_approve_email_notification(request, conservation_status):
     return msg
 
 
+def send_approver_proposed_for_agenda_email_notification(
+    request, conservation_status, assessor_comment
+):
+    """Recipient: Always internal users"""
+
+    email = ApproverProposedForAgendaSendNotificationEmail()
+    url = request.build_absolute_uri(reverse("internal-meeting-dashboard", kwargs={}))
+    context = {
+        "cs_proposal": conservation_status,
+        "url": url,
+        "assessor_comment": assessor_comment,
+    }
+
+    msg = email.send(conservation_status.approver_recipients, context=context)
+
+    sender = get_sender_user()
+
+    _log_conservation_status_email(msg, conservation_status, sender=sender)
+
+    return msg
+
+
 def send_assessor_ready_for_agenda_email_notification(
     request, conservation_status, assessor_comment
 ):

From 1a43d0eb9d3e0a80d4e30ec292fb7c4aa57b937a Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Mon, 11 Nov 2024 12:01:32 +0800
Subject: [PATCH 41/83] Split proposed for agenda and ready for agenda
 functionality into seperate methods.

---
 .../components/conservation_status/models.py  | 67 +++++++++++++++++--
 1 file changed, 60 insertions(+), 7 deletions(-)

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index 4e889f29..b7b00e22 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -15,6 +15,7 @@
     send_approver_decline_email_notification,
     send_approver_defer_email_notification,
     send_approver_propose_delist_email_notification,
+    send_approver_proposed_for_agenda_email_notification,
     send_assessor_ready_for_agenda_email_notification,
     send_conservation_status_amendment_email_notification,
     send_conservation_status_referral_complete_email_notification,
@@ -755,6 +756,7 @@ def is_community_application(self):
     def allowed_assessors(self):
         group_ids = None
         if self.processing_status in [
+            ConservationStatus.PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
             ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA,
             ConservationStatus.PROCESSING_STATUS_WITH_APPROVER,
             ConservationStatus.PROCESSING_STATUS_APPROVED,
@@ -869,12 +871,15 @@ def can_assess(self, request):
             ConservationStatus.PROCESSING_STATUS_WITH_ASSESSOR,
             ConservationStatus.PROCESSING_STATUS_WITH_REFERRAL,
             ConservationStatus.PROCESSING_STATUS_APPROVED,
+            ConservationStatus.PROCESSING_STATUS_DEFERRED,
         ]:
             return is_conservation_status_assessor(request)
         elif self.processing_status in [
+            ConservationStatus.PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
             ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA,
             ConservationStatus.PROCESSING_STATUS_WITH_APPROVER,
             ConservationStatus.PROCESSING_STATUS_UNLOCKED,
+            ConservationStatus.PROCESSING_STATUS_DEFERRED,
         ]:
             return is_conservation_status_approver(request)
 
@@ -918,6 +923,7 @@ def can_user_assign_to_self(self, request):
         if self.processing_status in [
             ConservationStatus.PROCESSING_STATUS_WITH_ASSESSOR,
             ConservationStatus.PROCESSING_STATUS_WITH_REFERRAL,
+            ConservationStatus.PROCESSING_STATUS_DEFERRED,
         ]:
             return (
                 self.assigned_officer != request.user.id
@@ -925,12 +931,14 @@ def can_user_assign_to_self(self, request):
             )
 
         if self.processing_status in [
+            ConservationStatus.PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
             ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA,
             ConservationStatus.PROCESSING_STATUS_WITH_APPROVER,
             ConservationStatus.PROCESSING_STATUS_APPROVED,
             ConservationStatus.PROCESSING_STATUS_CLOSED,
             ConservationStatus.PROCESSING_STATUS_DECLINED,
             ConservationStatus.PROCESSING_STATUS_DELISTED,
+            ConservationStatus.PROCESSING_STATUS_DEFERRED,
         ]:
             return (
                 self.assigned_approver != request.user.id
@@ -976,6 +984,7 @@ def assign_officer(self, request, officer):
 
         if is_conservation_status_approver(request):
             allowed_statuses = [
+                ConservationStatus.PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
                 ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA,
                 ConservationStatus.PROCESSING_STATUS_WITH_APPROVER,
                 ConservationStatus.PROCESSING_STATUS_APPROVED,
@@ -1044,6 +1053,7 @@ def assign_officer(self, request, officer):
     @transaction.atomic
     def unassign(self, request):
         if self.processing_status in [
+            ConservationStatus.PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
             ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA,
             ConservationStatus.PROCESSING_STATUS_WITH_APPROVER,
             ConservationStatus.PROCESSING_STATUS_APPROVED,
@@ -1511,7 +1521,7 @@ def final_approval(self, request, details):
         self.documents.all().update(can_delete=False)
 
     @transaction.atomic
-    def proposed_ready_for_agenda(self, request):
+    def proposed_for_agenda(self, request):
         if not self.can_assess(request):
             raise exceptions.ProposalNotAuthorized()
 
@@ -1520,15 +1530,55 @@ def proposed_ready_for_agenda(self, request):
                 "You cannot propose for ready for agenda if it is not with assessor"
             )
 
+        self.processing_status = (
+            ConservationStatus.PROCESSING_STATUS_PROPOSED_FOR_AGENDA
+        )
+        self.save()
+
+        assessor_comment = request.data.get("assessor_comment")
+
+        # Log proposal action
+        self.log_user_action(
+            ConservationStatusUserAction.ACTION_PROPOSED_FOR_AGENDA.format(
+                self.conservation_status_number, assessor_comment
+            ),
+            request,
+        )
+
+        # Create a log entry for the user
+        request.user.log_user_action(
+            ConservationStatusUserAction.ACTION_PROPOSED_FOR_AGENDA.format(
+                self.conservation_status_number, assessor_comment
+            ),
+            request,
+        )
+
+        send_approver_proposed_for_agenda_email_notification(
+            request, self, assessor_comment
+        )
+
+    @transaction.atomic
+    def ready_for_agenda(self, request):
+        if not self.can_assess(request):
+            raise exceptions.ProposalNotAuthorized()
+
+        if (
+            self.processing_status
+            != ConservationStatus.PROCESSING_STATUS_PROPOSED_FOR_AGENDA
+        ):
+            raise ValidationError(
+                "You cannot change the processing status to 'Ready for Agenda'"
+                "unless it is currently 'Proposed for Agenda'"
+            )
+
         self.processing_status = ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA
-        self.customer_status = ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA
         self.save()
 
         assessor_comment = request.data.get("assessor_comment")
 
         # Log proposal action
         self.log_user_action(
-            ConservationStatusUserAction.ACTION_PROPOSED_READY_FOR_AGENDA.format(
+            ConservationStatusUserAction.ACTION_READY_FOR_AGENDA.format(
                 self.conservation_status_number, assessor_comment
             ),
             request,
@@ -1536,7 +1586,7 @@ def proposed_ready_for_agenda(self, request):
 
         # Create a log entry for the user
         request.user.log_user_action(
-            ConservationStatusUserAction.ACTION_PROPOSED_READY_FOR_AGENDA.format(
+            ConservationStatusUserAction.ACTION_READY_FOR_AGENDA.format(
                 self.conservation_status_number, assessor_comment
             ),
             request,
@@ -1985,9 +2035,12 @@ class ConservationStatusUserAction(UserAction):
     ACTION_PROPOSE_DELIST_PROPOSAL = (
         "Propose discard conservation status proposal {}. Reason: {}"
     )
-    ACTION_PROPOSED_READY_FOR_AGENDA = (
-        "Propose conservation status proposal {} "
-        "is ready for agenda. Assessor Comment: {}"
+    ACTION_PROPOSED_FOR_AGENDA = (
+        "Conservation status proposal {} "
+        "has bee proposed for agenda. Assessor Comment: {}"
+    )
+    ACTION_READY_FOR_AGENDA = (
+        "Conservation status proposal {} " "is ready for agenda. Assessor Comment: {}"
     )
     ACTION_DELIST_PROPOSAL = "Delist conservation status proposal {}"
     ACTION_DEFER_PROPOSAL = "Defer conservation status proposal {}. Reason: {}"

From 84713084e67dc79dae9a1ef14ff01d2228cbf98b Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Mon, 11 Nov 2024 13:49:32 +0800
Subject: [PATCH 42/83] Change generic myModal id to component appropriate
 name.

---
 .../internal/conservation_status/amendment_request.vue        | 4 ++--
 .../internal/conservation_status/back_to_assessor.vue         | 2 +-
 .../src/components/internal/occurrence/amendment_request.vue  | 2 +-
 .../src/components/internal/occurrence/back_to_assessor.vue   | 2 +-
 .../src/components/internal/occurrence/ocr_approve.vue        | 2 +-
 .../src/components/internal/occurrence/ocr_decline.vue        | 2 +-
 .../components/internal/occurrence/ocr_propose_approve.vue    | 2 +-
 .../components/internal/occurrence/ocr_propose_decline.vue    | 2 +-
 .../components/internal/species_communities/make_public.vue   | 2 +-
 .../internal/species_communities/species_combine.vue          | 2 +-
 .../internal/species_communities/species_rename.vue           | 2 +-
 .../components/internal/species_communities/species_split.vue | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/amendment_request.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/amendment_request.vue
index 1272e5f2..1ba524ce 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/amendment_request.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/amendment_request.vue
@@ -1,6 +1,6 @@
 <template lang="html">
     <div id="internal-conservation-status-proposal-amend">
-        <modal id="myModal" transition="modal fade" @ok="ok()" @cancel="cancel()" title="Amendment Request" large>
+        <modal id="amendment-request-modal" transition="modal fade" @ok="ok()" @cancel="cancel()" title="Amendment Request" large>
             <div class="container-fluid">
                 <div class="row">
                     <form class="form-horizontal" name="amendForm">
@@ -221,7 +221,7 @@ export default {
                 "theme": "bootstrap-5",
                 allowClear: true,
                 placeholder: "Select Reason",
-                dropdownParent: $('#myModal .modal-body'),
+                dropdownParent: $('#amendment-request-modal .modal-body'),
             }).
                 on("select2:select", function (e) {
                     var selected = $(e.currentTarget);
diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/back_to_assessor.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/back_to_assessor.vue
index f27038fa..420206a1 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/back_to_assessor.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/back_to_assessor.vue
@@ -1,6 +1,6 @@
 <template lang="html">
     <div id="internal-conservation-status-proposal-back-to-assessor">
-        <modal id="myModal" transition="modal fade" @ok="ok()" @cancel="close()"
+        <modal id="back-to-assessor-modal" transition="modal fade" @ok="ok()" @cancel="close()"
             :title="`Send CS${conservation_status_id} Back to Assessor`" okText="Back to Assessor" large>
             <div class="container-fluid">
                 <div class="row">
diff --git a/boranga/frontend/boranga/src/components/internal/occurrence/amendment_request.vue b/boranga/frontend/boranga/src/components/internal/occurrence/amendment_request.vue
index de034957..7451eb00 100644
--- a/boranga/frontend/boranga/src/components/internal/occurrence/amendment_request.vue
+++ b/boranga/frontend/boranga/src/components/internal/occurrence/amendment_request.vue
@@ -1,6 +1,6 @@
 <template lang="html">
     <div id="internal-ocr-amendment-request">
-        <modal id="myModal" transition="modal fade" @ok="ok()" @cancel="cancel()" title="Amendment Request" large>
+        <modal id="amendment-request-modal" transition="modal fade" @ok="ok()" @cancel="cancel()" title="Amendment Request" large>
             <div class="container-fluid">
                 <div class="row">
                     <form class="form-horizontal" name="amendForm">
diff --git a/boranga/frontend/boranga/src/components/internal/occurrence/back_to_assessor.vue b/boranga/frontend/boranga/src/components/internal/occurrence/back_to_assessor.vue
index 9de959a9..e356abc2 100644
--- a/boranga/frontend/boranga/src/components/internal/occurrence/back_to_assessor.vue
+++ b/boranga/frontend/boranga/src/components/internal/occurrence/back_to_assessor.vue
@@ -1,6 +1,6 @@
 <template lang="html">
     <div id="internal-ocr-back-to-assessor">
-        <modal id="myModal" transition="modal fade" @ok="ok()" @cancel="cancel()" title="Back to Assessor"
+        <modal id="back-to-assessor-modal" transition="modal fade" @ok="ok()" @cancel="cancel()" title="Back to Assessor"
             okText="Back to Assessor" large>
             <div class="container-fluid">
                 <div class="row">
diff --git a/boranga/frontend/boranga/src/components/internal/occurrence/ocr_approve.vue b/boranga/frontend/boranga/src/components/internal/occurrence/ocr_approve.vue
index bcc9f274..2f8e7fa6 100644
--- a/boranga/frontend/boranga/src/components/internal/occurrence/ocr_approve.vue
+++ b/boranga/frontend/boranga/src/components/internal/occurrence/ocr_approve.vue
@@ -1,6 +1,6 @@
 <template lang="html">
     <div id="internal-ocr-approve-request">
-        <modal id="myModal" transition="modal fade" @ok="ok()" ok-text="Approve" @cancel="close()"
+        <modal id="ocr-approve-modal" transition="modal fade" @ok="ok()" ok-text="Approve" @cancel="close()"
             :title="`Approve ${occurrence_report_number}`" large>
             <div class="container">
                 <form id="approve-form">
diff --git a/boranga/frontend/boranga/src/components/internal/occurrence/ocr_decline.vue b/boranga/frontend/boranga/src/components/internal/occurrence/ocr_decline.vue
index d57767da..80207fbe 100644
--- a/boranga/frontend/boranga/src/components/internal/occurrence/ocr_decline.vue
+++ b/boranga/frontend/boranga/src/components/internal/occurrence/ocr_decline.vue
@@ -1,6 +1,6 @@
 <template lang="html">
     <div id="internal-ocr-decline-request">
-        <modal id="myModal" transition="modal fade" @ok="ok()" ok-text="Decline" @cancel="close()"
+        <modal id="ocr-decline-modal" transition="modal fade" @ok="ok()" ok-text="Decline" @cancel="close()"
             :title="`Decline ${occurrence_report_number}`" large>
             <div class="container-fluid">
                 <div class="row">
diff --git a/boranga/frontend/boranga/src/components/internal/occurrence/ocr_propose_approve.vue b/boranga/frontend/boranga/src/components/internal/occurrence/ocr_propose_approve.vue
index 654a4ce4..6bda9af8 100644
--- a/boranga/frontend/boranga/src/components/internal/occurrence/ocr_propose_approve.vue
+++ b/boranga/frontend/boranga/src/components/internal/occurrence/ocr_propose_approve.vue
@@ -1,6 +1,6 @@
 <template lang="html">
     <div id="internal-ocr-propose-approve-request">
-        <modal id="myModal" transition="modal fade" @ok="ok()" ok-text="Propose Approve" @cancel="close()"
+        <modal id="ocr-propose-approve-modal" transition="modal fade" @ok="ok()" ok-text="Propose Approve" @cancel="close()"
             :title="`Propose Approve ${occurrence_report_number}`" large>
             <div class="container">
                 <form id="propose-approve-form">
diff --git a/boranga/frontend/boranga/src/components/internal/occurrence/ocr_propose_decline.vue b/boranga/frontend/boranga/src/components/internal/occurrence/ocr_propose_decline.vue
index da712e21..6881dbf4 100644
--- a/boranga/frontend/boranga/src/components/internal/occurrence/ocr_propose_decline.vue
+++ b/boranga/frontend/boranga/src/components/internal/occurrence/ocr_propose_decline.vue
@@ -1,6 +1,6 @@
 <template lang="html">
     <div id="internal-ocr-propose-decline-request">
-        <modal id="myModal" transition="modal fade" @ok="ok()" ok-text="Propose Decline" @cancel="close()"
+        <modal id="ocr-propose-decline-modal" transition="modal fade" @ok="ok()" ok-text="Propose Decline" @cancel="close()"
             :title="`Propose Decline ${occurrence_report_number}`" large>
             <div class="container-fluid">
                 <div class="row">
diff --git a/boranga/frontend/boranga/src/components/internal/species_communities/make_public.vue b/boranga/frontend/boranga/src/components/internal/species_communities/make_public.vue
index 9bb3ace1..dc287328 100644
--- a/boranga/frontend/boranga/src/components/internal/species_communities/make_public.vue
+++ b/boranga/frontend/boranga/src/components/internal/species_communities/make_public.vue
@@ -1,6 +1,6 @@
 <template lang="html">
     <div id="makePublic">
-        <modal transition="modal fade" @ok="ok()" @cancel="cancel()" :title="title" large id="myModal">
+        <modal transition="modal fade" @ok="ok()" @cancel="cancel()" :title="title" large id="make-public-modal">
             <div class="container-fluid">
                 <div class="row">
                     <form class="form-horizontal" name="makePublicForm">
diff --git a/boranga/frontend/boranga/src/components/internal/species_communities/species_combine.vue b/boranga/frontend/boranga/src/components/internal/species_communities/species_combine.vue
index 87f381ee..17805e8c 100644
--- a/boranga/frontend/boranga/src/components/internal/species_communities/species_combine.vue
+++ b/boranga/frontend/boranga/src/components/internal/species_communities/species_combine.vue
@@ -1,6 +1,6 @@
 <template lang="html">
     <div id="combineSpecies">
-        <modal transition="modal fade" @ok="ok()" @cancel="cancel()" :title="title" extraLarge id="myModal">
+        <modal transition="modal fade" @ok="ok()" @cancel="cancel()" :title="title" extraLarge id="species-combine-modal">
             <div class="container-fluid">
                 <div class="row">
                     <form class="form-horizontal" name="combineSpeciesForm">
diff --git a/boranga/frontend/boranga/src/components/internal/species_communities/species_rename.vue b/boranga/frontend/boranga/src/components/internal/species_communities/species_rename.vue
index 61867324..eb51a416 100644
--- a/boranga/frontend/boranga/src/components/internal/species_communities/species_rename.vue
+++ b/boranga/frontend/boranga/src/components/internal/species_communities/species_rename.vue
@@ -1,6 +1,6 @@
 <template lang="html">
     <div id="renameSpecies">
-        <modal transition="modal fade" @ok="ok()" @cancel="cancel()" :title="title" extraLarge id="myModal">
+        <modal transition="modal fade" @ok="ok()" @cancel="cancel()" :title="title" extraLarge id="species-rename-modal">
             <div class="container-fluid">
                 <div class="row">
                     <form class="form-horizontal" name="renameSpeciesForm">
diff --git a/boranga/frontend/boranga/src/components/internal/species_communities/species_split.vue b/boranga/frontend/boranga/src/components/internal/species_communities/species_split.vue
index 6fb4979d..45a2cab9 100644
--- a/boranga/frontend/boranga/src/components/internal/species_communities/species_split.vue
+++ b/boranga/frontend/boranga/src/components/internal/species_communities/species_split.vue
@@ -1,6 +1,6 @@
 <template lang="html">
     <div id="splitSpecies">
-        <modal transition="modal fade" @ok="ok()" @cancel="cancel()" :title="title" extraLarge id="myModal">
+        <modal transition="modal fade" @ok="ok()" @cancel="cancel()" :title="title" extraLarge id="species-split-modal">
             <div class="container-fluid">
                 <div class="row">
                     <form class="form-horizontal" name="splitSpeciesForm">

From 2170bfe2e00b155026dd061d8ec5c84d09c1a242 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Mon, 11 Nov 2024 13:49:57 +0800
Subject: [PATCH 43/83] Update propose for agenda template path.:

---
 boranga/components/conservation_status/email.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boranga/components/conservation_status/email.py b/boranga/components/conservation_status/email.py
index b2b07879..791524e4 100644
--- a/boranga/components/conservation_status/email.py
+++ b/boranga/components/conservation_status/email.py
@@ -104,9 +104,9 @@ class ApproverApproveSendNotificationEmail(TemplateEmailBase):
 
 class ApproverProposedForAgendaSendNotificationEmail(TemplateEmailBase):
     subject = "A conservation status proposal has been proposed for agenda."
-    html_template = "boranga/emails/cs_proposals/send_assessor_proposed_for_agenda_notification.html"
+    html_template = "boranga/emails/cs_proposals/send_approver_proposed_for_agenda_notification.html"
     txt_template = (
-        "boranga/emails/cs_proposals/send_assessor_proposed_for_agenda_notification.txt"
+        "boranga/emails/cs_proposals/send_approver_proposed_for_agenda_notification.txt"
     )
 
 

From 1aec86970094898cfa5454beff14dcdcaea3c09d Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Mon, 11 Nov 2024 13:50:17 +0800
Subject: [PATCH 44/83] Correct case for Proposed For Agenda.

---
 boranga/frontend/boranga/src/utils/constants.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boranga/frontend/boranga/src/utils/constants.js b/boranga/frontend/boranga/src/utils/constants.js
index 3bf05868..2d31332c 100755
--- a/boranga/frontend/boranga/src/utils/constants.js
+++ b/boranga/frontend/boranga/src/utils/constants.js
@@ -5,7 +5,7 @@ module.exports = {
         WITH_ASSESSOR: { ID: 'with_assessor', TEXT: 'With Assessor' },
         WITH_REFERRAL: { ID: 'with_referral', TEXT: 'With Referral' },
         DEFERRED: { ID: 'deferred', TEXT: 'Deferred' },
-        PROPOSED_FOR_AGENDA: { ID: 'proposed_for_agenda', TEXT: 'Proposed for Agenda' },
+        PROPOSED_FOR_AGENDA: { ID: 'proposed_for_agenda', TEXT: 'Proposed For Agenda' },
         READY_FOR_AGENDA: { ID: 'ready_for_agenda', TEXT: 'Ready For Agenda' },
         ON_AGENDA: { ID: 'on_agenda', TEXT: 'On Agenda' },
         WITH_APPROVER: { ID: 'with_approver', TEXT: 'Proposed DeListed' },

From 2ee5ca38986dac99cf3891f106c84bc5aacf9efd Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Mon, 11 Nov 2024 13:51:17 +0800
Subject: [PATCH 45/83] Add ready for agenda endpoint and make proposed for
 agenda and ready for agenda use PATCH method instead of POST.

---
 boranga/components/conservation_status/api.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/boranga/components/conservation_status/api.py b/boranga/components/conservation_status/api.py
index 5b8ada33..cb98c353 100644
--- a/boranga/components/conservation_status/api.py
+++ b/boranga/components/conservation_status/api.py
@@ -1977,7 +1977,7 @@ def switch_status(self, request, *args, **kwargs):
 
     @detail_route(
         methods=[
-            "POST",
+            "PATCH",
         ],
         detail=True,
         permission_classes=[ConservationStatusPermission],
@@ -1989,6 +1989,20 @@ def proposed_for_agenda(self, request, *args, **kwargs):
         serializer = serializer_class(instance, context={"request": request})
         return Response(serializer.data)
 
+    @detail_route(
+        methods=[
+            "PATCH",
+        ],
+        detail=True,
+        permission_classes=[ConservationStatusPermission],
+    )
+    def ready_for_agenda(self, request, *args, **kwargs):
+        instance = self.get_object()
+        instance.ready_for_agenda(request)
+        serializer_class = self.internal_serializer_class()
+        serializer = serializer_class(instance, context={"request": request})
+        return Response(serializer.data)
+
     @detail_route(
         methods=[
             "GET",

From 7a4c8c2d777dc2220dfb4c15c259dfc0e19fc0ff Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Mon, 11 Nov 2024 13:51:42 +0800
Subject: [PATCH 46/83] Add ready for agenda modal.

---
 .../conservation_status/ready_for_agenda.vue  | 92 +++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 boranga/frontend/boranga/src/components/internal/conservation_status/ready_for_agenda.vue

diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/ready_for_agenda.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/ready_for_agenda.vue
new file mode 100644
index 00000000..69138c7c
--- /dev/null
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/ready_for_agenda.vue
@@ -0,0 +1,92 @@
+<template lang="html">
+    <div id="internal-conservation-status-proposal-ready-for-agenda">
+        <modal id="ready-for-agenda-modal" transition="modal fade" @ok="ok()" @cancel="close()"
+            :title="`CS${conservation_status_id} Ready for Agenda`" okText="Confirm Ready for Agenda" large>
+            <div class="container-fluid">
+                <div class="row">
+                    <form class="form-horizontal needs-validation" id="ready-for-agenda-form"
+                        name="ready-for-agenda-form" novalidate>
+                        <alert v-if="errors" type="danger"><strong>{{ errors }}</strong></alert>
+                        <div class="col-sm-12">
+                            <div class="row mb-3">
+                                <div class="col">
+                                    <div class="form-group">
+                                        <label class="control-label mb-3" for="Name">Approver Comments</label>
+                                        <textarea class="form-control" name="assessor_comment" ref="assessor_comment"
+                                            required v-model="assessor_comment"></textarea>
+                                        <div class="invalid-feedback">
+                                            Please enter any relevant comments.
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </modal>
+    </div>
+</template>
+
+<script>
+import modal from '@vue-utils/bootstrap-modal.vue'
+import alert from '@vue-utils/alert.vue'
+import { helpers, api_endpoints } from "@/utils/hooks.js"
+
+export default {
+    name: 'ReadyForAgenda',
+    components: {
+        modal,
+        alert,
+    },
+    props: {
+        conservation_status_id: {
+            type: Number,
+        },
+    },
+    data: function () {
+        return {
+            assessor_comment: null,
+            isModalOpen: false,
+            errors: null,
+        }
+    },
+    emits: ['refreshFromResponse'],
+    watch: {
+        isModalOpen: function (val) {
+            if (val) {
+                this.$nextTick(() => {
+                    $(this.$refs.assessor_comment).focus();
+                });
+            }
+        }
+    },
+    methods: {
+        ok: function () {
+            let vm = this;
+            var form = document.getElementById('ready-for-agenda-form');
+            if (form.checkValidity()) {
+                vm.readyForAgenda();
+            } else {
+                form.classList.add('was-validated');
+                $('#ready-for-agenda-form').find(':invalid').first().focus();
+            }
+            return false;
+        },
+        close: function () {
+            this.assessor_comment = null;
+            this.errors = null;
+            this.isModalOpen = false;
+        },
+        readyForAgenda: function () {
+            let vm = this;
+            vm.$http.patch(helpers.add_endpoint_json(api_endpoints.conservation_status, vm.conservation_status_id + '/ready_for_agenda'), { 'assessor_comment': vm.assessor_comment }).then((response) => {
+                vm.$router.push({ path: '/internal/conservation-status/' });
+            }, (error) => {
+                vm.errors = true;
+                vm.errorString = helpers.apiVueResourceError(error);
+            });
+        }
+    },
+}
+</script>

From 9aca5ffae3aaf0cb0543945b5a2c77eae3df30c3 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Mon, 11 Nov 2024 13:52:07 +0800
Subject: [PATCH 47/83] Rename propose ready for agenda component to propose
 for agenda.

---
 ..._for_agenda.vue => propose_for_agenda.vue} | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)
 rename boranga/frontend/boranga/src/components/internal/conservation_status/{propose_ready_for_agenda.vue => propose_for_agenda.vue} (77%)

diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/propose_ready_for_agenda.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/propose_for_agenda.vue
similarity index 77%
rename from boranga/frontend/boranga/src/components/internal/conservation_status/propose_ready_for_agenda.vue
rename to boranga/frontend/boranga/src/components/internal/conservation_status/propose_for_agenda.vue
index 2fccee2f..9429a70f 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/propose_ready_for_agenda.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/propose_for_agenda.vue
@@ -1,11 +1,11 @@
 <template lang="html">
-    <div id="internal-conservation-status-proposal-propose-ready-for-agenda">
-        <modal id="myModal" transition="modal fade" @ok="ok()" @cancel="close()"
+    <div id="internal-conservation-status-proposal-propose-for-agenda">
+        <modal id="propose-for-agenda-modal" transition="modal fade" @ok="ok()" @cancel="close()"
             :title="`Propose CS${conservation_status_id} for Agenda`" okText="Propose for Agenda" large>
             <div class="container-fluid">
                 <div class="row">
-                    <form class="form-horizontal needs-validation" id="propose-ready-for-agenda-form"
-                        name="propose-ready-for-agenda-form" novalidate>
+                    <form class="form-horizontal needs-validation" id="propose-for-agenda-form"
+                        name="propose-for-agenda-form" novalidate>
                         <alert v-if="errors" type="danger"><strong>{{ errors }}</strong></alert>
                         <div class="col-sm-12">
                             <div class="row mb-3">
@@ -35,7 +35,7 @@ import alert from '@vue-utils/alert.vue'
 import { helpers, api_endpoints } from "@/utils/hooks.js"
 
 export default {
-    name: 'ProposeReadyForAgenda',
+    name: 'ProposeForAgenda',
     components: {
         modal,
         alert,
@@ -65,12 +65,12 @@ export default {
     methods: {
         ok: function () {
             let vm = this;
-            var form = document.getElementById('propose-ready-for-agenda-form');
+            var form = document.getElementById('propose-for-agenda-form');
             if (form.checkValidity()) {
-                vm.proposeReadyForAgenda();
+                vm.proposeForAgenda();
             } else {
                 form.classList.add('was-validated');
-                $('#propose-ready-for-agenda-form').find(':invalid').first().focus();
+                $('#propose-for-agenda-form').find(':invalid').first().focus();
             }
             return false;
         },
@@ -79,10 +79,10 @@ export default {
             this.errors = null;
             this.isModalOpen = false;
         },
-        proposeReadyForAgenda: function () {
+        proposeForAgenda: function () {
             let vm = this;
-            vm.$http.post(helpers.add_endpoint_json(api_endpoints.conservation_status, vm.conservation_status_id + '/proposed_ready_for_agenda'), { 'assessor_comment': vm.assessor_comment }).then((response) => {
-                vm.$router.push({ path: '/internal/conservation-status/' }); //Navigate to dashboard page after Propose issue.
+            vm.$http.patch(helpers.add_endpoint_json(api_endpoints.conservation_status, vm.conservation_status_id + '/proposed_for_agenda'), { 'assessor_comment': vm.assessor_comment }).then((response) => {
+                vm.$router.push({ path: '/internal/conservation-status/' });
             }, (error) => {
                 vm.errors = true;
                 vm.errorString = helpers.apiVueResourceError(error);

From af817c0c40eeaa3c582036e4cb8c99bdcc7812eb Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Mon, 11 Nov 2024 16:29:54 +0800
Subject: [PATCH 48/83] When adding a CS to agenda update it's processing
 status to On Agenda. When removing a CS update to Ready For Agenda.

---
 boranga/components/meetings/api.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/boranga/components/meetings/api.py b/boranga/components/meetings/api.py
index 846efed3..1c4decf2 100644
--- a/boranga/components/meetings/api.py
+++ b/boranga/components/meetings/api.py
@@ -449,6 +449,8 @@ def add_agenda_item(self, request, *args, **kwargs):
                 id=request_data["conservation_status_id"]
             )
             instance.agenda_items.create(conservation_status=cs)
+            cs.processing_status = ConservationStatus.PROCESSING_STATUS_ON_AGENDA
+            cs.save()
         agenda_items = [cs.conservation_status_id for cs in instance.agenda_items.all()]
         return Response(agenda_items)
 
@@ -467,6 +469,8 @@ def remove_agenda_item(self, request, *args, **kwargs):
                 meeting=instance, conservation_status=cs
             )
             agenda_item.delete()
+            cs.processing_status = ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA
+            cs.save()
         agenda_items = [cs.conservation_status_id for cs in instance.agenda_items.all()]
         return Response(agenda_items)
 

From 69c9fa866f5580836b1987301cc36726d4673e25 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Mon, 11 Nov 2024 16:32:38 +0800
Subject: [PATCH 49/83] Update methods to include On Agenda processing status
 in permission checks for approvers.

---
 boranga/components/conservation_status/models.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index b7b00e22..1ae4bb49 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -758,6 +758,7 @@ def allowed_assessors(self):
         if self.processing_status in [
             ConservationStatus.PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
             ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA,
+            ConservationStatus.PROCESSING_STATUS_ON_AGENDA,
             ConservationStatus.PROCESSING_STATUS_WITH_APPROVER,
             ConservationStatus.PROCESSING_STATUS_APPROVED,
             ConservationStatus.PROCESSING_STATUS_UNLOCKED,
@@ -877,6 +878,7 @@ def can_assess(self, request):
         elif self.processing_status in [
             ConservationStatus.PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
             ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA,
+            ConservationStatus.PROCESSING_STATUS_ON_AGENDA,
             ConservationStatus.PROCESSING_STATUS_WITH_APPROVER,
             ConservationStatus.PROCESSING_STATUS_UNLOCKED,
             ConservationStatus.PROCESSING_STATUS_DEFERRED,
@@ -933,12 +935,12 @@ def can_user_assign_to_self(self, request):
         if self.processing_status in [
             ConservationStatus.PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
             ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA,
+            ConservationStatus.PROCESSING_STATUS_ON_AGENDA,
             ConservationStatus.PROCESSING_STATUS_WITH_APPROVER,
             ConservationStatus.PROCESSING_STATUS_APPROVED,
             ConservationStatus.PROCESSING_STATUS_CLOSED,
             ConservationStatus.PROCESSING_STATUS_DECLINED,
             ConservationStatus.PROCESSING_STATUS_DELISTED,
-            ConservationStatus.PROCESSING_STATUS_DEFERRED,
         ]:
             return (
                 self.assigned_approver != request.user.id
@@ -986,6 +988,7 @@ def assign_officer(self, request, officer):
             allowed_statuses = [
                 ConservationStatus.PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
                 ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA,
+                ConservationStatus.PROCESSING_STATUS_ON_AGENDA,
                 ConservationStatus.PROCESSING_STATUS_WITH_APPROVER,
                 ConservationStatus.PROCESSING_STATUS_APPROVED,
                 ConservationStatus.PROCESSING_STATUS_CLOSED,
@@ -1055,6 +1058,7 @@ def unassign(self, request):
         if self.processing_status in [
             ConservationStatus.PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
             ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA,
+            ConservationStatus.PROCESSING_STATUS_ON_AGENDA,
             ConservationStatus.PROCESSING_STATUS_WITH_APPROVER,
             ConservationStatus.PROCESSING_STATUS_APPROVED,
             ConservationStatus.PROCESSING_STATUS_CLOSED,

From 23071ab84e99a0727cc4acf3c9c2e60ca99b2375 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Tue, 12 Nov 2024 10:39:39 +0800
Subject: [PATCH 50/83] Change abstract list models to be able to be specified
 as applicable to either flora, fauna, or communities rather than just species
 or communities.

---
 .../components/conservation_status/admin.py   |   8 +-
 .../components/conservation_status/models.py  | 152 ++++++++++--------
 ...servationlist_applies_to_flora_and_more.py |  43 +++++
 3 files changed, 139 insertions(+), 64 deletions(-)
 create mode 100644 boranga/migrations/0491_rename_applies_to_species_commonwealthconservationlist_applies_to_flora_and_more.py

diff --git a/boranga/components/conservation_status/admin.py b/boranga/components/conservation_status/admin.py
index 274968ac..072e16db 100644
--- a/boranga/components/conservation_status/admin.py
+++ b/boranga/components/conservation_status/admin.py
@@ -12,7 +12,13 @@ class ProposalAmendmentReasonAdmin(
 
 
 class AbstractListAdmin(DeleteProtectedModelAdmin):
-    list_display = ["code", "label", "applies_to_species", "applies_to_communities"]
+    list_display = [
+        "code",
+        "label",
+        "applies_to_flora",
+        "applies_to_fauna",
+        "applies_to_communities",
+    ]
 
 
 class AbstractCategoryAdmin(DeleteProtectedModelAdmin):
diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index 1ae4bb49..b866349f 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -98,7 +98,8 @@ def update_conservation_status_doc_filename(instance, filename):
 class AbstractConservationList(ArchivableModel):
     code = models.CharField(max_length=64)
     label = models.CharField(max_length=512)
-    applies_to_species = models.BooleanField(default=False)
+    applies_to_flora = models.BooleanField(default=False)
+    applies_to_fauna = models.BooleanField(default=False)
     applies_to_communities = models.BooleanField(default=False)
 
     class Meta:
@@ -132,9 +133,12 @@ def get_lists_dict(
             lists = lists.filter(applies_to_communities=True)
         elif group_type and group_type.name in [
             GroupType.GROUP_TYPE_FLORA,
+        ]:
+            lists = lists.filter(applies_to_flora=True)
+        elif group_type and group_type.name in [
             GroupType.GROUP_TYPE_FAUNA,
         ]:
-            lists = lists.filter(applies_to_species=True)
+            lists = lists.filter(applies_to_fauna=True)
         return list(lists)
 
     def __str__(self):
@@ -203,10 +207,15 @@ def get_categories_dict(
             )
         elif group_type and group_type.name in [
             GroupType.GROUP_TYPE_FLORA,
+        ]:
+            wa_priority_categories_qs = wa_priority_categories_qs.filter(
+                wa_priority_lists__applies_to_flora=True
+            )
+        elif group_type and group_type.name in [
             GroupType.GROUP_TYPE_FAUNA,
         ]:
             wa_priority_categories_qs = wa_priority_categories_qs.filter(
-                wa_priority_lists__applies_to_species=True
+                wa_priority_lists__applies_to_fauna=True
             )
         for wa_priority_category in wa_priority_categories_qs.distinct():
             list_ids = list(
@@ -274,10 +283,15 @@ def get_categories_dict(
             )
         elif group_type and group_type.name in [
             GroupType.GROUP_TYPE_FLORA,
+        ]:
+            wa_legislative_categories_qs = wa_legislative_categories_qs.filter(
+                wa_legislative_lists__applies_to_flora=True
+            )
+        elif group_type and group_type.name in [
             GroupType.GROUP_TYPE_FAUNA,
         ]:
             wa_legislative_categories_qs = wa_legislative_categories_qs.filter(
-                wa_legislative_lists__applies_to_species=True
+                wa_legislative_lists__applies_to_fauna=True
             )
         for wa_legislative_category in wa_legislative_categories_qs.distinct():
             list_ids = list(
@@ -770,6 +784,7 @@ def allowed_assessors(self):
         elif self.processing_status in [
             ConservationStatus.PROCESSING_STATUS_WITH_ASSESSOR,
             ConservationStatus.PROCESSING_STATUS_WITH_REFERRAL,
+            ConservationStatus.PROCESSING_STATUS_DEFERRED,
         ]:
             group_ids = member_ids(GROUP_NAME_CONSERVATION_STATUS_ASSESSOR)
 
@@ -984,74 +999,85 @@ def assign_officer(self, request, officer):
                 f"Officer with id {officer} is not authorised to be assigned to this conservation status"
             )
 
-        if is_conservation_status_approver(request):
-            allowed_statuses = [
-                ConservationStatus.PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
-                ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA,
-                ConservationStatus.PROCESSING_STATUS_ON_AGENDA,
-                ConservationStatus.PROCESSING_STATUS_WITH_APPROVER,
-                ConservationStatus.PROCESSING_STATUS_APPROVED,
-                ConservationStatus.PROCESSING_STATUS_CLOSED,
-                ConservationStatus.PROCESSING_STATUS_DELISTED,
-                ConservationStatus.PROCESSING_STATUS_DECLINED,
-                ConservationStatus.PROCESSING_STATUS_UNLOCKED,
-            ]
-
-            if self.processing_status in allowed_statuses:
-                if officer == self.assigned_approver:
-                    return
-
-                self.assigned_approver = officer.id
-                self.save()
+        approver_statuses = [
+            ConservationStatus.PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
+            ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA,
+            ConservationStatus.PROCESSING_STATUS_ON_AGENDA,
+            ConservationStatus.PROCESSING_STATUS_WITH_APPROVER,
+            ConservationStatus.PROCESSING_STATUS_APPROVED,
+            ConservationStatus.PROCESSING_STATUS_CLOSED,
+            ConservationStatus.PROCESSING_STATUS_DELISTED,
+            ConservationStatus.PROCESSING_STATUS_DECLINED,
+            ConservationStatus.PROCESSING_STATUS_UNLOCKED,
+        ]
 
-                # Create a log entry for the conservation status
-                self.log_user_action(
-                    ConservationStatusUserAction.ACTION_ASSIGN_TO_APPROVER.format(
-                        self.conservation_status_number,
-                        f"{officer.get_full_name()}({officer.email})",
-                    ),
-                    request,
+        if (
+            self.processing_status in approver_statuses
+            and is_conservation_status_approver(request)
+        ):
+            if officer == self.assigned_approver:
+                logger.warning(
+                    "Approver is already assigned to this conservation status"
                 )
+                return
 
-                # Create a log entry for the user
-                request.user.log_user_action(
-                    ConservationStatusUserAction.ACTION_ASSIGN_TO_APPROVER.format(
-                        self.conservation_status_number,
-                        f"{officer.get_full_name()}({officer.email})",
-                    ),
-                    request,
-                )
+            self.assigned_approver = officer.id
+            self.save()
 
-        if is_conservation_status_assessor(request):
-            allowed_statuses = [
-                ConservationStatus.PROCESSING_STATUS_WITH_ASSESSOR,
-                ConservationStatus.PROCESSING_STATUS_WITH_REFERRAL,
-            ]
+            # Create a log entry for the conservation status
+            self.log_user_action(
+                ConservationStatusUserAction.ACTION_ASSIGN_TO_APPROVER.format(
+                    self.conservation_status_number,
+                    f"{officer.get_full_name()}({officer.email})",
+                ),
+                request,
+            )
 
-            if self.processing_status in allowed_statuses:
-                if officer == self.assigned_officer:
-                    return
+            # Create a log entry for the user
+            request.user.log_user_action(
+                ConservationStatusUserAction.ACTION_ASSIGN_TO_APPROVER.format(
+                    self.conservation_status_number,
+                    f"{officer.get_full_name()}({officer.email})",
+                ),
+                request,
+            )
 
-                self.assigned_officer = officer.id
-                self.save()
+        assessor_statuses = [
+            ConservationStatus.PROCESSING_STATUS_WITH_ASSESSOR,
+            ConservationStatus.PROCESSING_STATUS_WITH_REFERRAL,
+            ConservationStatus.PROCESSING_STATUS_DEFERRED,
+        ]
 
-                # Create a log entry for the conservation status
-                self.log_user_action(
-                    ConservationStatusUserAction.ACTION_ASSIGN_TO_ASSESSOR.format(
-                        self.conservation_status_number,
-                        f"{officer.get_full_name()}({officer.email})",
-                    ),
-                    request,
+        if (
+            self.processing_status in assessor_statuses
+            and is_conservation_status_assessor(request)
+        ):
+            if officer == self.assigned_officer:
+                logger.warning(
+                    "Assessor is already assigned to this conservation status"
                 )
+                return
 
-                # Create a log entry for the user
-                request.user.log_user_action(
-                    ConservationStatusUserAction.ACTION_ASSIGN_TO_ASSESSOR.format(
-                        self.conservation_status_number,
-                        f"{officer.get_full_name()}({officer.email})",
-                    ),
-                    request,
-                )
+            self.assigned_officer = officer.id
+            self.save()
+
+            # Create a log entry for the conservation status
+            self.log_user_action(
+                ConservationStatusUserAction.ACTION_ASSIGN_TO_ASSESSOR.format(
+                    self.conservation_status_number,
+                    f"{officer.get_full_name()}({officer.email})",
+                ),
+                request,
+            )
+
+            # Create a log entry for the user
+            request.user.log_user_action(
+                ConservationStatusUserAction.ACTION_ASSIGN_TO_ASSESSOR.format(
+                    self.conservation_status_number,
+                    f"{officer.get_full_name()}({officer.email})",
+                ),
+                request,
+            )
 
     @transaction.atomic
     def unassign(self, request):
diff --git a/boranga/migrations/0491_rename_applies_to_species_commonwealthconservationlist_applies_to_flora_and_more.py b/boranga/migrations/0491_rename_applies_to_species_commonwealthconservationlist_applies_to_flora_and_more.py
new file mode 100644
index 00000000..a5699478
--- /dev/null
+++ b/boranga/migrations/0491_rename_applies_to_species_commonwealthconservationlist_applies_to_flora_and_more.py
@@ -0,0 +1,43 @@
+# Generated by Django 5.0.9 on 2024-11-12 02:38
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0490_alter_communitydocument__file_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="commonwealthconservationlist",
+            old_name="applies_to_species",
+            new_name="applies_to_flora",
+        ),
+        migrations.RenameField(
+            model_name="walegislativelist",
+            old_name="applies_to_species",
+            new_name="applies_to_flora",
+        ),
+        migrations.RenameField(
+            model_name="waprioritylist",
+            old_name="applies_to_species",
+            new_name="applies_to_flora",
+        ),
+        migrations.AddField(
+            model_name="commonwealthconservationlist",
+            name="applies_to_fauna",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="walegislativelist",
+            name="applies_to_fauna",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="waprioritylist",
+            name="applies_to_fauna",
+            field=models.BooleanField(default=False),
+        ),
+    ]

From 46277293c24b338e7b9f59f0ce0ad3985e66f893 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Tue, 12 Nov 2024 11:21:15 +0800
Subject: [PATCH 51/83] Change international_conservation field name to
 other_conservation_assessment.

---
 boranga/components/conservation_status/api.py |  8 +++----
 .../components/conservation_status/models.py  |  4 +++-
 .../conservation_status/serializers.py        | 18 +++++++-------
 .../components/species_and_communities/api.py |  4 ++--
 .../species_and_communities/serializers.py    | 24 +++++++++----------
 .../common/communities_dashboard.vue          |  8 +++----
 .../conservation_status/community_status.vue  | 14 +++++------
 .../conservation_status/species_status.vue    | 14 +++++------
 ...onservation_status_community_dashboard.vue |  8 +++----
 .../conservation_status_fauna_dashboard.vue   |  8 +++----
 .../conservation_status_flora_dashboard.vue   |  8 +++----
 .../basic_conservation_status.vue             |  8 +++----
 .../common/species_fauna_dashboard.vue        |  8 +++----
 .../common/species_flora_dashboard.vue        |  8 +++----
 .../components/internal/meetings/cs_queue.vue |  6 ++++-
 ..._other_conservation_assessment_and_more.py | 21 ++++++++++++++++
 16 files changed, 98 insertions(+), 71 deletions(-)
 create mode 100644 boranga/migrations/0492_rename_international_conservation_conservationstatus_other_conservation_assessment_and_more.py

diff --git a/boranga/components/conservation_status/api.py b/boranga/components/conservation_status/api.py
index cb98c353..8a1d324d 100644
--- a/boranga/components/conservation_status/api.py
+++ b/boranga/components/conservation_status/api.py
@@ -326,10 +326,10 @@ def filter_queryset(self, request, queryset, view):
         )
         if filter_international_relevance == "true":
             if queryset.model is ConservationStatus:
-                queryset = queryset.exclude(international_conservation__isnull=True)
+                queryset = queryset.exclude(other_conservation_assessment__isnull=True)
             elif queryset.model is ConservationStatusReferral:
                 queryset = queryset.exclude(
-                    conservation_status__international_conservation__isnull=True
+                    conservation_status__other_conservation_assessment__isnull=True
                 )
 
         filter_from_effective_from_date = request.POST.get(
@@ -934,10 +934,10 @@ def filter_queryset(self, request, queryset, view):
         )
         if filter_international_relevance == "true":
             if queryset.model is ConservationStatus:
-                queryset = queryset.exclude(international_conservation__isnull=True)
+                queryset = queryset.exclude(other_conservation_assessment__isnull=True)
             elif queryset.model is ConservationStatusReferral:
                 queryset = queryset.exclude(
-                    conservation_status__international_conservation__isnull=True
+                    conservation_status__other_conservation_assessment__isnull=True
                 )
 
         filter_from_effective_from_date = request.POST.get(
diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index b866349f..985c691b 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -559,7 +559,9 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
         null=True,
         related_name="curr_commonwealth_conservation_list",
     )
-    international_conservation = models.CharField(max_length=100, blank=True, null=True)
+    other_conservation_assessment = models.CharField(
+        max_length=100, blank=True, null=True
+    )
     conservation_criteria = models.CharField(max_length=100, blank=True, null=True)
     cam_mou = models.BooleanField(null=True, blank=True)
     cam_mou_date_sent = models.DateField(null=True, blank=True)
diff --git a/boranga/components/conservation_status/serializers.py b/boranga/components/conservation_status/serializers.py
index 0b9a135e..4414f56e 100644
--- a/boranga/components/conservation_status/serializers.py
+++ b/boranga/components/conservation_status/serializers.py
@@ -60,7 +60,7 @@ class Meta:
             "wa_legislative_category",
             "wa_priority_category",
             "commonwealth_conservation_list",
-            "international_conservation",
+            "other_conservation_assessment",
             "conservation_criteria",
             "under_review",
         )
@@ -202,7 +202,7 @@ class Meta:
             "wa_legislative_list",
             "wa_legislative_category",
             "commonwealth_conservation_list",
-            "international_conservation",
+            "other_conservation_assessment",
             "conservation_criteria",
             "processing_status",
             "customer_status",
@@ -400,7 +400,7 @@ class Meta:
             "wa_legislative_list",
             "wa_legislative_category",
             "commonwealth_conservation_list",
-            "international_conservation",
+            "other_conservation_assessment",
             "conservation_criteria",
             "effective_from",
             "effective_to",
@@ -433,7 +433,7 @@ class Meta:
             "wa_legislative_list",
             "wa_legislative_category",
             "commonwealth_conservation_list",
-            "international_conservation",
+            "other_conservation_assessment",
             "conservation_criteria",
             "effective_from",
             "effective_to",
@@ -556,7 +556,7 @@ class Meta:
             "wa_priority_category",
             "commonwealth_conservation_list_id",
             "commonwealth_conservation_list",
-            "international_conservation",
+            "other_conservation_assessment",
             "conservation_criteria",
             "comment",
             "lodgement_date",
@@ -771,7 +771,7 @@ class Meta:
             "wa_priority_list_id",
             "wa_priority_category_id",
             "commonwealth_conservation_list_id",
-            "international_conservation",
+            "other_conservation_assessment",
             "conservation_criteria",
         ]
 
@@ -834,7 +834,7 @@ class Meta:
             "wa_priority_category",
             "commonwealth_conservation_list_id",
             "commonwealth_conservation_list",
-            "international_conservation",
+            "other_conservation_assessment",
             "conservation_criteria",
             "comment",
             "processing_status",
@@ -1088,7 +1088,7 @@ class Meta:
             "wa_priority_list_id",
             "wa_priority_category_id",
             "commonwealth_conservation_list_id",
-            "international_conservation",
+            "other_conservation_assessment",
             "conservation_criteria",
             "comment",
             "lodgement_date",
@@ -1239,7 +1239,7 @@ class Meta:
             "wa_priority_list_id",
             "wa_priority_category_id",
             "commonwealth_conservation_list_id",
-            "international_conservation",
+            "other_conservation_assessment",
             "conservation_criteria",
             "comment",
             "lodgement_date",
diff --git a/boranga/components/species_and_communities/api.py b/boranga/components/species_and_communities/api.py
index 8525fe0c..1465636d 100755
--- a/boranga/components/species_and_communities/api.py
+++ b/boranga/components/species_and_communities/api.py
@@ -673,7 +673,7 @@ def filter_queryset(self, request, queryset, view):
         if filter_international_relevance == "true":
             queryset = queryset.filter(
                 conservation_status__processing_status=ConservationStatus.PROCESSING_STATUS_APPROVED,
-            ).exclude(conservation_status__international_conservation__isnull=True)
+            ).exclude(conservation_status__other_conservation_assessment__isnull=True)
 
         filter_conservation_criteria = request.POST.get("filter_conservation_criteria")
         if filter_conservation_criteria:
@@ -933,7 +933,7 @@ def filter_queryset(self, request, queryset, view):
         if filter_international_relevance == "true":
             queryset = queryset.filter(
                 conservation_status__processing_status=ConservationStatus.PROCESSING_STATUS_APPROVED,
-            ).exclude(conservation_status__international_conservation__isnull=True)
+            ).exclude(conservation_status__other_conservation_assessment__isnull=True)
 
         filter_conservation_criteria = request.GET.get("filter_conservation_criteria")
         if filter_conservation_criteria:
diff --git a/boranga/components/species_and_communities/serializers.py b/boranga/components/species_and_communities/serializers.py
index 4d78f384..8965a22f 100755
--- a/boranga/components/species_and_communities/serializers.py
+++ b/boranga/components/species_and_communities/serializers.py
@@ -62,7 +62,7 @@ class ListSpeciesSerializer(serializers.ModelSerializer):
     wa_legislative_category = serializers.SerializerMethodField()
     wa_priority_category = serializers.SerializerMethodField()
     commonwealth_conservation_list = serializers.SerializerMethodField()
-    international_conservation = serializers.SerializerMethodField()
+    other_conservation_assessment = serializers.SerializerMethodField()
     conservation_criteria = serializers.SerializerMethodField()
 
     class Meta:
@@ -88,7 +88,7 @@ class Meta:
             "wa_legislative_category",
             "wa_priority_category",
             "commonwealth_conservation_list",
-            "international_conservation",
+            "other_conservation_assessment",
             "conservation_criteria",
         )
         datatables_always_serialize = (
@@ -112,7 +112,7 @@ class Meta:
             "wa_legislative_category",
             "wa_priority_category",
             "commonwealth_conservation_list",
-            "international_conservation",
+            "other_conservation_assessment",
             "conservation_criteria",
         )
 
@@ -203,10 +203,10 @@ def get_commonwealth_conservation_list(self, obj):
             return conservation_status.commonwealth_conservation_list.code
         return ""
 
-    def get_international_conservation(self, obj):
+    def get_other_conservation_assessment(self, obj):
         conservation_status = obj.approved_conservation_status
-        if conservation_status and conservation_status.international_conservation:
-            return conservation_status.international_conservation
+        if conservation_status and conservation_status.other_conservation_assessment:
+            return conservation_status.other_conservation_assessment
         return ""
 
     def get_conservation_criteria(self, obj):
@@ -230,7 +230,7 @@ class ListCommunitiesSerializer(serializers.ModelSerializer):
     wa_legislative_category = serializers.SerializerMethodField()
     wa_priority_category = serializers.SerializerMethodField()
     commonwealth_conservation_list = serializers.SerializerMethodField()
-    international_conservation = serializers.SerializerMethodField()
+    other_conservation_assessment = serializers.SerializerMethodField()
     conservation_criteria = serializers.SerializerMethodField()
 
     class Meta:
@@ -253,7 +253,7 @@ class Meta:
             "wa_legislative_category",
             "wa_priority_category",
             "commonwealth_conservation_list",
-            "international_conservation",
+            "other_conservation_assessment",
             "conservation_criteria",
         )
         datatables_always_serialize = (
@@ -274,7 +274,7 @@ class Meta:
             "wa_legislative_category",
             "wa_priority_category",
             "commonwealth_conservation_list",
-            "international_conservation",
+            "other_conservation_assessment",
             "conservation_criteria",
         )
 
@@ -345,10 +345,10 @@ def get_commonwealth_conservation_list(self, obj):
             return conservation_status.commonwealth_conservation_list.code
         return ""
 
-    def get_international_conservation(self, obj):
+    def get_other_conservation_assessment(self, obj):
         conservation_status = obj.approved_conservation_status
-        if conservation_status and conservation_status.international_conservation:
-            return conservation_status.international_conservation
+        if conservation_status and conservation_status.other_conservation_assessment:
+            return conservation_status.other_conservation_assessment
         return ""
 
     def get_conservation_criteria(self, obj):
diff --git a/boranga/frontend/boranga/src/components/common/communities_dashboard.vue b/boranga/frontend/boranga/src/components/common/communities_dashboard.vue
index 05782bb0..0b69cd20 100644
--- a/boranga/frontend/boranga/src/components/common/communities_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/communities_dashboard.vue
@@ -530,10 +530,10 @@ export default {
                 visible: true,
             }
         },
-        column_international_conservation:
+        column_other_conservation_assessment:
             function () {
                 return {
-                    data: "international_conservation",
+                    data: "other_conservation_assessment",
                     orderable: false,
                     searchable: false,
                     visible: true,
@@ -615,7 +615,7 @@ export default {
                     vm.column_wa_legislative_list,
                     vm.column_wa_legislative_category,
                     vm.column_commonwealth_conservation_list,
-                    vm.column_international_conservation,
+                    vm.column_other_conservation_assessment,
                     vm.column_conservation_criteria,
                     vm.column_action,
                 ]
@@ -633,7 +633,7 @@ export default {
                     vm.column_wa_legislative_list,
                     vm.column_wa_legislative_category,
                     vm.column_commonwealth_conservation_list,
-                    vm.column_international_conservation,
+                    vm.column_other_conservation_assessment,
                     vm.column_conservation_criteria,
                     vm.column_status,
                     vm.column_action,
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
index e959b877..7f92543f 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
@@ -323,13 +323,13 @@
                         </div>
                     </div>
                     <div class="row mb-3">
-                        <label for="proposed_international_conservation" class="col-sm-4 col-form-label">Other
+                        <label for="proposed_other_conservation_assessment" class="col-sm-4 col-form-label">Other
                             Conservation Assessment:</label>
                         <div class="col-sm-8">
                             <input :disabled="isReadOnly" type="text" class="form-control"
-                                id="proposed_international_conservation"
+                                id="proposed_other_conservation_assessment"
                                 :placeholder="isReadOnly ? 'N/A' : 'Enter Other Conservation Assessment Details if Applicable'"
-                                v-model="conservation_status_obj.international_conservation" />
+                                v-model="conservation_status_obj.other_conservation_assessment" />
                         </div>
                     </div>
                     <div class="row mb-3">
@@ -466,14 +466,14 @@
                             </select>
                         </div>
                     </div>
-                    <div v-if="conservation_status_obj.current_conservation_status.international_conservation"
+                    <div v-if="conservation_status_obj.current_conservation_status.other_conservation_assessment"
                         class="row mb-3">
-                        <label for="current_international_conservation" class="col-sm-4 col-form-label">Other
+                        <label for="current_other_conservation_assessment" class="col-sm-4 col-form-label">Other
                             Conservation Assessment:</label>
                         <div class="col-sm-8">
                             <input :disabled="true" type="text" class="form-control"
-                                id="current_international_conservation"
-                                v-model="conservation_status_obj.current_conservation_status.international_conservation" />
+                                id="current_other_conservation_assessment"
+                                v-model="conservation_status_obj.current_conservation_status.other_conservation_assessment" />
                         </div>
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.conservation_criteria"
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
index 9e3dd7dc..a412710b 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
@@ -329,13 +329,13 @@
                         </div>
                     </div>
                     <div class="row mb-3">
-                        <label for="proposed_international_conservation" class="col-sm-4 col-form-label">Other
+                        <label for="proposed_other_conservation_assessment" class="col-sm-4 col-form-label">Other
                             Conservation Assessment:</label>
                         <div class="col-sm-8">
                             <input :disabled="isReadOnly" type="text" class="form-control"
-                                id="proposed_international_conservation"
+                                id="proposed_other_conservation_assessment"
                                 :placeholder="isReadOnly ? 'N/A' : 'Enter Other Conservation Assessment Details if Applicable'"
-                                v-model="conservation_status_obj.international_conservation" />
+                                v-model="conservation_status_obj.other_conservation_assessment" />
                         </div>
                     </div>
                     <div class="row mb-3">
@@ -471,14 +471,14 @@
                             </select>
                         </div>
                     </div>
-                    <div v-if="conservation_status_obj.current_conservation_status.international_conservation"
+                    <div v-if="conservation_status_obj.current_conservation_status.other_conservation_assessment"
                         class="row mb-3">
-                        <label for="current_international_conservation" class="col-sm-4 col-form-label">Other
+                        <label for="current_other_conservation_assessment" class="col-sm-4 col-form-label">Other
                             Conservation Assessment:</label>
                         <div class="col-sm-8">
                             <input :disabled="true" type="text" class="form-control"
-                                id="current_international_conservation"
-                                v-model="conservation_status_obj.current_conservation_status.international_conservation" />
+                                id="current_other_conservation_assessment"
+                                v-model="conservation_status_obj.current_conservation_status.other_conservation_assessment" />
                         </div>
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.conservation_criteria"
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue b/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue
index 56563f15..c457d088 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue
@@ -726,14 +726,14 @@ export default {
                 name: "commonwealth_conservation_list",
             }
         },
-        column_international_conservation:
+        column_other_conservation_assessment:
             function () {
                 return {
-                    data: "international_conservation",
+                    data: "other_conservation_assessment",
                     orderable: true,
                     searchable: true,
                     visible: true,
-                    name: "international_conservation",
+                    name: "other_conservation_assessment",
                 }
             },
         column_conservation_criteria: function () {
@@ -887,7 +887,7 @@ export default {
                 vm.column_wa_legislative_list,
                 vm.column_wa_legislative_category,
                 vm.column_commonwealth_conservation_list,
-                vm.column_international_conservation,
+                vm.column_other_conservation_assessment,
                 vm.column_conservation_criteria,
                 vm.column_submitter_name,
                 vm.column_submitter_category,
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue b/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue
index ed8e35e1..69a3cf18 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue
@@ -790,14 +790,14 @@ export default {
                 name: "commonwealth_conservation_list",
             }
         },
-        column_international_conservation:
+        column_other_conservation_assessment:
             function () {
                 return {
-                    data: "international_conservation",
+                    data: "other_conservation_assessment",
                     orderable: true,
                     searchable: true,
                     visible: true,
-                    name: "international_conservation",
+                    name: "other_conservation_assessment",
                 }
             },
         column_conservation_criteria: function () {
@@ -970,7 +970,7 @@ export default {
                 vm.column_wa_legislative_list,
                 vm.column_wa_legislative_category,
                 vm.column_commonwealth_conservation_list,
-                vm.column_international_conservation,
+                vm.column_other_conservation_assessment,
                 vm.column_conservation_criteria,
                 vm.column_submitter_name,
                 vm.column_submitter_category,
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue b/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue
index abad9d4a..443af567 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue
@@ -780,14 +780,14 @@ export default {
                 name: "commonwealth_conservation_list",
             }
         },
-        column_international_conservation:
+        column_other_conservation_assessment:
             function () {
                 return {
-                    data: "international_conservation",
+                    data: "other_conservation_assessment",
                     orderable: true,
                     searchable: true,
                     visible: true,
-                    name: "international_conservation",
+                    name: "other_conservation_assessment",
                 }
             },
         column_conservation_criteria: function () {
@@ -960,7 +960,7 @@ export default {
                 vm.column_wa_legislative_list,
                 vm.column_wa_legislative_category,
                 vm.column_commonwealth_conservation_list,
-                vm.column_international_conservation,
+                vm.column_other_conservation_assessment,
                 vm.column_conservation_criteria,
                 vm.column_submitter_name,
                 vm.column_submitter_category,
diff --git a/boranga/frontend/boranga/src/components/common/species_communities/basic_conservation_status.vue b/boranga/frontend/boranga/src/components/common/species_communities/basic_conservation_status.vue
index 1030186c..543cf7cc 100644
--- a/boranga/frontend/boranga/src/components/common/species_communities/basic_conservation_status.vue
+++ b/boranga/frontend/boranga/src/components/common/species_communities/basic_conservation_status.vue
@@ -42,12 +42,12 @@
                             :value="conservation_status.commonwealth_conservation_list" />
                     </div>
                 </div>
-                <div class="row mb-3" v-if="conservation_status.international_conservation">
-                    <label for="international_conservation" class="col-sm-4 col-form-label">Other
+                <div class="row mb-3" v-if="conservation_status.other_conservation_assessment">
+                    <label for="other_conservation_assessment" class="col-sm-4 col-form-label">Other
                         Conservation Assessment</label>
                     <div class="col-sm-8">
-                        <input class="form-control" id="international_conservation"
-                            :value="conservation_status.international_conservation" />
+                        <input class="form-control" id="other_conservation_assessment"
+                            :value="conservation_status.other_conservation_assessment" />
                     </div>
                 </div>
                 <div class="row pb-3 mb-3 border-bottom" v-if="conservation_status.conservation_criteria">
diff --git a/boranga/frontend/boranga/src/components/common/species_fauna_dashboard.vue b/boranga/frontend/boranga/src/components/common/species_fauna_dashboard.vue
index cb8f1f02..66bc4496 100644
--- a/boranga/frontend/boranga/src/components/common/species_fauna_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/species_fauna_dashboard.vue
@@ -646,10 +646,10 @@ export default {
                 visible: true,
             }
         },
-        column_international_conservation:
+        column_other_conservation_assessment:
             function () {
                 return {
-                    data: "international_conservation",
+                    data: "other_conservation_assessment",
                     orderable: false,
                     searchable: false,
                     visible: true,
@@ -732,7 +732,7 @@ export default {
                     vm.column_wa_legislative_list,
                     vm.column_wa_legislative_category,
                     vm.column_commonwealth_conservation_list,
-                    vm.column_international_conservation,
+                    vm.column_other_conservation_assessment,
                     vm.column_conservation_criteria,
                     vm.column_action,
                 ]
@@ -753,7 +753,7 @@ export default {
                     vm.column_wa_legislative_list,
                     vm.column_wa_legislative_category,
                     vm.column_commonwealth_conservation_list,
-                    vm.column_international_conservation,
+                    vm.column_other_conservation_assessment,
                     vm.column_conservation_criteria,
                     vm.column_status,
                     vm.column_action,
diff --git a/boranga/frontend/boranga/src/components/common/species_flora_dashboard.vue b/boranga/frontend/boranga/src/components/common/species_flora_dashboard.vue
index b5952cb0..fd244945 100755
--- a/boranga/frontend/boranga/src/components/common/species_flora_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/species_flora_dashboard.vue
@@ -619,10 +619,10 @@ export default {
                 visible: true,
             }
         },
-        column_international_conservation:
+        column_other_conservation_assessment:
             function () {
                 return {
-                    data: "international_conservation",
+                    data: "other_conservation_assessment",
                     orderable: false,
                     searchable: false,
                     visible: true,
@@ -744,7 +744,7 @@ export default {
                     vm.column_wa_legislative_list,
                     vm.column_wa_legislative_category,
                     vm.column_commonwealth_conservation_list,
-                    vm.column_international_conservation,
+                    vm.column_other_conservation_assessment,
                     vm.column_conservation_criteria,
                     vm.column_action,
                 ]
@@ -765,7 +765,7 @@ export default {
                     vm.column_wa_legislative_list,
                     vm.column_wa_legislative_category,
                     vm.column_commonwealth_conservation_list,
-                    vm.column_international_conservation,
+                    vm.column_other_conservation_assessment,
                     vm.column_conservation_criteria,
                     vm.column_status,
                     vm.column_action,
diff --git a/boranga/frontend/boranga/src/components/internal/meetings/cs_queue.vue b/boranga/frontend/boranga/src/components/internal/meetings/cs_queue.vue
index 593b6f54..ef6c9295 100644
--- a/boranga/frontend/boranga/src/components/internal/meetings/cs_queue.vue
+++ b/boranga/frontend/boranga/src/components/internal/meetings/cs_queue.vue
@@ -251,7 +251,7 @@ export default {
             let vm = this;
             swal.fire({
                 title: "Remove Agenda Item",
-                text: "Are you sure you want to remove this agenda item?",
+                html: "<p>Are you sure?</p><p>This action will change the CS status back to 'Ready For Agenda'. If you wish to Defer or send it Back to the Assessor, you can do so from the CS form (which will open in a new tab for you).</p>",
                 icon: "question",
                 showCancelButton: true,
                 confirmButtonText: 'Remove Agenda Item',
@@ -276,6 +276,10 @@ export default {
                             });
                             vm.meeting_obj.agenda_items_arr = res.body;
                             vm.$refs.cs_queue_datatable.vmDataTable.ajax.reload(vm.addTableListeners, false);
+                            // Open the CS details page in a new tab
+                            var new_window = window.open(`/internal/conservation_status/${conservation_status_id}?action=view`, '_blank');
+                            new_window.blur();
+                            window.focus();
                         }, (error) => {
                             console.log(error);
                         });
diff --git a/boranga/migrations/0492_rename_international_conservation_conservationstatus_other_conservation_assessment_and_more.py b/boranga/migrations/0492_rename_international_conservation_conservationstatus_other_conservation_assessment_and_more.py
new file mode 100644
index 00000000..57be411a
--- /dev/null
+++ b/boranga/migrations/0492_rename_international_conservation_conservationstatus_other_conservation_assessment_and_more.py
@@ -0,0 +1,21 @@
+# Generated by Django 5.0.9 on 2024-11-12 03:15
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "boranga",
+            "0491_rename_applies_to_species_commonwealthconservationlist_applies_to_flora_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="conservationstatus",
+            old_name="international_conservation",
+            new_name="other_conservation_assessment",
+        ),
+    ]

From b16d4a7d56239c7b313e78e491e174a2bc6e0844 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Tue, 12 Nov 2024 11:49:03 +0800
Subject: [PATCH 52/83] Allow most form fields to be edited when the status is
 deferred. User has to send back to assessor to chagne applicable workflow.

---
 .../conservation_status/community_status.vue  | 52 +++++++++----------
 .../conservation_status/species_status.vue    | 47 +++++++++--------
 2 files changed, 50 insertions(+), 49 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
index 7f92543f..0bc05bed 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
@@ -621,7 +621,7 @@ export default {
         show_administrative_information: function () {
             return !this.is_external &&
                 this.conservation_status_obj.community_id &&
-                this.conservation_status_obj.processing_status != "Draft";
+                this.conservation_status_obj.processing_status != 'Draft';
         },
         show_proposed_conservation_status: function () {
             return this.conservation_status_obj.community_id;
@@ -629,10 +629,10 @@ export default {
         show_listing_and_review_due_date: function () {
             return this.conservation_status_obj.listing_date ||
                 this.conservation_status_obj.review_due_date ||
-                this.conservation_status_obj.processing_status == "With Assessor";
+                this.conservation_status_obj.processing_status == 'With Assessor';
         },
         listing_and_review_due_date_disabled: function () {
-            return this.isReadOnly || !["With Assessor", "Unlocked"].includes(this.conservation_status_obj.processing_status)
+            return this.isReadOnly || !['With Assessor', 'Deferred', 'Unlocked'].includes(this.conservation_status_obj.processing_status)
         },
         approval_level_disabled: function () {
             return this.isReadOnly || !['With Assessor', 'With Referral'].includes(this.conservation_status_obj.processing_status);
@@ -655,10 +655,10 @@ export default {
             return has_value;
         },
         isStatusApproved: function () {
-            return this.conservation_status_obj.processing_status == "Approved" ? true : false;
+            return this.conservation_status_obj.processing_status == 'Approved' ? true : false;
         },
         isAssignedOfficer: function () {
-            if (['With Assessor', 'With Referral'].includes(this.conservation_status_obj.processing_status)) {
+            if (['With Assessor', 'With Referral', 'Deferred'].includes(this.conservation_status_obj.processing_status)) {
                 return Boolean(this.conservation_status_obj.assigned_officer) &&
                     this.conservation_status_obj.assigned_officer == this.conservation_status_obj.current_assessor.id;
             }
@@ -672,12 +672,12 @@ export default {
             if (this.is_external) {
                 return !this.conservation_status_obj.can_user_edit;
             } else if (
-                this.conservation_status_obj.processing_status == "With Referral" &&
+                this.conservation_status_obj.processing_status == 'With Referral' &&
                 this.referral
             ) {
                 return true;
             } else {
-                if (["Ready For Agenda", "Approved", "Closed", "DeListed", "Discarded"].includes(this.conservation_status_obj.processing_status)) {
+                if (['Ready For Agenda', 'Approved', 'Closed', 'DeListed', 'Discarded'].includes(this.conservation_status_obj.processing_status)) {
                     return true;
                 }
                 if (
@@ -692,15 +692,15 @@ export default {
             return true;
         },
         conservation_criteria_label: function () {
-            if (this.conservation_status_obj.processing_status == "Approved" || this.conservation_status_obj.processing_status == "DeListed") {
-                return "Conservation Criteria";
+            if (this.conservation_status_obj.processing_status == 'Approved' || this.conservation_status_obj.processing_status == 'DeListed') {
+                return 'Conservation Criteria';
             }
             else {
-                if (this.conservation_status_obj.processing_status == "Draft") {
-                    return "Propose Conservation Criteria";
+                if (this.conservation_status_obj.processing_status == 'Draft') {
+                    return 'Propose Conservation Criteria';
                 }
                 else {
-                    return "Proposed Conservation Criteria";
+                    return 'Proposed Conservation Criteria';
                 }
             }
         },
@@ -708,7 +708,7 @@ export default {
             return !(['Approved', 'DeListed', 'Declined', 'Closed', 'Unlocked'].includes(this.conservation_status_obj.processing_status))
         },
         canViewCurrentList: function () {
-            return (this.conservation_status_obj.processing_status == "Approved" || this.conservation_status_obj.processing_status == "DeListed") ? false : true;
+            return (this.conservation_status_obj.processing_status == 'Approved' || this.conservation_status_obj.processing_status == 'DeListed') ? false : true;
         },
         isConservationStatusUnderReview: function () {
             return Boolean(this.conservation_status_obj.conservation_status_under_review);
@@ -736,10 +736,10 @@ export default {
             let vm = this;
             $(vm.$refs[vm.community_name_lookup]).select2({
                 minimumInputLength: 2,
-                dropdownParent: $("#" + vm.select_community_name),
-                "theme": "bootstrap-5",
+                dropdownParent: $('#' + vm.select_community_name),
+                'theme': 'bootstrap-5',
                 allowClear: true,
-                placeholder: "Select Community Name",
+                placeholder: 'Select Community Name',
                 ajax: {
                     url: api_endpoints.community_name_lookup,
                     dataType: 'json',
@@ -753,19 +753,19 @@ export default {
                     },
                 },
             }).
-                on("select2:select", function (e) {
+                on('select2:select', function (e) {
                     var selected = $(e.currentTarget);
                     let data = e.params.data.id;
                     vm.conservation_status_obj.community_id = data
                     vm.community_display = e.params.data.text;
                     vm.$emit('saveConservationStatus');
                 }).
-                on("select2:unselect", function (e) {
+                on('select2:unselect', function (e) {
                     var selected = $(e.currentTarget);
                     vm.conservation_status_obj.community_id = null
                     vm.community_display = '';
                 }).
-                on("select2:open", function (e) {
+                on('select2:open', function (e) {
                     const searchField = $('[aria-controls="select2-' + vm.community_name_lookup + '-results"]')
                     searchField[0].focus();
                 });
@@ -778,7 +778,7 @@ export default {
             let vm = this;
             if (vm.conservation_status_obj?.community_id) {
                 let community_display_url = api_endpoints.community_display +
-                    "?community_id=" + vm.conservation_status_obj.community_id
+                    '?community_id=' + vm.conservation_status_obj.community_id
                 vm.$http.get(community_display_url).then(
                     (response) => {
                         var newOption = new Option(response.body.name, response.body.id, false, true);
@@ -821,11 +821,11 @@ export default {
                     var referral_comment_val = `${v.referral_comment}`;
                     this.referral_comments_boxes.push(
                         {
-                            "box_view": box_visibility,
-                            "name": referral_name,
-                            "label": referral_label,
-                            "readonly": referral_visibility,
-                            "value": referral_comment_val,
+                            'box_view': box_visibility,
+                            'name': referral_name,
+                            'label': referral_label,
+                            'readonly': referral_visibility,
+                            'value': referral_comment_val,
                         }
                     )
                 });
@@ -848,7 +848,7 @@ export default {
     created: async function () {
         let vm = this;
         let action = this.$route.query.action;
-        let dict_url = action == "view" ? api_endpoints.cs_profile_dict + '?group_type=' + vm.conservation_status_obj.group_type + '&action=' + action :
+        let dict_url = action == 'view' ? api_endpoints.cs_profile_dict + '?group_type=' + vm.conservation_status_obj.group_type + '&action=' + action :
             api_endpoints.cs_profile_dict + '?group_type=' + vm.conservation_status_obj.group_type
         vm.$http.get(dict_url).then((response) => {
             vm.cs_profile_dict = response.body;
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
index a412710b..532b5eb1 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
@@ -1,6 +1,7 @@
 <template lang="html">
     <div id="speciesStatus">
         <FormSection :formCollapse="false" label="Conservation Status" Index="conservation_status">
+            {{ conservation_status_obj.assessor_mode.assessor_can_assess }}
             <form @change="saveConservationStatus($event)">
                 <div class="row mb-3">
                     <label :for="scientific_name_lookup" class="col-sm-4 col-form-label fw-bold">Scientific Name: <span
@@ -603,9 +604,9 @@ export default {
         let vm = this;
         return {
             scientific_name_lookup: 'scientific_name_lookup' + vm.conservation_status_obj.id,
-            select_scientific_name: "select_scientific_name" + vm.conservation_status_obj.id,
+            select_scientific_name: 'select_scientific_name' + vm.conservation_status_obj.id,
             isShowComment: false,
-            isFauna: vm.conservation_status_obj.group_type === "fauna" ? true : false,
+            isFauna: vm.conservation_status_obj.group_type === 'fauna' ? true : false,
             cs_profile_dict: {},
             wa_legislative_lists: [],
             wa_legislative_categories: [],
@@ -628,7 +629,7 @@ export default {
         show_administrative_information: function () {
             return !this.is_external &&
                 this.conservation_status_obj.species_taxonomy_id &&
-                this.conservation_status_obj.processing_status != "Draft";
+                this.conservation_status_obj.processing_status != 'Draft';
         },
         show_proposed_conservation_status: function () {
             return this.conservation_status_obj.species_taxonomy_id;
@@ -636,10 +637,10 @@ export default {
         show_listing_and_review_due_date: function () {
             return this.conservation_status_obj.listing_date ||
                 this.conservation_status_obj.review_due_date ||
-                this.conservation_status_obj.processing_status == "With Assessor";
+                this.conservation_status_obj.processing_status == 'With Assessor';
         },
         listing_and_review_due_date_disabled: function () {
-            return this.isReadOnly || !["With Assessor", "Unlocked"].includes(this.conservation_status_obj.processing_status)
+            return this.isReadOnly || !['With Assessor', 'Deferred', 'Unlocked'].includes(this.conservation_status_obj.processing_status)
         },
         approval_level_disabled: function () {
             return this.isReadOnly || !['With Assessor', 'With Referral'].includes(this.conservation_status_obj.processing_status);
@@ -662,10 +663,10 @@ export default {
             return has_value;
         },
         isStatusApproved: function () {
-            return this.conservation_status_obj.processing_status == "Approved" ? true : false;
+            return this.conservation_status_obj.processing_status == 'Approved' ? true : false;
         },
         isAssignedOfficer: function () {
-            if (['With Assessor', 'With Referral'].includes(this.conservation_status_obj.processing_status)) {
+            if (['With Assessor', 'With Referral', 'Deferred'].includes(this.conservation_status_obj.processing_status)) {
                 return Boolean(this.conservation_status_obj.assigned_officer) &&
                     this.conservation_status_obj.assigned_officer == this.conservation_status_obj.current_assessor.id;
             }
@@ -679,12 +680,12 @@ export default {
             if (this.is_external) {
                 return !this.conservation_status_obj.can_user_edit;
             } else if (
-                this.conservation_status_obj.processing_status == "With Referral" &&
+                this.conservation_status_obj.processing_status == 'With Referral' &&
                 this.referral
             ) {
                 return true;
             } else {
-                if (["Ready For Agenda", "Approved", "Closed", "DeListed", "Discarded"].includes(this.conservation_status_obj.processing_status)) {
+                if (['Ready For Agenda', 'Approved', 'Closed', 'DeListed', 'Discarded'].includes(this.conservation_status_obj.processing_status)) {
                     return true;
                 }
                 if (
@@ -701,7 +702,7 @@ export default {
             return !(['Approved', 'DeListed', 'Declined', 'Closed', 'Unlocked'].includes(this.conservation_status_obj.processing_status))
         },
         canViewCurrentList: function () {
-            return (this.conservation_status_obj.processing_status == "Approved" || this.conservation_status_obj.processing_status == "DeListed") ? false : true;
+            return (this.conservation_status_obj.processing_status == 'Approved' || this.conservation_status_obj.processing_status == 'DeListed') ? false : true;
         },
         isConservationStatusUnderReview: function () {
             return Boolean(this.conservation_status_obj.conservation_status_under_review);
@@ -729,10 +730,10 @@ export default {
             let vm = this;
             $(vm.$refs[vm.scientific_name_lookup]).select2({
                 minimumInputLength: 2,
-                dropdownParent: $("#" + vm.select_scientific_name),
-                "theme": "bootstrap-5",
+                dropdownParent: $('#' + vm.select_scientific_name),
+                'theme': 'bootstrap-5',
                 allowClear: true,
-                placeholder: "Search for the Scientific Name of the Species",
+                placeholder: 'Search for the Scientific Name of the Species',
                 ajax: {
                     url: api_endpoints.scientific_name_lookup,
                     dataType: 'json',
@@ -746,20 +747,20 @@ export default {
                     },
                 },
             }).
-                on("select2:select", function (e) {
+                on('select2:select', function (e) {
                     let data = e.params.data;
                     vm.conservation_status_obj.species_taxonomy_id = data.id
                     vm.species_display = data.text;
                     vm.taxon_previous_name = data.taxon_previous_name;
                     vm.$emit('saveConservationStatus');
                 }).
-                on("select2:unselect", function (e) {
+                on('select2:unselect', function (e) {
                     var selected = $(e.currentTarget);
                     vm.conservation_status_obj.species_taxonomy_id = null
                     vm.species_display = '';
                     vm.taxon_previous_name = '';
                 }).
-                on("select2:open", function (e) {
+                on('select2:open', function (e) {
                     const searchField = $('[aria-controls="select2-' + vm.scientific_name_lookup + '-results"]')
                     // move focus to select2 field
                     searchField[0].focus();
@@ -773,7 +774,7 @@ export default {
         getSpeciesDisplay: function () {
             let vm = this;
             if (vm.conservation_status_obj.species_taxonomy_id != null) {
-                let species_display_url = api_endpoints.species_display + "?taxon_id=" + vm.conservation_status_obj.species_taxonomy_id
+                let species_display_url = api_endpoints.species_display + '?taxon_id=' + vm.conservation_status_obj.species_taxonomy_id
                 vm.$http.get(species_display_url).then(
                     (response) => {
                         var newOption = new Option(response.body.name, response.body.id, false, true);
@@ -819,11 +820,11 @@ export default {
                     var referral_comment_val = `${v.referral_comment}`;
                     this.referral_comments_boxes.push(
                         {
-                            "box_view": box_visibility,
-                            "name": referral_name,
-                            "label": referral_label,
-                            "readonly": referral_visibility,
-                            "value": referral_comment_val,
+                            'box_view': box_visibility,
+                            'name': referral_name,
+                            'label': referral_label,
+                            'readonly': referral_visibility,
+                            'value': referral_comment_val,
                         }
                     )
                 });
@@ -846,7 +847,7 @@ export default {
     created: async function () {
         let vm = this;
         let action = this.$route.query.action;
-        let dict_url = action == "view" ? api_endpoints.cs_profile_dict + '?group_type=' + vm.conservation_status_obj.group_type + '&action=' + action :
+        let dict_url = action == 'view' ? api_endpoints.cs_profile_dict + '?group_type=' + vm.conservation_status_obj.group_type + '&action=' + action :
             api_endpoints.cs_profile_dict + '?group_type=' + vm.conservation_status_obj.group_type
         vm.$http.get(dict_url).then((response) => {
             vm.cs_profile_dict = response.body;

From cc5e325d50d6bb17700d0c7c85f0c526757fd4bc Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Tue, 12 Nov 2024 12:13:30 +0800
Subject: [PATCH 53/83] Changes to support new Deferred processing status and
 adding new step of proposing ready for agenda.

---
 .../conservation_status.vue                   | 99 +++++++++++--------
 1 file changed, 56 insertions(+), 43 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
index 2ec911a7..ebbf6e65 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
@@ -29,7 +29,7 @@
                                     <strong>Currently assigned to</strong><br />
                                     <div class="form-group">
                                         <template
-                                            v-if="['Ready For Agenda', 'Proposed DeListed', 'Unlocked', 'Approved', 'Closed', 'DeListed'].includes(conservation_status_obj.processing_status)">
+                                            v-if="['Proposed For Agenda', 'Ready For Agenda', 'On Agenda', 'Proposed DeListed', 'Unlocked', 'Approved', 'Closed', 'DeListed'].includes(conservation_status_obj.processing_status)">
                                             <select ref="assigned_officer" :disabled="!canAction || canLock"
                                                 class="form-control"
                                                 v-model="conservation_status_obj.assigned_approver">
@@ -42,7 +42,7 @@
                                                 to me</a>
                                         </template>
                                         <template
-                                            v-else-if="['With Assessor', 'With Referral'].includes(conservation_status_obj.processing_status)">
+                                            v-else-if="['With Assessor', 'With Referral', 'Deferred'].includes(conservation_status_obj.processing_status)">
                                             <select ref="assigned_officer" :disabled="!canAction" class="form-control"
                                                 v-model="conservation_status_obj.assigned_officer">
                                                 <option v-for="member in conservation_status_obj.allowed_assessors"
@@ -258,7 +258,7 @@
                                             v-if="conservation_status_obj.approval_level == 'minister' && conservation_status_obj.processing_status == 'With Assessor'">
                                             <div class="col-sm-12">
                                                 <button style="width:90%;" class="btn btn-primary top-buffer-s"
-                                                    @click.prevent="proposedReadyForAgenda()">Propose Ready for
+                                                    @click.prevent="proposedReadyForAgenda()">Propose for
                                                     Agenda</button><br />
                                             </div>
                                         </div>
@@ -275,17 +275,18 @@
                                             </div>
                                         </div>
                                     </template>
-                                    <template v-if="canSendBackToAssessor">
+                                    <template
+                                        v-if="conservation_status_obj.processing_status == 'Proposed For Agenda' && conservation_status_obj.approval_level == 'minister'">
                                         <div class="row">
                                             <div class="col-sm-12">
                                                 <button style="width:90%;" class="btn btn-primary top-buffer-s"
-                                                    @click.prevent="backToAssessor">Back To
-                                                    Assessor</button><br />
+                                                    @click.prevent="readyForAgenda">Confirm Ready for
+                                                    Agenda</button><br />
                                             </div>
                                         </div>
                                     </template>
                                     <template
-                                        v-if="conservation_status_obj.processing_status == 'Ready For Agenda' && conservation_status_obj.approval_level == 'minister'">
+                                        v-if="conservation_status_obj.processing_status == 'On Agenda' && conservation_status_obj.approval_level == 'minister'">
                                         <div class="row">
                                             <div class="col-sm-12">
                                                 <button style="width:90%;" class="btn btn-primary top-buffer-s"
@@ -297,14 +298,6 @@
                                             </div>
                                         </div>
                                     </template>
-                                    <template v-if="canDefer">
-                                        <div class="row">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary top-buffer-s"
-                                                    @click.prevent="deferProposal()">Defer</button><br />
-                                            </div>
-                                        </div>
-                                    </template>
                                     <template
                                         v-else-if="conservation_status_obj.processing_status == 'Proposed DeListed'">
                                         <div class="row">
@@ -322,6 +315,23 @@
                                         </div>
                                     </template>
                                 </div>
+                                <template v-if="canSendBackToAssessor">
+                                    <div class="row">
+                                        <div class="col-sm-12">
+                                            <button style="width:90%;" class="btn btn-primary top-buffer-s"
+                                                @click.prevent="backToAssessor">Back To
+                                                Assessor</button><br />
+                                        </div>
+                                    </div>
+                                </template>
+                                <template v-if="canDefer">
+                                    <div class="row">
+                                        <div class="col-sm-12">
+                                            <button style="width:90%;" class="btn btn-primary top-buffer-s"
+                                                @click.prevent="deferProposal()">Defer</button><br />
+                                        </div>
+                                    </div>
+                                </template>
                                 <template v-if="canDiscard">
                                     <div class="row">
                                         <div class="col-sm-12">
@@ -417,9 +427,12 @@
         <BackToAssessor ref="back_to_assessor_modal" :conservation_status_id="conservation_status_obj.id"
             @refreshFromResponse="refreshFromResponse"></BackToAssessor>
         <Defer ref="defer_modal" :conservation_status="conservation_status_obj"
-            @refreshFromResponse="refreshFromResponse"></Defer>
-        <ProposeReadyForAgenda ref="propose_ready_for_agenda_modal" :conservation_status_id="conservation_status_obj.id"
-            @refreshFromResponse="refreshFromResponse"></ProposeReadyForAgenda>
+            @refreshFromResponse="refreshFromResponse">
+        </Defer>
+        <ProposeForAgenda ref="propose_for_agenda" :conservation_status_id="conservation_status_obj.id"
+            @refreshFromResponse="refreshFromResponse"></ProposeForAgenda>
+        <ReadyForAgenda ref="ready_for_agenda" :conservation_status_id="conservation_status_obj.id"
+            @refreshFromResponse="refreshFromResponse"></ReadyForAgenda>
         <ProposedDecline ref="proposed_decline" :processing_status="conservation_status_obj.processing_status"
             :conservation_status_id="conservation_status_obj.id" @refreshFromResponse="refreshFromResponse">
         </ProposedDecline>
@@ -441,7 +454,8 @@ import Submission from '@common-utils/submission.vue'
 import AmendmentRequest from './amendment_request.vue'
 import BackToAssessor from './back_to_assessor.vue'
 import Defer from './defer.vue'
-import ProposeReadyForAgenda from './propose_ready_for_agenda.vue'
+import ProposeForAgenda from './propose_for_agenda.vue'
+import ReadyForAgenda from './ready_for_agenda.vue'
 import ProposedDecline from './proposal_proposed_decline'
 import ProposeDelist from './proposal_propose_delist'
 import ProposedApproval from './proposed_issuance.vue'
@@ -493,11 +507,12 @@ export default {
         ProposalConservationStatus,
         AmendmentRequest,
         BackToAssessor,
-        ProposeReadyForAgenda,
+        ProposeForAgenda,
         CSMoreReferrals,
         ProposedDecline,
         ProposeDelist,
         ProposedApproval,
+        ReadyForAgenda,
         InviteExternalReferee
     },
     filters: {
@@ -576,25 +591,27 @@ export default {
                 && this.conservation_status_obj.assessor_mode.assessor_can_assess;
         },
         canAction: function () {
-            // NOTE: Completely redo the permissions for actions on this page
-            // It was a mess before and now it's even worse =D
+            if (!this.conservation_status_obj) {
+                return false;
+            }
             if (this.isFinalised) {
-                return this.conservation_status_obj
-                    && (
-                        this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_approver)
+                return this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_approver;
             }
-            else if (['Ready For Agenda', 'Proposed DeListed', 'Unlocked'].includes(this.conservation_status_obj.processing_status)) {
-                return this.conservation_status_obj
-                    && (
-                        this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_approver)
+            else if (['Proposed For Agenda', 'Ready For Agenda', 'On Agenda', 'Proposed DeListed', 'Unlocked'].includes(this.conservation_status_obj.processing_status)) {
+                return this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_approver
                     && this.conservation_status_obj.assessor_mode.assessor_can_assess;
             }
             else if (['With Assessor', 'With Referral'].includes(this.conservation_status_obj.processing_status)) {
-                return this.conservation_status_obj
-                    && (
-                        this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_officer)
+                return this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_officer
                     && this.conservation_status_obj.assessor_mode.assessor_can_assess;
-            } else {
+            }
+            else if (this.conservation_status_obj.processing_status == 'Deferred') {
+                return this.conservation_status_obj.assessor_mode.assessor_can_assess &&
+                    (
+                        this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_officer
+                    );
+            }
+            else {
                 return this.conservation_status_obj
                     && this.conservation_status_obj.processing_status == 'Draft'
                     && this.conservation_status_obj.internal_application
@@ -614,30 +631,23 @@ export default {
                 this.conservation_status_obj.approver_process;
         },
         canSendBackToAssessor: function () {
-            console.log([
-                constants.PROPOSAL_STATUS.PROPOSED_FOR_AGENDA.TEXT,
-                constants.PROPOSAL_STATUS.READY_FOR_AGENDA.TEXT,
-                constants.PROPOSAL_STATUS.DEFERRED.TEXT,
-            ].includes(this.conservation_status_obj.processing_status))
             return this.conservation_status_obj &&
                 this.conservation_status_obj.approval_level == 'minister' &&
                 [
                     constants.PROPOSAL_STATUS.PROPOSED_FOR_AGENDA.TEXT,
-                    constants.PROPOSAL_STATUS.READY_FOR_AGENDA.TEXT,
                     constants.PROPOSAL_STATUS.DEFERRED.TEXT,
                 ].includes(this.conservation_status_obj.processing_status) &&
                 this.conservation_status_obj.assessor_mode.assessor_can_assess &&
                 (
-                    this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_officer ||
-                    this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_approver
+                    this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_officer
                 );
         },
         canDefer: function () {
             return this.conservation_status_obj &&
                 [
                     constants.PROPOSAL_STATUS.WITH_ASSESSOR.TEXT,
-                    constants.PROPOSAL_STATUS.PROPOSED_FOR_AGENDA.TEXT,
                     constants.PROPOSAL_STATUS.READY_FOR_AGENDA.TEXT,
+                    constants.PROPOSAL_STATUS.ON_AGENDA.TEXT,
                 ].includes(this.conservation_status_obj.processing_status) &&
                 this.conservation_status_obj.assessor_mode.assessor_can_assess &&
                 (
@@ -773,7 +783,10 @@ export default {
             if (!this.validateConservationStatus()) {
                 return;
             }
-            this.$refs.propose_ready_for_agenda_modal.isModalOpen = true;
+            this.$refs.propose_for_agenda.isModalOpen = true;
+        },
+        readyForAgenda: function () {
+            this.$refs.ready_for_agenda.isModalOpen = true;
         },
         proposeDelist: function () {
             this.$refs.propose_delist.isModalOpen = true;

From ce53bb72a0d1c0db9e09a6a55f85a276d03fa57a Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Tue, 12 Nov 2024 12:17:26 +0800
Subject: [PATCH 54/83] Allow user to see assessment comments when processing
 status is deferred.

---
 boranga/components/conservation_status/models.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index 985c691b..470fe05b 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -914,6 +914,7 @@ def assessor_comments_view(self, request):
             ConservationStatus.PROCESSING_STATUS_UNLOCKED,
             ConservationStatus.PROCESSING_STATUS_CLOSED,
             ConservationStatus.PROCESSING_STATUS_DELISTED,
+            ConservationStatus.PROCESSING_STATUS_DEFERRED,
         ]:
             if ConservationStatusReferral.objects.filter(
                 conservation_status=self, referral=request.user.id

From 6f36d6cf0b5c10278cb4d42fc86a62b9bb5554a5 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Tue, 12 Nov 2024 12:18:22 +0800
Subject: [PATCH 55/83] Remove Deferred from the awaiting approver action list
 of statuses.

---
 .../common/conservation_status_community_dashboard.vue           | 1 -
 .../components/common/conservation_status_fauna_dashboard.vue    | 1 -
 .../components/common/conservation_status_flora_dashboard.vue    | 1 -
 3 files changed, 3 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue b/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue
index c457d088..61a9090e 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status_community_dashboard.vue
@@ -396,7 +396,6 @@ export default {
                 { value: 'proposed_for_agenda', name: 'Proposed For Agenda', className: 'optionChild' },
                 { value: 'ready_for_agenda', name: 'Ready For Agenda', className: 'optionChild' },
                 { value: 'on_agenda', name: 'On Agenda', className: 'optionChild' },
-                { value: 'deferred', name: 'Deferred', className: 'optionChild' },
                 { value: 'with_approver', name: 'Proposed DeListed', className: 'optionChild' },
                 { value: 'inactive', name: 'Inactive', className: 'optionGroup' },
                 { value: 'declined', name: 'Declined', className: 'optionChild' },
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue b/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue
index 69a3cf18..01c3c04d 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status_fauna_dashboard.vue
@@ -447,7 +447,6 @@ export default {
                 { value: 'proposed_for_agenda', name: 'Proposed For Agenda', className: 'optionChild' },
                 { value: 'ready_for_agenda', name: 'Ready For Agenda', className: 'optionChild' },
                 { value: 'on_agenda', name: 'On Agenda', className: 'optionChild' },
-                { value: 'deferred', name: 'Deferred', className: 'optionChild' },
                 { value: 'with_approver', name: 'Proposed DeListed', className: 'optionChild' },
                 { value: 'inactive', name: 'Inactive', className: 'optionGroup' },
                 { value: 'declined', name: 'Declined', className: 'optionChild' },
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue b/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue
index 443af567..6077b6b7 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status_flora_dashboard.vue
@@ -438,7 +438,6 @@ export default {
                 { value: 'proposed_for_agenda', name: 'Proposed For Agenda', className: 'optionChild' },
                 { value: 'ready_for_agenda', name: 'Ready For Agenda', className: 'optionChild' },
                 { value: 'on_agenda', name: 'On Agenda', className: 'optionChild' },
-                { value: 'deferred', name: 'Deferred', className: 'optionChild' },
                 { value: 'with_approver', name: 'Proposed DeListed', className: 'optionChild' },
                 { value: 'inactive', name: 'Inactive', className: 'optionGroup' },
                 { value: 'declined', name: 'Declined', className: 'optionChild' },

From bed4f535cd820bcedda90bf247167e7bf03b43d9 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Tue, 12 Nov 2024 13:53:46 +0800
Subject: [PATCH 56/83] Add IUCNVersion model.

---
 .../components/conservation_status/models.py  |  7 ++++
 ..._alter_communitydocument__file_and_more.py | 40 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 boranga/migrations/0493_iucnversion_alter_communitydocument__file_and_more.py

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index 470fe05b..2732b5d7 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -310,6 +310,13 @@ def get_categories_dict(
         return wa_legislative_categories
 
 
+class IUCNVersion(AbstractConservationList):
+    class Meta:
+        ordering = ["code"]
+        app_label = "boranga"
+        verbose_name = "IU"
+
+
 class CommonwealthConservationList(AbstractConservationList):
 
     class Meta:
diff --git a/boranga/migrations/0493_iucnversion_alter_communitydocument__file_and_more.py b/boranga/migrations/0493_iucnversion_alter_communitydocument__file_and_more.py
new file mode 100644
index 00000000..fe195d50
--- /dev/null
+++ b/boranga/migrations/0493_iucnversion_alter_communitydocument__file_and_more.py
@@ -0,0 +1,40 @@
+# Generated by Django 5.0.9 on 2024-11-12 05:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "boranga",
+            "0492_rename_international_conservation_conservationstatus_other_conservation_assessment_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="IUCNVersion",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("archived", models.BooleanField(default=False)),
+                ("code", models.CharField(max_length=64)),
+                ("label", models.CharField(max_length=512)),
+                ("applies_to_flora", models.BooleanField(default=False)),
+                ("applies_to_fauna", models.BooleanField(default=False)),
+                ("applies_to_communities", models.BooleanField(default=False)),
+            ],
+            options={
+                "verbose_name": "IU",
+                "ordering": ["code"],
+            },
+        ),
+    ]

From 203205926d31519795ecd9afdc5bb1b491099bd3 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Tue, 12 Nov 2024 14:01:05 +0800
Subject: [PATCH 57/83] Fix iucn version verbose name.

---
 .../components/conservation_status/models.py    |  2 +-
 .../0494_alter_iucnversion_options_and_more.py  | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 boranga/migrations/0494_alter_iucnversion_options_and_more.py

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index 2732b5d7..76710b68 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -314,7 +314,7 @@ class IUCNVersion(AbstractConservationList):
     class Meta:
         ordering = ["code"]
         app_label = "boranga"
-        verbose_name = "IU"
+        verbose_name = "IUCN Version"
 
 
 class CommonwealthConservationList(AbstractConservationList):
diff --git a/boranga/migrations/0494_alter_iucnversion_options_and_more.py b/boranga/migrations/0494_alter_iucnversion_options_and_more.py
new file mode 100644
index 00000000..cf06e0a5
--- /dev/null
+++ b/boranga/migrations/0494_alter_iucnversion_options_and_more.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.0.9 on 2024-11-12 05:58
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0493_iucnversion_alter_communitydocument__file_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="iucnversion",
+            options={"ordering": ["code"], "verbose_name": "IUCN Version"},
+        ),
+    ]

From b29048d2166f9785f2da11910e08042077a8fc0a Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Tue, 12 Nov 2024 14:04:26 +0800
Subject: [PATCH 58/83] Add basic admin for IUCNVersion model.

---
 boranga/components/conservation_status/admin.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/boranga/components/conservation_status/admin.py b/boranga/components/conservation_status/admin.py
index 072e16db..1948eac5 100644
--- a/boranga/components/conservation_status/admin.py
+++ b/boranga/components/conservation_status/admin.py
@@ -33,6 +33,10 @@ class WAPriorityCategoryAdmin(ArchivableModelAdminMixin, AbstractCategoryAdmin):
     filter_horizontal = ("wa_priority_lists",)
 
 
+class IUCNVersionAdmin(ArchivableModelAdminMixin, AbstractListAdmin):
+    pass
+
+
 class WALegislativeListAdmin(ArchivableModelAdminMixin, AbstractListAdmin):
     pass
 
@@ -53,6 +57,7 @@ class ConservationChangeCodeAdmin(ArchivableModelAdminMixin, DeleteProtectedMode
 admin.site.register(models.WAPriorityCategory, WAPriorityCategoryAdmin)
 admin.site.register(models.WALegislativeList, WALegislativeListAdmin)
 admin.site.register(models.WALegislativeCategory, WALegislativeCategoryAdmin)
+admin.site.register(models.IUCNVersion, IUCNVersionAdmin)
 admin.site.register(
     models.CommonwealthConservationList, CommonwealthConservationListAdmin
 )

From 5817dc1c0b88184905e5a2c1a3b02242e5ae82ae Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Tue, 12 Nov 2024 14:28:35 +0800
Subject: [PATCH 59/83] Add iucn_version field to CS model.

---
 .../components/conservation_status/models.py  |  7 ++++++
 ...onservationstatus_iucn_version_and_more.py | 25 +++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 boranga/migrations/0495_conservationstatus_iucn_version_and_more.py

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index 76710b68..f86b3194 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -559,6 +559,13 @@ class ConservationStatus(SubmitterInformationModelMixin, RevisionedMixin):
         null=True,
         related_name="curr_wa_legislative_category",
     )
+    iucn_version = models.ForeignKey(
+        IUCNVersion,
+        on_delete=models.PROTECT,
+        blank=True,
+        null=True,
+        related_name="curr_iucn_version",
+    )
     commonwealth_conservation_list = models.ForeignKey(
         CommonwealthConservationList,
         on_delete=models.PROTECT,
diff --git a/boranga/migrations/0495_conservationstatus_iucn_version_and_more.py b/boranga/migrations/0495_conservationstatus_iucn_version_and_more.py
new file mode 100644
index 00000000..ea3fbe39
--- /dev/null
+++ b/boranga/migrations/0495_conservationstatus_iucn_version_and_more.py
@@ -0,0 +1,25 @@
+# Generated by Django 5.0.9 on 2024-11-12 06:24
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0494_alter_iucnversion_options_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="conservationstatus",
+            name="iucn_version",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.PROTECT,
+                related_name="curr_iucn_version",
+                to="boranga.iucnversion",
+            ),
+        ),
+    ]

From 42e40b28a06673fded1eb061f229f28df0c66ea1 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Tue, 12 Nov 2024 14:29:08 +0800
Subject: [PATCH 60/83] Add iucn_version and iucn_version_id fields to
 serializers as required.

---
 .../conservation_status/serializers.py        | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/boranga/components/conservation_status/serializers.py b/boranga/components/conservation_status/serializers.py
index 4414f56e..88f91756 100644
--- a/boranga/components/conservation_status/serializers.py
+++ b/boranga/components/conservation_status/serializers.py
@@ -534,6 +534,7 @@ class BaseConservationStatusSerializer(serializers.ModelSerializer):
     wa_legislative_category = serializers.SerializerMethodField(read_only=True)
     wa_priority_list = serializers.SerializerMethodField(read_only=True)
     wa_priority_category = serializers.SerializerMethodField(read_only=True)
+    iucn_version = serializers.SerializerMethodField(read_only=True)
     commonwealth_conservation_list = serializers.SerializerMethodField(read_only=True)
 
     class Meta:
@@ -548,6 +549,8 @@ class Meta:
             "conservation_status_number",
             "wa_legislative_list_id",
             "wa_legislative_list",
+            "iucn_version_id",
+            "iucn_version",
             "wa_legislative_category_id",
             "wa_legislative_category",
             "wa_priority_list_id",
@@ -598,6 +601,15 @@ def get_wa_legislative_category(self, obj):
 
         return obj.wa_legislative_category.code
 
+    def get_iucn_version(self, obj):
+        if not obj.iucn_version:
+            return None
+
+        if obj.iucn_version.code and obj.iucn_version.label:
+            return f"{obj.iucn_version.code} - {obj.iucn_version.label}"
+
+        return obj.iucn_version.code
+
     def get_wa_priority_list(self, obj):
         if not obj.wa_priority_list:
             return None
@@ -768,6 +780,7 @@ class Meta:
             "conservation_status_number",
             "wa_legislative_list_id",
             "wa_legislative_category_id",
+            "iucn_version_id",
             "wa_priority_list_id",
             "wa_priority_category_id",
             "commonwealth_conservation_list_id",
@@ -826,6 +839,8 @@ class Meta:
             "conservation_status_number",
             "wa_legislative_list_id",
             "wa_legislative_list",
+            "iucn_version_id",
+            "iucn_version",
             "wa_legislative_category_id",
             "wa_legislative_category",
             "wa_priority_list_id",
@@ -1059,6 +1074,9 @@ class SaveSpeciesConservationStatusSerializer(BaseConservationStatusSerializer):
     wa_legislative_category_id = serializers.IntegerField(
         required=False, allow_null=True, write_only=True
     )
+    iucn_version_id = serializers.IntegerField(
+        required=False, allow_null=True, write_only=True
+    )
     wa_priority_list_id = serializers.IntegerField(
         required=False, allow_null=True, write_only=True
     )
@@ -1085,6 +1103,7 @@ class Meta:
             "species_taxonomy_id",
             "wa_legislative_list_id",
             "wa_legislative_category_id",
+            "iucn_version_id",
             "wa_priority_list_id",
             "wa_priority_category_id",
             "commonwealth_conservation_list_id",
@@ -1208,13 +1227,15 @@ class SaveCommunityConservationStatusSerializer(BaseConservationStatusSerializer
     community_id = serializers.IntegerField(
         required=False, allow_null=True, write_only=True
     )
-
     wa_legislative_list_id = serializers.IntegerField(
         required=False, allow_null=True, write_only=True
     )
     wa_legislative_category_id = serializers.IntegerField(
         required=False, allow_null=True, write_only=True
     )
+    iucn_version_id = serializers.IntegerField(
+        required=False, allow_null=True, write_only=True
+    )
     wa_priority_list_id = serializers.IntegerField(
         required=False, allow_null=True, write_only=True
     )
@@ -1236,6 +1257,7 @@ class Meta:
             "community_id",
             "wa_legislative_list_id",
             "wa_legislative_category_id",
+            "iucn_version_id",
             "wa_priority_list_id",
             "wa_priority_category_id",
             "commonwealth_conservation_list_id",

From 0767c86e52b27f1e0d7e3d490d0ad89050a5fb14 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Tue, 12 Nov 2024 14:29:49 +0800
Subject: [PATCH 61/83] Add iucn_versions to dicts in appropriate end points.

---
 boranga/components/conservation_status/api.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/boranga/components/conservation_status/api.py b/boranga/components/conservation_status/api.py
index 8a1d324d..d696736f 100644
--- a/boranga/components/conservation_status/api.py
+++ b/boranga/components/conservation_status/api.py
@@ -35,6 +35,7 @@
     ConservationStatusReferral,
     ConservationStatusUserAction,
     CSExternalRefereeInvite,
+    IUCNVersion,
     ProposalAmendmentReason,
     WALegislativeCategory,
     WALegislativeList,
@@ -171,6 +172,7 @@ def get(self, request, format=None):
             "wa_legislative_categories": WALegislativeCategory.get_categories_dict(
                 group_type, active_only=True
             ),
+            "iucn_versions": IUCNVersion.get_lists_dict(group_type, active_only=True),
             "commonwealth_conservation_lists": CommonwealthConservationList.get_lists_dict(
                 group_type, active_only=True
             ),
@@ -2335,6 +2337,7 @@ def filter_list(self, request, *args, **kwargs):
             "wa_legislative_categories": WALegislativeCategory.get_categories_dict(
                 group_type
             ),
+            "iucn_versions": IUCNVersion.get_lists_dict(group_type),
             "commonwealth_conservation_lists": CommonwealthConservationList.get_lists_dict(
                 group_type
             ),
@@ -2398,6 +2401,7 @@ def community_filter_list(self, request, *args, **kwargs):
             "wa_legislative_categories": WALegislativeCategory.get_categories_dict(
                 group_type
             ),
+            "iucn_versions": IUCNVersion.get_lists_dict(group_type),
             "commonwealth_conservation_lists": CommonwealthConservationList.get_lists_dict(
                 group_type
             ),

From 3b114247e9a0ea5a7480a80f2d04212510f7fc07 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Tue, 12 Nov 2024 16:38:34 +0800
Subject: [PATCH 62/83] Add iucn version to proposed and current CS sections.
 Fix bug with change type field being blank when draft not yet assigned to
 assessor.

---
 .../conservation_status/community_status.vue  | 48 ++++++++++++++++++-
 .../conservation_status/species_status.vue    | 48 ++++++++++++++++++-
 2 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
index 0bc05bed..f494da07 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
@@ -36,7 +36,7 @@
                                     </div>
                                 </template>
                                 <select class="form-select" v-model="conservation_status_obj.change_code_id">
-                                    <option :value="null">Select the appropriate Change type</option>
+                                    <option :value="null">Select Appropriate Change Type</option>
                                     <option v-for="change_code in change_codes" :value="change_code.id"
                                         v-bind:key="change_code.id">
                                         {{ change_code.code }}
@@ -45,7 +45,7 @@
                             </template>
                             <template v-else>
                                 <input class="form-control" type="text" disabled
-                                    v-model="conservation_status_obj.change_code" />
+                                    :value="conservation_status_obj.change_code ? conservation_status_obj.change_code : 'Select Appropriate Change Type'" />
                             </template>
                         </div>
                     </div>
@@ -226,6 +226,35 @@
                             </template>
                         </div>
                     </div>
+                    <div class="row mb-3">
+                        <label for="proposed_iucnversion" class="col-sm-4 col-form-label">IUCN Version</label>
+                        <div class="col-sm-8">
+                            <template v-if="!isReadOnly">
+                                <template
+                                    v-if="iucn_version && iucn_version.length > 0 && conservation_status_obj.iucn_version_id && !iucn_versions.map((d) => d.id).includes(conservation_status_obj.iucn_version_id)">
+                                    <input type="text" v-if="conservation_status_obj.iucn_version"
+                                        class="form-control mb-3"
+                                        :value="conservation_status_obj.iucn_version + ' (Now Archived)'"
+                                        disabled />
+                                    <div class="mb-3 text-muted">
+                                        Change iucn version to:
+                                    </div>
+                                </template>
+                                <select :disabled="isReadOnly" class="form-select"
+                                    v-model="conservation_status_obj.iucn_version_id" id="proposed_iucnversion">
+                                    <option :value="null" disabled>Select the appropriate IUCN Version</option>
+                                    <option v-for="option in iucn_versions" :value="option.id"
+                                        v-bind:key="option.id">
+                                        {{ option.code }} - {{ option.label }}
+                                    </option>
+                                </select>
+                            </template>
+                            <template v-else>
+                                <input class="form-control" type="text" :disabled="true"
+                                    :value="conservation_status_obj.iucn_version ? conservation_status_obj.iucn_version : 'N/A'" />
+                            </template>
+                        </div>
+                    </div>
                     <div class="row mb-3">
                         <label for="proposed_wa_priority_list" class="col-sm-4 col-form-label fw-bold">WA Priority
                             List <span class="text-warning">*</span></label>
@@ -423,6 +452,20 @@
                             </select>
                         </div>
                     </div>
+                    <div v-if="conservation_status_obj.current_conservation_status.iucn_version_id"
+                        class="row mb-3">
+                        <label for="current_iucn_version" class="col-sm-4 col-form-label">IUCN Version:</label>
+                        <div class="col-sm-8">
+                            <select :disabled="true" class="form-select"
+                                v-model="conservation_status_obj.current_conservation_status.iucn_version_id"
+                                id="current_iucn_version">
+                                <option v-for="option in iucn_versions" :value="option.id"
+                                    v-bind:key="option.id">
+                                    {{ option.code }}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
                     <div v-if="conservation_status_obj.current_conservation_status.wa_priority_list_id"
                         class="row mb-3">
                         <label for="current_wa_priority_list" class="col-sm-4 col-form-label">WA Priority List:</label>
@@ -854,6 +897,7 @@ export default {
             vm.cs_profile_dict = response.body;
             vm.wa_legislative_lists = vm.cs_profile_dict.wa_legislative_lists;
             vm.wa_legislative_categories = vm.cs_profile_dict.wa_legislative_categories;
+            vm.iucn_versions = vm.cs_profile_dict.iucn_versions;
             vm.wa_priority_lists = vm.cs_profile_dict.wa_priority_lists;
             vm.wa_priority_categories = vm.cs_profile_dict.wa_priority_categories;
             vm.commonwealth_conservation_lists = vm.cs_profile_dict.commonwealth_conservation_lists;
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
index 532b5eb1..cec03496 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
@@ -43,7 +43,7 @@
                                     </div>
                                 </template>
                                 <select class="form-select" v-model="conservation_status_obj.change_code_id">
-                                    <option :value="null">Select the appropriate Change type</option>
+                                    <option :value="null">Select Appropriate Change Type</option>
                                     <option v-for="change_code in change_codes" :value="change_code.id"
                                         v-bind:key="change_code.id">
                                         {{ change_code.code }}
@@ -52,7 +52,7 @@
                             </template>
                             <template v-else>
                                 <input class="form-control" type="text" disabled
-                                    v-model="conservation_status_obj.change_code" />
+                                    :value="conservation_status_obj.change_code ? conservation_status_obj.change_code : 'Select Appropriate Change Type'" />
                             </template>
                         </div>
                     </div>
@@ -233,6 +233,35 @@
                             </template>
                         </div>
                     </div>
+                    <div class="row mb-3">
+                        <label for="proposed_iucnversion" class="col-sm-4 col-form-label">IUCN Version</label>
+                        <div class="col-sm-8">
+                            <template v-if="!isReadOnly">
+                                <template
+                                    v-if="iucn_version && iucn_version.length > 0 && conservation_status_obj.iucn_version_id && !iucn_versions.map((d) => d.id).includes(conservation_status_obj.iucn_version_id)">
+                                    <input type="text" v-if="conservation_status_obj.iucn_version"
+                                        class="form-control mb-3"
+                                        :value="conservation_status_obj.iucn_version + ' (Now Archived)'"
+                                        disabled />
+                                    <div class="mb-3 text-muted">
+                                        Change iucn version to:
+                                    </div>
+                                </template>
+                                <select :disabled="isReadOnly" class="form-select"
+                                    v-model="conservation_status_obj.iucn_version_id" id="proposed_iucnversion">
+                                    <option :value="null" disabled>Select the appropriate IUCN Version</option>
+                                    <option v-for="option in iucn_versions" :value="option.id"
+                                        v-bind:key="option.id">
+                                        {{ option.code }} - {{ option.label }}
+                                    </option>
+                                </select>
+                            </template>
+                            <template v-else>
+                                <input class="form-control" type="text" :disabled="true"
+                                    :value="conservation_status_obj.iucn_version ? conservation_status_obj.iucn_version : 'N/A'" />
+                            </template>
+                        </div>
+                    </div>
                     <div class="row mb-3">
                         <label for="proposed_wa_priority_list" class="col-sm-4 col-form-label fw-bold">WA Priority
                             List <span class="text-warning">*</span></label>
@@ -429,6 +458,20 @@
                             </select>
                         </div>
                     </div>
+                    <div v-if="conservation_status_obj.current_conservation_status.iucn_version_id"
+                        class="row mb-3">
+                        <label for="current_iucn_version" class="col-sm-4 col-form-label">IUCN Version:</label>
+                        <div class="col-sm-8">
+                            <select :disabled="true" class="form-select"
+                                v-model="conservation_status_obj.current_conservation_status.iucn_version_id"
+                                id="current_iucn_version">
+                                <option v-for="option in iucn_versions" :value="option.id"
+                                    v-bind:key="option.id">
+                                    {{ option.code }}
+                                </option>
+                            </select>
+                        </div>
+                    </div>
                     <div v-if="conservation_status_obj.current_conservation_status.wa_priority_list_id"
                         class="row mb-3">
                         <label for="current_wa_priority_list" class="col-sm-4 col-form-label">WA Priority List:</label>
@@ -853,6 +896,7 @@ export default {
             vm.cs_profile_dict = response.body;
             vm.wa_legislative_lists = vm.cs_profile_dict.wa_legislative_lists;
             vm.wa_legislative_categories = vm.cs_profile_dict.wa_legislative_categories;
+            vm.iucn_versions = vm.cs_profile_dict.iucn_versions;
             vm.wa_priority_lists = vm.cs_profile_dict.wa_priority_lists;
             vm.wa_priority_categories = vm.cs_profile_dict.wa_priority_categories;
             vm.commonwealth_conservation_lists = vm.cs_profile_dict.commonwealth_conservation_lists;

From 3f4125e30acf52cad70245643958e81d4706b240 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Tue, 12 Nov 2024 17:19:45 +0800
Subject: [PATCH 63/83] Remove top-buffer-s class from codebase and replace
 with standard bootstrap mb-2.

---
 .../species_communities.vue                   |  18 ---
 .../conservation_status.vue                   | 130 ++++++++----------
 .../internal/conservation_status/referral.vue |   2 +-
 .../components/internal/meetings/meeting.vue  |  10 +-
 .../internal/occurrence/referral.vue          |   2 +-
 .../species_communities.vue                   | 115 ++++++++--------
 .../src/components/internal/users/manage.vue  |  15 --
 7 files changed, 119 insertions(+), 173 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/external/species_communities/species_communities.vue b/boranga/frontend/boranga/src/components/external/species_communities/species_communities.vue
index 865ab467..fd2dd199 100755
--- a/boranga/frontend/boranga/src/components/external/species_communities/species_communities.vue
+++ b/boranga/frontend/boranga/src/components/external/species_communities/species_communities.vue
@@ -152,24 +152,6 @@ export default {
 }
 </script>
 <style scoped>
-.top-buffer-s {
-    margin-top: 10px;
-}
-
-.actionBtn {
-    cursor: pointer;
-}
-
-.hidePopover {
-    display: none;
-}
-
-.separator {
-    border: 1px solid;
-    margin-top: 15px;
-    margin-bottom: 10px;
-    width: 100%;
-}
 
 @keyframes placeHolderShimmer {
     0% {
diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
index ebbf6e65..41b48aa6 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
@@ -25,7 +25,7 @@
                         </div>
                         <div v-if="conservation_status_obj.processing_status != 'Draft'" class="card-body border-top">
                             <div class="row">
-                                <div class="col-sm-12 top-buffer-s">
+                                <div class="col-sm-12">
                                     <strong>Currently assigned to</strong><br />
                                     <div class="form-group">
                                         <template
@@ -38,7 +38,8 @@
                                                 </option>
                                             </select>
                                             <a v-if="conservation_status_obj.can_user_assign_to_self"
-                                                @click.prevent="assignRequestUser()" class="actionBtn float-end">Assign
+                                                @click.prevent="assignRequestUser()" class="float-end"
+                                                role="button">Assign
                                                 to me</a>
                                         </template>
                                         <template
@@ -50,7 +51,8 @@
                                                 </option>
                                             </select>
                                             <a v-if="canAssess && conservation_status_obj.assigned_officer != conservation_status_obj.current_assessor.id"
-                                                @click.prevent="assignRequestUser()" class="actionBtn float-end">Assign
+                                                @click.prevent="assignRequestUser()" class="float-end"
+                                                role="button">Assign
                                                 to me</a>
                                         </template>
                                     </div>
@@ -59,7 +61,7 @@
                         </div>
                         <div v-if="canRefer" class="card-body border-top">
                             <div class="row">
-                                <div class="col-sm-12 top-buffer-s">
+                                <div class="col-sm-12">
                                     <strong>Referrals</strong><br />
                                     <div class="form-group mb-3">
                                         <select :disabled="!canLimitedAction" ref="referees" class="form-control">
@@ -70,12 +72,12 @@
                                                 <textarea class="form-control" name="referral_text" ref="referral_text"
                                                     v-model="referral_text"></textarea>
                                                 <a v-if="canLimitedAction" @click.prevent="sendReferral()"
-                                                    class="actionBtn float-end">Send</a>
+                                                    class="float-end" role="button">Send</a>
                                             </template>
                                         </template>
                                         <template v-else>
                                             <span v-if="canLimitedAction" @click.prevent="sendReferral()" disabled
-                                                class="actionBtn text-primary float-end">
+                                                class="text-primary float-end" role="button">
                                                 Sending Referral <span class="spinner-border spinner-border-sm"
                                                     role="status" aria-hidden="true"></span>
                                                 <span class="visually-hidden">Loading...</span>
@@ -204,33 +206,33 @@
                         </div>
                         <div v-if="show_finalised_actions" class="card-body border-top">
                             <div class="row">
-                                <div class="col-sm-12 top-buffer-s">
-                                    <div class="row">
+                                <div class="col-sm-12">
+                                    <div class="row mb-2">
                                         <div class="col-sm-12">
                                             <strong>Action</strong><br />
                                         </div>
                                     </div>
                                     <template
                                         v-if="hasAssessorMode && conservation_status_obj.processing_status == 'Approved'">
-                                        <div class="row">
+                                        <div class="row mb-2">
                                             <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary top-buffer-s"
+                                                <button style="width:90%;" class="btn btn-primary"
                                                     @click.prevent="proposeDelist()">Propose Delist</button><br />
                                             </div>
                                         </div>
                                     </template>
                                     <template v-if="canAction && canUnlock">
-                                        <div class="row">
+                                        <div class="row mb-2">
                                             <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary top-buffer-s"
+                                                <button style="width:90%;" class="btn btn-primary"
                                                     @click.prevent="unlockConservationStatus()">Unlock</button><br />
                                             </div>
                                         </div>
                                     </template>
                                     <template v-if="canAction && canLock">
-                                        <div class="row">
+                                        <div class="row mb-2">
                                             <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary top-buffer-s"
+                                                <button style="width:90%;" class="btn btn-primary"
                                                     @click.prevent="lockConservationStatus()">Lock</button><br />
                                             </div>
                                         </div>
@@ -240,46 +242,48 @@
                         </div>
                         <div v-if="!isFinalised && canAction" class="card-body border-top">
                             <div class="row">
-                                <div class="col-sm-12 top-buffer-s">
-                                    <div class="row">
+                                <div class="col-sm-12">
+                                    <div class="row mb-2">
                                         <div class="col-sm-12">
                                             <strong>Action</strong><br />
                                         </div>
                                     </div>
                                     <template v-if="conservation_status_obj.processing_status == 'With Assessor'">
-                                        <div class="row">
+                                        <div class="row mb-2">
                                             <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary top-buffer-s"
+                                                <button style="width:90%;" class="btn btn-primary"
                                                     @click.prevent="amendmentRequest()">Request
                                                     Amendment</button><br />
                                             </div>
                                         </div>
-                                        <div class="row"
+                                        <div class="row mb-2"
                                             v-if="conservation_status_obj.approval_level == 'minister' && conservation_status_obj.processing_status == 'With Assessor'">
                                             <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary top-buffer-s"
+                                                <button style="width:90%;" class="btn btn-primary"
                                                     @click.prevent="proposedReadyForAgenda()">Propose for
                                                     Agenda</button><br />
                                             </div>
                                         </div>
-                                        <div class="row" v-if="conservation_status_obj.approval_level == 'immediate'">
+                                        <div class="row mb-2"
+                                            v-if="conservation_status_obj.approval_level == 'immediate'">
                                             <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary top-buffer-s"
+                                                <button style="width:90%;" class="btn btn-primary"
                                                     @click.prevent="declineProposal()">Decline</button><br />
                                             </div>
                                         </div>
-                                        <div class="row" v-if="conservation_status_obj.approval_level == 'immediate'">
+                                        <div class="row mb-2"
+                                            v-if="conservation_status_obj.approval_level == 'immediate'">
                                             <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary top-buffer-s"
+                                                <button style="width:90%;" class="btn btn-primary"
                                                     @click.prevent="issueProposal()">Approve</button><br />
                                             </div>
                                         </div>
                                     </template>
                                     <template
                                         v-if="conservation_status_obj.processing_status == 'Proposed For Agenda' && conservation_status_obj.approval_level == 'minister'">
-                                        <div class="row">
+                                        <div class="row mb-2">
                                             <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary top-buffer-s"
+                                                <button style="width:90%;" class="btn btn-primary"
                                                     @click.prevent="readyForAgenda">Confirm Ready for
                                                     Agenda</button><br />
                                             </div>
@@ -287,13 +291,13 @@
                                     </template>
                                     <template
                                         v-if="conservation_status_obj.processing_status == 'On Agenda' && conservation_status_obj.approval_level == 'minister'">
-                                        <div class="row">
+                                        <div class="row mb-2">
                                             <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary top-buffer-s"
+                                                <button style="width:90%;" class="btn btn-primary"
                                                     @click.prevent="issueProposal()">Approve</button><br />
                                             </div>
                                             <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary top-buffer-s"
+                                                <button style="width:90%;" class="btn btn-primary"
                                                     @click.prevent="declineProposal()">Decline</button><br />
                                             </div>
                                         </div>
@@ -309,37 +313,37 @@
                                         </div>
                                         <div class="row">
                                             <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary top-buffer-s"
+                                                <button style="width:90%;" class="btn btn-primary"
                                                     @click.prevent="delistProposal()">Confirm Delisting</button><br />
                                             </div>
                                         </div>
                                     </template>
-                                </div>
-                                <template v-if="canSendBackToAssessor">
-                                    <div class="row">
-                                        <div class="col-sm-12">
-                                            <button style="width:90%;" class="btn btn-primary top-buffer-s"
-                                                @click.prevent="backToAssessor">Back To
-                                                Assessor</button><br />
+                                    <template v-if="canSendBackToAssessor">
+                                        <div class="row">
+                                            <div class="col-sm-12">
+                                                <button style="width:90%;" class="btn btn-primary"
+                                                    @click.prevent="backToAssessor">Back To
+                                                    Assessor</button><br />
+                                            </div>
                                         </div>
-                                    </div>
-                                </template>
-                                <template v-if="canDefer">
-                                    <div class="row">
-                                        <div class="col-sm-12">
-                                            <button style="width:90%;" class="btn btn-primary top-buffer-s"
-                                                @click.prevent="deferProposal()">Defer</button><br />
+                                    </template>
+                                    <template v-if="canDefer">
+                                        <div class="row">
+                                            <div class="col-sm-12">
+                                                <button style="width:90%;" class="btn btn-primary"
+                                                    @click.prevent="deferProposal()">Defer</button><br />
+                                            </div>
                                         </div>
-                                    </div>
-                                </template>
-                                <template v-if="canDiscard">
-                                    <div class="row">
-                                        <div class="col-sm-12">
-                                            <button style="width:90%;" class="btn btn-primary top-buffer-s"
-                                                @click.prevent="discardCSProposal()">Discard</button><br />
+                                    </template>
+                                    <template v-if="canDiscard">
+                                        <div class="row">
+                                            <div class="col-sm-12">
+                                                <button style="width:90%;" class="btn btn-primary"
+                                                    @click.prevent="discardCSProposal()">Discard</button><br />
+                                            </div>
                                         </div>
-                                    </div>
-                                </template>
+                                    </template>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -1586,23 +1590,3 @@ export default {
     },
 }
 </script>
-<style scoped>
-.top-buffer-s {
-    margin-top: 10px;
-}
-
-.actionBtn {
-    cursor: pointer;
-}
-
-.hidePopover {
-    display: none;
-}
-
-.separator {
-    border: 1px solid;
-    margin-top: 15px;
-    margin-bottom: 10px;
-    width: 100%;
-}
-</style>
diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/referral.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/referral.vue
index 02414245..554fa337 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/referral.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/referral.vue
@@ -47,7 +47,7 @@
                             </div>
                             <div class="row">
                                 <div class="col-sm-12">
-                                    <button style="width:80%;" class="btn btn-primary top-buffer-s"
+                                    <button style="width:80%;" class="btn btn-primary"
                                         :disabled="conservation_status_obj.can_user_edit"
                                         @click.prevent="completeReferral">Complete Referral
                                         Task</button>
diff --git a/boranga/frontend/boranga/src/components/internal/meetings/meeting.vue b/boranga/frontend/boranga/src/components/internal/meetings/meeting.vue
index c624c661..5bf20f84 100644
--- a/boranga/frontend/boranga/src/components/internal/meetings/meeting.vue
+++ b/boranga/frontend/boranga/src/components/internal/meetings/meeting.vue
@@ -28,7 +28,7 @@
                         <div class="card-body border-top">
                             <div class="row">
                                 <div class="col-sm-12">
-                                    <div class="col-sm-12 top-buffer-s">
+                                    <div class="col-sm-12">
                                         <div class="row">
                                             <div class="col-sm-12">
                                                 <strong>Action</strong><br />
@@ -36,24 +36,24 @@
                                         </div>
                                         <div class="row" v-if="userCanSchedule">
                                             <div class="col-sm-12">
-                                                <button style="width:80%;" class="btn btn-primary top-buffer-s"
+                                                <button style="width:80%;" class="btn btn-primary"
                                                     @click.prevent="scheduleMeeting()">Schedule</button><br />
                                             </div>
                                             <div class="col-sm-12">&nbsp;</div>
                                             <div class="col-sm-12">
-                                                <button style="width:80%;" class="btn btn-primary top-buffer-s"
+                                                <button style="width:80%;" class="btn btn-primary"
                                                     @click.prevent="discardMeeting()">Discard</button><br />
                                             </div>
                                         </div>
                                         <div class="row" v-if="userCanComplete">
                                             <div class="col-sm-12">
-                                                <button style="width:80%;" class="btn btn-primary top-buffer-s"
+                                                <button style="width:80%;" class="btn btn-primary"
                                                     @click.prevent="completeMeeting()">Complete</button><br />
                                             </div>
                                         </div>
                                         <div class="row" v-if="userCanReinstate">
                                             <div class="col-sm-12">
-                                                <button style="width:80%;" class="btn btn-primary top-buffer-s"
+                                                <button style="width:80%;" class="btn btn-primary"
                                                     @click.prevent="reinstateMeeting()">Reinstate</button><br />
                                             </div>
                                         </div>
diff --git a/boranga/frontend/boranga/src/components/internal/occurrence/referral.vue b/boranga/frontend/boranga/src/components/internal/occurrence/referral.vue
index 75ba456f..2e442348 100644
--- a/boranga/frontend/boranga/src/components/internal/occurrence/referral.vue
+++ b/boranga/frontend/boranga/src/components/internal/occurrence/referral.vue
@@ -47,7 +47,7 @@
                             </div>
                             <div class="row">
                                 <div class="col-sm-12">
-                                    <button style="width:80%;" class="btn btn-primary top-buffer-s"
+                                    <button style="width:80%;" class="btn btn-primary"
                                         :disabled="occurrence_report_obj.can_user_edit"
                                         @click.prevent="completeReferral">Complete Referral
                                         Task</button>
diff --git a/boranga/frontend/boranga/src/components/internal/species_communities/species_communities.vue b/boranga/frontend/boranga/src/components/internal/species_communities/species_communities.vue
index 2f50bfa8..1d7da115 100755
--- a/boranga/frontend/boranga/src/components/internal/species_communities/species_communities.vue
+++ b/boranga/frontend/boranga/src/components/internal/species_communities/species_communities.vue
@@ -84,7 +84,7 @@
                     :submitter_last_name="submitter_last_name" :lodgement_date="species_community.lodgement_date"
                     class="mb-3" />
 
-                <div class="top-buffer-s">
+                <div>
                     <div class="card card-default">
                         <div class="card-header">
                             Workflow
@@ -101,55 +101,66 @@
                         <div v-if='hasUserEditMode' class="card-body border-top">
                             <div class="row">
                                 <div class="col-sm-12">
-                                    <div class="col-sm-12 top-buffer-s">
-                                        <div class="row">
-                                            <div class="col-sm-12">
-                                                <strong>Action</strong><br />
-                                            </div>
+                                    <div class="row mb-2">
+                                        <div class="col-sm-12">
+                                            <strong>Action</strong><br />
                                         </div>
-                                        <div class="row" v-if="isActive">
-                                            <template v-if="!isCommunity">
+                                    </div>
+                                    <div class="row" v-if="isActive">
+                                        <template v-if="!isCommunity">
+                                            <div class="row mb-2">
                                                 <div class="col-sm-12">
-                                                    <button style="width:80%;" class="btn btn-primary top-buffer-s"
+                                                    <button class="btn btn-primary w-100"
                                                         @click.prevent="splitSpecies()">Split</button><br />
                                                 </div>
+                                            </div>
+                                            <div class="row mb-2">
                                                 <div class="col-sm-12">
-                                                    <button style="width:80%;" class="btn btn-primary top-buffer-s"
+                                                    <button class="btn btn-primary w-100"
                                                         @click.prevent="combineSpecies()">Combine</button><br />
                                                 </div>
+                                            </div>
+                                            <div class="row mb-2">
                                                 <div class="col-sm-12">
-                                                    <button style="width:80%;" class="btn btn-primary top-buffer-s"
+                                                    <button class="btn btn-primary w-100"
                                                         @click.prevent="renameSpecies()">Rename</button><br />
                                                 </div>
-                                            </template>
-                                            <template v-else>
+                                            </div>
+                                        </template>
+                                        <template v-else>
+                                            <div class="row mb-2">
                                                 <div class="col-sm-12">
-                                                    <button style="width:80%;" class="btn btn-primary top-buffer-s"
+                                                    <button class="btn btn-primary"
                                                         @click.prevent="renameCommunity()">Rename</button><br />
                                                 </div>
-                                            </template>
-                                        </div>
-                                        <div class="row" v-if="isActive">
-                                            <div class="col-sm-12" v-if="!isPublic">
-                                                <button style="width:80%;" class="btn btn-primary top-buffer-s"
-                                                    @click.prevent="makePublic()">Make Public</button><br />
                                             </div>
-                                            <div class="col-sm-12" v-else>
-                                                <button style="width:80%;" class="btn btn-primary top-buffer-s"
-                                                    @click.prevent="makePrivate()">Make Private</button><br />
+                                        </template>
+                                    </div>
+                                    <div class="row" v-if="isActive">
+                                        <div v-if="!isPublic" class="row mb-2">
+                                            <div class="col-sm-12">
+                                                <button class="btn btn-primary w-100" @click.prevent="makePublic()">Make
+                                                    Public</button><br />
                                             </div>
                                         </div>
-                                        <div v-if="canDiscard">
-                                            <div class="row">
-                                                <div class="col-sm-12">
-                                                    <strong>Action</strong><br />
-                                                </div>
+                                        <div v-else class="row mb-2">
+                                            <div class="col-sm-12">
+                                                <button class="btn btn-primary w-100"
+                                                    @click.prevent="makePrivate()">Make
+                                                    Private</button><br />
                                             </div>
-                                            <div class="row">
-                                                <div class="col-sm-12">
-                                                    <button style="width:80%;" class="btn btn-primary top-buffer-s"
-                                                        @click.prevent="discardSpeciesProposal()">Discard</button><br />
-                                                </div>
+                                        </div>
+                                    </div>
+                                    <div v-if="canDiscard">
+                                        <div class="row">
+                                            <div class="col-sm-12">
+                                                <strong>Action</strong><br />
+                                            </div>
+                                        </div>
+                                        <div class="row">
+                                            <div class="col-sm-12">
+                                                <button class="btn btn-primary w-100"
+                                                    @click.prevent="discardSpeciesProposal()">Discard</button><br />
                                             </div>
                                         </div>
                                     </div>
@@ -159,15 +170,15 @@
                         <div v-else-if='canReopen' class="card-body border-top">
                             <div class="row">
                                 <div class="col-sm-12">
-                                    <div class="col-sm-12 top-buffer-s">
-                                        <div class="row">
+                                    <div class="col-sm-12">
+                                        <div class="row mb-2">
                                             <div class="col-sm-12">
                                                 <strong>Action</strong><br />
                                             </div>
                                         </div>
                                         <div class="row">
                                             <div class="col-sm-12">
-                                                <button style="width:80%;" class="btn btn-primary top-buffer-s"
+                                                <button class="btn btn-primary"
                                                     @click.prevent="reopen()">Reopen</button><br />
                                             </div>
                                         </div>
@@ -257,13 +268,15 @@
             </div>
         </div>
 
-        <SpeciesSplit v-if="species_community && !isCommunity" ref="species_split" :species_community="species_community" :is_internal="true"
-            @refreshFromResponse="refreshFromResponse" />
-        <SpeciesCombine v-if="species_community && !isCommunity" ref="species_combine" :species_community="species_community" :is_internal="true"
+        <SpeciesSplit v-if="species_community && !isCommunity" ref="species_split"
+            :species_community="species_community" :is_internal="true" @refreshFromResponse="refreshFromResponse" />
+        <SpeciesCombine v-if="species_community && !isCommunity" ref="species_combine"
+            :species_community="species_community" :is_internal="true" @refreshFromResponse="refreshFromResponse" />
+        <SpeciesRename v-if="species_community && !isCommunity" ref="species_rename"
+            :species_community_original="species_community" :is_internal="true"
             @refreshFromResponse="refreshFromResponse" />
-        <SpeciesRename v-if="species_community && !isCommunity" ref="species_rename" :species_community_original="species_community" :is_internal="true"
-            @refreshFromResponse="refreshFromResponse" />
-        <CommunityRename v-if="species_community && isCommunity" ref="community_rename" :species_community_original="species_community" :is_internal="true"
+        <CommunityRename v-if="species_community && isCommunity" ref="community_rename"
+            :species_community_original="species_community" :is_internal="true"
             @refreshFromResponse="refreshFromResponse" />
 
         <MakePublic ref="make_public" :species_community="species_community"
@@ -1099,24 +1112,6 @@ export default {
 }
 </script>
 <style scoped>
-.top-buffer-s {
-    margin-top: 10px;
-}
-
-.actionBtn {
-    cursor: pointer;
-}
-
-.hidePopover {
-    display: none;
-}
-
-.separator {
-    border: 1px solid;
-    margin-top: 15px;
-    margin-bottom: 10px;
-    width: 100%;
-}
 
 @keyframes placeHolderShimmer {
     0% {
diff --git a/boranga/frontend/boranga/src/components/internal/users/manage.vue b/boranga/frontend/boranga/src/components/internal/users/manage.vue
index 8a536053..02af8dd1 100644
--- a/boranga/frontend/boranga/src/components/internal/users/manage.vue
+++ b/boranga/frontend/boranga/src/components/internal/users/manage.vue
@@ -521,18 +521,3 @@ export default {
     },
 }
 </script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-.top-buffer-s {
-    margin-top: 10px;
-}
-
-.actionBtn {
-    cursor: pointer;
-}
-
-.hidePopover {
-    display: none;
-}
-</style>

From a55e83ef518b14c3c66289b3a1c8e5db699d2eaa Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Tue, 12 Nov 2024 17:24:09 +0800
Subject: [PATCH 64/83] Add margin under action heading.

---
 .../internal/species_communities/species_communities.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boranga/frontend/boranga/src/components/internal/species_communities/species_communities.vue b/boranga/frontend/boranga/src/components/internal/species_communities/species_communities.vue
index 1d7da115..515bb48a 100755
--- a/boranga/frontend/boranga/src/components/internal/species_communities/species_communities.vue
+++ b/boranga/frontend/boranga/src/components/internal/species_communities/species_communities.vue
@@ -152,7 +152,7 @@
                                         </div>
                                     </div>
                                     <div v-if="canDiscard">
-                                        <div class="row">
+                                        <div class="row mb-2">
                                             <div class="col-sm-12">
                                                 <strong>Action</strong><br />
                                             </div>

From 9e0d6dde49acbcb32ef83223d4c6f1f55681a949 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 13 Nov 2024 09:37:43 +0800
Subject: [PATCH 65/83] Change label from Commonwealth Conservation List to
 Commonwealth Conservation Category. Add comments field for current CS.

---
 .../conservation_status/community_status.vue  | 87 +++++++++---------
 .../conservation_status/species_status.vue    | 90 ++++++++++---------
 2 files changed, 96 insertions(+), 81 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
index f494da07..7cc7d23d 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
@@ -164,9 +164,9 @@
                         <h5 class="text-muted mb-4"><template v-if="conservation_list_proposed">Proposed
                             </template>Conservation
                             Status</h5>
-                        <label for="proposed_wa_legislative_list" class="col-sm-4 col-form-label fw-bold">WA Legislative
+                        <label for="proposed_wa_legislative_list" class="col-sm-5 col-form-label fw-bold">WA Legislative
                             List <span class="text-warning">*</span></label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <template v-if="!isReadOnly">
                                 <template
                                     v-if="wa_legislative_lists && wa_legislative_lists.length > 0 && conservation_status_obj.wa_legislative_list_id && !wa_legislative_lists.map((d) => d.id).includes(conservation_status_obj.wa_legislative_list_id)">
@@ -195,9 +195,9 @@
                         </div>
                     </div>
                     <div v-if="conservation_status_obj.wa_legislative_list_id" class="row mb-3">
-                        <label for="proposed_wa_legislative_category" class="col-sm-4 col-form-label">WA Legislative
+                        <label for="proposed_wa_legislative_category" class="col-sm-5 col-form-label">WA Legislative
                             Category:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <template v-if="!isReadOnly">
                                 <template
                                     v-if="wa_legislative_categories && wa_legislative_categories.length > 0 && conservation_status_obj.wa_legislative_category_id && !wa_legislative_categories.map((d) => d.id).includes(conservation_status_obj.wa_legislative_category_id)">
@@ -227,8 +227,8 @@
                         </div>
                     </div>
                     <div class="row mb-3">
-                        <label for="proposed_iucnversion" class="col-sm-4 col-form-label">IUCN Version</label>
-                        <div class="col-sm-8">
+                        <label for="proposed_iucnversion" class="col-sm-5 col-form-label">IUCN Version</label>
+                        <div class="col-sm-7">
                             <template v-if="!isReadOnly">
                                 <template
                                     v-if="iucn_version && iucn_version.length > 0 && conservation_status_obj.iucn_version_id && !iucn_versions.map((d) => d.id).includes(conservation_status_obj.iucn_version_id)">
@@ -256,9 +256,9 @@
                         </div>
                     </div>
                     <div class="row mb-3">
-                        <label for="proposed_wa_priority_list" class="col-sm-4 col-form-label fw-bold">WA Priority
+                        <label for="proposed_wa_priority_list" class="col-sm-5 col-form-label fw-bold">WA Priority
                             List <span class="text-warning">*</span></label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <template v-if="!isReadOnly">
                                 <template
                                     v-if="wa_priority_lists && wa_priority_lists.length > 0 && conservation_status_obj.wa_priority_list_id && !wa_priority_lists.map((d) => d.id).includes(conservation_status_obj.wa_priority_list_id)">
@@ -287,9 +287,9 @@
                         </div>
                     </div>
                     <div v-if="conservation_status_obj.wa_priority_list_id" class="row mb-3">
-                        <label for="proposed_wa_priority_category" class="col-sm-4 col-form-label">WA Priority
+                        <label for="proposed_wa_priority_category" class="col-sm-5 col-form-label">WA Priority
                             Category:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <template v-if="!isReadOnly">
                                 <template
                                     v-if="wa_priority_categories && wa_priority_categories.length > 0 && conservation_status_obj.wa_priority_category_id && !wa_priority_categories.map((d) => d.id).includes(conservation_status_obj.wa_priority_category_id)">
@@ -319,10 +319,10 @@
                     </div>
                     <div class="row mb-3">
                         <label for="proposed_commonwealth_conservation_list"
-                            class="col-sm-4 col-form-label">Commonwealth
+                            class="col-sm-5 col-form-label">Commonwealth
                             Conservation
-                            List:</label>
-                        <div class="col-sm-8">
+                            Category:</label>
+                        <div class="col-sm-7">
                             <template v-if="!isReadOnly">
                                 <template
                                     v-if="commonwealth_conservation_lists && commonwealth_conservation_lists.length > 0 && conservation_status_obj.commonwealth_conservation_list_id && !commonwealth_conservation_lists.map((d) => d.id).includes(conservation_status_obj.commonwealth_conservation_list_id)">
@@ -352,9 +352,9 @@
                         </div>
                     </div>
                     <div class="row mb-3">
-                        <label for="proposed_other_conservation_assessment" class="col-sm-4 col-form-label">Other
+                        <label for="proposed_other_conservation_assessment" class="col-sm-5 col-form-label">Other
                             Conservation Assessment:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <input :disabled="isReadOnly" type="text" class="form-control"
                                 id="proposed_other_conservation_assessment"
                                 :placeholder="isReadOnly ? 'N/A' : 'Enter Other Conservation Assessment Details if Applicable'"
@@ -362,9 +362,9 @@
                         </div>
                     </div>
                     <div class="row mb-3">
-                        <label for="proposed_conservation_criteria" class="col-sm-4 col-form-label">Conservation
+                        <label for="proposed_conservation_criteria" class="col-sm-5 col-form-label">Conservation
                             Criteria:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <input :disabled="isReadOnly" type="text" class="form-control"
                                 id="proposed_conservation_criteria"
                                 :placeholder="isReadOnly ? 'N/A' : 'Enter Conservation Criteria if Applicable'"
@@ -372,9 +372,9 @@
                         </div>
                     </div>
                     <div class="row mb-3">
-                        <label for="comment" class="col-sm-4 col-form-label fw-bold">Comments <span
+                        <label for="comment" class="col-sm-5 col-form-label fw-bold">Comments <span
                                 class="text-danger">*</span></label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <textarea :disabled="isReadOnly" class="form-control" rows="3" id="comment" placeholder=""
                                 v-model="conservation_status_obj.comment" />
                         </div>
@@ -413,9 +413,9 @@
                             Status</h5>
                     </div>
                     <div class="row mb-3">
-                        <label for="conservation_status_number" class="col-sm-4 col-form-label">Conservation Status
+                        <label for="conservation_status_number" class="col-sm-5 col-form-label">Conservation Status
                             Number:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <a :href="`/internal/conservation_status/${conservation_status_obj.current_conservation_status.id}`"
                                 target="_blank" class="btn btn-primary">{{
                                     conservation_status_obj.current_conservation_status.conservation_status_number }}<i
@@ -424,9 +424,9 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.wa_legislative_list_id"
                         class="row mb-3">
-                        <label for="current_wa_legislative_list" class="col-sm-4 col-form-label">WA Legislative
+                        <label for="current_wa_legislative_list" class="col-sm-5 col-form-label">WA Legislative
                             List:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <select :disabled="true" class="form-select"
                                 v-model="conservation_status_obj.current_conservation_status.wa_legislative_list_id"
                                 id="current_wa_legislative_list" @change="filterWALegislativeCategories($event)">
@@ -439,9 +439,9 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.wa_legislative_category_id"
                         class="row mb-3">
-                        <label for="current_wa_legislative_category" class="col-sm-4 col-form-label">WA Legislative
+                        <label for="current_wa_legislative_category" class="col-sm-5 col-form-label">WA Legislative
                             Category:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <select :disabled="true" class="form-select"
                                 v-model="conservation_status_obj.current_conservation_status.wa_legislative_category_id"
                                 id="current_wa_legislative_category">
@@ -454,8 +454,8 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.iucn_version_id"
                         class="row mb-3">
-                        <label for="current_iucn_version" class="col-sm-4 col-form-label">IUCN Version:</label>
-                        <div class="col-sm-8">
+                        <label for="current_iucn_version" class="col-sm-5 col-form-label">IUCN Version:</label>
+                        <div class="col-sm-7">
                             <select :disabled="true" class="form-select"
                                 v-model="conservation_status_obj.current_conservation_status.iucn_version_id"
                                 id="current_iucn_version">
@@ -468,8 +468,8 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.wa_priority_list_id"
                         class="row mb-3">
-                        <label for="current_wa_priority_list" class="col-sm-4 col-form-label">WA Priority List:</label>
-                        <div class="col-sm-8">
+                        <label for="current_wa_priority_list" class="col-sm-5 col-form-label">WA Priority List:</label>
+                        <div class="col-sm-7">
                             <select :disabled="true" class="form-select"
                                 v-model="conservation_status_obj.current_conservation_status.wa_priority_list_id"
                                 id="current_wa_priority_list" @change="filterWAPriorityCategories($event)">
@@ -481,9 +481,9 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.wa_priority_category_id"
                         class="row mb-3">
-                        <label for="current_wa_priority_category" class="col-sm-4 col-form-label">WA Priority
+                        <label for="current_wa_priority_category" class="col-sm-5 col-form-label">WA Priority
                             Category:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <select :disabled="true" class="form-select"
                                 v-model="conservation_status_obj.current_conservation_status.wa_priority_category_id"
                                 id="current_wa_priority_category">
@@ -496,12 +496,12 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.commonwealth_conservation_list_id"
                         class="row mb-3">
-                        <label for="current_commonwealth_conservation_list" class="col-sm-4 col-form-label">Commonwealth
-                            Conservation List:</label>
-                        <div class="col-sm-8">
+                        <label for="current_commonwealth_conservation_category" class="col-sm-5 col-form-label">Commonwealth
+                            Conservation Category:</label>
+                        <div class="col-sm-7">
                             <select :disabled="true" class="form-select"
                                 v-model="conservation_status_obj.current_conservation_status.commonwealth_conservation_list_id"
-                                id="current_commonwealth_conservation_list">
+                                id="current_commonwealth_conservation_category">
                                 <option v-for="option in commonwealth_conservation_lists" :value="option.id"
                                     v-bind:key="option.id">
                                     {{ option.code }}
@@ -511,9 +511,9 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.other_conservation_assessment"
                         class="row mb-3">
-                        <label for="current_other_conservation_assessment" class="col-sm-4 col-form-label">Other
+                        <label for="current_other_conservation_assessment" class="col-sm-5 col-form-label">Other
                             Conservation Assessment:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <input :disabled="true" type="text" class="form-control"
                                 id="current_other_conservation_assessment"
                                 v-model="conservation_status_obj.current_conservation_status.other_conservation_assessment" />
@@ -521,17 +521,24 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.conservation_criteria"
                         class="row mb-3">
-                        <label for="current_conservation_criteria" class="col-sm-4 col-form-label">Conservation
+                        <label for="current_conservation_criteria" class="col-sm-5 col-form-label">Conservation
                             Criteria:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <input :disabled="true" type="text" class="form-control" id="current_conservation_criteria"
                                 v-model="conservation_status_obj.current_conservation_status.conservation_criteria" />
                         </div>
                     </div>
+                    <div v-if="conservation_status_obj.current_conservation_status.comment" class="row mb-3">
+                        <label for="comment" class="col-sm-5 col-form-label fw-bold">Comments</label>
+                        <div class="col-sm-7">
+                            <textarea :disabled="true" class="form-control" rows="3" id="current_comment"
+                                v-model="conservation_status_obj.current_conservation_status.comment" />
+                        </div>
+                    </div>
                 </template>
                 <template v-if="!is_external && isStatusApproved">
                     <div class="row border-top pt-3 pb-3">
-                        <label for="" class="col-sm-4 col-form-label">Approval document:</label>
+                        <label for="" class="col-sm-5 col-form-label">Approval Document:</label>
                         <div class="col-sm-8">
                             <p class="col-form-label">
                                 <template v-if="conservation_status_obj.conservation_status_approval_document">
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
index cec03496..223f93bf 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
@@ -171,9 +171,9 @@
                         <h5 class="text-muted mb-4"><template v-if="conservation_list_proposed">Proposed
                             </template>Conservation
                             Status</h5>
-                        <label for="proposed_wa_legislative_list" class="col-sm-4 col-form-label fw-bold">WA Legislative
+                        <label for="proposed_wa_legislative_list" class="col-sm-5 col-form-label fw-bold">WA Legislative
                             List <span class="text-warning">*</span></label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <template v-if="!isReadOnly">
                                 <template
                                     v-if="wa_legislative_lists && wa_legislative_lists.length > 0 && conservation_status_obj.wa_legislative_list_id && !wa_legislative_lists.map((d) => d.id).includes(conservation_status_obj.wa_legislative_list_id)">
@@ -202,9 +202,9 @@
                         </div>
                     </div>
                     <div v-if="conservation_status_obj.wa_legislative_list_id" class="row mb-3">
-                        <label for="proposed_wa_legislative_category" class="col-sm-4 col-form-label">WA Legislative
+                        <label for="proposed_wa_legislative_category" class="col-sm-5 col-form-label">WA Legislative
                             Category:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <template v-if="!isReadOnly">
                                 <template
                                     v-if="wa_legislative_categories && wa_legislative_categories.length > 0 && conservation_status_obj.wa_legislative_category_id && !wa_legislative_categories.map((d) => d.id).includes(conservation_status_obj.wa_legislative_category_id)">
@@ -234,8 +234,8 @@
                         </div>
                     </div>
                     <div class="row mb-3">
-                        <label for="proposed_iucnversion" class="col-sm-4 col-form-label">IUCN Version</label>
-                        <div class="col-sm-8">
+                        <label for="proposed_iucnversion" class="col-sm-5 col-form-label">IUCN Version</label>
+                        <div class="col-sm-7">
                             <template v-if="!isReadOnly">
                                 <template
                                     v-if="iucn_version && iucn_version.length > 0 && conservation_status_obj.iucn_version_id && !iucn_versions.map((d) => d.id).includes(conservation_status_obj.iucn_version_id)">
@@ -263,9 +263,9 @@
                         </div>
                     </div>
                     <div class="row mb-3">
-                        <label for="proposed_wa_priority_list" class="col-sm-4 col-form-label fw-bold">WA Priority
+                        <label for="proposed_wa_priority_list" class="col-sm-5 col-form-label fw-bold">WA Priority
                             List <span class="text-warning">*</span></label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <template v-if="!isReadOnly">
                                 <template
                                     v-if="wa_priority_lists && wa_priority_lists.length > 0 && conservation_status_obj.wa_priority_list_id && !wa_priority_lists.map((d) => d.id).includes(conservation_status_obj.wa_priority_list_id)">
@@ -294,9 +294,9 @@
                         </div>
                     </div>
                     <div v-if="conservation_status_obj.wa_priority_list_id" class="row mb-3">
-                        <label for="proposed_wa_priority_category" class="col-sm-4 col-form-label">WA Priority
+                        <label for="proposed_wa_priority_category" class="col-sm-5 col-form-label">WA Priority
                             Category:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <template v-if="!isReadOnly">
                                 <template
                                     v-if="wa_priority_categories && wa_priority_categories.length > 0 && conservation_status_obj.wa_priority_category_id && !wa_priority_categories.map((d) => d.id).includes(conservation_status_obj.wa_priority_category_id)">
@@ -326,10 +326,10 @@
                     </div>
                     <div class="row mb-3">
                         <label for="proposed_commonwealth_conservation_list"
-                            class="col-sm-4 col-form-label">Commonwealth
+                            class="col-sm-5 col-form-label">Commonwealth
                             Conservation
-                            List:</label>
-                        <div class="col-sm-8">
+                            Category:</label>
+                        <div class="col-sm-7">
                             <template v-if="!isReadOnly">
                                 <template
                                     v-if="commonwealth_conservation_lists && commonwealth_conservation_lists.length > 0 && conservation_status_obj.commonwealth_conservation_list_id && !commonwealth_conservation_lists.map((d) => d.id).includes(conservation_status_obj.commonwealth_conservation_list_id)">
@@ -344,7 +344,7 @@
                                 <select :disabled="isReadOnly" class="form-select"
                                     v-model="conservation_status_obj.commonwealth_conservation_list_id"
                                     id="proposed_commonwealth_conservation_list">
-                                    <option :value="null" disabled>Select the appropriate Commonwealth Conservation List
+                                    <option :value="null" disabled>Select the appropriate Commonwealth Conservation Category
                                     </option>
                                     <option v-for="option in commonwealth_conservation_lists" :value="option.id"
                                         v-bind:key="option.id">
@@ -359,9 +359,9 @@
                         </div>
                     </div>
                     <div class="row mb-3">
-                        <label for="proposed_other_conservation_assessment" class="col-sm-4 col-form-label">Other
+                        <label for="proposed_other_conservation_assessment" class="col-sm-5 col-form-label">Other
                             Conservation Assessment:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <input :disabled="isReadOnly" type="text" class="form-control"
                                 id="proposed_other_conservation_assessment"
                                 :placeholder="isReadOnly ? 'N/A' : 'Enter Other Conservation Assessment Details if Applicable'"
@@ -369,9 +369,9 @@
                         </div>
                     </div>
                     <div class="row mb-3">
-                        <label for="proposed_conservation_criteria" class="col-sm-4 col-form-label">Conservation
+                        <label for="proposed_conservation_criteria" class="col-sm-5 col-form-label">Conservation
                             Criteria:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <input :disabled="isReadOnly" type="text" class="form-control"
                                 id="proposed_conservation_criteria"
                                 :placeholder="isReadOnly ? 'N/A' : 'Enter Conservation Criteria if Applicable'"
@@ -379,9 +379,9 @@
                         </div>
                     </div>
                     <div class="row mb-3">
-                        <label for="comment" class="col-sm-4 col-form-label fw-bold">Comments <span
+                        <label for="comment" class="col-sm-5 col-form-label fw-bold">Comments <span
                                 class="text-danger">*</span></label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <textarea :disabled="isReadOnly" class="form-control" rows="3" id="comment" placeholder=""
                                 v-model="conservation_status_obj.comment" />
                         </div>
@@ -419,9 +419,9 @@
                             Status</h5>
                     </div>
                     <div class="row mb-3">
-                        <label for="conservation_status_number" class="col-sm-4 col-form-label">Conservation Status
+                        <label for="conservation_status_number" class="col-sm-5 col-form-label">Conservation Status
                             Number:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <a :href="`/internal/conservation_status/${conservation_status_obj.current_conservation_status.id}`"
                                 target="_blank" class="btn btn-primary">{{
                                     conservation_status_obj.current_conservation_status.conservation_status_number }}<i
@@ -430,9 +430,9 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.wa_legislative_list_id"
                         class="row mb-3">
-                        <label for="current_wa_legislative_list" class="col-sm-4 col-form-label">WA Legislative
+                        <label for="current_wa_legislative_list" class="col-sm-5 col-form-label">WA Legislative
                             List:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <select :disabled="true" class="form-select"
                                 v-model="conservation_status_obj.current_conservation_status.wa_legislative_list_id"
                                 id="current_wa_legislative_list" @change="filterWALegislativeCategories($event)">
@@ -445,9 +445,9 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.wa_legislative_category_id"
                         class="row mb-3">
-                        <label for="current_wa_legislative_category" class="col-sm-4 col-form-label">WA Legislative
+                        <label for="current_wa_legislative_category" class="col-sm-5 col-form-label">WA Legislative
                             Category:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <select :disabled="true" class="form-select"
                                 v-model="conservation_status_obj.current_conservation_status.wa_legislative_category_id"
                                 id="current_wa_legislative_category">
@@ -460,8 +460,8 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.iucn_version_id"
                         class="row mb-3">
-                        <label for="current_iucn_version" class="col-sm-4 col-form-label">IUCN Version:</label>
-                        <div class="col-sm-8">
+                        <label for="current_iucn_version" class="col-sm-5 col-form-label">IUCN Version:</label>
+                        <div class="col-sm-7">
                             <select :disabled="true" class="form-select"
                                 v-model="conservation_status_obj.current_conservation_status.iucn_version_id"
                                 id="current_iucn_version">
@@ -474,8 +474,8 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.wa_priority_list_id"
                         class="row mb-3">
-                        <label for="current_wa_priority_list" class="col-sm-4 col-form-label">WA Priority List:</label>
-                        <div class="col-sm-8">
+                        <label for="current_wa_priority_list" class="col-sm-5 col-form-label">WA Priority List:</label>
+                        <div class="col-sm-7">
                             <select :disabled="true" class="form-select"
                                 v-model="conservation_status_obj.current_conservation_status.wa_priority_list_id"
                                 id="current_wa_priority_list" @change="filterWAPriorityCategories($event)">
@@ -487,9 +487,9 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.wa_priority_category_id"
                         class="row mb-3">
-                        <label for="current_wa_priority_category" class="col-sm-4 col-form-label">WA Priority
+                        <label for="current_wa_priority_category" class="col-sm-5 col-form-label">WA Priority
                             Category:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <select :disabled="true" class="form-select"
                                 v-model="conservation_status_obj.current_conservation_status.wa_priority_category_id"
                                 id="current_wa_priority_category">
@@ -502,12 +502,12 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.commonwealth_conservation_list_id"
                         class="row mb-3">
-                        <label for="current_commonwealth_conservation_list" class="col-sm-4 col-form-label">Commonwealth
+                        <label for="current_commonwealth_conservation_category" class="col-sm-5 col-form-label">Commonwealth
                             Conservation List:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <select :disabled="true" class="form-select"
                                 v-model="conservation_status_obj.current_conservation_status.commonwealth_conservation_list_id"
-                                id="current_commonwealth_conservation_list">
+                                id="current_commonwealth_conservation_category">
                                 <option v-for="option in commonwealth_conservation_lists" :value="option.id"
                                     v-bind:key="option.id">
                                     {{ option.code }}
@@ -517,9 +517,9 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.other_conservation_assessment"
                         class="row mb-3">
-                        <label for="current_other_conservation_assessment" class="col-sm-4 col-form-label">Other
+                        <label for="current_other_conservation_assessment" class="col-sm-5 col-form-label">Other
                             Conservation Assessment:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <input :disabled="true" type="text" class="form-control"
                                 id="current_other_conservation_assessment"
                                 v-model="conservation_status_obj.current_conservation_status.other_conservation_assessment" />
@@ -527,18 +527,26 @@
                     </div>
                     <div v-if="conservation_status_obj.current_conservation_status.conservation_criteria"
                         class="row mb-3">
-                        <label for="current_conservation_criteria" class="col-sm-4 col-form-label">Conservation
+                        <label for="current_conservation_criteria" class="col-sm-5 col-form-label">Conservation
                             Criteria:</label>
-                        <div class="col-sm-8">
+                        <div class="col-sm-7">
                             <input :disabled="true" type="text" class="form-control" id="current_conservation_criteria"
                                 v-model="conservation_status_obj.current_conservation_status.conservation_criteria" />
                         </div>
                     </div>
+                    <div v-if="conservation_status_obj.current_conservation_status.comment" class="row mb-3">
+                        <label for="comment" class="col-sm-5 col-form-label fw-bold">Comments <span
+                                class="text-danger">*</span></label>
+                        <div class="col-sm-7">
+                            <textarea :disabled="true" class="form-control" rows="3" id="current_comment"
+                                v-model="conservation_status_obj.current_conservation_status.comment" />
+                        </div>
+                    </div>
                 </template>
                 <template v-if="!is_external && isStatusApproved">
                     <div class="row border-top pt-3 pb-3">
-                        <label for="" class="col-sm-4 col-form-label">Approval document:</label>
-                        <div class="col-sm-8">
+                        <label for="" class="col-sm-5 col-form-label">Approval Document:</label>
+                        <div class="col-sm-7">
                             <p class="col-form-label">
                                 <template v-if="conservation_status_obj.conservation_status_approval_document">
                                     <strong><a :href="conservation_status_obj.conservation_status_approval_document[1]"

From 32fbd5acf0dff08ef4cbfaa25cef08ff94f11bf2 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 13 Nov 2024 10:09:00 +0800
Subject: [PATCH 66/83] Bug fix with missing data variable iucn_versions.

---
 .../components/common/conservation_status/community_status.vue | 3 ++-
 .../components/common/conservation_status/species_status.vue   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
index 7cc7d23d..6ecb9089 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/community_status.vue
@@ -231,7 +231,7 @@
                         <div class="col-sm-7">
                             <template v-if="!isReadOnly">
                                 <template
-                                    v-if="iucn_version && iucn_version.length > 0 && conservation_status_obj.iucn_version_id && !iucn_versions.map((d) => d.id).includes(conservation_status_obj.iucn_version_id)">
+                                    v-if="iucn_versions && iucn_versions.length > 0 && conservation_status_obj.iucn_version_id && !iucn_versions.map((d) => d.id).includes(conservation_status_obj.iucn_version_id)">
                                     <input type="text" v-if="conservation_status_obj.iucn_version"
                                         class="form-control mb-3"
                                         :value="conservation_status_obj.iucn_version + ' (Now Archived)'"
@@ -652,6 +652,7 @@ export default {
             cs_profile_dict: {},
             wa_legislative_lists: [],
             wa_legislative_categories: [],
+            iucn_versions: [],
             wa_priority_lists: [],
             wa_priority_categories: [],
             commonwealth_conservation_lists: [],
diff --git a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
index 223f93bf..48e9f323 100644
--- a/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
+++ b/boranga/frontend/boranga/src/components/common/conservation_status/species_status.vue
@@ -238,7 +238,7 @@
                         <div class="col-sm-7">
                             <template v-if="!isReadOnly">
                                 <template
-                                    v-if="iucn_version && iucn_version.length > 0 && conservation_status_obj.iucn_version_id && !iucn_versions.map((d) => d.id).includes(conservation_status_obj.iucn_version_id)">
+                                    v-if="iucn_versions && iucn_versions.length > 0 && conservation_status_obj.iucn_version_id && !iucn_versions.map((d) => d.id).includes(conservation_status_obj.iucn_version_id)">
                                     <input type="text" v-if="conservation_status_obj.iucn_version"
                                         class="form-control mb-3"
                                         :value="conservation_status_obj.iucn_version + ' (Now Archived)'"
@@ -661,6 +661,7 @@ export default {
             cs_profile_dict: {},
             wa_legislative_lists: [],
             wa_legislative_categories: [],
+            iucn_versions: [],
             wa_priority_lists: [],
             wa_priority_categories: [],
             commonwealth_conservation_lists: [],

From 760deae4f73c68d2dde9b218afa74e97131bb0c8 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 13 Nov 2024 10:09:28 +0800
Subject: [PATCH 67/83] Layout bug fix with missing padding under Approve
 action button.

---
 .../internal/conservation_status/conservation_status.vue        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
index 41b48aa6..e6fbe921 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
@@ -296,6 +296,8 @@
                                                 <button style="width:90%;" class="btn btn-primary"
                                                     @click.prevent="issueProposal()">Approve</button><br />
                                             </div>
+                                        </div>
+                                        <div class="row mb-2">
                                             <div class="col-sm-12">
                                                 <button style="width:90%;" class="btn btn-primary"
                                                     @click.prevent="declineProposal()">Decline</button><br />

From 603138da819f63ac2a325ac744041a8d8ac658c8 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 13 Nov 2024 13:38:40 +0800
Subject: [PATCH 68/83] Modify Meeting model so that lodgement date is set when
 meeting it scheduled so that we can use it for ordering when wanting to
 select the most recently scheduled meeting.

---
 boranga/components/meetings/models.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/boranga/components/meetings/models.py b/boranga/components/meetings/models.py
index fbfcf5a0..6d3e7c61 100644
--- a/boranga/components/meetings/models.py
+++ b/boranga/components/meetings/models.py
@@ -288,7 +288,7 @@ def schedule_meeting(self, request, viewset):
 
         self.processing_status = self.PROCESSING_STATUS_SCHEDULED
         self.submitter = request.user.id
-        # self.lodgement_date = timezone.now()
+        self.lodgement_date = timezone.now()
 
         # Create a log entry for the meeting
         self.log_user_action(
@@ -313,7 +313,6 @@ def complete_meeting(self, request, viewset):
 
         self.processing_status = self.PROCESSING_STATUS_COMPLETED
         self.submitter = request.user.id
-        # self.lodgement_date = timezone.now()
 
         # Create a log entry for the meeting
         self.log_user_action(

From 17fb9769bb3f7853fd65325a1d73a4f46bf3b1f3 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 13 Nov 2024 13:42:53 +0800
Subject: [PATCH 69/83] Bug fix: Allow users to defer a CS that is On Agenda
 status.

---
 boranga/components/conservation_status/models.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index f86b3194..b56e3923 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -1820,10 +1820,11 @@ def defer(self, request, reason, review_due_date):
             ConservationStatus.PROCESSING_STATUS_WITH_REFERRAL,
             ConservationStatus.PROCESSING_STATUS_PROPOSED_FOR_AGENDA,
             ConservationStatus.PROCESSING_STATUS_READY_FOR_AGENDA,
+            ConservationStatus.PROCESSING_STATUS_ON_AGENDA,
         ]:
             raise ValidationError(
                 "You cannot defer a conservation status when the "
-                f"processing status is {self.get_processing_status_display}"
+                f"processing status is {self.get_processing_status_display()}"
             )
 
         if not is_conservation_status_assessor(

From ecbd34c95313545974600a46fd5fde44d3443137 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 13 Nov 2024 13:44:01 +0800
Subject: [PATCH 70/83] Add most_recent_meeting_completed property to CS model.

---
 boranga/components/conservation_status/models.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index b56e3923..38053faf 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -3,6 +3,7 @@
 from datetime import datetime, timedelta
 
 import reversion
+from django.apps import apps
 from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.files.storage import FileSystemStorage
@@ -1221,6 +1222,21 @@ def amendment_requests(self):
         qs = ConservationStatusAmendmentRequest.objects.filter(conservation_status=self)
         return qs
 
+    @property
+    def most_recent_meeting_completed(self):
+        Meeting = apps.get_model("boranga", "Meeting")
+        meetings = Meeting.objects.exclude(lodgement_date__isnull=True).filter(
+            agenda_items__conservation_status_id=self.id
+        )
+        if not meetings.exists():
+            return False
+
+        most_recent_meeting = meetings.first()
+
+        return (
+            most_recent_meeting.processing_status == Meeting.PROCESSING_STATUS_COMPLETED
+        )
+
     def move_to_status(self, request, status, approver_comment):
         if not self.can_assess(request):
             raise exceptions.ProposalNotAuthorized()

From 4f700bd2c6cc4ccdd7dc4ec898a730ff13e75dda Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 13 Nov 2024 13:59:37 +0800
Subject: [PATCH 71/83] Make workflow panel sticky.

---
 .../conservation_status.vue                   | 574 +++++++++---------
 1 file changed, 283 insertions(+), 291 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
index e6fbe921..8bff00fb 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
@@ -8,344 +8,336 @@
             </h3>
             <div class="col-md-3">
                 <CommsLogs :comms_url="comms_url" :logs_url="logs_url" :comms_add_url="comms_add_url"
-                    :disable_add_entry="!conservation_status_obj.can_add_log" />
+                    :disable_add_entry="!conservation_status_obj.can_add_log" class="mb-3"/>
 
                 <Submission :submitter_first_name="submitter_first_name" :submitter_last_name="submitter_last_name"
                     :lodgement_date="conservation_status_obj.lodgement_date"
-                    :is_new_contributor="conservation_status_obj.is_new_contributor" class="mt-3" />
+                    :is_new_contributor="conservation_status_obj.is_new_contributor" class="mb-3" />
 
-                <div class="mt-3">
-                    <div class="card card-default">
-                        <div class="card-header">
-                            Workflow
-                        </div>
-                        <div class="card-body">
-                            <strong>Status</strong><br />
-                            {{ conservation_status_obj.processing_status }}
-                        </div>
-                        <div v-if="conservation_status_obj.processing_status != 'Draft'" class="card-body border-top">
-                            <div class="row">
-                                <div class="col-sm-12">
-                                    <strong>Currently assigned to</strong><br />
-                                    <div class="form-group">
-                                        <template
-                                            v-if="['Proposed For Agenda', 'Ready For Agenda', 'On Agenda', 'Proposed DeListed', 'Unlocked', 'Approved', 'Closed', 'DeListed'].includes(conservation_status_obj.processing_status)">
-                                            <select ref="assigned_officer" :disabled="!canAction || canLock"
-                                                class="form-control"
-                                                v-model="conservation_status_obj.assigned_approver">
-                                                <option v-for="member in conservation_status_obj.allowed_assessors"
-                                                    :value="member.id">{{ member.first_name }} {{ member.last_name }}
-                                                </option>
-                                            </select>
-                                            <a v-if="conservation_status_obj.can_user_assign_to_self"
-                                                @click.prevent="assignRequestUser()" class="float-end"
-                                                role="button">Assign
-                                                to me</a>
-                                        </template>
-                                        <template
-                                            v-else-if="['With Assessor', 'With Referral', 'Deferred'].includes(conservation_status_obj.processing_status)">
-                                            <select ref="assigned_officer" :disabled="!canAction" class="form-control"
-                                                v-model="conservation_status_obj.assigned_officer">
-                                                <option v-for="member in conservation_status_obj.allowed_assessors"
-                                                    :value="member.id">{{ member.first_name }} {{ member.last_name }}
-                                                </option>
-                                            </select>
-                                            <a v-if="canAssess && conservation_status_obj.assigned_officer != conservation_status_obj.current_assessor.id"
-                                                @click.prevent="assignRequestUser()" class="float-end"
-                                                role="button">Assign
-                                                to me</a>
-                                        </template>
-                                    </div>
+                <div class="card card-default sticky-top">
+                    <div class="card-header">
+                        Workflow
+                    </div>
+                    <div class="card-body">
+                        <strong>Status</strong><br />
+                        {{ conservation_status_obj.processing_status }}
+                    </div>
+                    <div v-if="conservation_status_obj.processing_status != 'Draft'" class="card-body border-top">
+                        <div class="row">
+                            <div class="col-sm-12">
+                                <strong>Currently assigned to</strong><br />
+                                <div class="form-group">
+                                    <template
+                                        v-if="['Proposed For Agenda', 'Ready For Agenda', 'On Agenda', 'Proposed DeListed', 'Unlocked', 'Approved', 'Closed', 'DeListed'].includes(conservation_status_obj.processing_status)">
+                                        <select ref="assigned_officer" :disabled="!canAction || canLock"
+                                            class="form-control" v-model="conservation_status_obj.assigned_approver">
+                                            <option v-for="member in conservation_status_obj.allowed_assessors"
+                                                :value="member.id">{{ member.first_name }} {{ member.last_name }}
+                                            </option>
+                                        </select>
+                                        <a v-if="conservation_status_obj.can_user_assign_to_self"
+                                            @click.prevent="assignRequestUser()" class="float-end" role="button">Assign
+                                            to me</a>
+                                    </template>
+                                    <template
+                                        v-else-if="['With Assessor', 'With Referral', 'Deferred'].includes(conservation_status_obj.processing_status)">
+                                        <select ref="assigned_officer" :disabled="!canAction" class="form-control"
+                                            v-model="conservation_status_obj.assigned_officer">
+                                            <option v-for="member in conservation_status_obj.allowed_assessors"
+                                                :value="member.id">{{ member.first_name }} {{ member.last_name }}
+                                            </option>
+                                        </select>
+                                        <a v-if="canAssess && conservation_status_obj.assigned_officer != conservation_status_obj.current_assessor.id"
+                                            @click.prevent="assignRequestUser()" class="float-end" role="button">Assign
+                                            to me</a>
+                                    </template>
                                 </div>
                             </div>
                         </div>
-                        <div v-if="canRefer" class="card-body border-top">
-                            <div class="row">
-                                <div class="col-sm-12">
-                                    <strong>Referrals</strong><br />
-                                    <div class="form-group mb-3">
-                                        <select :disabled="!canLimitedAction" ref="referees" class="form-control">
-                                        </select>
-                                        <template v-if='!sendingReferral'>
-                                            <template v-if="selected_referral">
-                                                <label class="control-label mt-2" for="referral_text">Comments</label>
-                                                <textarea class="form-control" name="referral_text" ref="referral_text"
-                                                    v-model="referral_text"></textarea>
-                                                <a v-if="canLimitedAction" @click.prevent="sendReferral()"
-                                                    class="float-end" role="button">Send</a>
-                                            </template>
-                                        </template>
-                                        <template v-else>
-                                            <span v-if="canLimitedAction" @click.prevent="sendReferral()" disabled
-                                                class="text-primary float-end" role="button">
-                                                Sending Referral <span class="spinner-border spinner-border-sm"
-                                                    role="status" aria-hidden="true"></span>
-                                                <span class="visually-hidden">Loading...</span>
-                                            </span>
+                    </div>
+                    <div v-if="canRefer" class="card-body border-top">
+                        <div class="row">
+                            <div class="col-sm-12">
+                                <strong>Referrals</strong><br />
+                                <div class="form-group mb-3">
+                                    <select :disabled="!canLimitedAction" ref="referees" class="form-control">
+                                    </select>
+                                    <template v-if='!sendingReferral'>
+                                        <template v-if="selected_referral">
+                                            <label class="control-label mt-2" for="referral_text">Comments</label>
+                                            <textarea class="form-control" name="referral_text" ref="referral_text"
+                                                v-model="referral_text"></textarea>
+                                            <a v-if="canLimitedAction" @click.prevent="sendReferral()" class="float-end"
+                                                role="button">Send</a>
                                         </template>
-                                    </div>
-                                    <div v-if="
-                                        conservation_status_obj.external_referral_invites &&
-                                        conservation_status_obj.external_referral_invites.length > 0
-                                    ">
-                                        <div class="fw-bold mb-1">External Referee Invites</div>
-                                        <table class="table table-sm table-hover table-referrals">
-                                            <thead>
-                                                <tr>
-                                                    <th scope="col">Referee</th>
-                                                    <th scope="col">Status</th>
-                                                    <th scope="col">Actions</th>
-                                                </tr>
-                                            </thead>
-                                            <tbody>
-                                                <tr v-for="external_referee_invite in conservation_status_obj.external_referral_invites"
-                                                    :key="external_referee_invite.id">
-                                                    <td class="truncate-name">
-                                                        {{ external_referee_invite.full_name }}
-                                                    </td>
-                                                    <td>Pending</td>
-                                                    <td class="text-center">
-                                                        <a role="button" data-bs-toggle="popover"
-                                                            data-bs-trigger="hover focus" :data-bs-content="'Send a reminder to ' +
-                                                                external_referee_invite.full_name
-                                                                " data-bs-placement="bottom" @click.prevent="
+                                    </template>
+                                    <template v-else>
+                                        <span v-if="canLimitedAction" @click.prevent="sendReferral()" disabled
+                                            class="text-primary float-end" role="button">
+                                            Sending Referral <span class="spinner-border spinner-border-sm"
+                                                role="status" aria-hidden="true"></span>
+                                            <span class="visually-hidden">Loading...</span>
+                                        </span>
+                                    </template>
+                                </div>
+                                <div v-if="
+                                    conservation_status_obj.external_referral_invites &&
+                                    conservation_status_obj.external_referral_invites.length > 0
+                                ">
+                                    <div class="fw-bold mb-1">External Referee Invites</div>
+                                    <table class="table table-sm table-hover table-referrals">
+                                        <thead>
+                                            <tr>
+                                                <th scope="col">Referee</th>
+                                                <th scope="col">Status</th>
+                                                <th scope="col">Actions</th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            <tr v-for="external_referee_invite in conservation_status_obj.external_referral_invites"
+                                                :key="external_referee_invite.id">
+                                                <td class="truncate-name">
+                                                    {{ external_referee_invite.full_name }}
+                                                </td>
+                                                <td>Pending</td>
+                                                <td class="text-center">
+                                                    <a role="button" data-bs-toggle="popover"
+                                                        data-bs-trigger="hover focus" :data-bs-content="'Send a reminder to ' +
+                                                            external_referee_invite.full_name
+                                                            " data-bs-placement="bottom" @click.prevent="
                                                                     remindExternalReferee(
                                                                         external_referee_invite
                                                                     )
                                                                     "><i class="fa fa-bell text-warning"
-                                                                aria-hidden="true"></i>
-                                                        </a>
-                                                        <a role="button" data-bs-toggle="popover"
-                                                            data-bs-trigger="hover focus" :data-bs-content="'Retract the external referee invite sent to ' +
-                                                                external_referee_invite.full_name
-                                                                " data-bs-placement="bottom" @click.prevent="
+                                                            aria-hidden="true"></i>
+                                                    </a>
+                                                    <a role="button" data-bs-toggle="popover"
+                                                        data-bs-trigger="hover focus" :data-bs-content="'Retract the external referee invite sent to ' +
+                                                            external_referee_invite.full_name
+                                                            " data-bs-placement="bottom" @click.prevent="
                                                                     retractExternalRefereeInvite(
                                                                         external_referee_invite
                                                                     )
                                                                     "><i class="fa fa-times-circle text-danger"
-                                                                aria-hidden="true"></i>
-                                                        </a>
-                                                    </td>
-                                                </tr>
-                                            </tbody>
-                                        </table>
-                                    </div>
+                                                            aria-hidden="true"></i>
+                                                    </a>
+                                                </td>
+                                            </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
 
-                                    <template
-                                        v-if="conservation_status_obj.latest_referrals && conservation_status_obj.latest_referrals.length > 0">
-                                        <div>
-                                            <div class="fw-bold mb-1">
-                                                Recent Referrals
-                                                <small class="text-secondary fw-lighter">(Showing {{
-                                                    conservation_status_obj.latest_referrals.length }} of
-                                                    {{ conservation_status_obj.referrals.length }})</small>
-                                            </div>
-                                            <table class="table table-sm table-hover table-referrals">
-                                                <thead>
-                                                    <tr>
-                                                        <th>Referee</th>
-                                                        <th>Status</th>
-                                                        <th>Actions</th>
-                                                    </tr>
-                                                </thead>
-                                                <tbody>
-                                                    <tr v-for="r in conservation_status_obj.latest_referrals">
-                                                        <td class="truncate-name">
-                                                            {{ r.referral.first_name }} {{
-                                                                r.referral.last_name }}
-                                                        </td>
-                                                        <td>
-                                                            {{ r.processing_status }}
-                                                        </td>
-                                                        <td>
-                                                            <template v-if="r.processing_status == 'Awaiting'">
-                                                                <a v-if="canLimitedAction" role="button"
+                                <template
+                                    v-if="conservation_status_obj.latest_referrals && conservation_status_obj.latest_referrals.length > 0">
+                                    <div>
+                                        <div class="fw-bold mb-1">
+                                            Recent Referrals
+                                            <small class="text-secondary fw-lighter">(Showing {{
+                                                conservation_status_obj.latest_referrals.length }} of
+                                                {{ conservation_status_obj.referrals.length }})</small>
+                                        </div>
+                                        <table class="table table-sm table-hover table-referrals">
+                                            <thead>
+                                                <tr>
+                                                    <th>Referee</th>
+                                                    <th>Status</th>
+                                                    <th>Actions</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                <tr v-for="r in conservation_status_obj.latest_referrals">
+                                                    <td class="truncate-name">
+                                                        {{ r.referral.first_name }} {{
+                                                            r.referral.last_name }}
+                                                    </td>
+                                                    <td>
+                                                        {{ r.processing_status }}
+                                                    </td>
+                                                    <td>
+                                                        <template v-if="r.processing_status == 'Awaiting'">
+                                                            <a v-if="canLimitedAction" role="button"
+                                                                data-bs-toggle="popover" data-bs-trigger="hover"
+                                                                :data-bs-content="'Send a reminder to ' +
+                                                                    r.referral['fullname']
+                                                                    " data-bs-placement="bottom"
+                                                                data-bs-container="body"
+                                                                @click.prevent="remindReferral(r)"><i
+                                                                    class="fa fa-bell text-warning"
+                                                                    aria-hidden="true"></i>
+                                                            </a>
+                                                            <a role="button" data-bs-toggle="popover"
+                                                                data-bs-trigger="hover" :data-bs-content="'Recall the referral request sent to ' +
+                                                                    r.referral['fullname']
+                                                                    " data-bs-placement="bottom"
+                                                                data-bs-container="body"
+                                                                @click.prevent="recallReferral(r)"><i
+                                                                    class="fa fa-times-circle text-danger"
+                                                                    aria-hidden="true"></i>
+                                                            </a>
+                                                        </template>
+                                                        <template v-else>
+                                                            <template v-if="canLimitedAction"><a role="button"
                                                                     data-bs-toggle="popover" data-bs-trigger="hover"
-                                                                    :data-bs-content="'Send a reminder to ' +
+                                                                    :data-bs-content="'Resend this referral request to ' +
                                                                         r.referral['fullname']
-                                                                        " data-bs-placement="bottom"
-                                                                    data-bs-container="body"
-                                                                    @click.prevent="remindReferral(r)"><i
-                                                                        class="fa fa-bell text-warning"
+                                                                        " data-bs-container="body"
+                                                                    @click.prevent="resendReferral(r)"><i
+                                                                        class="fa fa-envelope text-primary"
                                                                         aria-hidden="true"></i>
                                                                 </a>
-                                                                <a role="button" data-bs-toggle="popover"
-                                                                    data-bs-trigger="hover" :data-bs-content="'Recall the referral request sent to ' +
-                                                                        r.referral['fullname']
-                                                                        " data-bs-placement="bottom"
-                                                                    data-bs-container="body"
-                                                                    @click.prevent="recallReferral(r)"><i
-                                                                        class="fa fa-times-circle text-danger"
-                                                                        aria-hidden="true"></i>
-                                                                </a>
-                                                            </template>
-                                                            <template v-else>
-                                                                <template v-if="canLimitedAction"><a role="button"
-                                                                        data-bs-toggle="popover" data-bs-trigger="hover"
-                                                                        :data-bs-content="'Resend this referral request to ' +
-                                                                            r.referral['fullname']
-                                                                            " data-bs-container="body"
-                                                                        @click.prevent="resendReferral(r)"><i
-                                                                            class="fa fa-envelope text-primary"
-                                                                            aria-hidden="true"></i>
-                                                                    </a>
-                                                                </template>
                                                             </template>
-                                                        </td>
-                                                    </tr>
-                                                </tbody>
-                                            </table>
-                                            <CSMoreReferrals @refreshFromResponse="refreshFromResponse"
-                                                :conservation_status_obj="conservation_status_obj"
-                                                :canAction="canLimitedAction" :isFinalised="isFinalised"
-                                                :referral_url="referralListURL" />
-                                        </div>
-                                    </template>
-                                </div>
+                                                        </template>
+                                                    </td>
+                                                </tr>
+                                            </tbody>
+                                        </table>
+                                        <CSMoreReferrals @refreshFromResponse="refreshFromResponse"
+                                            :conservation_status_obj="conservation_status_obj"
+                                            :canAction="canLimitedAction" :isFinalised="isFinalised"
+                                            :referral_url="referralListURL" />
+                                    </div>
+                                </template>
                             </div>
                         </div>
-                        <div v-if="show_finalised_actions" class="card-body border-top">
-                            <div class="row">
-                                <div class="col-sm-12">
+                    </div>
+                    <div v-if="show_finalised_actions" class="card-body border-top">
+                        <div class="row">
+                            <div class="col-sm-12">
+                                <div class="row mb-2">
+                                    <div class="col-sm-12">
+                                        <strong>Action</strong><br />
+                                    </div>
+                                </div>
+                                <template
+                                    v-if="hasAssessorMode && conservation_status_obj.processing_status == 'Approved'">
                                     <div class="row mb-2">
                                         <div class="col-sm-12">
-                                            <strong>Action</strong><br />
+                                            <button style="width:90%;" class="btn btn-primary"
+                                                @click.prevent="proposeDelist()">Propose Delist</button><br />
                                         </div>
                                     </div>
-                                    <template
-                                        v-if="hasAssessorMode && conservation_status_obj.processing_status == 'Approved'">
-                                        <div class="row mb-2">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary"
-                                                    @click.prevent="proposeDelist()">Propose Delist</button><br />
-                                            </div>
-                                        </div>
-                                    </template>
-                                    <template v-if="canAction && canUnlock">
-                                        <div class="row mb-2">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary"
-                                                    @click.prevent="unlockConservationStatus()">Unlock</button><br />
-                                            </div>
+                                </template>
+                                <template v-if="canAction && canUnlock">
+                                    <div class="row mb-2">
+                                        <div class="col-sm-12">
+                                            <button style="width:90%;" class="btn btn-primary"
+                                                @click.prevent="unlockConservationStatus()">Unlock</button><br />
                                         </div>
-                                    </template>
-                                    <template v-if="canAction && canLock">
-                                        <div class="row mb-2">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary"
-                                                    @click.prevent="lockConservationStatus()">Lock</button><br />
-                                            </div>
+                                    </div>
+                                </template>
+                                <template v-if="canAction && canLock">
+                                    <div class="row mb-2">
+                                        <div class="col-sm-12">
+                                            <button style="width:90%;" class="btn btn-primary"
+                                                @click.prevent="lockConservationStatus()">Lock</button><br />
                                         </div>
-                                    </template>
-                                </div>
+                                    </div>
+                                </template>
                             </div>
                         </div>
-                        <div v-if="!isFinalised && canAction" class="card-body border-top">
-                            <div class="row">
-                                <div class="col-sm-12">
+                    </div>
+                    <div v-if="!isFinalised && canAction" class="card-body border-top">
+                        <div class="row">
+                            <div class="col-sm-12">
+                                <div class="row mb-2">
+                                    <div class="col-sm-12">
+                                        <strong>Action</strong><br />
+                                    </div>
+                                </div>
+                                <template v-if="conservation_status_obj.processing_status == 'With Assessor'">
                                     <div class="row mb-2">
                                         <div class="col-sm-12">
-                                            <strong>Action</strong><br />
+                                            <button style="width:90%;" class="btn btn-primary"
+                                                @click.prevent="amendmentRequest()">Request
+                                                Amendment</button><br />
                                         </div>
                                     </div>
-                                    <template v-if="conservation_status_obj.processing_status == 'With Assessor'">
-                                        <div class="row mb-2">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary"
-                                                    @click.prevent="amendmentRequest()">Request
-                                                    Amendment</button><br />
-                                            </div>
-                                        </div>
-                                        <div class="row mb-2"
-                                            v-if="conservation_status_obj.approval_level == 'minister' && conservation_status_obj.processing_status == 'With Assessor'">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary"
-                                                    @click.prevent="proposedReadyForAgenda()">Propose for
-                                                    Agenda</button><br />
-                                            </div>
+                                    <div class="row mb-2"
+                                        v-if="conservation_status_obj.approval_level == 'minister' && conservation_status_obj.processing_status == 'With Assessor'">
+                                        <div class="col-sm-12">
+                                            <button style="width:90%;" class="btn btn-primary"
+                                                @click.prevent="proposedReadyForAgenda()">Propose for
+                                                Agenda</button><br />
                                         </div>
-                                        <div class="row mb-2"
-                                            v-if="conservation_status_obj.approval_level == 'immediate'">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary"
-                                                    @click.prevent="declineProposal()">Decline</button><br />
-                                            </div>
+                                    </div>
+                                    <div class="row mb-2" v-if="conservation_status_obj.approval_level == 'immediate'">
+                                        <div class="col-sm-12">
+                                            <button style="width:90%;" class="btn btn-primary"
+                                                @click.prevent="declineProposal()">Decline</button><br />
                                         </div>
-                                        <div class="row mb-2"
-                                            v-if="conservation_status_obj.approval_level == 'immediate'">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary"
-                                                    @click.prevent="issueProposal()">Approve</button><br />
-                                            </div>
+                                    </div>
+                                    <div class="row mb-2" v-if="conservation_status_obj.approval_level == 'immediate'">
+                                        <div class="col-sm-12">
+                                            <button style="width:90%;" class="btn btn-primary"
+                                                @click.prevent="issueProposal()">Approve</button><br />
                                         </div>
-                                    </template>
-                                    <template
-                                        v-if="conservation_status_obj.processing_status == 'Proposed For Agenda' && conservation_status_obj.approval_level == 'minister'">
-                                        <div class="row mb-2">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary"
-                                                    @click.prevent="readyForAgenda">Confirm Ready for
-                                                    Agenda</button><br />
-                                            </div>
+                                    </div>
+                                </template>
+                                <template
+                                    v-if="conservation_status_obj.processing_status == 'Proposed For Agenda' && conservation_status_obj.approval_level == 'minister'">
+                                    <div class="row mb-2">
+                                        <div class="col-sm-12">
+                                            <button style="width:90%;" class="btn btn-primary"
+                                                @click.prevent="readyForAgenda">Confirm Ready for
+                                                Agenda</button><br />
                                         </div>
-                                    </template>
-                                    <template
-                                        v-if="conservation_status_obj.processing_status == 'On Agenda' && conservation_status_obj.approval_level == 'minister'">
-                                        <div class="row mb-2">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary"
-                                                    @click.prevent="issueProposal()">Approve</button><br />
-                                            </div>
+                                    </div>
+                                </template>
+                                <template
+                                    v-if="conservation_status_obj.processing_status == 'On Agenda' && conservation_status_obj.approval_level == 'minister'">
+                                    <div class="row mb-2">
+                                        <div class="col-sm-12">
+                                            <button style="width:90%;" class="btn btn-primary"
+                                                @click.prevent="issueProposal()">Approve</button><br />
                                         </div>
-                                        <div class="row mb-2">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary"
-                                                    @click.prevent="declineProposal()">Decline</button><br />
-                                            </div>
+                                    </div>
+                                    <div class="row mb-2">
+                                        <div class="col-sm-12">
+                                            <button style="width:90%;" class="btn btn-primary"
+                                                @click.prevent="declineProposal()">Decline</button><br />
                                         </div>
-                                    </template>
-                                    <template
-                                        v-else-if="conservation_status_obj.processing_status == 'Proposed DeListed'">
-                                        <div class="row">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary"
-                                                    @click.prevent="switchStatus('approved')">Revert To
-                                                    Approved</button><br />
-                                            </div>
+                                    </div>
+                                </template>
+                                <template v-else-if="conservation_status_obj.processing_status == 'Proposed DeListed'">
+                                    <div class="row">
+                                        <div class="col-sm-12">
+                                            <button style="width:90%;" class="btn btn-primary"
+                                                @click.prevent="switchStatus('approved')">Revert To
+                                                Approved</button><br />
                                         </div>
-                                        <div class="row">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary"
-                                                    @click.prevent="delistProposal()">Confirm Delisting</button><br />
-                                            </div>
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-sm-12">
+                                            <button style="width:90%;" class="btn btn-primary"
+                                                @click.prevent="delistProposal()">Confirm Delisting</button><br />
                                         </div>
-                                    </template>
-                                    <template v-if="canSendBackToAssessor">
-                                        <div class="row">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary"
-                                                    @click.prevent="backToAssessor">Back To
-                                                    Assessor</button><br />
-                                            </div>
+                                    </div>
+                                </template>
+                                <template v-if="canSendBackToAssessor">
+                                    <div class="row">
+                                        <div class="col-sm-12">
+                                            <button style="width:90%;" class="btn btn-primary"
+                                                @click.prevent="backToAssessor">Back To
+                                                Assessor</button><br />
                                         </div>
-                                    </template>
-                                    <template v-if="canDefer">
-                                        <div class="row">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary"
-                                                    @click.prevent="deferProposal()">Defer</button><br />
-                                            </div>
+                                    </div>
+                                </template>
+                                <template v-if="canDefer">
+                                    <div class="row">
+                                        <div class="col-sm-12">
+                                            <button style="width:90%;" class="btn btn-primary"
+                                                @click.prevent="deferProposal()">Defer</button><br />
                                         </div>
-                                    </template>
-                                    <template v-if="canDiscard">
-                                        <div class="row">
-                                            <div class="col-sm-12">
-                                                <button style="width:90%;" class="btn btn-primary"
-                                                    @click.prevent="discardCSProposal()">Discard</button><br />
-                                            </div>
+                                    </div>
+                                </template>
+                                <template v-if="canDiscard">
+                                    <div class="row">
+                                        <div class="col-sm-12">
+                                            <button style="width:90%;" class="btn btn-primary"
+                                                @click.prevent="discardCSProposal()">Discard</button><br />
                                         </div>
-                                    </template>
-                                </div>
+                                    </div>
+                                </template>
                             </div>
                         </div>
                     </div>

From 78f5aef0cdcc50a628980aa55ca4459e75426564 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 13 Nov 2024 14:28:20 +0800
Subject: [PATCH 72/83] Fix CS excel and csv export (species and communities).

---
 boranga/components/conservation_status/api.py | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/boranga/components/conservation_status/api.py b/boranga/components/conservation_status/api.py
index d696736f..c63f481e 100644
--- a/boranga/components/conservation_status/api.py
+++ b/boranga/components/conservation_status/api.py
@@ -590,8 +590,8 @@ def species_cs_internal_export(self, request, *args, **kwargs):
             "genus",
             "phylogenetic_group",
             "processing_status",
-            "effective_from_date",
-            "effective_to_date",
+            "effective_from",
+            "effective_to",
             "conservation_status_number",
         ]
 
@@ -599,12 +599,14 @@ def species_cs_internal_export(self, request, *args, **kwargs):
             qs, context={"request": request}, many=True
         )
         serialized_data = serializer.data
-
         filtered_data = []
         for obj in serialized_data:
             filtered_obj = {
                 key: value for key, value in obj.items() if key in allowed_fields
             }
+            for key, value in obj.items():
+                if key == "phylogenetic_group":
+                    filtered_obj[key] = ", ".join(value)
             filtered_data.append(filtered_obj)
 
         def flatten_dict(d, parent_key="", sep="_"):
@@ -626,7 +628,7 @@ def flatten_dict(d, parent_key="", sep="_"):
             "Common Name",
             "Family",
             "Genera",
-            "Phylo Group",
+            "Phylo Group(s)",
             "Processing Status",
             "Effective From Date",
             "Effective To Date",
@@ -641,6 +643,7 @@ def flatten_dict(d, parent_key="", sep="_"):
             "Effective To Date",
             "Family",
             "Genera",
+            "Phylo Group(s)",
             "Processing Status",
         ]
         df = df[column_order]
@@ -1193,11 +1196,9 @@ def community_cs_internal_export(self, request, *args, **kwargs):
             "community_number",
             "community_migrated_id",
             "community_name",
-            "region",
-            "district",
             "processing_status",
-            "effective_from_date",
-            "effective_to_date",
+            "effective_from",
+            "effective_to",
         ]
 
         serializer = ListCommunityConservationStatusSerializer(
@@ -1211,6 +1212,7 @@ def community_cs_internal_export(self, request, *args, **kwargs):
                 key: value for key, value in obj.items() if key in allowed_fields
             }
             filtered_data.append(filtered_obj)
+        logger.debug(filtered_data)
 
         def flatten_dict(d, parent_key="", sep="_"):
             flattened_dict = {}
@@ -1229,8 +1231,6 @@ def flatten_dict(d, parent_key="", sep="_"):
             "Community",
             "Community Id",
             "Community Name",
-            "Region",
-            "District",
             "Processing Status",
             "Effective From Date",
             "Effective To Date",
@@ -1241,8 +1241,6 @@ def flatten_dict(d, parent_key="", sep="_"):
             "Community",
             "Community Id",
             "Community Name",
-            "Region",
-            "District",
             "Effective From Date",
             "Effective To Date",
             "Processing Status",

From 568cefa563c4eea592c077439e19e2ea86f20e9b Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 13 Nov 2024 15:33:47 +0800
Subject: [PATCH 73/83] Dev ops task 7270: CS Bug: Just after approving a CS
 the Search for Referee dropdown is visible.

---
 .../internal/conservation_status/conservation_status.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
index 8bff00fb..2968333b 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
@@ -678,6 +678,15 @@ export default {
             return (this.hasAssessorMode && this.conservation_status_obj.processing_status == 'Approved') || this.canAction && (this.canUnlock || this.canLock);
         }
     },
+    watch: {
+        canRefer: function (newVal, oldVal) {
+            // Had to add this hack as the select2 was not being removed when the parent div was removed
+            // from the DOM when the CS was approved
+            if (!newVal && Object.hasOwn(this.$refs, 'referees')) {
+                $(this.$refs.referees).select2('destroy');
+            }
+        },
+    },
     methods: {
         commaToNewline(s) {
             return s.replace(/[,;]/g, '\n');

From d0f837b06160944b28753dd71a83ab0f65f96faf Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Wed, 13 Nov 2024 16:58:21 +0800
Subject: [PATCH 74/83] npm update

---
 boranga/frontend/boranga/package-lock.json | 649 ++++++++++-----------
 1 file changed, 306 insertions(+), 343 deletions(-)

diff --git a/boranga/frontend/boranga/package-lock.json b/boranga/frontend/boranga/package-lock.json
index 7d2facb7..4f396c87 100644
--- a/boranga/frontend/boranga/package-lock.json
+++ b/boranga/frontend/boranga/package-lock.json
@@ -66,11 +66,12 @@
             }
         },
         "node_modules/@babel/code-frame": {
-            "version": "7.25.7",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.25.7.tgz",
-            "integrity": "sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==",
+            "version": "7.26.2",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+            "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
             "dependencies": {
-                "@babel/highlight": "^7.25.7",
+                "@babel/helper-validator-identifier": "^7.25.9",
+                "js-tokens": "^4.0.0",
                 "picocolors": "^1.0.0"
             },
             "engines": {
@@ -78,19 +79,20 @@
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.25.8",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.8.tgz",
-            "integrity": "sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==",
+            "version": "7.26.2",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz",
+            "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.25.7",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.7.tgz",
-            "integrity": "sha512-5Dqpl5fyV9pIAD62yK9P7fcA768uVPUyrQmqpqstHWgMma4feF1x/oFysBCVZLY5wJ2GkMUCdsNDnGZrPoR6rA==",
+            "version": "7.26.2",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
+            "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
             "dependencies": {
-                "@babel/types": "^7.25.7",
+                "@babel/parser": "^7.26.2",
+                "@babel/types": "^7.26.0",
                 "@jridgewell/gen-mapping": "^0.3.5",
                 "@jridgewell/trace-mapping": "^0.3.25",
                 "jsesc": "^3.0.2"
@@ -100,12 +102,12 @@
             }
         },
         "node_modules/@babel/helper-compilation-targets": {
-            "version": "7.25.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.7.tgz",
-            "integrity": "sha512-DniTEax0sv6isaw6qSQSfV4gVRNtw2rte8HHM45t9ZR0xILaufBRNkpMifCRiAPyvL4ACD6v0gfCwCmtOQaV4A==",
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
+            "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
             "dependencies": {
-                "@babel/compat-data": "^7.25.7",
-                "@babel/helper-validator-option": "^7.25.7",
+                "@babel/compat-data": "^7.25.9",
+                "@babel/helper-validator-option": "^7.25.9",
                 "browserslist": "^4.24.0",
                 "lru-cache": "^5.1.1",
                 "semver": "^6.3.1"
@@ -115,113 +117,35 @@
             }
         },
         "node_modules/@babel/helper-string-parser": {
-            "version": "7.25.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.7.tgz",
-            "integrity": "sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==",
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+            "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.25.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.7.tgz",
-            "integrity": "sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==",
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+            "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-validator-option": {
-            "version": "7.25.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.7.tgz",
-            "integrity": "sha512-ytbPLsm+GjArDYXJ8Ydr1c/KJuutjF2besPNbIZnZ6MKUxi/uTA22t2ymmA4WFjZFpjiAMO0xuuJPqK2nvDVfQ==",
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@babel/highlight": {
-            "version": "7.25.7",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.25.7.tgz",
-            "integrity": "sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==",
-            "dependencies": {
-                "@babel/helper-validator-identifier": "^7.25.7",
-                "chalk": "^2.4.2",
-                "js-tokens": "^4.0.0",
-                "picocolors": "^1.0.0"
-            },
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+            "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
-        "node_modules/@babel/highlight/node_modules/ansi-styles": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-            "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-            "dependencies": {
-                "color-convert": "^1.9.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/@babel/highlight/node_modules/chalk": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-            "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-            "dependencies": {
-                "ansi-styles": "^3.2.1",
-                "escape-string-regexp": "^1.0.5",
-                "supports-color": "^5.3.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/@babel/highlight/node_modules/color-convert": {
-            "version": "1.9.3",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-            "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-            "dependencies": {
-                "color-name": "1.1.3"
-            }
-        },
-        "node_modules/@babel/highlight/node_modules/color-name": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-            "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-        },
-        "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-            "engines": {
-                "node": ">=0.8.0"
-            }
-        },
-        "node_modules/@babel/highlight/node_modules/has-flag": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-            "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/@babel/highlight/node_modules/supports-color": {
-            "version": "5.5.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-            "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-            "dependencies": {
-                "has-flag": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/@babel/parser": {
-            "version": "7.25.8",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.8.tgz",
-            "integrity": "sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==",
+            "version": "7.26.2",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz",
+            "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
             "dependencies": {
-                "@babel/types": "^7.25.8"
+                "@babel/types": "^7.26.0"
             },
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -231,9 +155,9 @@
             }
         },
         "node_modules/@babel/runtime": {
-            "version": "7.25.7",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz",
-            "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==",
+            "version": "7.26.0",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
+            "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
             "dependencies": {
                 "regenerator-runtime": "^0.14.0"
             },
@@ -242,28 +166,28 @@
             }
         },
         "node_modules/@babel/template": {
-            "version": "7.25.7",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.7.tgz",
-            "integrity": "sha512-wRwtAgI3bAS+JGU2upWNL9lSlDcRCqD05BZ1n3X2ONLH1WilFP6O1otQjeMK/1g0pvYcXC7b/qVUB1keofjtZA==",
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+            "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
             "dependencies": {
-                "@babel/code-frame": "^7.25.7",
-                "@babel/parser": "^7.25.7",
-                "@babel/types": "^7.25.7"
+                "@babel/code-frame": "^7.25.9",
+                "@babel/parser": "^7.25.9",
+                "@babel/types": "^7.25.9"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.25.7",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.7.tgz",
-            "integrity": "sha512-jatJPT1Zjqvh/1FyJs6qAHL+Dzb7sTb+xr7Q+gM1b+1oBsMsQQ4FkVKb6dFlJvLlVssqkRzV05Jzervt9yhnzg==",
-            "dependencies": {
-                "@babel/code-frame": "^7.25.7",
-                "@babel/generator": "^7.25.7",
-                "@babel/parser": "^7.25.7",
-                "@babel/template": "^7.25.7",
-                "@babel/types": "^7.25.7",
+            "version": "7.25.9",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+            "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+            "dependencies": {
+                "@babel/code-frame": "^7.25.9",
+                "@babel/generator": "^7.25.9",
+                "@babel/parser": "^7.25.9",
+                "@babel/template": "^7.25.9",
+                "@babel/types": "^7.25.9",
                 "debug": "^4.3.1",
                 "globals": "^11.1.0"
             },
@@ -272,13 +196,12 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.25.8",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.8.tgz",
-            "integrity": "sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==",
+            "version": "7.26.0",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
+            "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
             "dependencies": {
-                "@babel/helper-string-parser": "^7.25.7",
-                "@babel/helper-validator-identifier": "^7.25.7",
-                "to-fast-properties": "^2.0.0"
+                "@babel/helper-string-parser": "^7.25.9",
+                "@babel/helper-validator-identifier": "^7.25.9"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -293,24 +216,27 @@
             }
         },
         "node_modules/@eslint-community/eslint-utils": {
-            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-            "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
+            "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
             "dev": true,
             "dependencies": {
-                "eslint-visitor-keys": "^3.3.0"
+                "eslint-visitor-keys": "^3.4.3"
             },
             "engines": {
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
             },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            },
             "peerDependencies": {
                 "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
             }
         },
         "node_modules/@eslint-community/regexpp": {
-            "version": "4.11.1",
-            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.1.tgz",
-            "integrity": "sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==",
+            "version": "4.12.1",
+            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
+            "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
             "dev": true,
             "engines": {
                 "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -2646,6 +2572,24 @@
             "resolved": "https://registry.npmjs.org/@types/d3-voronoi/-/d3-voronoi-1.1.12.tgz",
             "integrity": "sha512-DauBl25PKZZ0WVJr42a6CNvI6efsdzofl9sajqZr2Gf5Gu733WkDdUGiPkUHXiUvYGzNNlFQde2wdZdfQPG+yw=="
         },
+        "node_modules/@types/eslint": {
+            "version": "9.6.1",
+            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
+            "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+            "dependencies": {
+                "@types/estree": "*",
+                "@types/json-schema": "*"
+            }
+        },
+        "node_modules/@types/eslint-scope": {
+            "version": "3.7.7",
+            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
+            "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+            "dependencies": {
+                "@types/eslint": "*",
+                "@types/estree": "*"
+            }
+        },
         "node_modules/@types/estree": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -2663,9 +2607,9 @@
             }
         },
         "node_modules/@types/express-serve-static-core": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.0.tgz",
-            "integrity": "sha512-AbXMTZGt40T+KON9/Fdxx0B2WK5hsgxcfXJLr5bFpZ7b4JCex2WyQPTEKdXqfHiY5nKKBScZ7yCoO6Pvgxfvnw==",
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.1.tgz",
+            "integrity": "sha512-CRICJIl0N5cXDONAdlTv5ShATZ4HEwk6kDDIW2/w9qOWKg+NU/5F8wYRWCrONad0/UKkloNSmmyN/wX4rtpbVA==",
             "dependencies": {
                 "@types/node": "*",
                 "@types/qs": "*",
@@ -2741,11 +2685,11 @@
             "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag=="
         },
         "node_modules/@types/node": {
-            "version": "22.7.5",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
-            "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==",
+            "version": "22.9.0",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
+            "integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==",
             "dependencies": {
-                "undici-types": "~6.19.2"
+                "undici-types": "~6.19.8"
             }
         },
         "node_modules/@types/node-forge": {
@@ -2767,9 +2711,9 @@
             "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw=="
         },
         "node_modules/@types/qs": {
-            "version": "6.9.16",
-            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.16.tgz",
-            "integrity": "sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A=="
+            "version": "6.9.17",
+            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.17.tgz",
+            "integrity": "sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ=="
         },
         "node_modules/@types/range-parser": {
             "version": "1.2.7",
@@ -2825,9 +2769,9 @@
             }
         },
         "node_modules/@types/ws": {
-            "version": "8.5.12",
-            "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.12.tgz",
-            "integrity": "sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==",
+            "version": "8.5.13",
+            "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.13.tgz",
+            "integrity": "sha512-osM/gWBTPKgHV8XkTunnegTRIsvF6owmf5w+JtAfOw472dptdm0dlGv4xCt6GwQRcC2XVOvvRE/0bAoQcL2QkA==",
             "dependencies": {
                 "@types/node": "*"
             }
@@ -3169,133 +3113,133 @@
             "integrity": "sha512-Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA=="
         },
         "node_modules/@webassemblyjs/ast": {
-            "version": "1.12.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz",
-            "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==",
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
+            "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
             "dependencies": {
-                "@webassemblyjs/helper-numbers": "1.11.6",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
+                "@webassemblyjs/helper-numbers": "1.13.2",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
             }
         },
         "node_modules/@webassemblyjs/floating-point-hex-parser": {
-            "version": "1.11.6",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
-            "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw=="
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
+            "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA=="
         },
         "node_modules/@webassemblyjs/helper-api-error": {
-            "version": "1.11.6",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
-            "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q=="
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
+            "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ=="
         },
         "node_modules/@webassemblyjs/helper-buffer": {
-            "version": "1.12.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz",
-            "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw=="
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
+            "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA=="
         },
         "node_modules/@webassemblyjs/helper-numbers": {
-            "version": "1.11.6",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
-            "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
+            "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
             "dependencies": {
-                "@webassemblyjs/floating-point-hex-parser": "1.11.6",
-                "@webassemblyjs/helper-api-error": "1.11.6",
+                "@webassemblyjs/floating-point-hex-parser": "1.13.2",
+                "@webassemblyjs/helper-api-error": "1.13.2",
                 "@xtuc/long": "4.2.2"
             }
         },
         "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-            "version": "1.11.6",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
-            "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA=="
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
+            "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA=="
         },
         "node_modules/@webassemblyjs/helper-wasm-section": {
-            "version": "1.12.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz",
-            "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==",
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
+            "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
             "dependencies": {
-                "@webassemblyjs/ast": "1.12.1",
-                "@webassemblyjs/helper-buffer": "1.12.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-                "@webassemblyjs/wasm-gen": "1.12.1"
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-buffer": "1.14.1",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+                "@webassemblyjs/wasm-gen": "1.14.1"
             }
         },
         "node_modules/@webassemblyjs/ieee754": {
-            "version": "1.11.6",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
-            "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
+            "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
             "dependencies": {
                 "@xtuc/ieee754": "^1.2.0"
             }
         },
         "node_modules/@webassemblyjs/leb128": {
-            "version": "1.11.6",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
-            "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
+            "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
             "dependencies": {
                 "@xtuc/long": "4.2.2"
             }
         },
         "node_modules/@webassemblyjs/utf8": {
-            "version": "1.11.6",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
-            "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA=="
+            "version": "1.13.2",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
+            "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ=="
         },
         "node_modules/@webassemblyjs/wasm-edit": {
-            "version": "1.12.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz",
-            "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==",
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
+            "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
             "dependencies": {
-                "@webassemblyjs/ast": "1.12.1",
-                "@webassemblyjs/helper-buffer": "1.12.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-                "@webassemblyjs/helper-wasm-section": "1.12.1",
-                "@webassemblyjs/wasm-gen": "1.12.1",
-                "@webassemblyjs/wasm-opt": "1.12.1",
-                "@webassemblyjs/wasm-parser": "1.12.1",
-                "@webassemblyjs/wast-printer": "1.12.1"
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-buffer": "1.14.1",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+                "@webassemblyjs/helper-wasm-section": "1.14.1",
+                "@webassemblyjs/wasm-gen": "1.14.1",
+                "@webassemblyjs/wasm-opt": "1.14.1",
+                "@webassemblyjs/wasm-parser": "1.14.1",
+                "@webassemblyjs/wast-printer": "1.14.1"
             }
         },
         "node_modules/@webassemblyjs/wasm-gen": {
-            "version": "1.12.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz",
-            "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==",
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
+            "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
             "dependencies": {
-                "@webassemblyjs/ast": "1.12.1",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-                "@webassemblyjs/ieee754": "1.11.6",
-                "@webassemblyjs/leb128": "1.11.6",
-                "@webassemblyjs/utf8": "1.11.6"
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+                "@webassemblyjs/ieee754": "1.13.2",
+                "@webassemblyjs/leb128": "1.13.2",
+                "@webassemblyjs/utf8": "1.13.2"
             }
         },
         "node_modules/@webassemblyjs/wasm-opt": {
-            "version": "1.12.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz",
-            "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==",
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
+            "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
             "dependencies": {
-                "@webassemblyjs/ast": "1.12.1",
-                "@webassemblyjs/helper-buffer": "1.12.1",
-                "@webassemblyjs/wasm-gen": "1.12.1",
-                "@webassemblyjs/wasm-parser": "1.12.1"
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-buffer": "1.14.1",
+                "@webassemblyjs/wasm-gen": "1.14.1",
+                "@webassemblyjs/wasm-parser": "1.14.1"
             }
         },
         "node_modules/@webassemblyjs/wasm-parser": {
-            "version": "1.12.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz",
-            "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==",
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
+            "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
             "dependencies": {
-                "@webassemblyjs/ast": "1.12.1",
-                "@webassemblyjs/helper-api-error": "1.11.6",
-                "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
-                "@webassemblyjs/ieee754": "1.11.6",
-                "@webassemblyjs/leb128": "1.11.6",
-                "@webassemblyjs/utf8": "1.11.6"
+                "@webassemblyjs/ast": "1.14.1",
+                "@webassemblyjs/helper-api-error": "1.13.2",
+                "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
+                "@webassemblyjs/ieee754": "1.13.2",
+                "@webassemblyjs/leb128": "1.13.2",
+                "@webassemblyjs/utf8": "1.13.2"
             }
         },
         "node_modules/@webassemblyjs/wast-printer": {
-            "version": "1.12.1",
-            "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz",
-            "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==",
+            "version": "1.14.1",
+            "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
+            "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
             "dependencies": {
-                "@webassemblyjs/ast": "1.12.1",
+                "@webassemblyjs/ast": "1.14.1",
                 "@xtuc/long": "4.2.2"
             }
         },
@@ -3362,10 +3306,18 @@
                 "node": ">= 0.6"
             }
         },
+        "node_modules/accepts/node_modules/negotiator": {
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+            "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+            "engines": {
+                "node": ">= 0.6"
+            }
+        },
         "node_modules/acorn": {
-            "version": "8.12.1",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
-            "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
+            "version": "8.14.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
+            "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
             "bin": {
                 "acorn": "bin/acorn"
             },
@@ -3373,14 +3325,6 @@
                 "node": ">=0.4.0"
             }
         },
-        "node_modules/acorn-import-attributes": {
-            "version": "1.9.5",
-            "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
-            "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
-            "peerDependencies": {
-                "acorn": "^8"
-            }
-        },
         "node_modules/acorn-jsx": {
             "version": "5.3.2",
             "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -3790,14 +3734,6 @@
                 "npm": "1.2.8000 || >= 1.4.16"
             }
         },
-        "node_modules/body-parser/node_modules/bytes": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-            "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
         "node_modules/body-parser/node_modules/debug": {
             "version": "2.6.9",
             "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -3863,9 +3799,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
-            "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
+            "version": "4.24.2",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+            "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -3881,10 +3817,10 @@
                 }
             ],
             "dependencies": {
-                "caniuse-lite": "^1.0.30001663",
-                "electron-to-chromium": "^1.5.28",
+                "caniuse-lite": "^1.0.30001669",
+                "electron-to-chromium": "^1.5.41",
                 "node-releases": "^2.0.18",
-                "update-browserslist-db": "^1.1.0"
+                "update-browserslist-db": "^1.1.1"
             },
             "bin": {
                 "browserslist": "cli.js"
@@ -3922,9 +3858,9 @@
             "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
         },
         "node_modules/bytes": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-            "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+            "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
             "engines": {
                 "node": ">= 0.8"
             }
@@ -4034,9 +3970,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001668",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001668.tgz",
-            "integrity": "sha512-nWLrdxqCdblixUO+27JtGJJE/txpJlyUy5YN1u53wLZkP0emYCo5zgS6QYft7VUYR42LGgi/S5hdLZTrnyIddw==",
+            "version": "1.0.30001680",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz",
+            "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -4313,16 +4249,16 @@
             }
         },
         "node_modules/compression": {
-            "version": "1.7.4",
-            "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-            "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+            "version": "1.7.5",
+            "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.5.tgz",
+            "integrity": "sha512-bQJ0YRck5ak3LgtnpKkiabX5pNF7tMUh1BSy2ZBOTh0Dim0BUu6aPPwByIns6/A5Prh8PufSPerMDUklpzes2Q==",
             "dependencies": {
-                "accepts": "~1.3.5",
-                "bytes": "3.0.0",
-                "compressible": "~2.0.16",
+                "bytes": "3.1.2",
+                "compressible": "~2.0.18",
                 "debug": "2.6.9",
+                "negotiator": "~0.6.4",
                 "on-headers": "~1.0.2",
-                "safe-buffer": "5.1.2",
+                "safe-buffer": "5.2.1",
                 "vary": "~1.1.2"
             },
             "engines": {
@@ -4342,6 +4278,25 @@
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
             "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
         },
+        "node_modules/compression/node_modules/safe-buffer": {
+            "version": "5.2.1",
+            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ]
+        },
         "node_modules/concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -4480,9 +4435,9 @@
             }
         },
         "node_modules/cross-spawn": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+            "version": "7.0.5",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz",
+            "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==",
             "dependencies": {
                 "path-key": "^3.1.0",
                 "shebang-command": "^2.0.0",
@@ -5260,9 +5215,9 @@
             "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.38",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.38.tgz",
-            "integrity": "sha512-VbeVexmZ1IFh+5EfrYz1I0HTzHVIlJa112UEWhciPyeOcKJGeTv6N8WnG4wsQB81DGCaVEGhpSb6o6a8WYFXXg=="
+            "version": "1.5.57",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.57.tgz",
+            "integrity": "sha512-xS65H/tqgOwUBa5UmOuNSLuslDo7zho0y/lgQw35pnrqiZh7UOWHCeL/Bt6noJATbA6tpQJGCifsFsIRZj1Fqg=="
         },
         "node_modules/emoji-regex": {
             "version": "8.0.0",
@@ -5973,9 +5928,9 @@
             "dev": true
         },
         "node_modules/fast-uri": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.2.tgz",
-            "integrity": "sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row=="
+            "version": "3.0.3",
+            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.3.tgz",
+            "integrity": "sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw=="
         },
         "node_modules/fastest-levenshtein": {
             "version": "1.0.16",
@@ -6648,9 +6603,9 @@
             }
         },
         "node_modules/html-webpack-plugin": {
-            "version": "5.6.0",
-            "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.0.tgz",
-            "integrity": "sha512-iwaY4wzbe48AfKLZ/Cc8k0L+FKG6oSNRaZ8x5A/T/IVDGyXcbHncM9TdDa93wn0FsSm82FhTKW7f3vS61thXAw==",
+            "version": "5.6.3",
+            "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.3.tgz",
+            "integrity": "sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg==",
             "dependencies": {
                 "@types/html-minifier-terser": "^6.0.0",
                 "html-minifier-terser": "^6.0.2",
@@ -7762,9 +7717,9 @@
             }
         },
         "node_modules/mini-css-extract-plugin": {
-            "version": "2.9.1",
-            "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.1.tgz",
-            "integrity": "sha512-+Vyi+GCCOHnrJ2VPS+6aPoXN2k2jgUzDRhTFLjjTBn23qyXJXkjUWQgTL+mXpF5/A8ixLdCc6kWsoeOjKGejKQ==",
+            "version": "2.9.2",
+            "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
+            "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
             "dependencies": {
                 "schema-utils": "^4.0.0",
                 "tapable": "^2.2.1"
@@ -8020,9 +7975,9 @@
             "dev": true
         },
         "node_modules/negotiator": {
-            "version": "0.6.3",
-            "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-            "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+            "version": "0.6.4",
+            "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+            "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
             "engines": {
                 "node": ">= 0.6"
             }
@@ -8168,9 +8123,9 @@
             }
         },
         "node_modules/object-inspect": {
-            "version": "1.13.2",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
-            "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
+            "version": "1.13.3",
+            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz",
+            "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==",
             "engines": {
                 "node": ">= 0.4"
             },
@@ -8201,9 +8156,9 @@
             }
         },
         "node_modules/ol-ext": {
-            "version": "4.0.23",
-            "resolved": "https://registry.npmjs.org/ol-ext/-/ol-ext-4.0.23.tgz",
-            "integrity": "sha512-g1TBIEC9je2SoPx0qz8w4emCIRcOhz87eYxeszoLSWm6HMAbCQcymjmEIqpOHxL+R9BVKs4ar5KJShobv6510g==",
+            "version": "4.0.24",
+            "resolved": "https://registry.npmjs.org/ol-ext/-/ol-ext-4.0.24.tgz",
+            "integrity": "sha512-VEf1+mjvbe35mMsszVsugqcvWfeGcU8TwS+GgXm3nGYqiHR7CckX2DWmM9B94QCDnrJWKKXBicfInbkoe2xT7w==",
             "peerDependencies": {
                 "ol": ">= 5.3.0"
             }
@@ -8547,9 +8502,9 @@
             }
         },
         "node_modules/picocolors": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
-            "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw=="
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
         },
         "node_modules/picomatch": {
             "version": "2.3.1",
@@ -8675,9 +8630,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.47",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
-            "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+            "version": "8.4.49",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+            "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -8694,7 +8649,7 @@
             ],
             "dependencies": {
                 "nanoid": "^3.3.7",
-                "picocolors": "^1.1.0",
+                "picocolors": "^1.1.1",
                 "source-map-js": "^1.2.1"
             },
             "engines": {
@@ -8925,12 +8880,12 @@
             }
         },
         "node_modules/postcss-modules-local-by-default": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz",
-            "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==",
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.1.0.tgz",
+            "integrity": "sha512-rm0bdSv4jC3BDma3s9H19ZddW0aHX6EoqwDYU2IfZhRN+53QrufTRo2IdkAbRqLx4R2IYbZnbjKKxg4VN5oU9Q==",
             "dependencies": {
                 "icss-utils": "^5.0.0",
-                "postcss-selector-parser": "^6.0.2",
+                "postcss-selector-parser": "^7.0.0",
                 "postcss-value-parser": "^4.1.0"
             },
             "engines": {
@@ -8940,12 +8895,24 @@
                 "postcss": "^8.1.0"
             }
         },
+        "node_modules/postcss-modules-local-by-default/node_modules/postcss-selector-parser": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
+            "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
+            "dependencies": {
+                "cssesc": "^3.0.0",
+                "util-deprecate": "^1.0.2"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
         "node_modules/postcss-modules-scope": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz",
-            "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==",
+            "version": "3.2.1",
+            "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+            "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
             "dependencies": {
-                "postcss-selector-parser": "^6.0.4"
+                "postcss-selector-parser": "^7.0.0"
             },
             "engines": {
                 "node": "^10 || ^12 || >= 14"
@@ -8954,6 +8921,18 @@
                 "postcss": "^8.1.0"
             }
         },
+        "node_modules/postcss-modules-scope/node_modules/postcss-selector-parser": {
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
+            "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
+            "dependencies": {
+                "cssesc": "^3.0.0",
+                "util-deprecate": "^1.0.2"
+            },
+            "engines": {
+                "node": ">=4"
+            }
+        },
         "node_modules/postcss-modules-values": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
@@ -9314,9 +9293,9 @@
             }
         },
         "node_modules/proj4": {
-            "version": "2.12.1",
-            "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.12.1.tgz",
-            "integrity": "sha512-vmhP3hmstjXjzFwg8QXJwpoj4n7GVrXk3ZW3DzNK/Ur4cuwXq7ZiMXaWYvLYLQbX8n4MXgbwTr4lthOUZltBpA==",
+            "version": "2.14.0",
+            "resolved": "https://registry.npmjs.org/proj4/-/proj4-2.14.0.tgz",
+            "integrity": "sha512-fumDL50ThQ3issOLxaLYwv1j4LePEzYleY6vqsX+2uWOcvKzqpzHhtTTH18CvIDg+nf8MYl0/XF6yYyESKDi4w==",
             "dependencies": {
                 "mgrs": "1.0.0",
                 "wkt-parser": "^1.3.3"
@@ -9448,14 +9427,6 @@
                 "node": ">= 0.8"
             }
         },
-        "node_modules/raw-body/node_modules/bytes": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
-            "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
         "node_modules/rbush": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/rbush/-/rbush-3.0.1.tgz",
@@ -10390,9 +10361,9 @@
             }
         },
         "node_modules/sweetalert2": {
-            "version": "11.14.3",
-            "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.14.3.tgz",
-            "integrity": "sha512-6NuBHWJCv2gtw4y8PUXLB41hty+V6U2mKZMAvydL1IRPcORR0yuyq3cjFD/+ByrCk3muEFggbZX/x6HwmbVfbA==",
+            "version": "11.14.5",
+            "resolved": "https://registry.npmjs.org/sweetalert2/-/sweetalert2-11.14.5.tgz",
+            "integrity": "sha512-8MWk5uc/r6bWhiJWkUXyEuApfXAhSCZT8FFX7pZXL7YwaPxq+9Ynhi2dUzWkOFn9jvLjKj22CXuccZ+IHcnjvQ==",
             "funding": {
                 "type": "individual",
                 "url": "https://github.com/sponsors/limonte"
@@ -10407,9 +10378,9 @@
             }
         },
         "node_modules/terser": {
-            "version": "5.34.1",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.34.1.tgz",
-            "integrity": "sha512-FsJZ7iZLd/BXkz+4xrRTGJ26o/6VTjQytUk8b8OxkwcD2I+79VPJlz7qss1+zE7h8GNIScFqXcDyJ/KqBYZFVA==",
+            "version": "5.36.0",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.36.0.tgz",
+            "integrity": "sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==",
             "dependencies": {
                 "@jridgewell/source-map": "^0.3.3",
                 "acorn": "^8.8.2",
@@ -10536,14 +10507,6 @@
             "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz",
             "integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA=="
         },
-        "node_modules/to-fast-properties": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-            "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/to-regex-range": {
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -10611,9 +10574,9 @@
             "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
         },
         "node_modules/tslib": {
-            "version": "2.7.0",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
-            "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA=="
+            "version": "2.8.1",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+            "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
         },
         "node_modules/type": {
             "version": "2.7.3",
@@ -10901,17 +10864,17 @@
             "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
         },
         "node_modules/webpack": {
-            "version": "5.95.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.95.0.tgz",
-            "integrity": "sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==",
+            "version": "5.96.1",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.96.1.tgz",
+            "integrity": "sha512-l2LlBSvVZGhL4ZrPwyr8+37AunkcYj5qh8o6u2/2rzoPc8gxFJkLj1WxNgooi9pnoc06jh0BjuXnamM4qlujZA==",
             "dependencies": {
-                "@types/estree": "^1.0.5",
+                "@types/eslint-scope": "^3.7.7",
+                "@types/estree": "^1.0.6",
                 "@webassemblyjs/ast": "^1.12.1",
                 "@webassemblyjs/wasm-edit": "^1.12.1",
                 "@webassemblyjs/wasm-parser": "^1.12.1",
-                "acorn": "^8.7.1",
-                "acorn-import-attributes": "^1.9.5",
-                "browserslist": "^4.21.10",
+                "acorn": "^8.14.0",
+                "browserslist": "^4.24.0",
                 "chrome-trace-event": "^1.0.2",
                 "enhanced-resolve": "^5.17.1",
                 "es-module-lexer": "^1.2.1",
@@ -11342,9 +11305,9 @@
             "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ=="
         },
         "node_modules/wkt-parser": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.3.3.tgz",
-            "integrity": "sha512-ZnV3yH8/k58ZPACOXeiHaMuXIiaTk1t0hSUVisbO0t4RjA5wPpUytcxeyiN2h+LZRrmuHIh/1UlrR9e7DHDvTw=="
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/wkt-parser/-/wkt-parser-1.4.0.tgz",
+            "integrity": "sha512-qpwO7Ihds/YYDTi1aADFTI1Sm9YC/tTe3SHD24EeIlZxy7Ik6a1b4HOz7jAi0xdUAw487duqpo8OGu+Tf4nwlQ=="
         },
         "node_modules/word-wrap": {
             "version": "1.2.5",

From da7e343459ef19049ff7970c74d5ce9eddc4b4b0 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Thu, 14 Nov 2024 13:59:22 +0800
Subject: [PATCH 75/83] Replace lodgement_date with datetime_scheduled. Add
 fields for datetime_created, datetime_updated and datetime_completed.

---
 boranga/components/meetings/api.py            |  9 -----
 boranga/components/meetings/models.py         | 32 +++-------------
 boranga/components/meetings/serializers.py    |  5 ++-
 ...ate_meeting_datetime_scheduled_and_more.py | 38 +++++++++++++++++++
 4 files changed, 48 insertions(+), 36 deletions(-)
 create mode 100644 boranga/migrations/0496_rename_lodgement_date_meeting_datetime_scheduled_and_more.py

diff --git a/boranga/components/meetings/api.py b/boranga/components/meetings/api.py
index 1c4decf2..f84086d6 100644
--- a/boranga/components/meetings/api.py
+++ b/boranga/components/meetings/api.py
@@ -272,15 +272,6 @@ def meeting_save(self, request, *args, **kwargs):
 
         return Response(serializer.data)
 
-    @detail_route(methods=["PUT"], detail=True)
-    @renderer_classes((JSONRenderer,))
-    def submit(self, request, *args, **kwargs):
-        instance = self.get_object()
-        instance.submit(request, self)
-        instance.save()
-        serializer = self.get_serializer(instance)
-        return Response(serializer.data)
-
     @detail_route(methods=["PUT"], detail=True)
     @renderer_classes((JSONRenderer,))
     def schedule_meeting(self, request, *args, **kwargs):
diff --git a/boranga/components/meetings/models.py b/boranga/components/meetings/models.py
index 6d3e7c61..7dad5205 100644
--- a/boranga/components/meetings/models.py
+++ b/boranga/components/meetings/models.py
@@ -143,7 +143,10 @@ class Meeting(models.Model):
         choices=PROCESSING_STATUS_CHOICES,
         default=PROCESSING_STATUS_CHOICES[0][0],
     )
-    lodgement_date = models.DateTimeField(blank=True, null=True)
+    datetime_created = models.DateTimeField(auto_now_add=True)
+    datetime_updated = models.DateTimeField(auto_now=True)
+    datetime_scheduled = models.DateTimeField(blank=True, null=True)
+    datetime_completed = models.DateTimeField(blank=True, null=True)
     submitter = models.IntegerField(null=True)  # EmailUserRO
 
     class Meta:
@@ -258,29 +261,6 @@ def reinstate(self, request):
             request,
         )
 
-    @transaction.atomic
-    def submit(self, request, viewset):
-        if not self.can_user_edit:
-            raise ValidationError("You can't edit this meeting at this moment")
-
-        self.submitter = request.user.id
-        self.lodgement_date = timezone.now()
-
-        # Create a log entry for the meeting
-        self.log_user_action(
-            MeetingUserAction.ACTION_SUBMIT_MEETING.format(self.meeting_number), request
-        )
-
-        # Create a log entry for the submitter
-        request.user.log_user_action(
-            MeetingUserAction.ACTION_SUBMIT_MEETING.format(
-                self.meeting_number,
-            ),
-            request,
-        )
-
-        self.save()
-
     @transaction.atomic
     def schedule_meeting(self, request, viewset):
         if not self.processing_status == self.PROCESSING_STATUS_DRAFT:
@@ -288,7 +268,7 @@ def schedule_meeting(self, request, viewset):
 
         self.processing_status = self.PROCESSING_STATUS_SCHEDULED
         self.submitter = request.user.id
-        self.lodgement_date = timezone.now()
+        self.datetime_scheduled = timezone.now()
 
         # Create a log entry for the meeting
         self.log_user_action(
@@ -313,6 +293,7 @@ def complete_meeting(self, request, viewset):
 
         self.processing_status = self.PROCESSING_STATUS_COMPLETED
         self.submitter = request.user.id
+        self.datetime_completed = timezone.now()
 
         # Create a log entry for the meeting
         self.log_user_action(
@@ -366,7 +347,6 @@ def save(self, **kwargs):
 class MeetingUserAction(UserAction):
     ACTION_CREATE_MEETING = "Create meeting {}"
     ACTION_SAVE_MEETING = "Save Meeting {}"
-    ACTION_SUBMIT_MEETING = "Submit Meeting {}"
     ACTION_SCHEDULE_MEETING = "Schedule Meeting {}"
     ACTION_COMPLETE_MEETING = "Complete Meeting {}"
     ACTION_DISCARD_MEETING = "Discard Meeting {}"
diff --git a/boranga/components/meetings/serializers.py b/boranga/components/meetings/serializers.py
index 0be88143..5ac3cfaf 100644
--- a/boranga/components/meetings/serializers.py
+++ b/boranga/components/meetings/serializers.py
@@ -174,7 +174,10 @@ class Meta:
             "processing_status_display",
             "can_user_edit",
             "can_user_add_minutes",
-            "lodgement_date",
+            "datetime_created",
+            "datetime_updated",
+            "datetime_scheduled",
+            "datetime_completed",
             "submitter",
             "agenda_items_arr",
             "user_edit_mode",
diff --git a/boranga/migrations/0496_rename_lodgement_date_meeting_datetime_scheduled_and_more.py b/boranga/migrations/0496_rename_lodgement_date_meeting_datetime_scheduled_and_more.py
new file mode 100644
index 00000000..a8e8f711
--- /dev/null
+++ b/boranga/migrations/0496_rename_lodgement_date_meeting_datetime_scheduled_and_more.py
@@ -0,0 +1,38 @@
+# Generated by Django 5.0.9 on 2024-11-14 04:35
+
+import django.core.files.storage
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("boranga", "0495_conservationstatus_iucn_version_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="meeting",
+            old_name="lodgement_date",
+            new_name="datetime_scheduled",
+        ),
+        migrations.AddField(
+            model_name="meeting",
+            name="datetime_completed",
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="meeting",
+            name="datetime_created",
+            field=models.DateTimeField(
+                auto_now_add=True, default=django.utils.timezone.now
+            ),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="meeting",
+            name="datetime_updated",
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]

From dac1f9da94531407da9048df9987305d7ec7e102 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Thu, 14 Nov 2024 14:10:04 +0800
Subject: [PATCH 76/83] Add new meeting side panel component to show the person
 that created the meeting and the created, scheduled and completed dates.

---
 .../components/common/meeting_side_panel.vue  | 79 +++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 boranga/frontend/boranga/src/components/common/meeting_side_panel.vue

diff --git a/boranga/frontend/boranga/src/components/common/meeting_side_panel.vue b/boranga/frontend/boranga/src/components/common/meeting_side_panel.vue
new file mode 100644
index 00000000..e2b8ea7c
--- /dev/null
+++ b/boranga/frontend/boranga/src/components/common/meeting_side_panel.vue
@@ -0,0 +1,79 @@
+<template>
+    <div class="card card-default">
+        <div class="card-header">
+            Submission
+        </div>
+        <div class="card-body py-2">
+            <strong>Created by</strong><br />
+            {{ submitter_first_name }}
+            {{ submitter_last_name }}
+            <span v-if="is_new_contributor" class="badge bg-warning"><i class="bi bi-person-plus-fill"></i> New
+                Contributor</span>
+        </div>
+        <div v-if="datetime_created" class="card-body border-top py-2">
+            <strong>Created on</strong><br />
+            {{ datetime_created | formatDateDay }} <span class="fw-light">at</span> {{ datetime_created | formatDateTime }}
+        </div>
+        <div v-if="datetime_scheduled" class="card-body border-top py-2">
+            <strong>Scheduled on</strong><br />
+            {{ datetime_scheduled | formatDateDay }} <span class="fw-light">at</span> {{ datetime_scheduled | formatDateTime }}
+        </div>
+        <div v-if="datetime_completed" class="card-body border-top py-2">
+            <strong>Completed on</strong><br />
+            {{ datetime_completed | formatDateDay }} <span class="fw-light">at</span> {{ datetime_completed | formatDateTime }}
+        </div>
+        <div v-if="enableHistory" class="card-body border-top py-2">
+            <table class="table small-table">
+                <tr>
+                    <th>Lodgement</th>
+                    <th>Date</th>
+                    <th>Action</th>
+                </tr>
+            </table>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'MeetingSidePanel',
+    props: {
+        submitter_first_name: {
+            type: String,
+            default: '',
+        },
+        submitter_last_name: {
+            type: String,
+            default: '',
+        },
+        datetime_created: {
+            type: String,
+            default: null,
+        },
+        datetime_scheduled: {
+            type: String,
+            default: null,
+        },
+        datetime_completed: {
+            type: String,
+            default: null,
+        },
+        is_new_contributor: {
+            type: Boolean,
+            default: false,
+        },
+        enableHistory: {
+            type: Boolean,
+            default: false,
+        },
+    },
+    filters: {
+        formatDateDay: function (data) {
+            return data ? moment(data).format('DD/MM/YYYY') : '';
+        },
+        formatDateTime: function (data) {
+            return data ? moment(data).format('HH:mm:ss A') : '';
+        }
+    },
+}
+</script>

From c03330a23b2df885c37239c51be817317364fef3 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Thu, 14 Nov 2024 14:10:35 +0800
Subject: [PATCH 77/83] Add new meeting side panel.

---
 .../src/components/internal/meetings/meeting.vue   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/internal/meetings/meeting.vue b/boranga/frontend/boranga/src/components/internal/meetings/meeting.vue
index 5bf20f84..a8a299df 100644
--- a/boranga/frontend/boranga/src/components/internal/meetings/meeting.vue
+++ b/boranga/frontend/boranga/src/components/internal/meetings/meeting.vue
@@ -8,8 +8,10 @@
                 <CommsLogs :comms_url="comms_url" :logs_url="logs_url" :comms_add_url="comms_add_url"
                     :disable_add_entry="!meeting_obj.can_add_log" />
 
-                <Submission v-if="canSeeSubmission" :submitter_first_name="submitter_first_name"
-                    :submitter_last_name="submitter_last_name" :lodgement_date="meeting_obj.lodgement_date"
+                <MeetingSidePanel v-if="canSeeSidePanel" :submitter_first_name="submitter_first_name"
+                    :submitter_last_name="submitter_last_name" :datetime_created="meeting_obj.datetime_created"
+                    :datetime_scheduled="meeting_obj.datetime_scheduled"
+                    :datetime_completed="meeting_obj.datetime_completed"
                     class="mt-3" />
 
                 <div class="mt-3">
@@ -140,7 +142,7 @@
 import Vue from 'vue'
 import datatable from '@vue-utils/datatable.vue'
 import CommsLogs from '@common-utils/comms_logs.vue'
-import Submission from '@common-utils/submission.vue'
+import MeetingSidePanel from '@common-utils/meeting_side_panel.vue'
 import MeetingSection from './meeting_section.vue'
 import Minutes from './minutes.vue'
 import CSQueue from './cs_queue.vue';
@@ -175,7 +177,7 @@ export default {
     components: {
         datatable,
         CommsLogs,
-        Submission,
+        MeetingSidePanel,
         MeetingSection,
         Minutes,
         CSQueue,
@@ -225,8 +227,8 @@ export default {
                 //return this.meeting_obj.applicant_obj.email
             }
         },
-        canSeeSubmission: function () {
-            return this.meeting_obj && this.meeting_obj.lodgement_date
+        canSeeSidePanel: function () {
+            return this.meeting_obj && this.meeting_obj.datetime_scheduled
         },
         userCanEdit: function () {
             return this.meeting_obj.can_user_edit;

From 62b83bc50e9ee736ba996a5c4b3bb8b06da9cb8d Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Thu, 14 Nov 2024 14:56:02 +0800
Subject: [PATCH 78/83] Add most_recent_meeting property. Modify how most
 recent meeting is calculated based on datetime_udpated.

---
 boranga/components/conservation_status/models.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/boranga/components/conservation_status/models.py b/boranga/components/conservation_status/models.py
index 38053faf..e553c4ea 100644
--- a/boranga/components/conservation_status/models.py
+++ b/boranga/components/conservation_status/models.py
@@ -1223,15 +1223,24 @@ def amendment_requests(self):
         return qs
 
     @property
-    def most_recent_meeting_completed(self):
+    def most_recent_meeting(self):
         Meeting = apps.get_model("boranga", "Meeting")
-        meetings = Meeting.objects.exclude(lodgement_date__isnull=True).filter(
+        meetings = Meeting.objects.order_by("-datetime_updated").filter(
             agenda_items__conservation_status_id=self.id
         )
         if not meetings.exists():
-            return False
+            return None
 
         most_recent_meeting = meetings.first()
+        return most_recent_meeting
+
+    @property
+    def most_recent_meeting_completed(self):
+        Meeting = apps.get_model("boranga", "Meeting")
+        most_recent_meeting = self.most_recent_meeting
+
+        if not most_recent_meeting:
+            return False
 
         return (
             most_recent_meeting.processing_status == Meeting.PROCESSING_STATUS_COMPLETED

From d949b120ccd568cbfb3a662c2f0e3af100a0dad4 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Thu, 14 Nov 2024 14:57:56 +0800
Subject: [PATCH 79/83] Add most_recent_meeting and
 most_recent_meeting_completed fields to InternalConservationStatusSerializer.

---
 boranga/components/conservation_status/serializers.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/boranga/components/conservation_status/serializers.py b/boranga/components/conservation_status/serializers.py
index 88f91756..393bd9b7 100644
--- a/boranga/components/conservation_status/serializers.py
+++ b/boranga/components/conservation_status/serializers.py
@@ -18,6 +18,7 @@
     CommunicationLogEntrySerializer,
     EmailUserSerializer,
 )
+from boranga.components.meetings.serializers import MeetingSerializer
 from boranga.components.species_and_communities.models import CommunityTaxonomy
 from boranga.components.users.serializers import SubmitterInformationSerializer
 from boranga.helpers import (
@@ -824,6 +825,7 @@ class InternalConservationStatusSerializer(BaseConservationStatusSerializer):
     community_name = serializers.CharField(
         source="community.taxonomy.community_name", allow_null=True
     )
+    most_recent_meeting = MeetingSerializer(read_only=True, allow_null=True)
 
     class Meta:
         model = ConservationStatus
@@ -896,6 +898,8 @@ class Meta:
             "public_consultation",
             "public_consultation_start_date",
             "public_consultation_end_date",
+            "most_recent_meeting",
+            "most_recent_meeting_completed",
         )
 
     def get_submitter(self, obj):

From 86e9579db9904acd6109c46d8c0353686c030821 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Thu, 14 Nov 2024 14:58:25 +0800
Subject: [PATCH 80/83] Minor wording change.

---
 .../boranga/src/components/common/meeting_side_panel.vue        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boranga/frontend/boranga/src/components/common/meeting_side_panel.vue b/boranga/frontend/boranga/src/components/common/meeting_side_panel.vue
index e2b8ea7c..96cb29a0 100644
--- a/boranga/frontend/boranga/src/components/common/meeting_side_panel.vue
+++ b/boranga/frontend/boranga/src/components/common/meeting_side_panel.vue
@@ -19,7 +19,7 @@
             {{ datetime_scheduled | formatDateDay }} <span class="fw-light">at</span> {{ datetime_scheduled | formatDateTime }}
         </div>
         <div v-if="datetime_completed" class="card-body border-top py-2">
-            <strong>Completed on</strong><br />
+            <strong>Marked as Completed on</strong><br />
             {{ datetime_completed | formatDateDay }} <span class="fw-light">at</span> {{ datetime_completed | formatDateTime }}
         </div>
         <div v-if="enableHistory" class="card-body border-top py-2">

From ed3d93738ee4d20279ad00f3464e10c334856bfa Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Thu, 14 Nov 2024 14:59:33 +0800
Subject: [PATCH 81/83] Wording change.

---
 .../boranga/src/components/internal/meetings/cs_queue.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boranga/frontend/boranga/src/components/internal/meetings/cs_queue.vue b/boranga/frontend/boranga/src/components/internal/meetings/cs_queue.vue
index ef6c9295..0bb77aa3 100644
--- a/boranga/frontend/boranga/src/components/internal/meetings/cs_queue.vue
+++ b/boranga/frontend/boranga/src/components/internal/meetings/cs_queue.vue
@@ -251,7 +251,7 @@ export default {
             let vm = this;
             swal.fire({
                 title: "Remove Agenda Item",
-                html: "<p>Are you sure?</p><p>This action will change the CS status back to 'Ready For Agenda'. If you wish to Defer or send it Back to the Assessor, you can do so from the CS form (which will open in a new tab for you).</p>",
+                html: "<p>Are you sure?</p><p>This action will change the CS status back to 'Ready For Agenda'.</p><p>If you wish to Defer the CS and send it Back to the Assessor, you can do so from the CS details page at any time.</p>",
                 icon: "question",
                 showCancelButton: true,
                 confirmButtonText: 'Remove Agenda Item',

From 50e3801a87d655310e1f4ee90652c91b2dfecf42 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Thu, 14 Nov 2024 15:01:03 +0800
Subject: [PATCH 82/83] Add validation for mandatory attendees field when
 meeting is not committee meeting. Hide the actions heading in the workflow
 panel if there are no actions available. Show the side panel as long as there
 is a submitter for the meeting.

---
 .../src/components/internal/meetings/meeting.vue      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/internal/meetings/meeting.vue b/boranga/frontend/boranga/src/components/internal/meetings/meeting.vue
index a8a299df..1d854631 100644
--- a/boranga/frontend/boranga/src/components/internal/meetings/meeting.vue
+++ b/boranga/frontend/boranga/src/components/internal/meetings/meeting.vue
@@ -27,7 +27,7 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="card-body border-top">
+                        <div  v-if="showActions" class="card-body border-top">
                             <div class="row">
                                 <div class="col-sm-12">
                                     <div class="col-sm-12">
@@ -228,7 +228,7 @@ export default {
             }
         },
         canSeeSidePanel: function () {
-            return this.meeting_obj && this.meeting_obj.datetime_scheduled
+            return this.meeting_obj && this.meeting_obj.submitter
         },
         userCanEdit: function () {
             return this.meeting_obj.can_user_edit;
@@ -242,6 +242,9 @@ export default {
         userCanReinstate: function () {
             return this.meeting_obj.can_user_reinstate;
         },
+        showActions: function () {
+            return this.userCanSchedule || this.userCanComplete || this.userCanReinstate;
+        }
     },
     methods: {
         commaToNewline(s) {
@@ -373,6 +376,10 @@ export default {
                     //  to also check the start and end date of meeting validation befor saving
                     blank_fields.push('Please select at least two committee members who will be attending');
                 }
+            } else {
+                if (vm.meeting_obj.attendees == null || vm.meeting_obj.attendees == '') {
+                    blank_fields.push(' Please enter some attendees')
+                }
             }
             if (vm.meeting_obj.location_id == null || vm.meeting_obj.location_id == '') {
                 blank_fields.push(' Please select Location')

From 1ff06303afb175dfc866c070b066b1908e2012d4 Mon Sep 17 00:00:00 2001
From: Oak McIlwain <oak.mcilwain@dbca.wa.gov.au>
Date: Thu, 14 Nov 2024 15:02:57 +0800
Subject: [PATCH 83/83] Add extra status info about linked meeting if CS is On
 Agenda. Only show actions for On Agenda CS when the linked meeting has been
 completed.

---
 .../conservation_status.vue                   | 64 ++++++++++++++-----
 1 file changed, 48 insertions(+), 16 deletions(-)

diff --git a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
index 2968333b..23f19127 100644
--- a/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
+++ b/boranga/frontend/boranga/src/components/internal/conservation_status/conservation_status.vue
@@ -8,7 +8,7 @@
             </h3>
             <div class="col-md-3">
                 <CommsLogs :comms_url="comms_url" :logs_url="logs_url" :comms_add_url="comms_add_url"
-                    :disable_add_entry="!conservation_status_obj.can_add_log" class="mb-3"/>
+                    :disable_add_entry="!conservation_status_obj.can_add_log" class="mb-3" />
 
                 <Submission :submitter_first_name="submitter_first_name" :submitter_last_name="submitter_last_name"
                     :lodgement_date="conservation_status_obj.lodgement_date"
@@ -21,6 +21,21 @@
                     <div class="card-body">
                         <strong>Status</strong><br />
                         {{ conservation_status_obj.processing_status }}
+                        <template
+                            v-if="conservation_status_obj.processing_status == 'On Agenda' && conservation_status_obj.most_recent_meeting">
+                            <p class="my-2">
+                                <strong>
+                                    <template v-if="conservation_status_obj.most_recent_meeting_completed">Meeting
+                                        Completed<i class="bi bi-check-circle-fill ms-2 text-success"></i></template>
+                                    <template v-else>Awaiting Meeting<i class="bi bi-hourglass-split ms-2 text-secondary"></i></template>
+                                </strong><br />
+                                <a :href="`/internal/meetings/${conservation_status_obj.most_recent_meeting.id}?action=edit`"
+                                    target="_blank">{{
+                                        conservation_status_obj.most_recent_meeting.title ?
+                                            conservation_status_obj.most_recent_meeting.title : 'Meeting
+                                    Draft' }}<i class="bi bi-box-arrow-up-right ms-2"></i></a>
+                            </p>
+                        </template>
                     </div>
                     <div v-if="conservation_status_obj.processing_status != 'Draft'" class="card-body border-top">
                         <div class="row">
@@ -105,20 +120,20 @@
                                                         data-bs-trigger="hover focus" :data-bs-content="'Send a reminder to ' +
                                                             external_referee_invite.full_name
                                                             " data-bs-placement="bottom" @click.prevent="
-                                                                    remindExternalReferee(
-                                                                        external_referee_invite
-                                                                    )
-                                                                    "><i class="fa fa-bell text-warning"
+                                                                remindExternalReferee(
+                                                                    external_referee_invite
+                                                                )
+                                                                "><i class="fa fa-bell text-warning"
                                                             aria-hidden="true"></i>
                                                     </a>
                                                     <a role="button" data-bs-toggle="popover"
                                                         data-bs-trigger="hover focus" :data-bs-content="'Retract the external referee invite sent to ' +
                                                             external_referee_invite.full_name
                                                             " data-bs-placement="bottom" @click.prevent="
-                                                                    retractExternalRefereeInvite(
-                                                                        external_referee_invite
-                                                                    )
-                                                                    "><i class="fa fa-times-circle text-danger"
+                                                                retractExternalRefereeInvite(
+                                                                    external_referee_invite
+                                                                )
+                                                                "><i class="fa fa-times-circle text-danger"
                                                             aria-hidden="true"></i>
                                                     </a>
                                                 </td>
@@ -283,8 +298,7 @@
                                         </div>
                                     </div>
                                 </template>
-                                <template
-                                    v-if="conservation_status_obj.processing_status == 'On Agenda' && conservation_status_obj.approval_level == 'minister'">
+                                <template v-if="canApproveOrDeclineOnAgendaCS">
                                     <div class="row mb-2">
                                         <div class="col-sm-12">
                                             <button style="width:90%;" class="btn btn-primary"
@@ -595,7 +609,7 @@ export default {
             if (this.isFinalised) {
                 return this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_approver;
             }
-            else if (['Proposed For Agenda', 'Ready For Agenda', 'On Agenda', 'Proposed DeListed', 'Unlocked'].includes(this.conservation_status_obj.processing_status)) {
+            else if (['Proposed For Agenda', 'Ready For Agenda', 'Proposed DeListed', 'Unlocked'].includes(this.conservation_status_obj.processing_status)) {
                 return this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_approver
                     && this.conservation_status_obj.assessor_mode.assessor_can_assess;
             }
@@ -609,9 +623,14 @@ export default {
                         this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_officer
                     );
             }
+            else if (this.conservation_status_obj.processing_status == 'On Agenda') {
+                return this.conservation_status_obj.assessor_mode.assessor_can_assess && this.conservation_status_obj.most_recent_meeting_completed &&
+                    (
+                        this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_approver
+                    );
+            }
             else {
-                return this.conservation_status_obj
-                    && this.conservation_status_obj.processing_status == 'Draft'
+                return this.conservation_status_obj.processing_status == 'Draft'
                     && this.conservation_status_obj.internal_application
                     && this.conservation_status_obj.internal_user_edit
             }
@@ -640,13 +659,26 @@ export default {
                     this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_officer
                 );
         },
+        canApproveOrDeclineOnAgendaCS: function () {
+            return this.conservation_status_obj &&
+                this.conservation_status_obj.approval_level == 'minister' &&
+                this.conservation_status_obj.processing_status == 'On Agenda' &&
+                this.conservation_status_obj.most_recent_meeting_completed &&
+                this.conservation_status_obj.assessor_mode.assessor_can_assess &&
+                (
+                    this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_officer
+                );
+        },
         canDefer: function () {
             return this.conservation_status_obj &&
                 [
                     constants.PROPOSAL_STATUS.WITH_ASSESSOR.TEXT,
                     constants.PROPOSAL_STATUS.READY_FOR_AGENDA.TEXT,
-                    constants.PROPOSAL_STATUS.ON_AGENDA.TEXT,
-                ].includes(this.conservation_status_obj.processing_status) &&
+                ].includes(this.conservation_status_obj.processing_status) ||
+                (
+                    this.conservation_status_obj.processing_status == constants.PROPOSAL_STATUS.ON_AGENDA.TEXT &&
+                    this.conservation_status_obj.most_recent_meeting_completed
+                ) &&
                 this.conservation_status_obj.assessor_mode.assessor_can_assess &&
                 (
                     this.conservation_status_obj.current_assessor.id == this.conservation_status_obj.assigned_officer ||