Skip to content

Commit

Permalink
Ccfri 4321 rfi UI fix (#609)
Browse files Browse the repository at this point in the history
* UI updates for RFI , fix bug where rows containing dates do not delete properly

* fix next button on existing fees correct page

* fixed alignment on ul
  • Loading branch information
jenbeckett authored Jan 3, 2025
1 parent e69a140 commit 976d69a
Show file tree
Hide file tree
Showing 9 changed files with 182 additions and 181 deletions.
5 changes: 5 additions & 0 deletions backend/src/util/mapping/Mappings.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ const ServiceExpansionDetailsMappings = [
{ back: 'ccof_paymentfrequencydetails', front: 'frequency' },
{ back: 'ccof_dateofchange', front: 'date' },
{ back: 'ccof_amountofexpense', front: 'expense' },
{ back: 'ccof_rfipfiserviceexpansiondetailid', front: 'id' },
];

const DCSWageIncreaseMappings = [
Expand All @@ -117,13 +118,15 @@ const DCSWageIncreaseMappings = [
{ back: 'ccof_wageafterincrease', front: 'wageAfterIncrease' },
{ back: 'ccof_averagehoursperweek', front: 'averageHours' },
{ back: 'ccof_wageincreasedate', front: 'wageDate' },
{ back: 'ccof_rfi_pfi_dcs_wi_detailid', front: 'id' },
];

const ExpenseInformationMappings = [
{ back: 'ccof_expensedescription', front: 'description' },
{ back: 'ccof_dateofexpense', front: 'date' },
{ back: 'ccof_paymentfrequencydetails', front: 'frequency' },
{ back: 'ccof_expenseamountt', front: 'expense' },
{ back: 'ccof_rfipfiexpenseinfoid', front: 'id' },
];

const OtherFundingProgramMappings = [
Expand All @@ -132,13 +135,15 @@ const OtherFundingProgramMappings = [
{ back: 'ccof_statusofapplication', front: 'status' },
{ back: 'ccof_amountreceived', front: 'amount' },
{ back: 'ccof_expense', front: 'expenses' },
{ back: 'ccof_rfi_pfi_other_fundingid', front: 'id' },
];

const IndigenousExpenseMappings = [
{ back: 'ccof_expensedescription', front: 'description' },
{ back: 'ccof_date', front: 'date' },
{ back: 'ccof_paymentfrequency', front: 'frequency' },
{ back: 'ccof_amount', front: 'expense' },
{ back: 'ccof_rfipfiserviceexpansionindigenouscommunityid', front: 'id' },
];

const NMFApplicationMappings = [
Expand Down
17 changes: 14 additions & 3 deletions frontend/public/styles/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,22 @@ input[type="number"] {
color: #ff5252;
}

.add-file-button {
.font-large {
font-size: 18px;
}

.font-regular {
font-size: 16px;
}

.font-small {
font-size: 14px;
}

.font-xsmall {
font-size: 12px;
}

.border-right {
border-right: 0.5px solid lightgray;
}
Expand All @@ -133,10 +145,9 @@ input[type="number"] {
}

.span-label {
color: grey;
color: #636262;
font-style: normal;
font-family: "BCSans", Verdana, Arial, sans-serif;
font-size: 14px;
}

div.text-h4,
Expand Down
9 changes: 1 addition & 8 deletions frontend/src/components/RFI/RFIDocumentUpload.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,7 @@
>
<template #top>
<v-col flex>
<AppButton
v-if="!isLocked"
id="add-new-file"
:primary="false"
size="large"
class="add-file-button mb-2"
@click="addNew"
>
<AppButton v-if="!isLocked" id="add-new-file" :primary="false" size="large" class="mb-2" @click="addNew">
Add File
</AppButton>
</v-col>
Expand Down
Loading

0 comments on commit 976d69a

Please sign in to comment.