diff --git a/frontend/src/components/pages/HomePage/LogRecordsTable.tsx b/frontend/src/components/pages/HomePage/LogRecordsTable.tsx index 9130fe1e..0b154b95 100644 --- a/frontend/src/components/pages/HomePage/LogRecordsTable.tsx +++ b/frontend/src/components/pages/HomePage/LogRecordsTable.tsx @@ -60,7 +60,7 @@ const LogRecordsTable = ({ { // TODO: Resolve the resident record at some point } - {record.residentFirstName} + {record.residentId} {record.note} diff --git a/frontend/src/helper/CSVConverter.tsx b/frontend/src/helper/CSVConverter.tsx index 00c916ed..dbb9c1e9 100644 --- a/frontend/src/helper/CSVConverter.tsx +++ b/frontend/src/helper/CSVConverter.tsx @@ -12,8 +12,7 @@ const convertToCSVLog = (logRecord: LogRecord): CSVLog => { employee, flagged: logRecord.flagged, note: logRecord.note, - residentFirstName: logRecord.residentFirstName, - residentLastName: logRecord.residentLastName, + residentId: logRecord.residentId, tags: logRecord.tags.join("; "), }; }; @@ -23,7 +22,7 @@ const CSVConverter = (data: LogRecord[]): boolean => { try { const csvRows = []; - const headers = ["attnTo", "building", "datetime", "employee", "flagged", "note", "residentFirstName", "residentLastName", "tags"]; + const headers = ["attnTo", "building", "datetime", "employee", "flagged", "note", "residentId", "tags"]; csvRows.push(headers.join(",")); data.forEach((log: LogRecord) => { const logCSV = convertToCSVLog(log); diff --git a/frontend/src/types/CSVLog.ts b/frontend/src/types/CSVLog.ts index fd223004..7c72726d 100644 --- a/frontend/src/types/CSVLog.ts +++ b/frontend/src/types/CSVLog.ts @@ -5,7 +5,6 @@ export type CSVLog = { employee: string; flagged: boolean; note: string; - residentFirstName: string; - residentLastName: string; + residentId: string; tags: string; }; \ No newline at end of file diff --git a/frontend/src/types/LogRecordTypes.ts b/frontend/src/types/LogRecordTypes.ts index 8f3aaff6..6700e2ee 100644 --- a/frontend/src/types/LogRecordTypes.ts +++ b/frontend/src/types/LogRecordTypes.ts @@ -10,8 +10,7 @@ export type LogRecord = { employeeLastName: string; flagged: boolean; note: string; - residentFirstName: string; - residentLastName: string; + residentId: string; tags: string[]; };