From e48d486f8ae75cdbaae8398cad92ef4ad9e1c59f Mon Sep 17 00:00:00 2001
From: katsufumi shibata <katsufumi.shibata@dbca.wa.gov.au>
Date: Wed, 4 Oct 2023 10:10:58 +0800
Subject: [PATCH 1/2] Uppercase for subutb, state and vessel registration
 number in the sticker spreadsheet

---
 mooringlicensing/components/main/utils.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mooringlicensing/components/main/utils.py b/mooringlicensing/components/main/utils.py
index 04f6f17a..bd25c243 100755
--- a/mooringlicensing/components/main/utils.py
+++ b/mooringlicensing/components/main/utils.py
@@ -280,12 +280,12 @@ def sticker_export():
                         sticker.last_name,
                         sticker.postal_address_line1,
                         sticker.postal_address_line2,
-                        sticker.postal_address_suburb,
-                        sticker.postal_address_state,
+                        sticker.postal_address_suburb.upper(),
+                        sticker.postal_address_state.upper(),
                         sticker.postal_address_postcode,
                         sticker.approval.description,
                         sticker.number,
-                        sticker.vessel_registration_number,
+                        sticker.vessel_registration_number.upper(),
                         mooring_names,
                         sticker.get_sticker_colour(),
                         sticker.get_white_info(),

From 70eae55d6ea21d3e6a67c4d0e9aa9b495c6408a2 Mon Sep 17 00:00:00 2001
From: katsufumi shibata <katsufumi.shibata@dbca.wa.gov.au>
Date: Wed, 4 Oct 2023 11:45:03 +0800
Subject: [PATCH 2/2] Fix a bug where applications cannot be searched by
 applicant name

---
 .../src/components/common/table_proposals.vue                | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mooringlicensing/frontend/mooringlicensing/src/components/common/table_proposals.vue b/mooringlicensing/frontend/mooringlicensing/src/components/common/table_proposals.vue
index 58e84a84..508f4bd0 100644
--- a/mooringlicensing/frontend/mooringlicensing/src/components/common/table_proposals.vue
+++ b/mooringlicensing/frontend/mooringlicensing/src/components/common/table_proposals.vue
@@ -303,7 +303,7 @@ export default {
             return {
                 data: "id",
                 orderable: false,
-                searchable: false,
+                searchable: true,
                 visible: true,
                 'render': function(row, type, full){
                     if (full.submitter){
@@ -311,7 +311,8 @@ export default {
                     }
                     return ''
                 },
-                name: 'submitter__first_name, submitter__last_name',
+                // name: 'submitter__first_name, submitter__last_name',
+                name: 'proposalapplicant__first_name, proposalapplicant__last_name, proposalapplicant__email'
             }
         },
         column_assigned_to: function(){