Skip to content

CSCEXAM-1508 Add booking calendar component admin access check #1266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VirmasaloA merged 6 commits into from
Dec 1, 2025
Merged

CSCEXAM-1508 Add booking calendar component admin access check #1266

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
704fc83
CSCEXAM-1508 Add booking calendar component admin access check
VirmasaloA Nov 11, 2025
210e68e
Enhance booking calendar component with admin access checks and impro…
VirmasaloA Nov 12, 2025
873d191
Update booking calendar component to utilize session service for admi…
VirmasaloA Nov 17, 2025
d665156
Update README.md
VirmasaloA Nov 24, 2025
dec12f4
Remove style preprocessor options from angular.json
VirmasaloA Nov 26, 2025
40f2913
Merge branch 'dev' into CSCEXAM-1508
VirmasaloA Dec 1, 2025
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ SPDX-License-Identifier: EUPL-1.2
EXAM Quickstart for developers
=====================================

1. Prerequisites: install SBT, Java (21), Node (>= 18) and PostgreSQL (>= 9.4).
1. Prerequisites: install SBT, Java (25), Node (>= 18) and PostgreSQL (>= 9.4).
Copy link
Collaborator

@lupari lupari Nov 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Iteasiassa 21 on tässä bräntissä minimivaatimus tai ainakin pitäisi olla.

Copy link
Collaborator Author

@VirmasaloA VirmasaloA Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ei toimi ilman virheilmotuksia


2. Create PostgreSQL database

**Option A: Using Docker (recommended for development):**

$ docker compose up -d postgres
$ docker compose up -d postgres

Or with the provided Makefile:

Expand Down
7 changes: 6 additions & 1 deletion ui/src/app/calendar/booking-calendar.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import timeGridPlugin from '@fullcalendar/timegrid';
import { TranslateService } from '@ngx-translate/core';
import { DateTime } from 'luxon';
import type { Accessibility, ExamRoom } from 'src/app/reservation/reservation.model';
import { SessionService } from 'src/app/session/session.service';
import { CalendarService } from './calendar.service';

@Component({
Expand All @@ -32,7 +33,7 @@ import { CalendarService } from './calendar.service';
template: `
@if (visible()) {
<div class="row my-2">
@if (visible() && passwordVerified()) {
@if (visible() && (passwordVerified() || isAdmin())) {
<div class="col-md-12">
<full-calendar #fc [options]="calendarOptions()"></full-calendar>
</div>
Expand Down Expand Up @@ -62,11 +63,15 @@ export class BookingCalendarComponent implements OnInit, AfterViewInit {
calendarOptions = signal<CalendarOptions>({});
searchStart = DateTime.now().startOf('week').toISO();
searchEnd = DateTime.now().endOf('week').toISO();
isAdmin = signal(false);

private translate = inject(TranslateService);
private Calendar = inject(CalendarService);
private Session = inject(SessionService);

constructor() {
this.isAdmin.set(this.Session.getUser().isAdmin);

this.calendarOptions.set({
plugins: [luxon2Plugin, timeGridPlugin],
initialView: 'timeGridWeek',
Expand Down
Loading