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

Jump to bottom

Feature/336 add grades #383

Merged
merged 17 commits into from
Apr 26, 2022
Merged

Feature/336 add grades #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c358c21
Add select for GradingScales, refs 336
mfehlmann Apr 20, 2022
7f97bd9
get grading scales for tests, refs 336
mfehlmann Apr 20, 2022
382c54e
Add grading scales to grade input, refs 336
mfehlmann Apr 21, 2022
fec9cdf
request grading scales only once, refs 336
caebr Apr 21, 2022
a5db506
Show empty option if grade is not set, refs 336
caebr Apr 21, 2022
5c8aec0
Temporarily ignore course grading scale, refs 336
mfehlmann Apr 21, 2022
395e673
improve existing tests for grade component, refs 336
mburri Apr 22, 2022
12567b4
test dropdown in grade component, refs 336
mburri Apr 22, 2022
14a378a
move preparation of grading scale options from grade component to sta…
mburri Apr 25, 2022
3775d94
refactor grade component, refs 336
mburri Apr 25, 2022
14a5e67
Enable SetTestResult to use grades to update a result, add tests
mfehlmann Apr 25, 2022
61f87cf
Add test for course rest sevice to validate result update with grade …
mfehlmann Apr 25, 2022
9bae8d9
save grade when user selects value from grading scale, refs 336
mburri Apr 25, 2022
1ff0b4f
refactoring, refs 336
caebr Apr 25, 2022
5b0c550
Disable grading input when there are points, refs 336
mfehlmann Apr 26, 2022
dd03261
Prevent gradingScaleIds to be mapped for every result update, refs 336
mfehlmann Apr 26, 2022
0f62235
Add test for grade component, refs 336
mfehlmann Apr 26, 2022
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
25 changes: 18 additions & 7 deletions src/app/events/components/grade/grade.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,33 @@
<div *ngIf="grade.test.IsPointGrading" class="point-input-container mr-3">
<input
#pointInput
class="point-input form-control"
class="form-control"
type="number"
step="0.01"
min="0"
max="{{ maxPoints }}"
tabindex="{{ tabIndex }}"
[formControl]="pointsInput"
(input)="onChange(pointInput.value)"
(input)="onPointsChange(pointInput.value)"
data-testid="point-input"
/>
</div>
<div *ngIf="grade.kind === 'grade'">
{{ grade.result.GradeDesignation }}
</div>
<div *ngIf="grade.kind === 'no-result'">-</div>
<erz-select
[options]="gradeOptions"
[allowEmpty]="grade.kind === 'no-result'"
[value]="grade.kind === 'grade' ? grade.result.GradeId : null"
[disabled]="!isGradingScaleEnabled"
(valueChange)="onGradeChange($event)"
class="grade-select"
data-testid="grade-select"
>
</erz-select>
</div>
<div *ngIf="pointsInput.errors" class="invalid-feedback">
<div
*ngIf="pointsInput.errors"
class="invalid-feedback"
data-testid="validation-error-message"
>
{{ 'global.validation-errors.invalidPoints' | translate: { maxPoints } }}
</div>
</div>
4 changes: 4 additions & 0 deletions src/app/events/components/grade/grade.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
.point-input-container {
width: 5em;
}

:host ::ng-deep select {
min-width: 13ch;
}
Loading