Skip to content

Commit 60dfa98

Browse files
AdityaKhatrifrozenhelium
authored andcommitted
fix(field-report): rename ifrc staff to emergency response unit
1 parent 6f457c7 commit 60dfa98

File tree

6 files changed

+32
-31
lines changed

6 files changed

+32
-31
lines changed

app/src/views/FieldReportDetails/EventNumericDetails/i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"eventAssistedGovernmentLabel": "Assisted (Government)",
2121
"eventLocalStaffLabel": "Local Staff",
2222
"eventVolunteersLabel": "Volunteers",
23-
"eventIfrcStaffLabel": "IFRC Staff",
23+
"eventERULabel": "Emergency Response Units",
2424
"eventDelegatedLabel": "Delegates"
2525
}
2626
}

app/src/views/FieldReportDetails/EventNumericDetails/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ function EventNumericDetails(props: Props) {
9494
value={value?.num_volunteers}
9595
/>
9696
<KeyFigure
97-
label={strings.eventIfrcStaffLabel}
98-
value={value?.num_ifrc_staff}
97+
label={strings.eventERULabel}
98+
value={value?.num_emergency_response_unit}
9999
/>
100100
<KeyFigure
101101
label={strings.eventDelegatedLabel}

app/src/views/FieldReportDetails/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ export function Component() {
134134
const dref = fieldReportResponse?.dref;
135135
const appeal = fieldReportResponse?.appeal;
136136
const fact = fieldReportResponse?.fact;
137-
const ifrcStaff = fieldReportResponse?.ifrc_staff;
137+
const emergencyResponseUnit = fieldReportResponse?.emergency_response_unit;
138138

139139
// NOTE: Only in EW
140140

@@ -193,7 +193,7 @@ export function Component() {
193193
{
194194
key: 'ifrc-staff',
195195
title: strings.fieldReportEmergencyResponseTitle,
196-
value: reportType !== 'COVID' ? ifrcStaff : undefined,
196+
value: reportType !== 'COVID' ? emergencyResponseUnit : undefined,
197197
},
198198
/*
199199
{

app/src/views/FieldReportForm/ResponseFields/i18n.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
"fieldsStep4PlannedResponseRowsFactValueFieldLabel": "Number of people",
3030
"fieldsStep4PlannedResponseRowsForecastBasedActionEWLabel": "Forecast Based Action",
3131
"fieldsStep4PlannedResponseRowsForecastBasedActionValueFieldLabel": "Amount CHF",
32-
"fieldsStep4PlannedResponseRowsIFRCStaffEVTEPIEWLabel": "Emergency Response Units",
33-
"fieldsStep4PlannedResponseRowsIFRCStaffValueFieldLabel": "Units",
32+
"fieldsStep4PlannedResponseRowsERUEVTEPIEWLabel": "Emergency Response Units",
33+
"fieldsStep4PlannedResponseRowsERUValueFieldLabel": "Units",
3434
"fieldReportFormVisibility": "{visibilityValue} - {visibility}"
3535
}
3636
}

app/src/views/FieldReportForm/ResponseFields/index.tsx

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -281,34 +281,32 @@ function ResponseFields(props: Props) {
281281
/>
282282
</InputSection>
283283
<InputSection
284-
title={strings.fieldsStep4PlannedResponseRowsIFRCStaffEVTEPIEWLabel}
284+
title={strings.fieldsStep4PlannedResponseRowsERUEVTEPIEWLabel}
285285
numPreferredColumns={2}
286286
// eslint-disable-next-line max-len
287-
withAsteriskOnTitle={isDefined(value.num_ifrc_staff) || isDefined(value.ifrc_staff)}
287+
withAsteriskOnTitle={isDefined(value.num_emergency_response_unit) || isDefined(value.emergency_response_unit)}
288288
>
289289
<RadioInput
290-
error={error?.ifrc_staff}
291-
name="ifrc_staff"
290+
error={error?.emergency_response_unit}
291+
name="emergency_response_unit"
292292
onChange={onValueChange}
293293
options={requestOptions}
294294
// FIXME: do not use inline functions
295295
keySelector={(item) => item.key}
296296
labelSelector={(item) => item.value}
297-
value={value.ifrc_staff}
297+
value={value.emergency_response_unit}
298298
clearable
299299
disabled={disabled}
300-
// eslint-disable-next-line max-len
301-
// withAsterisk={isDefined(value.num_ifrc_staff) || isDefined(value.ifrc_staff)}
302300
/>
303301
<NumberInput
304-
label={strings.fieldsStep4PlannedResponseRowsIFRCStaffValueFieldLabel}
305-
name="num_ifrc_staff"
306-
value={value.num_ifrc_staff}
302+
label={strings.fieldsStep4PlannedResponseRowsERUValueFieldLabel}
303+
name="num_emergency_response_unit"
304+
value={value.num_emergency_response_unit}
307305
onChange={onValueChange}
308-
error={error?.num_ifrc_staff}
306+
error={error?.num_emergency_response_unit}
309307
disabled={disabled}
310308
// eslint-disable-next-line max-len
311-
withAsterisk={isDefined(value.num_ifrc_staff) || isDefined(value.ifrc_staff)}
309+
withAsterisk={isDefined(value.num_emergency_response_unit) || isDefined(value.emergency_response_unit)}
312310
/>
313311
</InputSection>
314312
{reportType === 'EW' && (

app/src/views/FieldReportForm/common.ts

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ const fieldsInResponse = [
226226
'appeal_amount',
227227
'fact',
228228
'num_fact',
229-
'ifrc_staff',
230-
'num_ifrc_staff',
229+
'emergency_response_unit',
230+
'num_emergency_response_unit',
231231
'forecast_based_action',
232232
'forecast_based_action_amount',
233233
] satisfies (keyof PartialFormValue)[];
@@ -696,25 +696,28 @@ export const reportSchema: FormSchema = {
696696
baseSchema = addCondition(
697697
baseSchema,
698698
value,
699-
['ifrc_staff', 'num_ifrc_staff', 'status', 'is_covid_report', 'dtype'],
700-
['ifrc_staff', 'num_ifrc_staff'],
701-
(val): Pick<FormSchemaFields, 'ifrc_staff' | 'num_ifrc_staff'> => {
699+
['emergency_response_unit', 'num_emergency_response_unit', 'status', 'is_covid_report', 'dtype'],
700+
['emergency_response_unit', 'num_emergency_response_unit'],
701+
(val): Pick<FormSchemaFields, 'emergency_response_unit' | 'num_emergency_response_unit'> => {
702702
const reportType = getReportType(val?.status, val?.is_covid_report, val?.dtype);
703703
if (reportType === 'COVID') {
704704
return {
705-
ifrc_staff: { forceValue: nullValue },
706-
num_ifrc_staff: { forceValue: nullValue },
705+
emergency_response_unit: { forceValue: nullValue },
706+
num_emergency_response_unit: { forceValue: nullValue },
707707
};
708708
}
709-
if (isDefined(val?.ifrc_staff) || isDefined(val?.num_ifrc_staff)) {
709+
if (
710+
isDefined(val?.emergency_response_unit)
711+
|| isDefined(val?.num_emergency_response_unit)
712+
) {
710713
return {
711-
ifrc_staff: { required: true },
712-
num_ifrc_staff: { required: true },
714+
emergency_response_unit: { required: true },
715+
num_emergency_response_unit: { required: true },
713716
};
714717
}
715718
return {
716-
ifrc_staff: {},
717-
num_ifrc_staff: {},
719+
emergency_response_unit: {},
720+
num_emergency_response_unit: {},
718721
};
719722
},
720723
);

0 commit comments

Comments
 (0)