From 0d3e9c08409dbc1039f5f09b8423d4610c9e69ff Mon Sep 17 00:00:00 2001 From: Hykilpikonna Date: Sat, 9 Nov 2019 16:53:53 -0500 Subject: [PATCH] [O] Remove toChartDate, use timestamp instead --- src/logic/utils/format-utils.ts | 14 -------------- src/pages/course/course-scatter/course-scatter.ts | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/logic/utils/format-utils.ts b/src/logic/utils/format-utils.ts index a8beee3..624d736 100644 --- a/src/logic/utils/format-utils.ts +++ b/src/logic/utils/format-utils.ts @@ -2,20 +2,6 @@ import moment from 'moment'; export class FormatUtils { - /** - * Convert date format to yyyy-mm-dd - * - * @param _date Date - */ - public static toChartDate(_date: string | Date) - { - // Convert to Date - let date: Date = _date instanceof Date ? _date : new Date(_date); - - // Convert to yyyy-mm-dd - return moment(date).format('YYYY-MM-DD'); - } - /** * Limit string length * diff --git a/src/pages/course/course-scatter/course-scatter.ts b/src/pages/course/course-scatter/course-scatter.ts index c2d9370..fbb94a4 100644 --- a/src/pages/course/course-scatter/course-scatter.ts +++ b/src/pages/course/course-scatter/course-scatter.ts @@ -40,7 +40,7 @@ export default class CourseScatter extends Vue { formatter: (name: any) => moment(name).format('MMM DD') }, - max: FormatUtils.toChartDate(new Date()) + max: new Date().getTime() }, // Y axis represents GPAs and MaxGPAs @@ -160,6 +160,6 @@ export default class CourseScatter extends Vue private static assignmentsData(assignments: Assignment[]) { return assignments.filter(a => a.complete == 'Complete') - .map(a => [FormatUtils.toChartDate(a.date), (a.score / a.scoreMax * 100).toFixed(2), a.description]); + .map(a => [a.time, (a.score / a.scoreMax * 100).toFixed(2), a.description]); } }