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(), 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(){