Skip to content

Commit 976d69a

Browse files
authored
Ccfri 4321 rfi UI fix (#609)
* 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
1 parent e69a140 commit 976d69a

File tree

9 files changed

+182
-181
lines changed

9 files changed

+182
-181
lines changed

backend/src/util/mapping/Mappings.js

+5
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ const ServiceExpansionDetailsMappings = [
107107
{ back: 'ccof_paymentfrequencydetails', front: 'frequency' },
108108
{ back: 'ccof_dateofchange', front: 'date' },
109109
{ back: 'ccof_amountofexpense', front: 'expense' },
110+
{ back: 'ccof_rfipfiserviceexpansiondetailid', front: 'id' },
110111
];
111112

112113
const DCSWageIncreaseMappings = [
@@ -117,13 +118,15 @@ const DCSWageIncreaseMappings = [
117118
{ back: 'ccof_wageafterincrease', front: 'wageAfterIncrease' },
118119
{ back: 'ccof_averagehoursperweek', front: 'averageHours' },
119120
{ back: 'ccof_wageincreasedate', front: 'wageDate' },
121+
{ back: 'ccof_rfi_pfi_dcs_wi_detailid', front: 'id' },
120122
];
121123

122124
const ExpenseInformationMappings = [
123125
{ back: 'ccof_expensedescription', front: 'description' },
124126
{ back: 'ccof_dateofexpense', front: 'date' },
125127
{ back: 'ccof_paymentfrequencydetails', front: 'frequency' },
126128
{ back: 'ccof_expenseamountt', front: 'expense' },
129+
{ back: 'ccof_rfipfiexpenseinfoid', front: 'id' },
127130
];
128131

129132
const OtherFundingProgramMappings = [
@@ -132,13 +135,15 @@ const OtherFundingProgramMappings = [
132135
{ back: 'ccof_statusofapplication', front: 'status' },
133136
{ back: 'ccof_amountreceived', front: 'amount' },
134137
{ back: 'ccof_expense', front: 'expenses' },
138+
{ back: 'ccof_rfi_pfi_other_fundingid', front: 'id' },
135139
];
136140

137141
const IndigenousExpenseMappings = [
138142
{ back: 'ccof_expensedescription', front: 'description' },
139143
{ back: 'ccof_date', front: 'date' },
140144
{ back: 'ccof_paymentfrequency', front: 'frequency' },
141145
{ back: 'ccof_amount', front: 'expense' },
146+
{ back: 'ccof_rfipfiserviceexpansionindigenouscommunityid', front: 'id' },
142147
];
143148

144149
const NMFApplicationMappings = [

frontend/public/styles/common.css

+14-3
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,22 @@ input[type="number"] {
113113
color: #ff5252;
114114
}
115115

116-
.add-file-button {
116+
.font-large {
117+
font-size: 18px;
118+
}
119+
120+
.font-regular {
117121
font-size: 16px;
118122
}
119123

124+
.font-small {
125+
font-size: 14px;
126+
}
127+
128+
.font-xsmall {
129+
font-size: 12px;
130+
}
131+
120132
.border-right {
121133
border-right: 0.5px solid lightgray;
122134
}
@@ -133,10 +145,9 @@ input[type="number"] {
133145
}
134146

135147
.span-label {
136-
color: grey;
148+
color: #636262;
137149
font-style: normal;
138150
font-family: "BCSans", Verdana, Arial, sans-serif;
139-
font-size: 14px;
140151
}
141152

142153
div.text-h4,

frontend/src/components/RFI/RFIDocumentUpload.vue

+1-8
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,7 @@
2626
>
2727
<template #top>
2828
<v-col flex>
29-
<AppButton
30-
v-if="!isLocked"
31-
id="add-new-file"
32-
:primary="false"
33-
size="large"
34-
class="add-file-button mb-2"
35-
@click="addNew"
36-
>
29+
<AppButton v-if="!isLocked" id="add-new-file" :primary="false" size="large" class="mb-2" @click="addNew">
3730
Add File
3831
</AppButton>
3932
</v-col>

0 commit comments

Comments
 (0)