resolve issues with new features
This commit is contained in:
@@ -70,6 +70,7 @@ import {
|
||||
} from '@mui/icons-material';
|
||||
import { useNavigate, useSearchParams } from 'react-router-dom';
|
||||
import DashboardLayout from '../components/dashboard/DashboardLayout';
|
||||
import { useLayout } from '../contexts/LayoutContext';
|
||||
import { toGermanDate, toGermanDateTime, fromGermanDate, fromGermanDateTime, isValidGermanDate, isValidGermanDateTime } from '../utils/dateInput';
|
||||
import { useAuth } from '../contexts/AuthContext';
|
||||
import { useNotification } from '../contexts/NotificationContext';
|
||||
@@ -1681,6 +1682,7 @@ export default function Kalender() {
|
||||
const [searchParams] = useSearchParams();
|
||||
const { user } = useAuth();
|
||||
const notification = useNotification();
|
||||
const { chatPanelOpen } = useLayout();
|
||||
const theme = useTheme();
|
||||
const isMobile = useMediaQuery(theme.breakpoints.down('sm'));
|
||||
|
||||
@@ -2218,34 +2220,6 @@ export default function Kalender() {
|
||||
</Tooltip>
|
||||
</ButtonGroup>
|
||||
|
||||
{/* Category filter */}
|
||||
{kategorien.length > 0 && (
|
||||
<Box sx={{ display: 'flex', gap: 0.5, flexWrap: 'wrap' }}>
|
||||
<Chip
|
||||
label="Alle"
|
||||
onClick={() => setSelectedKategorie('all')}
|
||||
color={selectedKategorie === 'all' ? 'primary' : 'default'}
|
||||
variant={selectedKategorie === 'all' ? 'filled' : 'outlined'}
|
||||
size="small"
|
||||
/>
|
||||
{kategorien.map((k) => (
|
||||
<Chip
|
||||
key={k.id}
|
||||
label={k.name}
|
||||
onClick={() =>
|
||||
setSelectedKategorie(selectedKategorie === k.id ? 'all' : k.id)
|
||||
}
|
||||
size="small"
|
||||
sx={{
|
||||
bgcolor: selectedKategorie === k.id ? k.farbe : undefined,
|
||||
color: selectedKategorie === k.id ? 'white' : undefined,
|
||||
}}
|
||||
variant={selectedKategorie === k.id ? 'filled' : 'outlined'}
|
||||
/>
|
||||
))}
|
||||
</Box>
|
||||
)}
|
||||
|
||||
{/* Kategorien verwalten */}
|
||||
{canWriteEvents && (
|
||||
<Tooltip title="Kategorien verwalten">
|
||||
@@ -2296,6 +2270,34 @@ export default function Kalender() {
|
||||
</Button>
|
||||
</Box>
|
||||
|
||||
{/* Category filter — between controls and navigation */}
|
||||
{kategorien.length > 0 && (
|
||||
<Box sx={{ display: 'flex', gap: 0.5, flexWrap: 'wrap', mb: 1 }}>
|
||||
<Chip
|
||||
label="Alle"
|
||||
onClick={() => setSelectedKategorie('all')}
|
||||
color={selectedKategorie === 'all' ? 'primary' : 'default'}
|
||||
variant={selectedKategorie === 'all' ? 'filled' : 'outlined'}
|
||||
size="small"
|
||||
/>
|
||||
{kategorien.map((k) => (
|
||||
<Chip
|
||||
key={k.id}
|
||||
label={k.name}
|
||||
onClick={() =>
|
||||
setSelectedKategorie(selectedKategorie === k.id ? 'all' : k.id)
|
||||
}
|
||||
size="small"
|
||||
sx={{
|
||||
bgcolor: selectedKategorie === k.id ? k.farbe : undefined,
|
||||
color: selectedKategorie === k.id ? 'white' : undefined,
|
||||
}}
|
||||
variant={selectedKategorie === k.id ? 'filled' : 'outlined'}
|
||||
/>
|
||||
))}
|
||||
</Box>
|
||||
)}
|
||||
|
||||
{/* Navigation */}
|
||||
<Box sx={{ display: 'flex', alignItems: 'center', mb: 2, gap: 1 }}>
|
||||
<IconButton onClick={handlePrev} size="small">
|
||||
@@ -2554,7 +2556,7 @@ export default function Kalender() {
|
||||
{canWriteEvents && (
|
||||
<Fab
|
||||
color="primary"
|
||||
sx={{ position: 'fixed', bottom: 32, right: 32 }}
|
||||
sx={{ position: 'fixed', bottom: 32, right: chatPanelOpen ? 376 : 80, transition: 'right 225ms cubic-bezier(0.4, 0, 0.6, 1)' }}
|
||||
onClick={() => {
|
||||
setVeranstEditing(null);
|
||||
setVeranstFormOpen(true);
|
||||
@@ -2562,7 +2564,6 @@ export default function Kalender() {
|
||||
>
|
||||
<Add />
|
||||
</Fab>
|
||||
)}
|
||||
|
||||
{/* Day Popover */}
|
||||
<DayPopover
|
||||
@@ -2927,7 +2928,7 @@ export default function Kalender() {
|
||||
{canCreateBookings && (
|
||||
<Fab
|
||||
color="primary"
|
||||
sx={{ position: 'fixed', bottom: 32, right: 32 }}
|
||||
sx={{ position: 'fixed', bottom: 32, right: chatPanelOpen ? 376 : 80, transition: 'right 225ms cubic-bezier(0.4, 0, 0.6, 1)' }}
|
||||
onClick={openBookingCreate}
|
||||
>
|
||||
<Add />
|
||||
|
||||
Reference in New Issue
Block a user