Fix bug where XLSX parses dates into floating point numbers

api/src/paths/dwc/scrape-occurrences.ts

@@ -8,8 +8,6 @@ import { getSubmissionFileFromS3, getSubmissionS3Key, prepDWCArchive } from './v
 import { HTTP400 } from '../../errors/CustomError';
 import { postOccurrenceSQL } from '../../queries/occurrence/occurrence-create-queries';
 import { PostOccurrence } from '../../models/occurrence-create';
-import xlsx from 'xlsx';
-import moment from 'moment';
 
 const defaultLog = getLogger('paths/dwc/scrape-occurrences');
 
@@ -114,9 +112,7 @@ export function scrapeAndUploadOccurrences(): RequestHandler {
 
         eventRows?.forEach((eventRow: any) => {
           if (eventRow[eventEventIdHeader] === occurrenceEventId) {
-            const eventMoment = convertExcelDateToMoment(eventRow[eventDateHeader] as number);
-            eventDate = eventMoment.toISOString();
-
+            eventDate = eventRow[eventDateHeader];
             verbatimCoordinates = eventRow[eventVerbatimCoordinatesHeader];
           }
         });
@@ -184,19 +180,6 @@ export const uploadScrapedOccurrence = async (
   }
 };
 
-export const convertExcelDateToMoment = (excelDateNumber: number): moment.Moment => {
-  const ssfDate = xlsx.SSF.parse_date_code(excelDateNumber);
-
-  return moment({
-    year: ssfDate.y,
-    month: ssfDate.m,
-    day: ssfDate.d,
-    hour: ssfDate.H,
-    minute: ssfDate.M,
-    second: ssfDate.S
-  });
-};
-
 const getHeadersAndRowsFromFile = (file: any) => {
   const eventHeaders = file.worksheets.event?.getHeaders();
   const eventRows = file.worksheets.event?.getRows();

api/src/utils/media/csv/csv-file.ts

@@ -26,6 +26,7 @@ export class CSVWorksheet {
 
   _headers: string[];
   _rows: (string | number)[][];
+  _rowObjects: object[];
 
   csvValidation: CSVValidation;
 
@@ -36,6 +37,7 @@ export class CSVWorksheet {
 
     this._headers = [];
     this._rows = [];
+    this._rowObjects = [];
 
     this.csvValidation = new CSVValidation(this.name);
   }
@@ -102,12 +104,38 @@ export class CSVWorksheet {
     }
 
     if (!this._rows.length) {
+      const rowsToReturn: (string | number)[][] = [];
+
       const originalRange = xlsx.utils.decode_range(ref);
 
-      // Specify range to not include the 0th row (header row)
-      const customRange: xlsx.Range = { ...originalRange, s: { ...originalRange.s, r: 1 } };
+      for (let i = 1; i <= originalRange.e.r; i++) {
+        const row = new Array(this.getHeaders().length);
+        let rowHasValues = false;
+
+        for (let j = 0; j <= originalRange.e.c; j++) {
+          const cellAddress = { c: j, r: i };
+          const cellRef = xlsx.utils.encode_cell(cellAddress);
+          const cellValue = this.worksheet[cellRef];
+
+          if (!cellValue) {
+            continue;
+          }
+
+          if (cellValue.t === 'n' || cellValue.t === 'd') {
+            row[j] = cellValue.w;
+          } else {
+            row[j] = cellValue.v;
+          }
 
-      this._rows = xlsx.utils.sheet_to_json(this.worksheet, { header: 1, blankrows: false, range: customRange });
+          rowHasValues = true;
+        }
+
+        if (row.length && rowHasValues) {
+          rowsToReturn.push(row);
+        }
+      }
+
+      this._rows = rowsToReturn;
     }
 
     return this._rows;
@@ -124,7 +152,25 @@ export class CSVWorksheet {
       return [];
     }
 
-    return xlsx.utils.sheet_to_json(this.worksheet);
+    if (!this._rowObjects.length) {
+      const rowObjectsArray: object[] = [];
+      const rows = this.getRows();
+      const headers = this.getHeaders();
+
+      rows.forEach((row: (string | number)[]) => {
+        const rowObject = {};
+
+        headers.forEach((header: string, index: number) => {
+          rowObject[header] = row[index];
+        });
+
+        rowObjectsArray.push(rowObject);
+      });
+
+      this._rowObjects = rowObjectsArray;
+    }
+
+    return this._rowObjects;
   }
 
   buildID(parts: (string | number)[], postfix?: string): string {

app/src/components/map/OccurrenceFeaturePopup.tsx

@@ -26,7 +26,7 @@ export const OccurrenceFeaturePopup: React.FC<{ featureData: any }> = (props) =>
       </div>
       <div>
         <b>Date</b>
-        {`: ${getFormattedDate(DATE_FORMAT.ShortMediumDateTimeFormat, featureData.eventDate)}`}
+        {`: ${getFormattedDate(DATE_FORMAT.ShortMediumDateFormat2, featureData.eventDate)}`}
       </div>
     </Popup>
   );