From 80267feb547dbf9043bea9dabfbe96c55f6bc02c Mon Sep 17 00:00:00 2001
From: Hykilpikonna <admin@moecraft.cc>
Date: Sat, 9 Nov 2019 16:00:57 -0500
Subject: [PATCH] [O] Separate series creation with the main settings

---
 .../course/course-scatter/course-scatter.ts   | 60 +++++++++++--------
 .../course/course-scatter/course-scatter.vue  |  2 +-
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/pages/course/course-scatter/course-scatter.ts b/src/pages/course/course-scatter/course-scatter.ts
index f7189e3..d664884 100644
--- a/src/pages/course/course-scatter/course-scatter.ts
+++ b/src/pages/course/course-scatter/course-scatter.ts
@@ -3,6 +3,7 @@ import Constants from '@/constants';
 import {FormatUtils} from '@/logic/utils/format-utils';
 import moment from 'moment';
 import Course, {Assignment} from '@/logic/course';
+import GraphUtils from '@/logic/utils/graph-utils';
 
 @Component({
 })
@@ -27,22 +28,6 @@ export default class CourseScatter extends Vue
      */
     get chartSettings()
     {
-        // Map assignments
-        let map = this.mapAssignments();
-
-        // Scatter data point style
-        let itemStyle =
-        {
-            normal:
-            {
-                opacity: 0.8,
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowOffsetY: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.2)'
-            }
-        };
-
         // Create settings
         let settings =
         {
@@ -114,20 +99,45 @@ export default class CourseScatter extends Vue
             },
 
             // Data
-            series: Array.from(map, ([type, assignments]) =>
-            {
-                return {
-                    type: 'scatter',
-                    name: type,
-                    data: CourseScatter.assignmentsData(assignments),
-                    itemStyle: itemStyle
-                }
-            })
+            series: this.series()
         };
 
         return settings;
     }
 
+    /**
+     * Get series data
+     */
+    private series()
+    {
+        // Scatter data point style
+        let itemStyle =
+        {
+            normal:
+            {
+                opacity: 0.8,
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowOffsetY: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.2)'
+            }
+        };
+
+        // Create scatter plots
+        let map = this.mapAssignments();
+        let series: any = Array.from(map, ([type, assignments]) =>
+        {
+            return {
+                type: 'scatter',
+                name: type,
+                data: CourseScatter.assignmentsData(assignments),
+                itemStyle: itemStyle
+            }
+        });
+
+        return series;
+    }
+
     /**
      * Map assignments to {assignmentType, [assignment]} format.
      */
diff --git a/src/pages/course/course-scatter/course-scatter.vue b/src/pages/course/course-scatter/course-scatter.vue
index 17dafb4..5f9cc07 100644
--- a/src/pages/course/course-scatter/course-scatter.vue
+++ b/src/pages/course/course-scatter/course-scatter.vue
@@ -1,6 +1,6 @@
 <template>
     <div id="course-scatter">
-        <ve-scatter height="450px" class="graph" :extend="{heyIUsedCourseObject: this.course.name}" :after-config="afterConfig"></ve-scatter>
+        <ve-scatter height="450px" class="graph" :extend="{a: this.course.name}" :after-config="afterConfig"></ve-scatter>
     </div>
 </template>