diff --git a/backend/src/components/message.js b/backend/src/components/message.js index 1bce6b6c..a5d7642a 100644 --- a/backend/src/components/message.js +++ b/backend/src/components/message.js @@ -16,7 +16,7 @@ function mapMessageObjectForFront(data) { function mapAssistanceRequestObjectForBack(data) { let assistanceRequest = new MappableObjectForBack(data, AssistanceRequestMappings).toJSON() - if (assistanceRequest['ofm_contact_method'] == '1') delete assistanceRequest['ofm_telephone'] + if (assistanceRequest['ofm_contact_method'] === '1') delete assistanceRequest['ofm_telephone'] assistanceRequest['ofm_request_category@odata.bind'] = `/ofm_request_categories(${data?.requestCategoryId})` assistanceRequest['ofm_contact@odata.bind'] = `/contacts(${data?.contactId})` assistanceRequest['ofm_facility_request_request'] = [] diff --git a/frontend/src/components/messages/MessagesTab.vue b/frontend/src/components/messages/MessagesTab.vue index 0a42c600..16555a6e 100644 --- a/frontend/src/components/messages/MessagesTab.vue +++ b/frontend/src/components/messages/MessagesTab.vue @@ -1,17 +1,83 @@ - - - mdi-email-plus-outline - New message - - + + + + + + + + + mdi-email-plus-outline + New message + + + mdi-email-outline + Mark unread + + + mdi-email-open-outline + Mark read + + + + + + + + + + + + + + + + + + + + - + diff --git a/frontend/src/components/messages/NewRequestConfirmationDialog.vue b/frontend/src/components/messages/NewRequestConfirmationDialog.vue index 78ce8935..64b1d692 100644 --- a/frontend/src/components/messages/NewRequestConfirmationDialog.vue +++ b/frontend/src/components/messages/NewRequestConfirmationDialog.vue @@ -1,18 +1,18 @@ - + - + - Your message has been submitted. - Reference: {{ referenceNumber }} - Typical response times are 3-5 business days. + Your message has been submitted. + Reference: {{ referenceNumber }} + Typical response times are 3-5 business days. - Return to home - View messages + Return to home + View messages @@ -21,13 +21,12 @@ diff --git a/frontend/src/components/ui/AppDialog.vue b/frontend/src/components/ui/AppDialog.vue index 74583419..d0fd6e83 100644 --- a/frontend/src/components/ui/AppDialog.vue +++ b/frontend/src/components/ui/AppDialog.vue @@ -1,24 +1,20 @@ - - - - - - {{ title }} - - - - - - - - - - - - - + + + + {{ title }} + + + + + + + + + + + + diff --git a/frontend/src/stores/app.js b/frontend/src/stores/app.js index 7c3d0a15..1093cd2a 100644 --- a/frontend/src/stores/app.js +++ b/frontend/src/stores/app.js @@ -23,14 +23,11 @@ export const useAppStore = defineStore('app', { config: '', }), actions: { - setRequestCategories(requestCategories) { - this.requestCategories = requestCategories - }, async getLookupInfo() { if (localStorage.getItem('jwtToken')) { // DONT Call api if there is no token. const lookupInfo = await ApiService.getLookupInfo() - this.setRequestCategories(lookupInfo.data?.requestCategories) + this.requestCategories = lookupInfo?.data?.requestCategories } }, async setConfig(config) { diff --git a/frontend/src/stores/messages.js b/frontend/src/stores/messages.js index b591188f..21a2caa4 100644 --- a/frontend/src/stores/messages.js +++ b/frontend/src/stores/messages.js @@ -61,7 +61,7 @@ export const useMessagesStore = defineStore('messages', { console.log(error) } }, - async submitNewAssistanceRequest(payload) { + async createNewAssistanceRequest(payload) { try { let response = await ApiService.apiAxios.post(ApiRoutes.MESSAGE + '/newAssistanceRequest', payload) return response?.data diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js index 1a28f901..bd7336a4 100644 --- a/frontend/src/utils/constants.js +++ b/frontend/src/utils/constants.js @@ -18,10 +18,6 @@ export const ApiRoutes = Object.freeze({ NOTICE: baseRoot + '/notifications', }) -export const PATHS = { - HOME: '/', -} - export const ACCOUNT_TYPE = Object.freeze({ FACILITY: 100000001, ORGANIZATION: 100000000,
Your message has been submitted.
Reference: {{ referenceNumber }}
Typical response times are 3-5 business days.