Merge pull request #291 from IFRCGo/fix/emergency-report-document-count

Fix emergency report document count

Author: tnagorra

src/views/AccountMyFormsDref/ActiveDrefTable/index.tsx

@@ -117,6 +117,7 @@ function ActiveDrefTable(props: Props) {
                 const opsUpdateList = operational_update_details;
                 return opsUpdateList[0];
             }
+
             return dref;
         },
         [],

src/views/EmergencyReportAndDocument/index.tsx

@@ -51,6 +51,7 @@ export function Component() {
     const { emergencyResponse } = useOutletContext<EmergencyOutletContext>();
     const {
         page: appealDocumentsPage,
+        offset: appealDocumentsOffset,
         setPage: setAppealDocumentsPage,
         limit: appealDocumentsLimit,
     } = useFilterState<object>({
@@ -93,7 +94,7 @@ export function Component() {
              */
             appeal: emergencyResponse.appeals.map((appeal) => appeal.id).filter(isDefined),
             limit: appealDocumentsLimit,
-            offset: appealDocumentsPage,
+            offset: appealDocumentsOffset,
         } : undefined,
     });
 
@@ -317,7 +318,7 @@ export function Component() {
                 <Container
                     heading={resolveToString(
                         strings.fieldReports,
-                        { count: emergencyResponse.field_reports.length },
+                        { count: emergencyResponse.field_reports.length ?? '--' },
                     )}
                     withHeaderBorder
                     footerActions={(
@@ -345,7 +346,7 @@ export function Component() {
                 <Container
                     heading={resolveToString(
                         strings.appealDocuments,
-                        { count: appealDocumentsResponse?.count },
+                        { count: appealDocumentsResponse?.count ?? '--' },
                     )}
                     withHeaderBorder
                     footerActions={(

src/views/EmergencySurge/SurgeTable/index.tsx

@@ -95,12 +95,17 @@ export default function SurgeTable(props: Props) {
                 'duration',
                 strings.surgeAlertDuration,
                 (item) => {
-                    if (isNotDefined(item.created_at) || isNotDefined(item.end)) {
+                    if (isNotDefined(item.start) || isNotDefined(item.end)) {
                         return undefined;
                     }
 
-                    const alertDate = new Date(item.created_at);
+                    const alertDate = new Date(item.start);
                     const deadline = new Date(item.end);
+
+                    if (alertDate > deadline) {
+                        return undefined;
+                    }
+
                     const duration = getDuration(alertDate, deadline);
 
                     return duration;
@@ -117,11 +122,11 @@ export default function SurgeTable(props: Props) {
                     const startDate = new Date(item.start);
                     const nowMs = new Date().getTime();
 
-                    const duration = startDate.getTime() < nowMs
+                    const start = startDate.getTime() < nowMs
                         ? strings.emergencySurgeImmediately
                         : startDate.toLocaleString();
 
-                    return duration;
+                    return start;
                 },
             ),
             createStringColumn<SurgeListItem, number>(