From c93b1e4eecbf35ebab65c3a8647aaf060cb7679e Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sun, 10 Nov 2019 13:09:18 -0500 Subject: [PATCH] [+] Resize scatter plot circles according to their weight --- src/pages/course/course-scatter/course-scatter.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/course/course-scatter/course-scatter.ts b/src/pages/course/course-scatter/course-scatter.ts index e060156..1409f35 100644 --- a/src/pages/course/course-scatter/course-scatter.ts +++ b/src/pages/course/course-scatter/course-scatter.ts @@ -69,7 +69,7 @@ export default class CourseScatter extends Vue }, formatter: (ps: any[]) => moment(ps[0].data[0]).format('MMM DD, YYYY') + '
' + ps.map(p => `${GraphUtils.DOT.replace('{color}', p.color)} - ${FormatUtils.limit(p.data[2], 22)}: ${p.data[1]}%
`).join('') + ${FormatUtils.limit(p.data[2].description, 22)}: ${p.data[1]}%
`).join('') }, // Legend @@ -116,7 +116,7 @@ export default class CourseScatter extends Vue type: 'scatter', name: type.name, data: CourseScatter.assignmentsData(this.course.assignments.filter(a => a.typeId == type.id)), - itemStyle: itemStyle + symbolSize: (data: any) => Math.max(Math.sqrt(type.weight * data[2].scoreMax / type.scoreMax) * 12, 12), } }); @@ -139,6 +139,6 @@ export default class CourseScatter extends Vue private static assignmentsData(assignments: Assignment[]) { return assignments.filter(a => a.complete == 'Complete') - .map(a => [a.time, (a.score / a.scoreMax * 100).toFixed(2), a.description]); + .map(a => [a.time, (a.score / a.scoreMax * 100).toFixed(2), a]); } }