Fix event condition for dref exports

Author: barshathakuri

src/views/DrefApplicationExport/index.tsx

@@ -482,15 +482,19 @@ export function Component() {
                         </Container>
                     )}
                     {eventTextDefined && (
-                        <Container
-                            heading={strings.approximateDateOfImpactHeading}
-                            headingLevel={3}
-                        >
+                        <Container heading={strings.approximateDateOfImpactHeading}>
                             <DescriptionText>
                                 {drefResponse.event_text}
                             </DescriptionText>
                         </Container>
                     )}
+                    {eventDateDefined && (
+                        <Container heading={strings.dateWhenTheTriggerWasMetHeading}>
+                            <DateOutput
+                                value={drefResponse?.event_date}
+                            />
+                        </Container>
+                    )}
                     {isTruthyString(drefResponse?.event_map_file?.file) && (
                         <Container>
                             <Image
@@ -499,13 +503,6 @@ export function Component() {
                             />
                         </Container>
                     )}
-                    {eventDateDefined && (
-                        <Container heading={strings.dateWhenTheTriggerWasMetHeading}>
-                            <DateOutput
-                                value={drefResponse?.event_date}
-                            />
-                        </Container>
-                    )}
                     {eventDescriptionDefined && (
                         <Container
                             heading={drefResponse?.type_of_dref === DREF_TYPE_IMMINENT

src/views/DrefFinalReportExport/i18n.json

@@ -25,6 +25,8 @@
         "additionalAllocationRequestedLabel": "Additional Allocation Requested",
         "targetedAreasLabel": "Targeted Areas",
         "eventDescriptionSectionHeading": "Description of the Event",
+        "approximateDateOfImpactHeading": "Approximate date of impact",
+        "dateWhenTheTriggerWasMetHeading": "Date of event / Date when the trigger was met",
         "whatWhereWhenSectionHeading": "What happened, where and when?",
         "situationUpdateSectionHeading": "Provide any updates in the situation since the field report and explain what is expected to happen.",
         "anticipatoryActionsHeading": "Why your National Society is acting now and what criteria is used to launch this operation.",

src/views/DrefFinalReportExport/index.tsx

@@ -14,6 +14,7 @@ import Image from '#components/printable/Image';
 import Heading from '#components/printable/Heading';
 import Link from '#components/printable/Link';
 
+import DateOutput from '#components/DateOutput';
 import DescriptionText from '#components/printable/DescriptionText';
 import NumberOutput from '#components/NumberOutput';
 import useTranslation from '#hooks/useTranslation';
@@ -144,9 +145,15 @@ export function Component() {
     const imagesFileDefined = isDefined(drefResponse)
         && isDefined(drefResponse.images_file)
         && drefResponse.images_file.length > 0;
+    const eventDateDefined = drefResponse?.type_of_dref !== DREF_TYPE_IMMINENT
+        && isDefined(drefResponse?.event_date);
+    const eventTextDefined = drefResponse?.type_of_dref === DREF_TYPE_IMMINENT
+        && isDefined(drefResponse?.event_text);
     const showEventDescriptionSection = eventDescriptionDefined
         || eventScopeDefined
         || imagesFileDefined
+        || eventDateDefined
+        || eventTextDefined
         || isDefined(drefResponse?.event_map_file?.file);
 
     const ifrcActionsDefined = isTruthyString(drefResponse?.ifrc?.trim());
@@ -394,6 +401,20 @@ export function Component() {
                             />
                         </Container>
                     )}
+                    {eventTextDefined && (
+                        <Container heading={strings.approximateDateOfImpactHeading}>
+                            <DescriptionText>
+                                {drefResponse.event_text}
+                            </DescriptionText>
+                        </Container>
+                    )}
+                    {eventDateDefined && (
+                        <Container heading={strings.dateWhenTheTriggerWasMetHeading}>
+                            <DateOutput
+                                value={drefResponse?.event_date}
+                            />
+                        </Container>
+                    )}
                     {eventDescriptionDefined && (
                         <Container
                             heading={drefResponse?.type_of_dref === DREF_TYPE_IMMINENT

src/views/DrefOperationalUpdateExport/i18n.json

@@ -29,6 +29,8 @@
         "situationUpdateSectionHeading": "Provide any updates in the situation since the field report and explain what is expected to happen.",
         "anticipatoryActionsHeading": "Why your National Society is acting now and what criteria is used to launch this operation.",
         "scopeAndScaleSectionHeading": "Scope and Scale",
+        "approximateDateOfImpactHeading": "Approximate date of impact",
+        "dateWhenTheTriggerWasMetHeading": "Date of event / Date when the trigger was met",
 
         "summaryOfChangesSectionHeading": "Summary of Changes",
         "changingTimeFrameLabel":"Are you changing the timeframe of the operation",

src/views/DrefOperationalUpdateExport/index.tsx

@@ -163,12 +163,18 @@ export function Component() {
     const imagesFileDefined = isDefined(drefResponse)
         && isDefined(drefResponse.images_file)
         && drefResponse.images_file.length > 0;
+    const eventDateDefined = drefResponse?.type_of_dref !== DREF_TYPE_IMMINENT
+        && isDefined(drefResponse?.event_date);
+    const eventTextDefined = drefResponse?.type_of_dref === DREF_TYPE_IMMINENT
+        && isDefined(drefResponse?.event_text);
     const anticipatoryActionsDefined = drefResponse?.type_of_dref === DREF_TYPE_IMMINENT
         && isTruthyString(drefResponse?.anticipatory_actions?.trim());
     const showEventDescriptionSection = eventDescriptionDefined
         || eventScopeDefined
         || imagesFileDefined
         || anticipatoryActionsDefined
+        || eventDateDefined
+        || eventTextDefined
         || isDefined(drefResponse?.event_map_file?.file);
 
     const ifrcActionsDefined = isTruthyString(drefResponse?.ifrc?.trim());
@@ -458,6 +464,20 @@ export function Component() {
                             />
                         </Container>
                     )}
+                    {eventTextDefined && (
+                        <Container heading={strings.approximateDateOfImpactHeading}>
+                            <DescriptionText>
+                                {drefResponse.event_text}
+                            </DescriptionText>
+                        </Container>
+                    )}
+                    {eventDateDefined && (
+                        <Container heading={strings.dateWhenTheTriggerWasMetHeading}>
+                            <DateOutput
+                                value={drefResponse?.event_date}
+                            />
+                        </Container>
+                    )}
                     {eventDescriptionDefined && (
                         <Container
                             heading={drefResponse?.type_of_dref === DREF_TYPE_IMMINENT