LouisMazin/Boulangerie_Website
LouisMazin/Boulangerie_Website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nice

Browse Source
This commit is contained in:
Louis Mazin 2026-09-19 22:38:46 +02:00
parent a5b5c6def8
commit 9df9847c8a
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
frontend/src/pages/TimeClockPage.jsx
View File

@ -878,9 +878,6 @@ const TimeClockPage = () => {
<div className="w-full"> <div className="w-full">
{isAdmin && ( {isAdmin && (
<Card className="mb-4"> <Card className="mb-4">
<CardHeader className="border-b">
<CardTitle>Utilisateur</CardTitle>
</CardHeader>
<CardContent className="space-y-4"> <CardContent className="space-y-4">
<div className="flex flex-col gap-3 md:flex-row md:items-end"> <div className="flex flex-col gap-3 md:flex-row md:items-end">
<div className="min-w-0 flex-1"> <div className="min-w-0 flex-1">
@ -924,13 +921,6 @@ const TimeClockPage = () => {
<span>Voir tout le monde</span> <span>Voir tout le monde</span>
</label> </label>
</div> </div>
{showAllUsers && (
<p className="text-sm text-muted-foreground">
La sélection d’un utilisateur et le pointage manuel sont
désactivés lorsque tous les utilisateurs sont affichés.
</p>
)}
</CardContent> </CardContent>
</Card> </Card>
)} )}
@ -941,7 +931,7 @@ const TimeClockPage = () => {
<CardTitle> <CardTitle>
{editingEntry {editingEntry
? 'Modifier le pointage' ? 'Modifier le pointage'
: `Ajouter un pointage manuel${selectedUser ? ` — ${getUserLabel(selectedUser)}` : ''}`} : `Ajouter un pointage pour${selectedUser ? ` ${getUserLabel(selectedUser)}` : ''}`}
</CardTitle> </CardTitle>
</CardHeader> </CardHeader>
<CardContent> <CardContent>
@ -976,7 +966,7 @@ const TimeClockPage = () => {
<form onSubmit={handleAddEntry}> <form onSubmit={handleAddEntry}>
<div className="mb-4 grid grid-cols-1 gap-4 md:grid-cols-2"> <div className="mb-4 grid grid-cols-1 gap-4 md:grid-cols-2">
<div> <div>
<Label>Date:</Label> <Label>Date d'entrée:</Label>
<DatePicker <DatePicker
value={newEntry.date} value={newEntry.date}
onChange={(value) => onChange={(value) =>
@ -1050,7 +1040,7 @@ const TimeClockPage = () => {
autoPlay autoPlay
/> />
<div className="scanner-frame" aria-hidden="true" /> <div className="scanner-frame" aria-hidden="true" />
<Button onClick={closeScanner} variant="secondary" className="mt-2"> <Button onClick={closeScanner} variant="secondary" className="mt-2 full-w">
Annuler Annuler
</Button> </Button>
</div> </div>
@ -1069,7 +1059,11 @@ const TimeClockPage = () => {
<Card> <Card>
<CardHeader className="border-b"> <CardHeader className="border-b">
<CardTitle>Historique des pointages</CardTitle> <CardTitle>
{showAllUsers
? 'Historique des pointages'
: `Historique des pointages de${selectedUser ? ` ${getUserLabel(selectedUser)}` : ''}`}
</CardTitle>
</CardHeader> </CardHeader>
<CardContent> <CardContent>
{loading ? ( {loading ? (
@ -1081,7 +1075,7 @@ const TimeClockPage = () => {
<Table> <Table>
<TableHeader> <TableHeader>
<TableRow> <TableRow>
{isAdmin && <TableHead>Utilisateur</TableHead>} {isAdmin && <TableHead>Nom</TableHead>}
<TableHead>Date</TableHead> <TableHead>Date</TableHead>
<TableHead>Entrée</TableHead> <TableHead>Entrée</TableHead>
<TableHead>Sortie</TableHead> <TableHead>Sortie</TableHead>
@ -1099,7 +1093,7 @@ const TimeClockPage = () => {
) )
.map((entry) => ( .map((entry) => (
<TableRow key={entry.id}> <TableRow key={entry.id}>
{isAdmin && <TableCell>{entry.user}</TableCell>} {isAdmin && <TableCell>{entry.user.first_name} {entry.user.last_name}</TableCell>}
<TableCell>{formatDate(entry.date)}</TableCell> <TableCell>{formatDate(entry.date)}</TableCell>
<TableCell>{formatTime(entry.start_time)}</TableCell> <TableCell>{formatTime(entry.start_time)}</TableCell>
<TableCell>{formatTime(entry.end_time)}</TableCell> <TableCell>{formatTime(entry.end_time)}</TableCell>