Skip to content
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

CSCEXAM-228 Fix cancel button to read the actual action #1196

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

CSCEXAM-228 Fix cancel button to read the actual action #1196

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
c44a9c3
Fix cancel button to read the actual action
VirmasaloA Feb 25, 2025
f3ed7a2
Merge branch 'dev' into CSCEXAM-228
VirmasaloA Feb 25, 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
2 changes: 1 addition & 1 deletion ui/src/app/facility/address/address.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ import { RoomService } from 'src/app/facility/rooms/room.service';
</div>
<div class="row mt-4">
<div class="col-md-12">
<button type="submit" [disabled]="addressForm.invalid" class="btn btn-primary">
<button type="submit" [disabled]="addressForm.invalid" class="btn btn-success">
{{ 'i18n_save' | translate }}
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/facility/machines/machine.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
</div>
<div class="row mt-2">
<div class="col-md-12 d-flex flex-row-reverse flex-align-r m-3">
<button [disabled]="!machineForm.valid" (click)="updateMachineAndExit()" class="btn btn-primary">
<button [disabled]="!machineForm.valid" (click)="updateMachineAndExit()" class="btn btn-success">
{{ 'i18n_save' | translate }}
</button>
</div>
Expand Down
6 changes: 3 additions & 3 deletions ui/src/app/facility/rooms/room.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
</div>
<div class="row mt-3">
<div class="col-md-12">
<button type="submit" [disabled]="!roomForm.valid" class="btn btn-primary">
<button type="submit" [disabled]="!roomForm.valid" class="btn btn-success">
{{ 'i18n_save' | translate }}
</button>
</div>
Expand Down Expand Up @@ -227,7 +227,7 @@ <h3>{{ 'i18n_instructions' | translate }}</h3>
</div>
<div class="row mt-2">
<div class="col-md-12">
<button class="btn btn-primary" (click)="updateRoom()">{{ 'i18n_save' | translate }}</button>
<button class="btn btn-success" (click)="updateRoom()">{{ 'i18n_save' | translate }}</button>
</div>
</div>
<!-- Postal address-->
Expand Down Expand Up @@ -276,7 +276,7 @@ <h3>{{ 'i18n_exam_room_address' | translate }}</h3>
<!-- Button row -->
<div class="row mt-2">
<div class="col-md-12">
<button [disabled]="!roomForm.valid" (click)="saveRoom()" class="btn btn-primary">
<button [disabled]="!roomForm.valid" (click)="saveRoom()" class="btn btn-success">
{{ 'i18n_save' | translate }}
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions ui/src/app/facility/schedule/maintenance-period-dialog.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,10 @@ import { DateTimePickerComponent } from 'src/app/shared/date/date-time-picker.co
</form>
</div>
<div class="d-flex flex-row-reverse flex-align-r m-3">
<button class="btn btn-primary" [disabled]="periodForm.invalid" (click)="ok()">
<button class="btn btn-success" [disabled]="periodForm.invalid" (click)="ok()">
{{ 'i18n_button_save' | translate }}
</button>
<button class="btn btn-danger float-end me-3" (click)="cancel()">
<button class="btn btn-outline-secondary float-end me-3" (click)="cancel()">
{{ 'i18n_button_cancel' | translate }}
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions ui/src/app/reservation/admin/change-machine-dialog.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ import { Option } from 'src/app/shared/select/select.model';
</div>
</form>
<div class="d-flex flex-row-reverse flex-align-r m-3">
<button class="btn btn-sm btn-primary" (click)="ok()" [disabled]="!machine?.id">
<button class="btn btn-sm btn-success" (click)="ok()" [disabled]="!machine?.id">
{{ 'i18n_button_save' | translate }}
</button>
<button class="btn btn-sm btn-danger me-3" (click)="cancel()">
<button class="btn btn-sm btn-outline-secondary me-3" (click)="cancel()">
{{ 'i18n_button_cancel' | translate }}
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions ui/src/app/reservation/reservation-details.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@
r.enrolment.exam.implementation === 'AQUARIUM' &&
!reservationIsInPast(r)
) {
<button (click)="removeReservation(r)" class="btn btn-sm btn-primary float-start">
<button (click)="removeReservation(r)" class="btn btn-sm btn-outline-danger float-start">
{{ 'i18n_remove_reservation' | translate }}
</button>
}
Expand All @@ -229,7 +229,7 @@
<button
(click)="permitRetrial(r.enrolment)"
[disabled]="!r.enrolment.exam.trialCount || r.enrolment.retrialPermitted"
class="btn btn-sm btn-primary float-start"
class="btn btn-sm btn-outline-primary float-start"
>
{{
!r.enrolment.exam.trialCount || r.enrolment.retrialPermitted
Expand Down
4 changes: 2 additions & 2 deletions ui/src/app/review/listing/dialogs/aborted.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
review.examParticipation.exam.examEnrolments[0].retrialPermitted
"
(click)="permitRetrial(review.examParticipation.exam.examEnrolments[0])"
class="btn btn-sm btn-primary"
class="btn btn-sm btn-outline-primary"
>
{{
review.examParticipation.exam.examEnrolments[0].retrialPermitted
Expand Down Expand Up @@ -153,6 +153,6 @@
<div class="d-flex flex-row-reverse flex-align-r m-3">
<!-- Buttons -->
<button class="btn btn-success" (click)="cancel()">
{{ 'i18n_button_ok' | translate }}
{{ 'i18n_close' | translate }}
</button>
</div>
2 changes: 1 addition & 1 deletion ui/src/app/review/listing/dialogs/no-shows.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<!-- Buttons -->
<div class="justify-content-end">
<button class="btn btn-success mb-2 me-2" (click)="cancel()">
{{ 'i18n_button_ok' | translate }}
{{ 'i18n_close' | translate }}
</button>
</div>
</div>
2 changes: 1 addition & 1 deletion ui/src/app/review/listing/speed-review.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
{{ 'i18n_grade_exams' | translate }}
</button>
<button class="btn btn-outline-secondary me-3" [routerLink]="['/staff/exams/', examId, '5']">
{{ 'i18n_button_cancel' | translate }}
{{ 'i18n_button_return' | translate }}
</button>
</div>
</div>
Expand Down
1 change: 1 addition & 0 deletions ui/src/assets/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"i18n_button_decline": "Decline",
"i18n_button_ok": "OK",
"i18n_button_save": "Save",
"i18n_button_return": "Return",
"i18n_calendar": "Reservation information",
"i18n_calendar_phase_1": "Exam",
"i18n_calendar_phase_2": "Choose room",
Expand Down
1 change: 1 addition & 0 deletions ui/src/assets/i18n/fi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"i18n_button_decline": "Hylkää",
"i18n_button_ok": "OK",
"i18n_button_save": "Tallenna",
"i18n_button_return": "Palaa",
"i18n_calendar": "Varaustiedot",
"i18n_calendar_phase_1": "Tentti",
"i18n_calendar_phase_2": "Valitse tenttitila",
Expand Down
1 change: 1 addition & 0 deletions ui/src/assets/i18n/sv.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"i18n_button_decline": "Ångra",
"i18n_button_ok": "OK",
"i18n_button_save": "Spara",
"i18n_button_return": "Återgå",
"i18n_calendar": "Bokningsinformation",
"i18n_calendar_phase_1": "Tentamen",
"i18n_calendar_phase_2": "Platsbokning",
Expand Down