Merge branch 'fix/update-fdrs-field-names' into develop

IFRCGo · Nov 6, 2024 · 19d3811 · 19d3811
2 parents 3a4b9d5 + 801ec3c
commit 19d3811
Show file tree

Hide file tree

Showing 6 changed files with 209 additions and 92 deletions.
diff --git a/.changeset/blue-falcons-protect.md b/.changeset/blue-falcons-protect.md
@@ -0,0 +1,5 @@
+---
+"@ifrc-go/ui": patch
+---
+
+Add _primary red_ as fallback color for ProgressBar
diff --git a/.changeset/wet-penguins-approve.md b/.changeset/wet-penguins-approve.md
@@ -0,0 +1,9 @@
+---
+"go-web-app": patch
+---
+
+Update FDRS data in Country / Context and Structure / NS indicators
+
+- Add separate icon for each field for data year
+- Use separate icon for disaggregation
+- 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)
diff --git a/...sDref/DownloadImportTemplateButton/DownloadImportTemplateModal/useImportTemplateSchema.ts b/...sDref/DownloadImportTemplateButton/DownloadImportTemplateModal/useImportTemplateSchema.ts
@@ -608,7 +608,7 @@ function useImportTemplateSchema() {
                 type: 'input',
                 validation: 'number',
                 label: 'Estimated number of <b>People on the move</b> (if any)',
-                description: '<i>Percentage, e.g. XX%.</i>',
+                description: '<i>Number, e.g. XX,XXX.</i>',
             },
 
             risk_security: {
@@ -671,6 +671,7 @@ function useImportTemplateSchema() {
                 type: 'input',
                 validation: 'number',
                 label: '<b>Requested Amount in CHF</b>',
+                description: 'General funding requested to fund the interventions.',
             },
 
             planned_interventions: {