Skip to content

Commit 5771a6b

Browse files
shreeyash07frozenhelium
authored andcommitted
Update DREF application form and export
- add new field hazard date and location - update hazard date as forcasted day of event - update the section in dref application export - remove Current National Society Actions from the export
1 parent 634f4cf commit 5771a6b

File tree

11 files changed

+284
-304
lines changed

11 files changed

+284
-304
lines changed

.changeset/big-lands-film.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
"go-web-app": minor
3+
---
4+
5+
Update DREF application form and export
6+
7+
- add new field hazard date and location
8+
- update hazard date as forcasted day of event
9+
- update the section in dref application export
10+
- remove Current National Society Actions from the export

app/src/views/DrefApplicationExport/PgaExport/i18n.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@
2020
"nationalSocietyDescriptionThirteen": "Provide a final financial and narrative report on the use of the Imminent DREF request within 30 days after the 45 days implementation period set out in paragraph 4 above,",
2121
"nationalSocietyDescriptionFourteen": "In the event the disaster does not materialize, the National Society shall:",
2222
"nationalSocietyDescriptionFifteen": "Refund the amount dedicated to immediate response activities of the Imminent DREF request within 30 days after the implementation period set out in paragraph 4 above.",
23-
"nationalSocietyDescriptionSixteen": "By signing this Imminent DREF request, the National Society commits to zero tolerance for, and shall take appropriate measures against, fraud, corruption, and any form of abuse against any person, in particular children, including without limitation sexual exploitation, abuse and harassment. The IFRC reserves the right to perform audits, financial reviews, checks and verifications and/or investigations to ensure the proper use of the Imminent DREF and compliance with the above-mentioned obligations. In order to facilitate such audits, financial reviews, checks and verifications and/or investigations, the National Society shall grant the IFRC access to its documents, records, and premises as well as its staff, agents, volunteers, beneficiaries, sub-grantees and contractors. Any breach of the above obligations shall entitle the IFRC to request a full refund of this Imminent DREF request.",
23+
"nationalSocietyDescriptionSixteen": "By signing this Imminent DREF request, the National Society commits to implement all activities funded with this Imminent DREF request in compliance with the Fundamental Principles of the International Red Cross and Red Crescent Movement and all applicable domestic and international laws and regulations. The National Society further commits to zero tolerance for, and shall take appropriate measures against fraud, corruption, and any form of abuse against any person, in particular children, including without limitation sexual exploitation, abuse and harassment, to comply with any applicable sanctions, and any applicable data protection laws and policies, in particular, the National Society shall only process personal data to the extent necessary to respond to the Imminent DREF Operation. The IFRC reserves the right to perform audits, financial reviews, checks and verifications and/or investigations to ensure the proper use of the Imminent DREF and compliance with the above-mentioned obligations. In order to facilitate such audits, financial reviews, checks and verifications and/or investigations, the National Society shall grant the IFRC access to its documents, records, and premises as well as its staff, agents, volunteers, beneficiaries, sub-grantees and contractors. Any breach of the above obligations shall entitle the IFRC to request a full refund of this Imminent DREF request.",
2424
"nationalSocietyBankDetails": "Bank details of the National Society",
2525
"nationalSocietyBankDescription": "to which the IFRC shall transfer the funds will be transferred.",
2626
"nationalSocietyBankName": "Bank Name and Address",
2727
"nationalSocietyBankAccountNumber": "Bank Account Number and Currency",
2828
"nationalSocietySwiftCode": "IBAN / SWIFT Code",
2929
"nationalSocietyAmount": "Amount(CHF)",
30-
"nationalSocietyAmountCHF": "CHF 75,000/CHF 90800",
3130
"nationalSocietyAdvancePayment": "For the Purpose of Advance Payment",
3231
"nationalSocietyBankFooter": "Please find attached letter from the Bank confirming banking relationship details.",
3332
"imminentDrefRequest": "This Imminent DREF request is signed on behalf of:",
@@ -38,4 +37,4 @@
3837
"imminentTitle": "Title",
3938
"imminentDate": "Date"
4039
}
41-
}
40+
}

app/src/views/DrefApplicationExport/PgaExport/index.tsx

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { useParams } from 'react-router-dom';
21
import { useTranslation } from '@ifrc-go/ui/hooks';
32
import {
43
Container,
@@ -8,16 +7,12 @@ import {
87
TextOutput,
98
type TextOutputProps,
109
} from '@ifrc-go/ui/printable';
11-
import {
12-
isDefined,
13-
isFalsyString,
14-
} from '@togglecorp/fujs';
15-
16-
import { useRequest } from '#utils/restRequest';
1710

1811
import i18n from './i18n.json';
1912
import styles from './styles.module.css';
2013

14+
const DREF_IMMINENT_OBLIGATION_EXACT_AMOUNT = 75000;
15+
2116
export function BlockTextOutput(props: TextOutputProps
2217
& { variant?: never, withoutLabelColon?: never }) {
2318
return (
@@ -31,19 +26,8 @@ export function BlockTextOutput(props: TextOutputProps
3126
}
3227

3328
function PgaExport() {
34-
const { drefId } = useParams<{ drefId: string }>();
3529
const strings = useTranslation(i18n);
3630

37-
const {
38-
response: drefResponse,
39-
} = useRequest({
40-
skip: isFalsyString(drefId),
41-
url: '/api/v2/dref/{id}/',
42-
pathVariables: isDefined(drefId) ? {
43-
id: drefId,
44-
} : undefined,
45-
});
46-
4731
return (
4832
<div className={styles.pgaExport}>
4933
<Heading level={2}>
@@ -160,7 +144,7 @@ function PgaExport() {
160144
/>
161145
<BlockTextOutput
162146
label={strings.nationalSocietyAmount}
163-
value={drefResponse?.total_cost}
147+
value={DREF_IMMINENT_OBLIGATION_EXACT_AMOUNT}
164148
valueType="number"
165149
/>
166150
<BlockTextOutput

app/src/views/DrefApplicationExport/i18n.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
"drefApplicationSupportingDocumentation": "Supporting Documentation",
111111
"drefAssessmentReportLink": "Assessment Report",
112112
"drefFormRiskPeopleLabel": "Population at risk (if available)",
113-
"drefApplicationExportForecastedLabel": "Forecasted day of event(or peak)",
113+
"drefApplicationExportForecastedLabel": "Forecasted day of event (or peak)",
114114
"sourceInformationSectionHeading": "Source Information",
115115
"sourceInformationSourceNameTitle": "Source Name",
116116
"sourceInformationSourceLinkTitle": "Source Link",

0 commit comments

Comments
 (0)