Merge pull request #1956 from IFRCGo/fix/dref-final-report-export-placement

fix(dref-final-report): fix placement of logo in proposed action in export

Author: frozenhelium

.changeset/whole-lions-guess.md

@@ -0,0 +1,7 @@
+---
+"go-web-app": patch
+---
+
+- Fix calculation of Operation End date in Final report form
+- Fix icon position issue in the implementation table of DREF PDF export
+- Update the label for last update date in the crisis categorization pop-up

app/src/views/DrefFinalReportExport/index.tsx

@@ -669,6 +669,8 @@ export function Component() {
                     headingLevel={3}
                     childrenContainerClassName={styles.proposedActions}
                 >
+                    {/* NOTE: Leaving this empty for empty header */}
+                    <div className={styles.logoHeader} />
                     <div className={styles.actionTitleLabel}>
                         {strings.proposedActionsSector}
                     </div>

app/src/views/DrefFinalReportExport/styles.module.css

@@ -234,6 +234,7 @@
         grid-template-columns: 4fr 5fr 5fr 4fr 4fr;
         page-break-inside: avoid;
 
+        .logo-header,
         .action-title-label {
             background-color: var(--go-ui-color-element-background);
             padding: var(--go-ui-spacing-sm);
@@ -289,4 +290,4 @@
             break-inside: avoid;
         }
     }
-}
+}

app/src/views/DrefFinalReportForm/Submission/index.tsx

@@ -8,10 +8,14 @@ import {
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
+    addNumDaysToDate,
     addNumMonthsToDate,
     encodeDate,
 } from '@ifrc-go/ui/utils';
-import { isDefined } from '@togglecorp/fujs';
+import {
+    isDefined,
+    isNotDefined,
+} from '@togglecorp/fujs';
 import {
     type EntriesAsList,
     type Error,
@@ -64,15 +68,23 @@ function Submission(props: Props) {
     const handleOperationStartDateChange = useCallback(
         (val: string | undefined, name: 'operation_start_date') => {
             setFieldValue(val, name);
-            const endDate = addNumMonthsToDate(
-                val,
-                value.total_operation_timeframe,
-            );
-            if (isDefined(endDate)) {
+            let endDate;
+            if (value.type_of_dref === TYPE_IMMINENT) {
+                endDate = addNumDaysToDate(
+                    val,
+                    value.total_operation_timeframe,
+                );
+            } else {
+                endDate = addNumMonthsToDate(
+                    val,
+                    value.total_operation_timeframe,
+                );
+            }
+            if (isNotDefined(endDate)) {
                 setFieldValue(encodeDate(endDate), 'operation_end_date');
             }
         },
-        [setFieldValue, value.total_operation_timeframe],
+        [setFieldValue, value.total_operation_timeframe, value.type_of_dref],
     );
 
     return (

app/src/views/EmergencyDetails/i18n.json

@@ -14,7 +14,7 @@
         "situationalOverviewTitle": "Situational Overview",
         "linksTitle": "Links",
         "emergencyMapTitle": "Affected Provinces",
-        "severityLevelUpdateDateLabel": "Updated date",
+        "severityLevelUpdateDateLabel": "Last update",
         "exportMap": "Export",
         "contactsTitle": "Contacts",
         "sourceLabel": "Source {source}"

translationMigrations/000044-1754370962181.json

@@ -0,0 +1,11 @@
+{
+    "parent": "000043-1754048543774.json",
+    "actions": [
+        {
+            "action": "update",
+            "key": "severityLevelUpdateDateLabel",
+            "namespace": "emergencyDetails",
+            "newValue": "Last update"
+        }
+    ]
+}