rick/rosterchirp-dev
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

schedules bug fix

Browse Source
This commit is contained in:
Ricky Stretch
2026-03-28 21:03:12 -04:00
parent 12c4a154e5
commit 3bf01cba1f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/routes/schedule.js
View File

@@ -377,9 +377,9 @@ router.delete('/:id', authMiddleware, async (req, res) => {
AND title=$2 AND start_at >= $3 AND title=$2 AND start_at >= $3
`, [event.created_by, event.title, event.start_at]); `, [event.created_by, event.title, event.start_at]);
} else if (recurringScope === 'all' && event.recurrence_rule) { } else if (recurringScope === 'all' && event.recurrence_rule) {
// Delete every occurrence // Delete present and future occurrences only — preserve past records
await exec(req.schema, ` await exec(req.schema, `
DELETE FROM events WHERE created_by=$1 AND recurrence_rule IS NOT NULL AND title=$2 DELETE FROM events WHERE created_by=$1 AND recurrence_rule IS NOT NULL AND title=$2 AND end_at >= NOW()
`, [event.created_by, event.title]); `, [event.created_by, event.title]);
} else { } else {
await exec(req.schema, 'DELETE FROM events WHERE id=$1', [req.params.id]); await exec(req.schema, 'DELETE FROM events WHERE id=$1', [req.params.id]);

2
frontend/src/components/SchedulePage.jsx
View File

@@ -782,7 +782,7 @@ function EventDetailModal({ event, onClose, onEdit, onAvailabilityChange, isTool
},[event]); },[event]);
const counts={going:0,maybe:0,not_going:0}; const counts={going:0,maybe:0,not_going:0};
avail.forEach(r=>{if(counts[r.response]!==undefined)counts[r.response]++;}); avail.forEach(r=>{if(counts[r.response]!==undefined)counts[r.response]++;});
const isPast = !event.all_day && event.end_at && new Date(event.end_at) < new Date(); const isPast = !!event.end_at && new Date(event.end_at) < new Date();
const noteChanged = noteInput.trim() !== myNote.trim(); const noteChanged = noteInput.trim() !== myNote.trim();
const handleResp=async resp=>{ const handleResp=async resp=>{