diff --git a/api/model/bookingItems.js b/api/model/bookingItems.js index 63fbb75..15ddd27 100644 --- a/api/model/bookingItems.js +++ b/api/model/bookingItems.js @@ -63,7 +63,7 @@ class BookingItems extends ModelItemsBase { .join('resources', 'resources.id', '=', 'bookings.resource_id') .where('bookings.resource_id', '=', resourceId) .where('starts', '>=', start.toISOString()) - .where('ends', '<=', end.toISOString()) + .where('ends', '>', start.toISOString()) .where('cancelled', '=', false); return query.then((bookings) => { return bookings; }); } diff --git a/website/app.js b/website/app.js index 52ceaee..00f5318 100644 --- a/website/app.js +++ b/website/app.js @@ -42,7 +42,7 @@ app.use(express.static(staticFilesRootDirectory)); app.use(bodyParser.urlencoded({ extended: true })); app.use(express.json()); app.use(session({ - secret: 'b8268fa1-3b29-4885-80fc-e916b9949386', + secret: process.env.OPTIMISM_SESSION_SECRET || 'b8268fa1-3b29-4885-80fc-e916b9949386', resave: true, saveUninitialized: true })); diff --git a/website/routes/admin/slots.js b/website/routes/admin/slots.js index bbe57e1..97fce7b 100644 --- a/website/routes/admin/slots.js +++ b/website/routes/admin/slots.js @@ -36,10 +36,13 @@ router.get('/slots/create', async function (req, res) { router.post('/slots/create', async function (req, res) { const name = req.body.name; try { - await axios.post(`${apiUrl}/resource-types`, { - name: name + await axios.post(`${apiUrl}/slots`, { + name: name, + day: parseInt(req.body.day), + starts: req.body.starts, + ends: req.body.ends }); - res.redirect('/admin/resource-types'); + res.redirect('/admin/slots'); } catch (error) { console.log(error); res.render('error.html', {