Skip to content

Commit de2866f

Browse files
AdityaKhatriAdityaKhatri
committed
Update strings & add fields to all dref forms
1 parent b95d52f commit de2866f

File tree

46 files changed

+1263
-364
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1263
-364
lines changed

‎app/src/views/AccountMyFormsDref/DownloadImportTemplateButton/DownloadImportTemplateModal/useImportTemplateSchema.ts

-8
Original file line numberDiff line numberDiff line change
@@ -199,14 +199,6 @@ function useImportTemplateSchema() {
199199
validation: 'string',
200200
},
201201

202-
emergency_appeal_planned: {
203-
type: 'select',
204-
label: 'Emergency appeal planned',
205-
optionsKey: '__boolean',
206-
validation: 'boolean',
207-
description: 'Select <b>Yes</b> or <b>No</b> from the drop-down list.',
208-
},
209-
210202
// EVENT DETAIL
211203

212204
did_it_affect_same_area: {

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"monthsSuffix": " months",
2222
"operationEndDateLabel": "Operation End Date",
2323
"drefPublishedLabel": "DREF Published",
24-
"targetedAreasLabel": "Targeted Areas",
24+
"targetedAreasLabel": "Targeted Regions",
2525
"eventDescriptionSectionHeading": "Description of the Event",
2626
"approximateDateOfImpactHeading": "Approximate date of impact",
2727
"whatWhereWhenSectionHeading": "What happened, where and when?",
@@ -67,8 +67,8 @@
6767
"ruralLabel": "Rural",
6868
"urbanLabel": "Urban",
6969
"peopleWithDisabilitiesLabel": "People with disabilities (estimated)",
70-
"riskAndSecuritySectionHeading": "Risk and Security Considerations",
71-
"riskSecurityHeading": "Please indicate about potential operation risk for this operations and mitigation actions",
70+
"riskAndSecuritySectionHeading": "Risk and Security Considerations (including \"management\")",
71+
"riskSecurityHeading": "Please analyse and indicate potential risks for this operation, its root causes and mitigation actions.",
7272
"safetyConcernHeading": "Please indicate any security and safety concerns for this operation",
7373
"hasChildRiskCompleted": "Has the child safeguarding risk analysis assessment been completed?",
7474
"plannedInterventionSectionHeading": "Planned Intervention",

‎app/src/views/DrefApplicationForm/Actions/i18n.json

+8
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
"drefFormDidNationalSocietyStartedImminent": "Did the National Society started any anticipatory actions?",
1111
"drefFormDidNationalSocietyStartedSlow": "Has the National Society started any actions?",
1212
"drefFormGapsInAssessment": "Any identified gaps/limitations in the assessment",
13+
"drefFormGapsInAssessmentDescriptionHeading": "Consider the following:",
14+
"drefFormGapsInAssessmentDescriptionPoint1": "Unmet needs: are there specific sectors (e.g., shelter, WASH, health) where needs remain unmet or only partially addressed?",
15+
"drefFormGapsInAssessmentDescriptionPoint2": "Resource shortages: highlight any shortages in available resources (e.g., funding, personnel, supplies) that limit the ability to meet the identified needs.",
16+
"drefFormGapsInAssessmentDescriptionPoint3": "Operational challenges: mention any operational constraints that are preventing a full response to the needs (e.g., logistical issues, insufficient capacity).",
17+
"drefFormGapsInAssessmentDescriptionPoint4": "Coordination issues: note any challenges in coordinating with other actors or agencies that have resulted in gaps in service delivery or response coverage.",
18+
"drefFormGapsInAssessmentDescriptionPoint5": "Vulnerable groups: identify any specific vulnerable groups whose needs may not have been fully captured or addressed during the assessment (e.g., displaced persons, elderly, people with disabilities).",
1319
"drefFormIcrc": "ICRC",
1420
"drefFormIcrcDescription": "Presence or not of ICRC in country, and support directly provided for this emergency response. Other programs and support provided outside of the scope of this emergency should not be indicated here.",
1521
"drefFormIfrc": "IFRC",
@@ -19,6 +25,7 @@
1925
"ifrcNetworkActionsHeading": "IFRC Network Actions Related To The Current Event",
2026
"icrcActionsHeading": "ICRC Actions Related To The Current Event",
2127
"drefFormNationalAuthorities": "National authorities",
28+
"drefFormNationalAuthoritiesDescription": "Brief description of actions taken by the national authorities.",
2229
"drefFormNationalOtherActors": "Other Actors Actions Related To The Current Event",
2330
"drefFormNationalSocietiesActions": "Current National Society Actions",
2431
"drefFormNationalSocietiesActionsDescription": "Please indicate a description of the ongoing response with if possible: Branches involved, number of volunteers/staff involved in actions, assets deployed/distributed, number of people reach. Impact/added value of the NS in the response already ongoing.",
@@ -29,6 +36,7 @@
2936
"drefFormPartnerNationalSociety": "Participating National Societies",
3037
"drefFormPartnerNationalSocietyDescription": "Briefly set out which PNS are present and give details of PNS contributions/roles on the ground and remotely for this specific operation",
3138
"drefFormUNorOtherActors": "UN or other actors",
39+
"drefFormUNorOtherActorsDescription": "Brief description of actions taken by the UN or other actors.",
3240
"drefFormAddButton": "Add"
3341
}
3442
}

