diff --git a/src/components/reports/ReportTable.tsx b/src/components/reports/ReportTable.tsx index 40c21ef..66305aa 100644 --- a/src/components/reports/ReportTable.tsx +++ b/src/components/reports/ReportTable.tsx @@ -52,15 +52,15 @@ export const ReportTable: React.FC<{ return (
- +
{head('name', label, 'left', 'pl-4')} - {head('minutes', 'Stunden')} - @@ -82,12 +82,12 @@ export const ReportTable: React.FC<{ ) : null} - {r.name} - {r.customer_name && {r.customer_name}{r.code ? ` · ${r.code}` : ''}} + {r.name} + {r.customer_name && {r.customer_name}{r.code ? ` · ${r.code}` : ''}} - + @@ -96,10 +96,10 @@ export const ReportTable: React.FC<{ {r.utilization == null ? '–' : `${r.utilization} %`} )} - - {showAmounts && } + {showAmounts && } ); })} diff --git a/src/components/reports/Reports.tsx b/src/components/reports/Reports.tsx index 0d418eb..29c825f 100644 --- a/src/components/reports/Reports.tsx +++ b/src/components/reports/Reports.tsx @@ -187,13 +187,13 @@ const TimeReport: React.FC = () => { ) : ( <> - -
+ +

Gesamtstunden

v.toLocaleString('de-DE', { minimumFractionDigits: 2, maximumFractionDigits: 2 })} className="text-4xl font-extrabold text-ink-900" />

{s!.entries} Buchungen

-
+

@@ -219,7 +219,7 @@ const TimeReport: React.FC = () => {

-
+

Billable Betrag

formatEuro(v, 2)} className="text-4xl font-extrabold text-ink-900" />
-
+

Auslastung

`${Math.round(v)} %`} className="text-4xl font-extrabold text-ink-900" />

Kapazität {formatHours(capacity, 0)} h bis heute

- {showUtil && head('utilization', 'Auslastung')} - {head('billable_minutes', 'Billable Std.')} - {showAmounts && head('amount', 'Billable Betrag', 'right', 'pr-4')} + {head('minutes', 'Stunden', 'right', 'w-[108px]')} + + {showUtil && head('utilization', 'Auslastung', 'right', 'w-[116px]')} + {head('billable_minutes', 'Billable Std.', 'right', 'w-[160px]')} + {showAmounts && head('amount', 'Billable Betrag', 'right', 'w-[150px] pr-4')}
{formatHours(r.minutes)}{formatHours(r.minutes)} + {formatHours(r.billable_minutes)} ({share} %) {formatEuro(r.amount, 2)}{formatEuro(r.amount, 2)}