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

Programming Exercises: Align title and buttons for participation page #10121

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+46 −55
Open

Programming Exercises: Align title and buttons for participation page #10121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
101 changes: 46 additions & 55 deletions src/main/webapp/app/exercises/shared/participation/participation.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,64 +1,55 @@
<div>
<div class="d-flex flex-wrap">
<div class="mr-auto flex-fill">
<h2>
<span>{{ exercise?.title }} - </span>{{ filteredParticipationsSize }} <span jhiTranslate="artemisApp.participation.home.title"></span>
</h2>
<div class="d-flex align-items-center mt-2">
<label class="radio-inline mb-0 d-flex align-items-center">
<input type="radio" [ngModel]="participationCriteria.filterProp" (click)="updateParticipationFilter(FilterProp.ALL)" [value]="FilterProp.ALL" />
<span class="ms-1" jhiTranslate="artemisApp.exercise.showAll"></span>
</label>
<label class="radio-inline ms-2 mb-0 d-flex align-items-center">
<input type="radio" [ngModel]="participationCriteria.filterProp" (click)="updateParticipationFilter(FilterProp.FAILED)" [value]="FilterProp.FAILED" />
<span class="ms-1" jhiTranslate="artemisApp.exercise.showFailed"></span>
</label>
<label class="radio-inline ms-2 mb-0 d-flex align-items-center">
<input
type="radio"
[ngModel]="participationCriteria.filterProp"
(click)="updateParticipationFilter(FilterProp.NO_SUBMISSIONS)"
[value]="FilterProp.NO_SUBMISSIONS"
/>
<span class="ms-1" jhiTranslate="artemisApp.exercise.showNoSubmissions"></span>
</label>
@if (exercise.type === ExerciseType.PROGRAMMING && afterDueDate) {
<label class="radio-inline ms-2 mb-0 d-flex align-items-center">
<input
type="radio"
[ngModel]="participationCriteria.filterProp"
(click)="updateParticipationFilter(FilterProp.NO_PRACTICE)"
[value]="FilterProp.NO_PRACTICE"
/>
<span class="ms-1" jhiTranslate="artemisApp.exercise.showNoPracticeMode"></span>
</label>
<div class="d-flex flex-wrap align-items-center justify-content-between">
<h2 class="mb-0">
<span>{{ exercise?.title }} - </span>{{ filteredParticipationsSize }} <span jhiTranslate="artemisApp.participation.home.title"></span>
</h2>
<div class="d-flex">
@if (exercise?.type !== ExerciseType.QUIZ && exercise?.isAtLeastInstructor) {
<div class="p-2">
<button
class="btn btn-success"
[disabled]="isSaving || participationsChangedDueDate.size === 0"
(click)="saveChangedDueDates()"
jhiTranslate="entity.action.save"
></button>
</div>
}
@if (exercise?.isAtLeastInstructor && exercise?.type === ExerciseType.PROGRAMMING) {
<jhi-programming-exercise-instructor-submission-state class="p-2" [exercise]="exercise" />
}
<div class="p-2">
@if (exercise?.isAtLeastTutor) {
<a class="btn btn-info" [routerLink]="getScoresRoute(exercise)">
<div>
<fa-icon [icon]="faTable" />
<span class="d-md-inline" jhiTranslate="entity.action.scores"></span>
</div>
</a>
}
</div>
</div>
@if (exercise?.type !== ExerciseType.QUIZ && exercise?.isAtLeastInstructor) {
<div class="p-2">
<button
class="btn btn-success"
[disabled]="isSaving || participationsChangedDueDate.size === 0"
(click)="saveChangedDueDates()"
jhiTranslate="entity.action.save"
></button>
</div>
}
@if (exercise?.isAtLeastInstructor && exercise?.type === ExerciseType.PROGRAMMING) {
<jhi-programming-exercise-instructor-submission-state class="p-2" [exercise]="exercise" />
</div>
<div class="d-flex align-items-center mt-2">
<label class="radio-inline mb-0 d-flex align-items-center">
<input type="radio" [ngModel]="participationCriteria.filterProp" (click)="updateParticipationFilter(FilterProp.ALL)" [value]="FilterProp.ALL" />
<span class="ms-1" jhiTranslate="artemisApp.exercise.showAll"></span>
</label>
<label class="radio-inline ms-2 mb-0 d-flex align-items-center">
<input type="radio" [ngModel]="participationCriteria.filterProp" (click)="updateParticipationFilter(FilterProp.FAILED)" [value]="FilterProp.FAILED" />
<span class="ms-1" jhiTranslate="artemisApp.exercise.showFailed"></span>
</label>
<label class="radio-inline ms-2 mb-0 d-flex align-items-center">
<input type="radio" [ngModel]="participationCriteria.filterProp" (click)="updateParticipationFilter(FilterProp.NO_SUBMISSIONS)" [value]="FilterProp.NO_SUBMISSIONS" />
<span class="ms-1" jhiTranslate="artemisApp.exercise.showNoSubmissions"></span>
</label>
@if (exercise.type === ExerciseType.PROGRAMMING && afterDueDate) {
<label class="radio-inline ms-2 mb-0 d-flex align-items-center">
<input type="radio" [ngModel]="participationCriteria.filterProp" (click)="updateParticipationFilter(FilterProp.NO_PRACTICE)" [value]="FilterProp.NO_PRACTICE" />
<span class="ms-1" jhiTranslate="artemisApp.exercise.showNoPracticeMode"></span>
</label>
}
<div class="p-2">
@if (exercise?.isAtLeastTutor) {
<a class="btn btn-info" [routerLink]="getScoresRoute(exercise)">
<div>
<fa-icon [icon]="faTable" />
<span class="d-md-inline" jhiTranslate="entity.action.scores"></span>
</div>
</a>
}
</div>
</div>

<jhi-data-table
[isLoading]="isLoading"
entityType="participation"
Expand Down
Loading