wip - fixed

Author: FilinBrChaos

apps/ehr/src/pages/reports/InvoiceablePatients.tsx

@@ -252,7 +252,7 @@ export default function InvoiceablePatients(): React.ReactElement {
                     DOB
                   </Typography>
                 </TableCell>
-                <TableCell style={{ width: '200px' }}>
+                <TableCell>
                   <Typography fontWeight="500" fontSize="14px">
                     Appointment Date
                   </Typography>
@@ -267,7 +267,7 @@ export default function InvoiceablePatients(): React.ReactElement {
                     Responsible Party
                   </Typography>
                 </TableCell>
-                <TableCell style={{ width: '200px' }}>
+                <TableCell style={{ width: '70px' }}>
                   <Typography fontWeight="500" fontSize="14px">
                     Amount
                   </Typography>
@@ -277,7 +277,7 @@ export default function InvoiceablePatients(): React.ReactElement {
                     Claim id
                   </Typography>
                 </TableCell>
-                <TableCell style={{ width: '200px' }}>
+                <TableCell style={{ width: '100px' }}>
                   <Typography fontWeight="500" fontSize="14px">
                     Status
                   </Typography>
@@ -354,6 +354,7 @@ export default function InvoiceablePatients(): React.ReactElement {
                           onClick={() => {
                             setSelectedReportToSend(report);
                           }}
+                          variant="contained"
                         >
                           Invoice
                         </Button>

packages/zambdas/src/ehr/get-invoices-tasks/index.ts

@@ -13,6 +13,7 @@ import {
 } from 'fhir/r4b';
 import { DateTime } from 'luxon';
 import {
+  DISPLAY_DATE_FORMAT,
   FHIR_EXTENSION,
   formatDateConfigurable,
   GET_INVOICES_TASKS_ZAMBDA_KEY,
@@ -114,12 +115,16 @@ function performEffect(taskGroups: TaskGroup[], total: number): GetInvoicesTasks
       }
     }
     const visitDate = formatDateConfigurable({ isoDate: appointment?.start, timezone });
+    const finalizationDate = formatDateConfigurable({
+      isoDate: taskInput.finalizationDate,
+      format: DISPLAY_DATE_FORMAT + ' HH:mm',
+    });
 
     const patientPhoneNumber = group.relatedPerson && getPhoneNumberForIndividual(group.relatedPerson);
 
     reports.push({
       claimId: taskInput.claimId ?? '---',
-      finalizationDate: taskInput.finalizationDate ?? '---',
+      finalizationDate: finalizationDate ?? '---',
       amountInvoiceable: `${(taskInput.amountCents ?? 0) / 100}`,
       visitDate: visitDate ?? '---',
       location: group.location?.name ?? '---',