diff --git a/app/javascript/src/common/ChartBar/index.tsx b/app/javascript/src/common/ChartBar/index.tsx index adf66af63f..e3b0232517 100644 --- a/app/javascript/src/common/ChartBar/index.tsx +++ b/app/javascript/src/common/ChartBar/index.tsx @@ -51,7 +51,7 @@ const GetClientBar = ({ data, totalMinutes }: IChartBarGraph) => {

- TOTAL HOURS:{" "} + TOTAL HOURS: {minToHHMM(totalMinutes)}

diff --git a/app/javascript/src/components/Clients/List/TableData.tsx b/app/javascript/src/components/Clients/List/TableData.tsx index a41450e6be..15e167bd2e 100644 --- a/app/javascript/src/components/Clients/List/TableData.tsx +++ b/app/javascript/src/components/Clients/List/TableData.tsx @@ -31,6 +31,14 @@ const TableData = ( ), col2: ( +
+ {client.email || "-"} +
+ ), + col3: (
{ const { isAdminUser, isDesktop } = useUserContext(); + const sortedClientData = clientData.sort((a, b) => b.minutes - a.minutes); + const getTableData = TableData( - clientData, + sortedClientData, handleTooltip, showToolTip, toolTipRef, diff --git a/app/javascript/src/components/Clients/constants.ts b/app/javascript/src/components/Clients/constants.ts index a61d49e758..ba2b2558f2 100644 --- a/app/javascript/src/components/Clients/constants.ts +++ b/app/javascript/src/components/Clients/constants.ts @@ -2,12 +2,17 @@ export const tableHeader = [ { Header: "CLIENT", accessor: "col1", // accessor is the "key" in the data - cssClass: "md:w-1/3 capitalize", + cssClass: "md:w-1/4 capitalize", }, { - Header: "HOURS LOGGED", + Header: "EMAIL ID(s)", accessor: "col2", - cssClass: "text-right md:w-1/5", // accessor is the "key" in the data + cssClass: "text-left md:w-2/5", // accessor is the "key" in the data + }, + { + Header: "HOURS LOGGED", + accessor: "col3", + cssClass: "text-right md:w-1/6", // accessor is the "key" in the data }, ];