Skip to content

Commit 19d3811

Browse files
committed
Merge branch 'fix/update-fdrs-field-names' into develop
2 parents 3a4b9d5 + 801ec3c commit 19d3811

File tree

6 files changed

+209
-92
lines changed

6 files changed

+209
-92
lines changed

.changeset/blue-falcons-protect.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@ifrc-go/ui": patch
3+
---
4+
5+
Add _primary red_ as fallback color for ProgressBar

.changeset/wet-penguins-approve.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
"go-web-app": patch
3+
---
4+
5+
Update FDRS data in Country / Context and Structure / NS indicators
6+
7+
- Add separate icon for each field for data year
8+
- Use separate icon for disaggregation
9+
- Update descriptions on dref import template (more details on *Missing / to be implemented* section in https://github.com/IFRCGo/go-web-app/pull/1434#issuecomment-2459034932)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ function useImportTemplateSchema() {
608608
type: 'input',
609609
validation: 'number',
610610
label: 'Estimated number of <b>People on the move</b> (if any)',
611-
description: '<i>Percentage, e.g. XX%.</i>',
611+
description: '<i>Number, e.g. XX,XXX.</i>',
612612
},
613613

614614
risk_security: {
@@ -671,6 +671,7 @@ function useImportTemplateSchema() {
671671
type: 'input',
672672
validation: 'number',
673673
label: '<b>Requested Amount in CHF</b>',
674+
description: 'General funding requested to fund the interventions.',
674675
},
675676

676677
planned_interventions: {

0 commit comments

Comments
 (0)