Add new assisted population field in dref final export

Author: shreeyash07

app/src/views/DrefFinalReportExport/i18n.json

@@ -22,7 +22,7 @@
         "hasChildProtectionPolicy": "Does your National Society have child protection/child safeguarding policy?",
         "hasWhistleblowerProtectionPolicy": "Does your National Society have whistleblower protection policy?",
         "hasAntiSexualHarassmentPolicy": "Does your National Society have anti-sexual harassment policy?",
-        "peopleAssistedLabel": "People Assisted",
+        "peopleAssistedLabel": "Total Population Assisted",
         "peopleSuffix": " people",
         "operationStartDateLabel": "Operation Start Date",
         "operationTimeframeLabel": "Total Operating Timeframe",
@@ -58,11 +58,11 @@
         "targetingStrategySectionHeading": "Targeting Strategy",
         "peopleAssistedHeading": "Who was targeted by this operation?",
         "selectionCriteriaHeading": "Explain the selection criteria for the targeted population",
-        "targetPopulationSectionHeading": "Total Targeted Population",
-        "womenLabel": "Women",
-        "girlsLabel": "Girls (under 18)",
-        "menLabel": "Men",
-        "boysLabel": "Boys (under 18)",
+        "targetPopulationSectionHeading": "Total Assisted Population",
+        "womenLabel": "Assisted Women",
+        "girlsLabel": "Assisted Girls (under 18)",
+        "menLabel": "Assisted Men",
+        "boysLabel": "Assisted Boys (under 18)",
         "targetedPopulationLabel": "Total targeted population",
         "ruralLabel": "Rural",
         "urbanLabel": "Urban",

app/src/views/DrefFinalReportExport/index.tsx

@@ -384,14 +384,6 @@ export function Component() {
                     valueType="number"
                     strongValue
                 />
-                <TextOutput
-                    className={styles.metaItem}
-                    label={strings.peopleAssistedLabel}
-                    value={drefResponse?.num_assisted}
-                    suffix={strings.peopleSuffix}
-                    valueType="number"
-                    strongValue
-                />
                 <TextOutput
                     className={styles.metaItem}
                     label={strings.eventOnsetLabel}
@@ -718,7 +710,7 @@ export function Component() {
                 {drefResponse?.type_of_dref !== DREF_TYPE_ASSESSMENT && (
                     <BlockTextOutput
                         label={strings.womenLabel}
-                        value={drefResponse?.women}
+                        value={drefResponse?.assisted_num_of_women}
                         valueType="number"
                         strongValue
                     />
@@ -733,7 +725,7 @@ export function Component() {
                 {drefResponse?.type_of_dref !== DREF_TYPE_ASSESSMENT && (
                     <BlockTextOutput
                         label={strings.girlsLabel}
-                        value={drefResponse?.girls}
+                        value={drefResponse?.assisted_num_of_girls_under_18}
                         valueType="number"
                         strongValue
                     />
@@ -748,7 +740,7 @@ export function Component() {
                 {drefResponse?.type_of_dref !== DREF_TYPE_ASSESSMENT && (
                     <BlockTextOutput
                         label={strings.menLabel}
-                        value={drefResponse?.men}
+                        value={drefResponse?.assisted_num_of_men}
                         valueType="number"
                         strongValue
                     />
@@ -764,12 +756,21 @@ export function Component() {
                 {drefResponse?.type_of_dref !== DREF_TYPE_ASSESSMENT && (
                     <BlockTextOutput
                         label={strings.boysLabel}
-                        value={drefResponse?.boys}
+                        value={drefResponse?.assisted_num_of_boys_under_18}
                         valueType="number"
                         strongValue
                     />
                 )}
                 <div className={styles.emptyBlock} />
+                <BlockTextOutput
+                    className={styles.metaItem}
+                    label={strings.peopleAssistedLabel}
+                    value={drefResponse?.num_assisted}
+                    suffix={strings.peopleSuffix}
+                    valueType="number"
+                    strongValue
+                />
+                <div className={styles.emptyBlock} />
                 <BlockTextOutput
                     label={strings.targetedPopulationLabel}
                     value={drefResponse?.total_targeted_population}

translationMigrations/000035-1749556447119.json

@@ -0,0 +1,95 @@
+{
+    "parent": "000034-1749016435785.json",
+    "actions": [
+        {
+            "action": "update",
+            "key": "boysLabel",
+            "namespace": "drefFinalReportExport",
+            "newValue": "Assisted Boys (under 18)"
+        },
+        {
+            "action": "update",
+            "key": "girlsLabel",
+            "namespace": "drefFinalReportExport",
+            "newValue": "Assisted Girls (under 18)"
+        },
+        {
+            "action": "update",
+            "key": "menLabel",
+            "namespace": "drefFinalReportExport",
+            "newValue": "Assisted Men"
+        },
+        {
+            "action": "update",
+            "key": "peopleAssistedLabel",
+            "namespace": "drefFinalReportExport",
+            "newValue": "Total Population Assisted"
+        },
+        {
+            "action": "update",
+            "key": "targetPopulationSectionHeading",
+            "namespace": "drefFinalReportExport",
+            "newValue": "Total Assisted Population"
+        },
+        {
+            "action": "update",
+            "key": "womenLabel",
+            "namespace": "drefFinalReportExport",
+            "newValue": "Assisted Women"
+        },
+        {
+            "action": "add",
+            "key": "drefFormOperationClickEmergencyResponseFramework",
+            "namespace": "drefFinalReportForm",
+            "value": "Click to view Emergency Response Framework"
+        },
+        {
+            "action": "update",
+            "key": "drefFinalReportTotalTargeted",
+            "namespace": "drefFinalReportForm",
+            "newValue": "Total assisted population is not equal to sum of other population fields"
+        },
+        {
+            "action": "update",
+            "key": "drefFormAssistedPopulation",
+            "namespace": "drefFinalReportForm",
+            "newValue": "Total Assisted Population"
+        },
+        {
+            "action": "update",
+            "key": "drefFormBoys",
+            "namespace": "drefFinalReportForm",
+            "newValue": "Assisted Boys (under 18)"
+        },
+        {
+            "action": "update",
+            "key": "drefFormGirls",
+            "namespace": "drefFinalReportForm",
+            "newValue": "Assisted Girls (under 18)"
+        },
+        {
+            "action": "update",
+            "key": "drefFormMen",
+            "namespace": "drefFinalReportForm",
+            "newValue": "Assisted Men"
+        },
+        {
+            "action": "update",
+            "key": "drefFormPeopleAssisted",
+            "namespace": "drefFinalReportForm",
+            "newValue": "Total population assisted"
+        },
+        {
+            "action": "update",
+            "key": "drefFormTargetedPopulation",
+            "namespace": "drefFinalReportForm",
+            "newValue": "Assisted Population"
+        },
+        {
+            "action": "update",
+            "key": "drefFormWomen",
+            "namespace": "drefFinalReportForm",
+            "newValue": "Assisted Women"
+        }
+    ]
+}