From b0ae4d40267a73a43f2ad45e4221c8827766d168 Mon Sep 17 00:00:00 2001 From: Le Date: Thu, 17 Oct 2024 16:04:27 -0700 Subject: [PATCH] ofmcc-6113 - move funding envelope assitance requests --- .../funding/FundingAllocationTab.vue | 61 +++++++++++++++++++ .../components/funding/FundingSearchCard.vue | 26 +++++++- .../components/messages/NewRequestDialog.vue | 19 +++++- frontend/src/utils/constants.js | 1 + .../src/views/funding/FundingOverviewView.vue | 10 ++- 5 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 frontend/src/components/funding/FundingAllocationTab.vue diff --git a/frontend/src/components/funding/FundingAllocationTab.vue b/frontend/src/components/funding/FundingAllocationTab.vue new file mode 100644 index 00000000..a8703164 --- /dev/null +++ b/frontend/src/components/funding/FundingAllocationTab.vue @@ -0,0 +1,61 @@ + + + diff --git a/frontend/src/components/funding/FundingSearchCard.vue b/frontend/src/components/funding/FundingSearchCard.vue index 1606425b..101b7933 100644 --- a/frontend/src/components/funding/FundingSearchCard.vue +++ b/frontend/src/components/funding/FundingSearchCard.vue @@ -5,10 +5,22 @@ - Facility(s): + {{ selectSingleFacility ? 'Facility:' : 'Facility(s):' }} + - + Date: @@ -133,6 +145,14 @@ export default { type: String, default: null, }, + showDateFilter: { + type: Boolean, + default: true, + }, + selectSingleFacility: { + type: Boolean, + default: false, + }, }, emits: ['search'], @@ -205,7 +225,7 @@ export default { methods: { resetFilter() { - this.selectedFacilities = this.userInfo?.facilities + this.selectedFacilities = this.selectSingleFacility ? this.userInfo?.facilities[0] : this.userInfo?.facilities this.selectedDateFilterType = this.defaultDateFilter this.selectedPaymentFilterTypes = this.paymentTypes this.selectedDateFrom = null diff --git a/frontend/src/components/messages/NewRequestDialog.vue b/frontend/src/components/messages/NewRequestDialog.vue index 3ef6faba..6623aba6 100644 --- a/frontend/src/components/messages/NewRequestDialog.vue +++ b/frontend/src/components/messages/NewRequestDialog.vue @@ -211,6 +211,15 @@ Request description: +
+
+ Each Funding Envelope has restrictions for how the funding can be used and if or how it can be re-allocated between the Funding Envelopes and between line items within the Funding + Envelopes, as applicable. Please see the Policy and Procedures Manual for detailed information. +
+
+ In the box below, please outline your request to re-allocate funds, including the amount and the envelopes you are moving funds between. Please also attach any relevant documents. +
+
0 }, @@ -503,7 +515,7 @@ export default { return this.documentsToUpload.length }, isMultipleFacilities() { - return !(this.isAccountMaintenanceRequest || this.isIrregularExpenseRequest || this.isReportingRequest) + return !(this.isAccountMaintenanceRequest || this.isFundingEnvelopeRequest || this.isIrregularExpenseRequest || this.isReportingRequest) }, facilityLabel() { return `Facility${this.isMultipleFacilities ? '(s)' : ''}:` @@ -858,4 +870,9 @@ export default { .v-messages { opacity: 1; } + +:deep(.v-select__selection-text) { + white-space: normal; /* Wraps the selected item text */ + word-wrap: break-word; +} diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js index 34c5955e..ae138566 100644 --- a/frontend/src/utils/constants.js +++ b/frontend/src/utils/constants.js @@ -132,6 +132,7 @@ export const SUPPLEMENTARY_TYPES = Object.freeze({ export const REQUEST_CATEGORY_NAMES = Object.freeze({ ACCOUNT_MAINTENANCE: 'Account Maintenance', + FUNDING_ENVELOPE_CR: 'Funding Envelope Change Request', REPORTING: 'Reporting', IRREGULAR_EXPENSES: 'Irregular Expense', }) diff --git a/frontend/src/views/funding/FundingOverviewView.vue b/frontend/src/views/funding/FundingOverviewView.vue index d9aa0cec..28e7d237 100644 --- a/frontend/src/views/funding/FundingOverviewView.vue +++ b/frontend/src/views/funding/FundingOverviewView.vue @@ -12,6 +12,10 @@ mdi-history Payment Records + + mdi-call-split + Funding Allocation + @@ -21,6 +25,9 @@ + + + @@ -32,13 +39,14 @@