Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/(dashboard)/administrator/archive-tab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,13 @@ function AdminRoleBadge({ role }: { role: string | null | undefined }) {
</span>
)
}
if (role === 'Information Manager') {
return (
<span className="text-xs font-semibold px-2.5 py-1 rounded-full bg-[#fbbf24] text-[#451a03]">
Info Manager
</span>
)
}
return null
}

Expand Down
7 changes: 7 additions & 0 deletions app/(dashboard)/administrator/audit-tab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ function AdminRoleBadge({ role }: { role: string | null | undefined }) {
</span>
)
}
if (role === 'Information Manager') {
return (
<span className="text-xs font-semibold px-2.5 py-1 rounded-full bg-[#fbbf24] text-[#451a03]">
Info Manager
</span>
)
}
return null
}

Expand Down
6 changes: 5 additions & 1 deletion app/(dashboard)/administrator/booking-settings-tab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,11 @@ export default function BookingSettingsTab() {
process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!
)
supabase.auth.getUser().then(({ data: { user } }) => {
if (user?.app_metadata?.admin_role === 'Vice President of Operational Affairs') {
if (
user?.app_metadata?.admin_role === 'Vice President of Operational Affairs' ||
user?.app_metadata?.admin_role === 'Executive Vice President' ||
user?.app_metadata?.admin_role === 'Information Manager'
) {
setIsVP(true)
}
})
Expand Down
43 changes: 30 additions & 13 deletions app/(dashboard)/administrator/bookings-tab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,13 @@ function AdminRoleBadge({ role }: { role: string | null | undefined }) {
</span>
)
}
if (role === 'Information Manager') {
return (
<span className="text-xs font-semibold px-2.5 py-1 rounded-full bg-[#fbbf24] text-[#451a03]">
Info Manager
</span>
)
}
return null
}

Expand All @@ -157,6 +164,7 @@ export default function BookingsTab() {
const [tabling, setTabling] = useState<TablingBooking[]>([])
const [bodies, setBodies] = useState<Body[]>([])
const [semesters, setSemesters] = useState<Semester[]>([])
const [showAll, setShowAll] = useState(false)
const [loading, setLoading] = useState(true)
const [showModal, setShowModal] = useState(false)
const [editingBooking, setEditingBooking] = useState<OneTimeBooking | null>(null)
Expand All @@ -167,8 +175,8 @@ export default function BookingsTab() {
sessions: { id: string; label: string }[]
} | null>(null)

const fetchBookings = async () => {
const res = await fetch('/api/administrator/bookings')
const fetchBookings = async (all = false) => {
const res = await fetch(`/api/administrator/bookings${all ? '?all=true' : ''}`)
const data = await res.json()
setOneTime(data.oneTime || [])
setWeekly(data.weekly || [])
Expand Down Expand Up @@ -211,10 +219,10 @@ export default function BookingsTab() {
}

useEffect(() => {
fetchBookings()
fetchBookings(showAll)
fetchBodies()
fetchSemesters()
}, [])
}, [showAll])

const sortedWeekly = loading ? [] : [...weekly].sort((a, b) => {
const wa = a.weekly_room_bookings?.[0]
Expand Down Expand Up @@ -245,8 +253,17 @@ export default function BookingsTab() {
))}
</div>

{/* Create button */}
<div className="flex justify-end">
{/* Create button + all-semesters toggle */}
<div className="flex items-center justify-between">
<label className="flex items-center gap-2 cursor-pointer select-none">
<div
onClick={() => setShowAll(v => !v)}
className={`relative w-8 h-4.5 rounded-full transition-colors ${showAll ? 'bg-[#c8102e]' : 'bg-[#1e5080]'}`}
>
<span className={`absolute top-0.5 left-0.5 w-3.5 h-3.5 rounded-full bg-white shadow transition-transform ${showAll ? 'translate-x-3.5' : 'translate-x-0'}`} />
</div>
<span className="text-xs text-[#93b8d8]">Show Inactive Bookings</span>
</label>
<button
onClick={() => setShowModal(true)}
disabled={loading}
Expand All @@ -267,23 +284,23 @@ export default function BookingsTab() {
bodies={bodies}
semesters={semesters}
onClose={() => setShowModal(false)}
onSuccess={fetchBookings}
onSuccess={() => fetchBookings(showAll)}
/>
)}
{subTab === 'Weekly Rooms' && (
<WeeklyForm
bodies={bodies}
semesters={semesters}
onClose={() => setShowModal(false)}
onSuccess={fetchBookings}
onSuccess={() => fetchBookings(showAll)}
/>
)}
{subTab === 'Tables' && (
<TablingForm
bodies={bodies}
semesters={semesters}
onClose={() => setShowModal(false)}
onSuccess={fetchBookings}
onSuccess={() => fetchBookings(showAll)}
/>
)}
</BookingModal>
Expand All @@ -297,7 +314,7 @@ export default function BookingsTab() {
booking={editingBooking}
bodies={bodies}
onClose={() => setEditingBooking(null)}
onSuccess={fetchBookings}
onSuccess={() => fetchBookings(showAll)}
/>
</BookingModal>
)}
Expand All @@ -311,7 +328,7 @@ export default function BookingsTab() {
booking={editingWeekly}
bodies={bodies}
onClose={() => setEditingWeekly(null)}
onSuccess={fetchBookings}
onSuccess={() => fetchBookings(showAll)}
/>
</BookingModal>
)}
Expand All @@ -325,7 +342,7 @@ export default function BookingsTab() {
booking={editingTabling}
bodies={bodies}
onClose={() => setEditingTabling(null)}
onSuccess={fetchBookings}
onSuccess={() => fetchBookings(showAll)}
/>
</BookingModal>
)}
Expand All @@ -335,7 +352,7 @@ export default function BookingsTab() {
booking={cancellingAdminBooking.booking}
sessions={cancellingAdminBooking.sessions}
onClose={() => setCancellingAdminBooking(null)}
onCancelled={() => { setCancellingAdminBooking(null); fetchBookings() }}
onCancelled={() => { setCancellingAdminBooking(null); fetchBookings(showAll) }}
/>
)}

Expand Down
3 changes: 3 additions & 0 deletions app/(dashboard)/administrator/one-time-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ const STATUSES = [
'Pending Cancellation',
'Cancelled',
'Virtual',
'Missed',
'Repurposed',
'Tentative',
]

interface Body {
Expand Down
Loading
Loading