Skip to content

Commit c36a0b7

Browse files
author
helicalbytes
committed
WIP admin bits for hack the space evening
1 parent 2c7d5f9 commit c36a0b7

File tree

6 files changed

+6
-2
lines changed

6 files changed

+6
-2
lines changed

api/routes/calendar.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ function _slotIsAvailableAtTime (slot, date, resource, bookings) {
9999
for (const b of bookings) {
100100
const bookingStarts = moment(b.starts);
101101
const bookingEnds = moment(b.ends);
102-
if (slotStarts.isBetween(bookingStarts, bookingEnds, undefined, '[]') ||
103-
slotEnds.isBetween(bookingStarts, bookingEnds, undefined, '[]')) {
102+
if (slotStarts.isBetween(bookingStarts, bookingEnds, undefined, '[)') ||
103+
slotEnds.isBetween(bookingStarts, bookingEnds, undefined, '()]')) {
104104
remainingCapacity--;
105105
}
106106
}

website/templates/admin/admin-base.html

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{% extends "../base.html" %}
22

3+
{% block header %}
4+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/font/bootstrap-icons.css">
5+
{% endblock %}
6+
37
{% block navbar %}
48
<div class="collapse navbar-collapse">
59
<ul class="navbar-nav mr-auto">

website/templates/admin/bookings/confirm-deletion.html

Whitespace-only changes.

website/templates/admin/bookings/create.html

Whitespace-only changes.

website/templates/admin/bookings/edit.html

Whitespace-only changes.

website/templates/admin/bookings/view.html

Whitespace-only changes.

0 commit comments

Comments
 (0)