perfect
This commit is contained in:
parent
c0ea55f77c
commit
17270122df
@ -56,7 +56,7 @@ function App() {
|
|||||||
<main className="flex-1 overflow-hidden">
|
<main className="flex-1 overflow-hidden">
|
||||||
|
|
||||||
{/* Marges autour de la page */}
|
{/* Marges autour de la page */}
|
||||||
<div className="h-full w-full p-4 md:p-12">
|
<div className="h-full w-full">
|
||||||
|
|
||||||
{/* SEULE zone scrollable */}
|
{/* SEULE zone scrollable */}
|
||||||
<div className="page-route h-full w-full overflow-y-auto">
|
<div className="page-route h-full w-full overflow-y-auto">
|
||||||
@ -120,8 +120,8 @@ function App() {
|
|||||||
|
|
||||||
</main>
|
</main>
|
||||||
|
|
||||||
<footer className="site-footer shrink-0 border-t border-border bg-muted py-2">
|
<footer className="site-footer shrink-0 py-2">
|
||||||
<p className="text-center text-sm text-muted-foreground">
|
<p className="text-right text-sm text-muted-foreground">
|
||||||
© 2026 Le Fournil du Bocage. Tous droits réservés.
|
© 2026 Le Fournil du Bocage. Tous droits réservés.
|
||||||
</p>
|
</p>
|
||||||
</footer>
|
</footer>
|
||||||
|
|||||||
@ -88,6 +88,7 @@ const NavBar = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<Sidebar
|
<Sidebar
|
||||||
|
className="border-0"
|
||||||
collapsible="icon"
|
collapsible="icon"
|
||||||
onMouseEnter={handleMouseEnter}
|
onMouseEnter={handleMouseEnter}
|
||||||
onMouseLeave={handleMouseLeave}
|
onMouseLeave={handleMouseLeave}
|
||||||
|
|||||||
@ -959,13 +959,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>
|
||||||
)}
|
)}
|
||||||
@ -976,7 +969,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>
|
||||||
@ -1011,7 +1004,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) =>
|
||||||
@ -1104,7 +1097,10 @@ const TimeClockPage = () => {
|
|||||||
|
|
||||||
<Card>
|
<Card>
|
||||||
<CardHeader className="border-b">
|
<CardHeader className="border-b">
|
||||||
<CardTitle>Historique des pointages</CardTitle>
|
<CardTitle>
|
||||||
|
Historique des pointages {
|
||||||
|
!showAllUsers && `de ${getUserLabel(selectedUser)}`
|
||||||
|
}</CardTitle>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardContent>
|
<CardContent>
|
||||||
{loading ? (
|
{loading ? (
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user