github/TREK
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(dayplan): resolve duplicate reservation display, date off-by-one, and missing day_id on edit

Browse Source 
- Exclude place-assigned reservations from timeline to prevent duplicate display
- Use selected day's date instead of today when entering time without date
- Pass day_id when updating reservations, not only when creating
This commit is contained in:
Maurice
2026-04-06 12:56:54 +02:00
parent 09ab829b17
commit 4ba6005ca3
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/Planner/DayPlanSidebar.tsx
View File

@@ -248,8 +248,10 @@ const DayPlanSidebar = React.memo(function DayPlanSidebar({
const getTransportForDay = (dayId: number) => { const getTransportForDay = (dayId: number) => {
const day = days.find(d => d.id === dayId) const day = days.find(d => d.id === dayId)
if (!day?.date) return [] if (!day?.date) return []
const dayAssignmentIds = (assignments[String(dayId)] || []).map(a => a.id)
return reservations.filter(r => { return reservations.filter(r => {
if (!r.reservation_time || r.type === 'hotel') return false if (!r.reservation_time || r.type === 'hotel') return false
if (r.assignment_id && dayAssignmentIds.includes(r.assignment_id)) return false
const startDate = r.reservation_time.split('T')[0] const startDate = r.reservation_time.split('T')[0]
const endDate = getEndDate(r) const endDate = getEndDate(r)

3
client/src/components/Planner/ReservationModal.tsx
View File

@@ -385,7 +385,8 @@ export function ReservationModal({ isOpen, onClose, onSave, reservation, days, p
value={(() => { const [, t] = (form.reservation_time || '').split('T'); return t || '' })()} value={(() => { const [, t] = (form.reservation_time || '').split('T'); return t || '' })()}
onChange={t => { onChange={t => {
const [d] = (form.reservation_time || '').split('T') const [d] = (form.reservation_time || '').split('T')
const date = d || new Date().toISOString().split('T')[0] const selectedDay = days.find(dy => dy.id === selectedDayId)
const date = d || selectedDay?.date || new Date().toISOString().split('T')[0]
set('reservation_time', t ? `${date}T${t}` : date) set('reservation_time', t ? `${date}T${t}` : date)
}} }}
/> />

2
client/src/pages/TripPlannerPage.tsx
View File

@@ -431,7 +431,7 @@ export default function TripPlannerPage(): React.ReactElement | null {
const handleSaveReservation = async (data) => { const handleSaveReservation = async (data) => {
try { try {
if (editingReservation) { if (editingReservation) {
const r = await tripActions.updateReservation(tripId, editingReservation.id, data) const r = await tripActions.updateReservation(tripId, editingReservation.id, { ...data, day_id: selectedDayId || null })
toast.success(t('trip.toast.reservationUpdated')) toast.success(t('trip.toast.reservationUpdated'))
setShowReservationModal(false) setShowReservationModal(false)
if (data.type === 'hotel') { if (data.type === 'hotel') {