Skip to content

Commit

Permalink
CSCEXAM-1289 Fix review-inspections buttons
Browse files Browse the repository at this point in the history
  • Loading branch information
VirmasaloA authored Jan 10, 2025
1 parent 61826fc commit bd30449
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 18 deletions.
19 changes: 11 additions & 8 deletions ui/src/app/maturity/listing/reviewed-inspections.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
<div class="col-md-6">
{{ 'i18n_processed_language_inspections' | translate }}
@if (inspections.length > 0) {
<a (click)="hideItems = !hideItems" class="pointer ms-1">
<button (click)="hideItems = !hideItems" class="btn btn-link ms-1">
<img [hidden]="!hideItems" src="/assets/images/icon_list_show_right.svg" alt="" />
<img [hidden]="hideItems" src="/assets/images/icon_list_show_down.svg" alt="" />
</a>
</button>
}
</div>
<div class="col-md-6">
<small class="float-end">
<a [routerLink]="['/staff/inspections/reports']">{{
'i18n_language_inspection_report_link' | translate
}}</a>
<button class="btn btn-primary" [routerLink]="['/staff/inspections/reports']">
{{ 'i18n_language_inspection_report_link' | translate }}
</button>
</small>
</div>
</div>
Expand Down Expand Up @@ -248,9 +248,12 @@
</td>
<!-- 11 -->
<td>
<a class="pointer" (click)="showStatement(inspection.statement)">{{
'i18n_view' | translate
}}</a>
<button
class="btn btn-sm btn-outline-secondary"
(click)="showStatement(inspection.statement)"
>
{{ 'i18n_view_feedback' | translate }}
</button>
</td>
</tr>
}
Expand Down
26 changes: 17 additions & 9 deletions ui/src/app/maturity/listing/unfinished-inspections.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
{{ 'i18n_ongoing_language_inspections' | translate }}
<span>{{ getInspectionAmounts() }}</span>
@if (inspections.length > 0) {
<a (click)="hideItems = !hideItems" class="pointer ms-1">
<button (click)="hideItems = !hideItems" class="btn btn-link ms-1">
<img [hidden]="!hideItems" src="/assets/images/icon_list_show_right.svg" alt="" />
<img [hidden]="hideItems" src="/assets/images/icon_list_show_down.svg" alt="" />
</a>
</button>
}
</div>
</div>
Expand Down Expand Up @@ -189,21 +189,29 @@ <h5 class="col-md-12">
}
@if (inspection.modifier) {
<td>
<a class="pointer" [routerLink]="['/staff/assessments', inspection.exam.id]">{{
'i18n_view' | translate
}}</a>
<button
class="btn btn-sm btn-outline-secondary"
[routerLink]="['/staff/assessments', inspection.exam.id]"
>
{{ 'i18n_view_assessment' | translate }}
</button>
</td>
}
@if (!inspection.modifier && !user.isAdmin) {
<td>
<a class="pointer" (click)="assignInspection(inspection)"
>{{ 'i18n_assign_to_me' | translate }}
</a>
<button
class="btn btn-sm btn-outline-secondary"
(click)="assignInspection(inspection)"
>
{{ 'i18n_assign_assessments_to_me' | translate }}
</button>
</td>
}
@if (!inspection.modifier && user.isAdmin) {
<td>
<span class="text-muted">{{ 'i18n_assign_to_me' | translate }}</span>
<button class="btn btn-sm btn-outline-secondary" disabled="disabled">
{{ 'i18n_assign_assessments_to_me' | translate }}
</button>
</td>
}
</tr>
Expand Down
3 changes: 3 additions & 0 deletions ui/src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1190,6 +1190,9 @@
"i18n_hide_participants": "Hide participants",
"i18n_exam_owner_info": "Exam needs to have at least one examiner.",
"i18n_csv_uploading_cancelled": "CSV file upload cancelled",
"i18n_view_assessment": "View assessments",
"i18n_assign_assessments_to_me": "Start evaluation",
"i18n_view_feedback": "View feedback",
"i18n_iop_reservations": "Tenttivierailut EN",
"i18n_outbound_reservations": "Muihin korkeakouluihin tehdyt varaukset EN",
"i18n_inbound_reservations": "Muista korkeakouluista tehdyt varaukset EN",
Expand Down
3 changes: 3 additions & 0 deletions ui/src/assets/i18n/fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -1190,6 +1190,9 @@
"i18n_hide_participants": "Piilota osallistujat",
"i18n_exam_owner_info": "Tentissä pitää olla vähintään yksi tentaattori.",
"i18n_csv_uploading_cancelled": "CSV tiedoston tuonti peruutettu",
"i18n_view_assessment": "Näytä arviointi",
"i18n_assign_assessments_to_me": "Arvioi suoritus",
"i18n_view_feedback": "Näytä palaute",
"i18n_iop_reservations": "Tenttivierailut",
"i18n_outbound_reservations": "Muihin korkeakouluihin tehdyt varaukset",
"i18n_inbound_reservations": "Muista korkeakouluista tehdyt varaukset",
Expand Down
5 changes: 4 additions & 1 deletion ui/src/assets/i18n/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -1188,8 +1188,11 @@
"i18n_exam_not_published": "Tentamen inte publicerad. SV",
"i18n_show_participants": "Visa deltagare",
"i18n_hide_participants": "Dölj deltagare",
"i18n_exam_owner_info": "Tentamen behöver minst en bedömare. SV",
"i18n_exam_owner_info": "Tentamen behöver minst en bedömare.SV",
"i18n_csv_uploading_cancelled": "Uppladdning av CSV-fil avbruten",
"i18n_view_assessment": "Visa bedöm SV",
"i18n_assign_assessments_to_me": "Arvioi suoritus SV",
"i18n_view_feedback": "Visa feedback SV",
"i18n_iop_reservations": "Tenttivierailut SV",
"i18n_outbound_reservations": "Muihin korkeakouluihin tehdyt varaukset SV",
"i18n_inbound_reservations": "Muista korkeakouluista tehdyt varaukset SV",
Expand Down

0 comments on commit bd30449

Please sign in to comment.