Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/goofy-tips-attend.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"go-web-app": patch
---

Add Migration considerations (yes/no) to PER Overview form
Simplify Email recovery page text
2 changes: 2 additions & 0 deletions app/src/views/PerOverviewForm/i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
"urbanConsiderationsInputDescription": "Do you want to assess the urban aspects of your National Society?",
"climateAndEnvironmentalConsiderationsInputLabel": "Climate and environmental considerations",
"climateAndEnvironmentalConsiderationsInputDescription": "Do you want to assess the climate and environment of your National Society?",
"migrationConsiderationsInputLabel": "Migration Considerations",
"migrationConsiderationsInputDescription": "Do you want to assess the migration aspects of your National Society?",
"dateOfPreviousPerAssessmentInputLabel": "Date of previous assessment",
"typeOfPreviousPerAssessmentInputLabel": "Type of previous PER assessment",
"processCycleHeading": "Per Process Cycle",
Expand Down
13 changes: 13 additions & 0 deletions app/src/views/PerOverviewForm/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,19 @@ export function Component() {
disabled={disabled}
/>
</InputSection>
<InputSection
title={strings.migrationConsiderationsInputLabel}
description={strings.migrationConsiderationsInputDescription}
>
<BooleanInput
name="assess_migration_aspect_of_country"
value={value?.assess_migration_aspect_of_country}
onChange={setFieldValue}
error={error?.assess_migration_aspect_of_country}
readOnly={partialReadOnly || readOnly}
disabled={disabled}
/>
</InputSection>
</ListView>
</Container>
<Container
Expand Down
3 changes: 3 additions & 0 deletions app/src/views/PerOverviewForm/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export const overviewSchema: OverviewFormSchema = {
'assess_preparedness_of_country',
'assess_urban_aspect_of_country',
'assess_climate_environment_of_country',
'assess_migration_aspect_of_country',
] as const;
schema = addCondition(
schema,
Expand All @@ -88,6 +89,7 @@ export const overviewSchema: OverviewFormSchema = {
assess_preparedness_of_country: { forceValue: undefinedValue },
assess_urban_aspect_of_country: { forceValue: undefinedValue },
assess_climate_environment_of_country: { forceValue: undefinedValue },
assess_migration_aspect_of_country: { forceValue: undefinedValue },
};
}
return {
Expand All @@ -97,6 +99,7 @@ export const overviewSchema: OverviewFormSchema = {
assess_preparedness_of_country: {},
assess_urban_aspect_of_country: {},
assess_climate_environment_of_country: {},
assess_migration_aspect_of_country: {},
};
},
);
Expand Down
2 changes: 1 addition & 1 deletion app/src/views/RecoverAccount/i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"strings": {
"pageTitle": "IFRC GO - Recover Account",
"pageHeading": "Recover Account",
"pageDescription": "Enter the email/username you used during registration",
"pageDescription": "Enter the email you used during registration",
"emailInputLabel": "Email/Username",
"submitButtonLabel": "Submit recovery request",
"successfulMessageTitle": "Account recovery submitted!",
Expand Down
2 changes: 1 addition & 1 deletion app/src/views/ResendValidationEmail/i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"strings": {
"pageTitle": "IFRC GO - Resend Validation Email",
"pageHeading": "Resend Validation Email",
"pageDescription": "Enter the email/username you used during registration",
"pageDescription": "Enter the email you used during registration",
"emailInputLabel": "Email/Username",
"submitButtonLabel": "Resend",
"successfulMessageTitle": "Submitted successfully!",
Expand Down
29 changes: 29 additions & 0 deletions translationMigrations/000089-1786703080162.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"parent": "000088-1786604379488.json",
"actions": [
{
"action": "add",
"key": "migrationConsiderationsInputDescription",
"namespace": "perOverviewForm",
"value": "Do you want to assess the migration aspects of your National Society?"
},
{
"action": "add",
"key": "migrationConsiderationsInputLabel",
"namespace": "perOverviewForm",
"value": "Migration Considerations"
},
{
"action": "update",
"key": "pageDescription",
"namespace": "recoverAccount",
"newValue": "Enter the email you used during registration"
},
{
"action": "update",
"key": "pageDescription",
"namespace": "resendValidationEmail",
"newValue": "Enter the email you used during registration"
}
]
}
Loading