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.

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

add desktop view for dossier grades, refs #337 #397

Merged
merged 1 commit into from
May 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
"
></erz-dossier-grades-final-grade>
<div *ngIf="course.Tests?.length > 0; else noTests">
<div *ngFor="let test of course.Tests" class="test-entry">
<erz-dossier-single-test
[test]="test"
[studentId]="studentId"
[gradingScale]="getGradingScaleOfTest(test)"
></erz-dossier-single-test>
</div>
<erz-dossier-single-test
*ngFor="let test of course.Tests"
[test]="test"
[studentId]="studentId"
[gradingScale]="getGradingScaleOfTest(test)"
></erz-dossier-single-test>
</div>
<ng-template #noTests>
<p class="p-3" data-testid="message-no-tests">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +0,0 @@
@import "../../../../../bootstrap-variables";

:host {
padding: $spacer;
}

.test-entry {
padding: $spacer;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@import "../../../../../bootstrap-variables";

.final-entry {
padding: $spacer;
display: grid;
grid-template-columns: repeat(2, 1fr);
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,15 @@ import { GradingScale } from 'src/app/shared/models/grading-scale.model';
import * as Gradings from 'src/app/shared/utils/gradings';
@Component({
selector: 'erz-dossier-grades-final-grade',
template: `<div class="row mx-1">
<div class="col-6">{{ 'dossier.grade' | translate }}</div>
<div class="col-6">
<span data-testid="final-grade">{{ getGradeForStudent() || '-' }}</span>
</div>
<div class="col-6">{{ 'dossier.average' | translate }}</div>
<div class="col-6">
<span data-testid="average-test-results">{{
grading?.AverageTestResult | number: '1.0-3'
}}</span>
template: `<div class="final-entry">
<div>{{ 'dossier.grade' | translate }}</div>
<div data-testid="final-grade">{{ getGradeForStudent() || '-' }}</div>
<div>{{ 'dossier.average' | translate }}</div>
<div data-testid="average-test-results">
{{ grading?.AverageTestResult | number: '1.0-3' }}
</div>
</div>`,
styles: [],
styleUrls: ['./dossier-grades-final-grade.component.scss'],
})
export class DossierGradesFinalGradeComponent {
@Input() finalGrade: Option<FinalGrading>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,51 @@
@import "../../../../../bootstrap-variables";
@import "node_modules/bootstrap/scss/mixins";

.test-entry {
border-top: 1px solid $border-color;
padding: $spacer;
display: grid;
grid-template-areas:
"designation designation grade factor"
"date date points ."
"teacher teacher . ."
"state state . .";
grid-template-columns: repeat(4, 1fr);
}

.designation {
grid-area: designation;
}

.date {
grid-area: date;
}

.grade {
grid-area: grade;
}

.points {
grid-area: points;
color: rgba($body-color, 0.5);
}

.teacher {
grid-area: teacher;
}

.state {
grid-area: state;
}

@include media-breakpoint-down(sm) {
.test-entry {
grid-template-areas:
"designation designation"
"date grade"
"factor points"
"teacher teacher"
"state state";
grid-template-columns: repeat(2, 1fr);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,30 @@ import { Test } from 'src/app/shared/models/test.model';

@Component({
selector: 'erz-dossier-single-test',
template: ` <div>
<span data-testid="test-designation">{{ test?.Designation }}</span>
<div class="row">
<div class="col-6" data-testid="test-date">
{{ test?.Date | date: 'mediumDate' }}
</div>
<div class="col-6" data-testid="test-grade">
{{ getGrading() || '-' }}
</div>
<div class="col-6" data-testid="test-factor">
{{ test | erzTestWeight }}
</div>
<div class="col-6 points" data-testid="test-points">
{{ test | erzTestPoints: studentId }}
</div>
<div class="col-6" data-testid="test-teacher">
{{ test?.Owner }}
</div>
<div class="col-6"></div>
<div class="col-6" data-testid="test-status">
{{
(test?.IsPublished ? 'tests.published' : 'tests.not-published')
| translate
}}
</div>
template: ` <div class="test-entry">
<div class="designation" data-testid="test-designation">
{{ test?.Designation }}
</div>
<div class="date" data-testid="test-date">
{{ test?.Date | date: 'mediumDate' }}
</div>
<div class="grade" data-testid="test-grade">
{{ getGrading() || '-' }}
</div>
<div class="factor" data-testid="test-factor">
{{ test | erzTestWeight }}
</div>
<div class="points" data-testid="test-points">
{{ test | erzTestPoints: studentId }}
</div>
<div class="teacher" data-testid="test-teacher">
{{ test?.Owner }}
</div>
<div class="state" data-testid="test-status">
{{
(test?.IsPublished ? 'tests.published' : 'tests.not-published')
| translate
}}
</div>
</div>`,
styleUrls: ['./dossier-single-test.component.scss'],
Expand Down