‎app/src/views/DrefApplicationForm/Actions/index.tsx

+26
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ function Actions(props: Props) {
333333
</InputSection>
334334
<InputSection
335335
title={strings.drefFormNationalAuthorities}
336+
description={strings.drefFormNationalAuthoritiesDescription}
336337
>
337338
<TextArea
338339
label={strings.drefFormActionDescription}
@@ -345,6 +346,7 @@ function Actions(props: Props) {
345346
</InputSection>
346347
<InputSection
347348
title={strings.drefFormUNorOtherActors}
349+
description={strings.drefFormUNorOtherActorsDescription}
348350
>
349351
<TextArea
350352
label={strings.drefFormActionDescription}
@@ -454,6 +456,30 @@ function Actions(props: Props) {
454456
{value?.type_of_dref !== TYPE_IMMINENT && (
455457
<InputSection
456458
title={strings.drefFormGapsInAssessment}
459+
description={(
460+
<>
461+
<p>
462+
{strings.drefFormGapsInAssessmentDescriptionHeading}
463+
</p>
464+
<ul>
465+
<li>
466+
{strings.drefFormGapsInAssessmentDescriptionPoint1}
467+
</li>
468+
<li>
469+
{strings.drefFormGapsInAssessmentDescriptionPoint2}
470+
</li>
471+
<li>
472+
{strings.drefFormGapsInAssessmentDescriptionPoint3}
473+
</li>
474+
<li>
475+
{strings.drefFormGapsInAssessmentDescriptionPoint4}
476+
</li>
477+
<li>
478+
{strings.drefFormGapsInAssessmentDescriptionPoint5}
479+
</li>
480+
</ul>
481+
</>
482+
)}
457483
>
458484
<TextArea
459485
label={strings.drefFormActionDescription}

‎app/src/views/DrefApplicationForm/EventDetail/i18n.json

+9
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
"drefFormPeopleInNeed": "People in need (Optional)",
1414
"drefFormPeopleAffected": "Total affected population",
1515
"drefFormRiskPeopleLabel": "Total population at risk",
16+
"drefFormAffectedMaleLabel": "Estimated male",
17+
"drefFormAffectedFemaleLabel": "Estimated female",
18+
"drefFormAffectedMinorsLabel": "Estimated minors",
19+
"drefFormChildSafeguardingRiskAnalysisTitle": "Did you complete the Child Safeguarding Risk Analysis in previous operations, what was risk level?",
20+
"drefFormChildSafeguardingRiskLevelLabel": "Risk Level",
1621
"drefFormPeopleInNeedDescriptionImminent": "Include all those whose physical security, basic rights, dignity, living conditions or livelihoods are threatened or have been disrupted, and whose current level of access to basic services, goods and social protection will be inadequate to re-establish normal living conditions without additional assistance",
1722
"drefFormPeopleInNeedDescriptionSlowSudden": "People in Need (PIN) are those members whose physical security, basic rights, dignity, living conditions or livelihoods are threatened or have been disrupted, and whose current level of access to basic services, goods and social protection is inadequate to re-establish normal living conditions without additional assistance.",
1823
"drefFormPeopleAffectedDescriptionImminent": "Includes all those whose lives and livelihoods are at risk as a direct result of the shock or stress.",
@@ -36,6 +41,10 @@
3641
"drefFormUploadSupportingDocumentButtonLabel": "Upload document",
3742
"drefFormUploadSupportingDocumentDescription": "Here the National Society can upload documentation that substantiates their decision to launch this operation now. For example: seasonal outlooks, forecast information, reports from credible sources...etc.",
3843
"drefFormWhatWhereWhen": "What happened, where and when?",
44+
"drefFormWhatWhereWhenDescriptionHeading": "Clearly Describe:",
45+
"drefFormWhatWhereWhenDescriptionPoint1": "What happened: Briefly explain the nature of the emergency (e.g., flood, earthquake, epidemic). Include key details such as the intensity, and any unique aspects of the event.",
46+
"drefFormWhatWhereWhenDescriptionPoint2": "Where: Specify the geographic location(s) affected. Be as precise as possible, including names of countries, regions, cities, or specific areas impacted by the event.",
47+
"drefFormWhatWhereWhenDescriptionPoint3": "When: Indicate the date and time when the event occurred or began. If the situation is ongoing, mention that and provide relevant updates on the timeframe.",
3948
"drefOperationalLearningPlatformLabel": "To access the Operational Learning Dashboard and check learnings for the country, {clickHereLink}",
4049
"clickHereLinkLabel": "Click Here",
4150
"drefFormSelectImages": "Select images",

‎app/src/views/DrefApplicationForm/EventDetail/index.tsx

+61
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,25 @@ function EventDetail(props: Props) {
249249
disabled={disabled}
250250
/>
251251
</InputSection>
252+
<InputSection
253+
title={strings.drefFormChildSafeguardingRiskAnalysisTitle}
254+
>
255+
<BooleanInput
256+
name="complete_child_safeguarding_risk"
257+
value={value.complete_child_safeguarding_risk}
258+
onChange={setFieldValue}
259+
error={error?.complete_child_safeguarding_risk}
260+
disabled={disabled}
261+
/>
262+
<TextArea
263+
label={strings.drefFormChildSafeguardingRiskLevelLabel}
264+
name="child_safeguarding_risk_level"
265+
onChange={setFieldValue}
266+
value={value.child_safeguarding_risk_level}
267+
error={error?.child_safeguarding_risk_level}
268+
disabled={disabled}
269+
/>
270+
</InputSection>
252271
</Container>
253272
)}
254273
<Container
@@ -355,6 +374,30 @@ function EventDetail(props: Props) {
355374
disabled={disabled}
356375
/>
357376
)}
377+
<NumberInput
378+
name="estimated_number_of_affected_male"
379+
label={strings.drefFormAffectedMaleLabel}
380+
value={value?.estimated_number_of_affected_male}
381+
onChange={setFieldValue}
382+
error={error?.estimated_number_of_affected_male}
383+
disabled={disabled}
384+
/>
385+
<NumberInput
386+
name="estimated_number_of_affected_female"
387+
label={strings.drefFormAffectedFemaleLabel}
388+
value={value?.estimated_number_of_affected_female}
389+
onChange={setFieldValue}
390+
error={error?.estimated_number_of_affected_female}
391+
disabled={disabled}
392+
/>
393+
<NumberInput
394+
name="estimated_number_of_affected_minors"
395+
label={strings.drefFormAffectedMinorsLabel}
396+
value={value?.estimated_number_of_affected_minors}
397+
onChange={setFieldValue}
398+
error={error?.estimated_number_of_affected_minors}
399+
disabled={disabled}
400+
/>
358401
{/* FIXME: use grid to fix the empty div issue */}
359402
{/* NOTE: Empty div to preserve the layout */}
360403
<div />
@@ -366,6 +409,24 @@ function EventDetail(props: Props) {
366409
? strings.drefFormWhatWhereWhen
367410
: strings.drefFormImminentDisaster
368411
}
412+
description={value.type_of_dref !== TYPE_IMMINENT && (
413+
<>
414+
<p>
415+
{strings.drefFormWhatWhereWhenDescriptionHeading}
416+
</p>
417+
<ol>
418+
<li>
419+
{strings.drefFormWhatWhereWhenDescriptionPoint1}
420+
</li>
421+
<li>
422+
{strings.drefFormWhatWhereWhenDescriptionPoint2}
423+
</li>
424+
<li>
425+
{strings.drefFormWhatWhereWhenDescriptionPoint3}
426+
</li>
427+
</ol>
428+
</>
429+
)}
369430
>
370431
<TextArea
371432
name="event_description"

0 commit comments

Comments
 (0)