diff --git a/src/components/booking/EntryList.tsx b/src/components/booking/EntryList.tsx index 20da213..8e46116 100644 --- a/src/components/booking/EntryList.tsx +++ b/src/components/booking/EntryList.tsx @@ -70,16 +70,16 @@ export const EntryList: React.FC<{ return (
- +
- {head('entry_date', 'Datum', 'left', 'pl-4')} - {showUser && head('user_name', 'Mitarbeiter')} - {head('customer_name', 'Kunde')} - {head('project_display', 'Projekt')} - {head('task_name', 'Task')} - {head('billable', 'Billable Zeit', 'right')} - {head('non_billable', 'Non-billable Zeit', 'right', 'pr-4')} + {head('entry_date', 'Datum', 'left', 'w-[110px] pl-4')} + {showUser && head('user_name', 'Mitarbeiter', 'left', 'w-[150px]')} + {head('customer_name', 'Kunde', 'left', 'w-[18%]')} + {head('project_display', 'Projekt', 'left', 'w-[24%]')} + {head('task_name', 'Task', 'left')} + {head('billable', 'Billable Zeit', 'right', 'w-[104px]')} + {head('non_billable', 'Non-billable Zeit', 'right', 'w-[124px] pr-4')} @@ -110,30 +110,31 @@ export const EntryList: React.FC<{ {showUser && ( )} - - diff --git a/src/components/reports/Reports.tsx b/src/components/reports/Reports.tsx index 7955cb0..b0ddcb4 100644 --- a/src/components/reports/Reports.tsx +++ b/src/components/reports/Reports.tsx @@ -280,7 +280,7 @@ const UserEntriesDialog: React.FC<{ ); return ( void; children: React.ReactNode; footer?: React.ReactNode; - size?: 'sm' | 'md' | 'lg' | 'xl' | '2xl'; + size?: 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl'; } -const SIZES = { sm: 'sm:max-w-sm', md: 'sm:max-w-lg', lg: 'sm:max-w-2xl', xl: 'sm:max-w-4xl', '2xl': 'sm:max-w-6xl' }; +const SIZES = { + sm: 'sm:max-w-sm', + md: 'sm:max-w-lg', + lg: 'sm:max-w-2xl', + xl: 'sm:max-w-4xl', + '2xl': 'sm:max-w-6xl', + // Fuer breite Tabellen: nimmt fast das ganze Fenster, hoert aber bei 1600 px auf. + '3xl': 'sm:max-w-[min(100rem,95vw)]', +}; /** Offene Dialoge in Oeffnungsreihenfolge - Escape schliesst nur den obersten. */ const openModals: symbol[] = [];
- + - {e.user_name} + {e.user_name} - - - {e.customer_name} + + + {e.customer_name} - {e.project_display} - {e.project_code} + {e.project_display} + {e.project_code} - {e.task_name ?? '–'} - {e.note && {e.note}} + {/* Tasknamen und Notizen sind teils sehr lang - hier wird umgebrochen statt abgeschnitten. */} + {e.task_name ?? '–'} + {e.note && {e.note}} + {bill ? formatHours(bill) : '–'} + {non ? formatHours(non) : '–'}