mirror of
https://gitlab.com/openstapps/openstapps.git
synced 2026-01-08 14:32:50 +00:00
fix: remove misleading assessment calculations
This commit is contained in:
@@ -15,7 +15,6 @@
|
|||||||
|
|
||||||
import {Component, Input} from '@angular/core';
|
import {Component, Input} from '@angular/core';
|
||||||
import {SCAssessment, SCCourseOfStudyWithoutReferences} from '@openstapps/core';
|
import {SCAssessment, SCCourseOfStudyWithoutReferences} from '@openstapps/core';
|
||||||
import {sum, sumBy} from '../../../../_helpers/collections/sum';
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'course-of-study-assessment',
|
selector: 'course-of-study-assessment',
|
||||||
@@ -27,21 +26,7 @@ export class CourseOfStudyAssessmentComponent {
|
|||||||
|
|
||||||
_assessments: Promise<SCAssessment[]>;
|
_assessments: Promise<SCAssessment[]>;
|
||||||
|
|
||||||
grade = 0;
|
|
||||||
|
|
||||||
ects = 0;
|
|
||||||
|
|
||||||
@Input() set assessments(value: SCAssessment[]) {
|
@Input() set assessments(value: SCAssessment[]) {
|
||||||
const assessments = value;
|
this._assessments = Promise.resolve(value);
|
||||||
|
|
||||||
const grades = assessments
|
|
||||||
// TODO: find out if this is correct
|
|
||||||
.filter(assessment => assessment.status === 'bestanden')
|
|
||||||
.map(assessment => Number(assessment.grade))
|
|
||||||
.filter(grade => !Number.isNaN(grade));
|
|
||||||
this.grade = grades.length > 0 ? sum(grades) / grades.length : 0;
|
|
||||||
this.ects = sumBy(assessments, it => it.ects);
|
|
||||||
|
|
||||||
this._assessments = Promise.resolve(assessments);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,14 +13,6 @@
|
|||||||
~ this program. If not, see <https://www.gnu.org/licenses/>.
|
~ this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<section>
|
|
||||||
<h3>{{ 'assessments.courseOfStudyAssessments.PROGRESS' | translate }}</h3>
|
|
||||||
<p>
|
|
||||||
{{ $any('grade' | propertyNameTranslate: 'assessment') | titlecase }}:
|
|
||||||
{{ grade | numberLocalized: 'minimumFractionDigits:1,maximumFractionDigits:1' }}
|
|
||||||
</p>
|
|
||||||
<p>{{ 'ects' | propertyNameTranslate: 'assessment' }}: {{ ects }}</p>
|
|
||||||
</section>
|
|
||||||
<section>
|
<section>
|
||||||
<h3>
|
<h3>
|
||||||
{{ 'assessments.courseOfStudyAssessments.ASSESSMENTS' | translate }}
|
{{ 'assessments.courseOfStudyAssessments.ASSESSMENTS' | translate }}
|
||||||
|
|||||||
Reference in New Issue
Block a user