Skip to content

CSCEXAM-1484 Reorganize room editing and schedule code #1303

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
lupari merged 2 commits into from
Dec 23, 2025
Merged

CSCEXAM-1484 Reorganize room editing and schedule code #1303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ea9cad
CSCEXAM-1484 Reorganize room editing and schedule code
lupari Dec 22, 2025
f9393ac
Merge branch 'dev' into CSCEXAM-1484
lupari Dec 23, 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 app/controllers/facility/RoomController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,8 @@ public Result updateExamStartingHours(Http.Request request) {
}

private ExceptionWorkingHours parse(JsonNode node) {
DateTime startDate = ISODateTimeFormat.dateTime().parseDateTime(node.get("start").asText());
DateTime endDate = ISODateTimeFormat.dateTime().parseDateTime(node.get("end").asText());
DateTime startDate = ISODateTimeFormat.dateTime().parseDateTime(node.get("startDate").asText());
DateTime endDate = ISODateTimeFormat.dateTime().parseDateTime(node.get("endDate").asText());
ExceptionWorkingHours hours = new ExceptionWorkingHours();
hours.setStartDate(startDate.toDate());
hours.setEndDate(endDate.toDate());
Expand Down
12 changes: 8 additions & 4 deletions ui/src/app/dashboard/staff/staff.routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import { ExaminationComponent } from 'src/app/examination/examination.component'
import { FacilityComponent } from 'src/app/facility/facility.component';
import { MachineComponent } from 'src/app/facility/machines/machine.component';
import { AvailabilityComponent } from 'src/app/facility/rooms/availability.component';
import { MultiRoomComponent } from 'src/app/facility/rooms/room-mass-edit.component';
import { RoomComponent } from 'src/app/facility/rooms/room.component';
import { RoomEditComponent } from 'src/app/facility/rooms/room-edit.component';
import { RoomExceptionsBulkComponent } from 'src/app/facility/rooms/room-exceptions-bulk.component';
import { LanguageInspectionsComponent } from 'src/app/maturity/language-inspections.component';
import { MaturityReportingComponent } from 'src/app/maturity/reporting/maturity-reporting.component';
import { QuestionComponent } from 'src/app/question/basequestion/question.component';
Expand Down Expand Up @@ -234,15 +234,19 @@ export const STAFF_ROUTES: Route[] = [
},
{ path: 'reservations/:eid', component: ReservationsComponent },
{ path: 'rooms', component: FacilityComponent, title: () => buildTitle('i18n_exam_rooms_title') },
{ path: 'rooms/:id', component: RoomComponent, title: () => buildTitle('i18n_exam_room_title') },
{ path: 'rooms/:id', component: RoomEditComponent, title: () => buildTitle('i18n_exam_room_title') },
{
path: 'rooms/:id/availability',
component: AvailabilityComponent,
title: () => buildTitle('i18n_room_availability_title'),
},
{ path: 'settings', component: SettingsComponent, title: () => buildTitle('i18n_settings_title') },
{ path: 'users', component: UsersComponent, title: () => buildTitle('i18n_users_title') },
{ path: 'multiroom', component: MultiRoomComponent, title: () => buildTitle('i18n_multiroom_title') },
{
path: 'rooms/exceptions/bulk',
component: RoomExceptionsBulkComponent,
title: () => buildTitle('i18n_multiroom_title'),
},
{ path: 'machines/:id', component: MachineComponent, title: () => buildTitle('i18n_machine_title') },
{ path: 'reports', component: ReportsComponent, title: () => buildTitle('i18n_reports_title') },
{ path: 'statistics', component: StatisticsComponent, title: () => buildTitle('i18n_statistics_title') },
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/facility/facility.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export class FacilityComponent implements OnInit {
});
};

editMultipleRooms = () => this.router.navigate(['/staff/multiroom']);
editMultipleRooms = () => this.router.navigate(['/staff/rooms/exceptions/bulk']);

