diff --git a/src/pages/overall/overall-line/overall-line.ts b/src/pages/overall/overall-line/overall-line.ts index 6d329b9..d259837 100644 --- a/src/pages/overall/overall-line/overall-line.ts +++ b/src/pages/overall/overall-line/overall-line.ts @@ -109,9 +109,12 @@ export default class OverallLine extends Vue */ private getCourseSeries(course: Course) { + console.log('===================='); // Graded assignments let assignments = course.assignments.slice().reverse(); + let currentTerm = 0; + // Create series return { name: course.name, @@ -120,8 +123,15 @@ export default class OverallLine extends Vue symbol: 'circle', // circle, diamond, emptyCircle, none data: this.toDateRange([...assignments.map(a => a.time)].map((time, i) => { + // Find current term + if (time > Constants.TERMS[currentTerm + 1].getTime()) + currentTerm ++; + // Find subset before this assignment - let subset = assignments.filter(a => a.time <= time); + let subset = assignments.filter(a => + a.time >= Constants.TERMS[currentTerm].getTime() && a.time <= time); + + console.log(subset); // Find grade if (course.grading.method == 'PERCENT_TYPE')