diff --git a/services/backend/src/services/courses/courseStatsCounter.ts b/services/backend/src/services/courses/courseStatsCounter.ts index be009551aa..648a2ae2e9 100644 --- a/services/backend/src/services/courses/courseStatsCounter.ts +++ b/services/backend/src/services/courses/courseStatsCounter.ts @@ -57,8 +57,6 @@ type Stats = { students: number passed: number failed: number - failedMany: number - retryPassed: number attempts: number improvedPassedGrade: number percentage: number | undefined @@ -76,8 +74,6 @@ type Students = { all: Record passed: Record failed: Record - retryPassed: Record - failedMany: Record improvedPassedGrade: Record markedToSemester: Record enrolledNoGrade: Record @@ -126,8 +122,6 @@ export class CourseStatsCounter { all: {}, passed: {}, failed: {}, - retryPassed: {}, - failedMany: {}, improvedPassedGrade: {}, markedToSemester: {}, enrolledNoGrade: {}, @@ -136,8 +130,6 @@ export class CourseStatsCounter { students: 0, passed: 0, failed: 0, - failedMany: 0, - retryPassed: 0, attempts: 0, improvedPassedGrade: 0, percentage: undefined, @@ -216,13 +208,11 @@ export class CourseStatsCounter { private removeFromFailed(studentNumber: string) { delete this.students.failed[studentNumber] - delete this.students.failedMany[studentNumber] } private markPassingGrade(studentNumber: string) { this.students.passed[studentNumber] = true if (this.failedBefore(studentNumber)) { - this.students.retryPassed[studentNumber] = true this.removeFromFailed(studentNumber) } } @@ -235,12 +225,8 @@ export class CourseStatsCounter { private markFailedGrade(studentNumber: string) { if (this.passedBefore(studentNumber)) { - this.students.retryPassed[studentNumber] = true this.removeFromFailed(studentNumber) } else { - if (this.failedBefore(studentNumber)) { - this.students.failedMany[studentNumber] = true - } this.students.failed[studentNumber] = true } } @@ -284,8 +270,6 @@ export class CourseStatsCounter { stats.students = lengthOf(students.all) stats.passed = lengthOf(students.passed) stats.failed = lengthOf(students.failed) - stats.failedMany = lengthOf(students.failedMany) - stats.retryPassed = lengthOf(students.retryPassed) stats.improvedPassedGrade = lengthOf(students.improvedPassedGrade) stats.percentage = percentageOf(stats.passed, stats.students) stats.passedOfPopulation = percentageOf(stats.passed, this.studentsInTotal) diff --git a/services/backend/src/services/statMerger.js b/services/backend/src/services/statMerger.js index fa9d63ea12..45979f7c95 100644 --- a/services/backend/src/services/statMerger.js +++ b/services/backend/src/services/statMerger.js @@ -16,13 +16,10 @@ const populationCourseStatsMerger = multiyearstats => { const index = stats.coursestatistics.findIndex(s => s.course.code === courseStats.course.code) stats.coursestatistics[index].stats.attempts += courseStats.stats.attempts stats.coursestatistics[index].stats.failed += courseStats.stats.failed - stats.coursestatistics[index].stats.failedMany += courseStats.stats.failedMany stats.coursestatistics[index].stats.improvedPassedGrade += courseStats.stats.improvedPassedGrade stats.coursestatistics[index].stats.passed += courseStats.stats.passed stats.coursestatistics[index].stats.students += courseStats.stats.students - stats.coursestatistics[index].stats.retryPassed += courseStats.stats.retryPassed - stats.coursestatistics[index].stats.perStudent = stats.coursestatistics[index].stats.attempts / stats.coursestatistics[index].stats.students diff --git a/services/frontend/src/components/PopulationCourseStats/PassFailEnrollments/index.jsx b/services/frontend/src/components/PopulationCourseStats/PassFailEnrollments/index.jsx index ce0d8ae4c0..8c047514a1 100644 --- a/services/frontend/src/components/PopulationCourseStats/PassFailEnrollments/index.jsx +++ b/services/frontend/src/components/PopulationCourseStats/PassFailEnrollments/index.jsx @@ -126,18 +126,6 @@ export const PassFailEnrollments = ({ flat, onlyIamRights }) => { }, ], }, - { - key: 'passed-after-retry', - title: 'Passed\nafter retry', - filterType: 'range', - getRowVal: row => row.stats?.retryPassed ?? 0, - }, - { - key: 'failed-many', - title: 'Failed\nmultiple times', - filterType: 'range', - getRowVal: row => row.stats?.failedMany ?? 0, - }, { key: 'of-population', title: 'Percentage of population',