goBack = (event: Event) => {
event.preventDefault();
Expand Down
328 changes: 328 additions & 0 deletions ui/src/app/facility/rooms/room-edit.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,328 @@
<!--
SPDX-FileCopyrightText: 2024 The members of the EXAM Consortium

SPDX-License-Identifier: EUPL-1.2
-->

<xm-page-header text="i18n_examination_location" />
@if (room) {
<xm-page-content [content]="content" />
}
<ng-template #content>
<div class="row">
<div class="col-md-12">
<div class="row">
<span class="col font-6">
<span class="me-2" [hidden]="!showName" onclick="document.getElementById('name_field').select()">
{{ room.name || 'i18n_no_name' | translate }}
<button
class="btn btn-link btn-lg text-body width-auto"
(click)="showName = !showName"
triggers="mouseenter:mouseleave"
popoverTitle="{{ 'i18n_instructions' | translate }}"
ngbPopover="{{ 'i18n_edit' | translate }}"
>
<i class="bi-pencil ms-2"></i>
</button>
<button
class="btn btn-link btn-lg width-auto"
(click)="disableRoom()"
triggers="mouseenter:mouseleave"
popoverTitle="{{ 'i18n_instructions' | translate }}"
ngbPopover="{{ 'i18n_inactivate_room' | translate }}"
>
<i class="text-danger bi-trash"></i>
</button>
</span>
<span [hidden]="showName">
<div class="input-group">
<input
id="name_field"
type="text"
name="name"
class="form-control input-lg"
[(ngModel)]="room.name"
required
(blur)="showName = !showName"
/>
<div class="input-group-append">
<button class="btn btn-primary" (click)="showName = !showName">
<i class="bi-check"></i>
</button>
</div>
</div>
</span>
</span>
</div>
<form
role="form"
#roomForm="ngForm"
name="roomForm"
novalidate
id="roomForm"
(ngSubmit)="validateAndUpdateRoom()"
>
<!-- Room Code & Building name -->
<div class="row">
<div class="col-md-6">
<div class="facility-info-text">{{ 'i18n_room_code' | translate }}</div>
<div class="input-group">
<input
type="text"
name="roomCode"
class="form-control"
[(ngModel)]="room.roomCode"
required
/>
<span class="input-group-append">
<span class="input-group-text">
<i
class="bi-question-circle"
triggers="mouseenter:mouseleave"
popoverTitle="{{ 'i18n_instructions' | translate }}"
ngbPopover="{{ 'i18n_exam_room_unique_code' | translate }}"
></i>
</span>
</span>
</div>
</div>
<div class="col-md-6">
<div class="facility-info-text">{{ 'i18n_room_building_name' | translate }}</div>
<div class="input-group">
<input
type="text"
name="buildingName"
class="form-control"
[(ngModel)]="room.buildingName"
/>
<span class="input-group-append">
<span class="input-group-text">
<i
class="bi-question-circle"
triggers="mouseenter:mouseleave"
popoverTitle="{{ 'i18n_instructions' | translate }}"
ngbPopover="{{ 'i18n_building_where_the_machine_is' | translate }}"
></i>
</span>
</span>
</div>
</div>
</div>
<div class="row">
<!-- Campus name -->
<div class="col-md-6">
<div class="facility-info-text">{{ 'i18n_room_campus' | translate }}</div>
<div class="input-group">
<input type="text" name="campus" class="form-control" [(ngModel)]="room.campus" />
<span class="input-group-append">
<span class="input-group-text">
<i
class="bi-question-circle"
triggers="mouseenter:mouseleave"
popoverTitle="{{ 'i18n_instructions' | translate }}"
ngbPopover="{{ 'i18n_campus_where_room_is' | translate }}"
></i>
</span>
</span>
</div>
</div>
</div>
<!-- Passwords -->
<div class="row">
<div class="col-md-6">
<div class="facility-info-text">{{ 'i18n_internal_password' | translate }}</div>
<div class="input-group">
<input
type="{{ internalPasswordInputType }}"
name="internalPassword"
class="form-control"
[(ngModel)]="room.internalPassword"
/>
<div class="input-group-append">
<button
class="btn btn-success"
type="button"
(click)="toggleInternalPasswordInputType()"
>
<i [ngClass]="internalPasswordInputType === 'text' ? 'bi-eye' : 'bi-eye-slash'"></i>
</button>
</div>
</div>
</div>
<div class="col-md-6">
<div class="facility-info-text">{{ 'i18n_external_password' | translate }}</div>
<div class="input-group">
<input
type="{{ externalPasswordInputType }}"
name="externalPassword"
class="form-control"
[(ngModel)]="room.externalPassword"
/>
<div class="input-group-append">
<button
class="btn btn-success"
type="button"
(click)="toggleExternalPasswordInputType()"
>
<i [ngClass]="externalPasswordInputType === 'text' ? 'bi-eye' : 'bi-eye-slash'"></i>
</button>
</div>
</div>
</div>
</div>

<div class="row mt-3">
<div class="col-md-12">
<button type="submit" [disabled]="!roomForm.valid" class="btn btn-success">
{{ 'i18n_save' | translate }}
</button>
</div>
</div>
</form>
</div>
</div>
<!-- IOP -->
<div class="row mt-2" [hidden]="!isInteroperable">
<div class="col">
<div class="form-check">
<label>
<input
type="checkbox"
class="form-check-input"
[(ngModel)]="room.availableForExternals"
(change)="updateInteroperability()"
/>
<strong>{{ 'i18n_interoperable' | translate }}</strong>
</label>
</div>
</div>
</div>
<!-- AVAILABILITY TODO: MOVE TO A TAB -->
<div class="row mt-2">
<div class="col-md-12">
<xm-availability [room]="room"></xm-availability>
</div>
</div>

<div class="row mt-2">
<div class="col-md-12">
<h3>{{ 'i18n_instructions' | translate }}</h3>
</div>
</div>
<!-- Accessibility information -->
<div class="row">
<xm-accessibility-picker [room]="room"></xm-accessibility-picker>
</div>
<!-- Guidance & Contact person information -->
<div class="row mt-2">
<div class="col-md-6">
<div class="facility-info-text">{{ 'i18n_room_guidance' | translate }}</div>
<div class="input-group">
<textarea class="form-control" [(ngModel)]="room.roomInstruction" placeholder="fin"> </textarea>
<textarea class="form-control" [(ngModel)]="room.roomInstructionEN" placeholder="eng"> </textarea>
<textarea class="form-control" [(ngModel)]="room.roomInstructionSV" placeholder="swe"> </textarea>
<span class="input-group-append">
<span class="input-group-text">
<i
class="bi-question-circle"
triggers="mouseenter:mouseleave"
popoverTitle="{{ 'i18n_instructions' | translate }}"
ngbPopover="{{ 'i18n_instructions_for_use_of_room' | translate }}"
></i>
</span>
</span>
</div>
</div>
<div class="col-md-6">
<div class="facility-info-text">{{ 'i18n_room_contact_person' | translate }}</div>
<div class="input-group">
<input type="text" class="form-control" [(ngModel)]="room.contactPerson" />
<span class="input-group-append">
<span class="input-group-text">
<i
class="bi-question-circle"
triggers="mouseenter:mouseleave"
popoverTitle="{{ 'i18n_instructions' | translate }}"
ngbPopover="{{ 'i18n_person_to_contact_if_need_info' | translate }}"
></i>
</span>
</span>
</div>
</div>
</div>
<!-- Video recordings URL -->
<div class="row mt-2">
<div class="col-md-6">
<div class="facility-info-text">{{ 'i18n_room_videorecordings_url' | translate }}</div>
<div class="input-group">
<input type="text" class="form-control" [(ngModel)]="room.videoRecordingsURL" />
<span class="input-group-append">
<span class="input-group-text">
<i
class="bi-question-circle"
triggers="mouseenter:mouseleave"
popoverTitle="{{ 'i18n_instructions' | translate }}"
ngbPopover="{{ 'i18n_address_for_camera_footage_from_this_room' | translate }}"
></i>
</span>
</span>
</div>
</div>
</div>
<div class="row mt-2">
<div class="col-md-12">
<button class="btn btn-success" (click)="updateRoom()">{{ 'i18n_save' | translate }}</button>
</div>
</div>
<!-- Postal address-->
<div class="row mt-2">
<div class="col-md-12">
<!-- Address -->
<h3>{{ 'i18n_exam_room_address' | translate }}</h3>
<xm-room-address [address]="room.mailAddress"></xm-room-address>
</div>
</div>
<!-- Service status -->
<div class="row mt-2">
<div class="col-md-12">
<label>
<input class="me-2" type="checkbox" [(ngModel)]="room.outOfService" (change)="updateRoom()" />
<strong>{{ 'i18n_out_of_service' | translate }}</strong>
</label>
</div>
</div>
<div class="row">
<div class="col-md-12 facility-info-text">{{ 'i18n_reason' | translate }}</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="input-group">
<textarea
[disabled]="!room.outOfService"
class="form-control"
[(ngModel)]="room.statusComment"
(blur)="updateRoom()"
>
</textarea>
<span class="input-group-append">
<span class="input-group-text">
<i
class="bi-question-circle"
popoverTitle="{{ 'i18n_instructions' | translate }}"
triggers="mouseenter:mouseleave"
ngbPopover="{{ 'i18n_room_accessibility_features' | translate }}"
></i>
</span>
</span>
</div>
</div>
</div>
<!-- Button row -->
<div class="row mt-2">
<div class="col-md-12">
<button [disabled]="!roomForm.valid" (click)="saveRoom()" class="btn btn-success">
{{ 'i18n_save' | translate }}
</button>
</div>
</div>
</ng-template>
Loading
Loading