[U] Pre-Release v0.3.5.703

This reverts commit f1089dbdf5.

README.md

@@ -22,7 +22,7 @@ This is a website that generates visual representation of students' grade data o
 
 **Here's how it looks like right now:** *(Now all of you know my grades ;-;)*
 
-![](https://i.imgur.com/xl3Q4Nt.jpg)
+![](https://user-images.githubusercontent.com/22280294/65841599-155ead00-e2f2-11e9-9d9f-c2f23c45d9a4.png)
 
 <br>
 

package-lock.json

@@ -6935,6 +6935,11 @@
         }
       }
     },
+    "moment": {
+      "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
+      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz",

package.json

@@ -11,6 +11,7 @@
     "core-js": "^2.6.5",
     "echarts": "^4.2.1",
     "element-ui": "^2.11.1",
+    "moment": "^2.24.0",
     "p-wait-for": "^3.1.0",
     "v-charts": "^1.19.0",
     "vue": "^2.6.10",

public/index.html

@@ -25,4 +25,14 @@
         <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
         <script src="https://unpkg.com/element-ui/lib/index.js"></script>
     </body>
+
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-Q615K1KFLC"></script>
+    <script>
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+
+        gtag('config', 'G-Q615K1KFLC');
+    </script>
 </html>

src/components/app/app.scss

@@ -1,8 +1,73 @@
 #app
 {
-  font-family: 'Avenir', Helvetica, Arial, sans-serif;
+    font-family: var(--font);
-  -webkit-font-smoothing: antialiased;
+    -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
+    -moz-osx-font-smoothing: grayscale;
-  text-align: center;
+    text-align: center;
-  color: #2c3e50;
+    color: #2c3e50;
+}
+
+#app-content
+{
+    // Limit max width
+    max-width: 1300px;
+    text-align: center;
+    margin: auto;
+}
+
+.theme-default
+{
+    --unread: #ff6c00;
+    --main: #0c6dad;
+
+    --assignment-type-2: #3f991e;
+    --assignment-type-3: #ff9900;
+    --assignment-type-4: #b02b02;
+
+    --font: 'Avenir', Helvetica, Arial, sans-serif;
+}
+
+// ##############
+// # Global CSS #
+// ##############
+
+.el-card
+{
+    margin: 10px;
+    padding: 0;
+}
+
+.el-card.large
+{
+    height: 494px;
+}
+
+// Fix padding
+.el-card__body
+{
+    padding-top: 0 !important;
+    padding-bottom: 0 !important;
+}
+
+// Vertical centering
+.vertical-center
+{
+    // Vertical center
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+}
+
+// Remove card padding for styling issues
+div.el-card.course-card > div.el-card__body
+{
+    padding-right: 0 !important;
+    padding-left: 0 !important;
+}
+
+// Clickable text
+.clickable:hover
+{
+    text-decoration: underline;
+    cursor: pointer;
 }

src/components/app/app.ts

@@ -6,19 +6,29 @@ import Constants from '@/constants';
 import JsonUtils from '@/utils/json-utils';
 import pWaitFor from 'p-wait-for';
 import {HttpUtils} from '@/utils/http-utils';
+import {CourseUtils} from '@/utils/course-utils';
+import {GPAUtils} from '@/utils/gpa-utils';
+import Loading from '@/components/loading/loading.vue';
+import CoursePage from '@/pages/course/course-page';
+
 
 /**
  * Objects of this interface represent assignment grades.
  */
-export interface Grade
+export interface Assignment
 {
+    id: number,
+    scoreId: number,
     type: string,
+    typeId: number,
     description: string,
     date: string,
     complete: string,
     include: boolean,
     display: boolean,
 
+    unread: boolean,
+
     scoreMax: number,
     score: number
 }
@@ -40,11 +50,17 @@ export interface Course
     level: string,
     scaleUp: number,
 
-    assignments: Grade[]
+    grading:
+    {
+        method: string,
+        weightingMap: {[index: string]: number}
+    }
+
+    assignments: Assignment[]
 }
 
 @Component({
-    components: {Login, Navigation, Overall},
+    components: {Login, Navigation, Overall, Loading, CoursePage},
 })
 export default class App extends Vue
 {
@@ -54,6 +70,9 @@ export default class App extends Vue
     // List of course that the student takes
     public courses: Course[] = [];
 
+    // List of course that should be displayed
+    public filteredCourses: Course[] = [];
+
     // Currently selected tab
     public selectedTab: string = 'overall';
 
@@ -63,8 +82,17 @@ export default class App extends Vue
     // Token
     public token: string = '';
 
+    // Loading text
+    public loading: string = '';
+
+    // Loading error
+    public loadingError: boolean = false;
+
     // Http Client
-    public http: HttpUtils = new HttpUtils('');
+    public static http: HttpUtils = new HttpUtils();
+
+    // Instance
+    public static instance: App;
 
     /**
      * This is called when the instance is created.
@@ -73,6 +101,9 @@ export default class App extends Vue
     {
         // Show splash
         console.log(Constants.SPLASH);
+
+        // Update instance
+        App.instance = this;
     }
 
     /**
@@ -85,11 +116,14 @@ export default class App extends Vue
         // Hide login bar
         this.showLogin = false;
 
+        // Show loading message
+        this.logLoading('1. Logging in...');
+
         // Store token
         this.token = token;
 
         // Assign token to http client
-        this.http.token = token;
+        App.http.token = token;
 
         // Load data
         this.loadCoursesAfterLogin();
@@ -100,7 +134,11 @@ export default class App extends Vue
      */
     public loadCoursesAfterLogin()
     {
-        this.http.post('/courses', {}).then(response =>
+        // Show loading message
+        this.logLoading('2. Loading courses...');
+
+        // Post request
+        App.http.post('/courses', {}).then(response =>
         {
             // Check success
             if (response.success)
@@ -111,27 +149,24 @@ export default class App extends Vue
                 // Load assignments
                 this.loadAssignments();
             }
-            else
+            else throw new Error(response.data);
-            {
-                // Show error message TODO: Show it properly
-                alert(response.data);
-            }
         })
-        .catch(alert);
+        .catch(e => this.showError(`Error: Course data failed to load.\n(${e})`));
     }
 
     /**
      * Load the assignments of the courses
-     *
-     * @param courses Courses Json
      */
     public loadAssignments()
     {
+        // Show loading message
+        this.logLoading('3. Loading assignments...');
+
         // Get assignments for all the courses
         this.courses.forEach(course =>
         {
             // Send request to get assignments
-            this.http.post('/assignments', {id: course.assignmentsId}).then(response =>
+            App.http.post('/assignments', {'assignmentsId': course.assignmentsId}).then(response =>
             {
                 // Check success
                 if (response.success)
@@ -140,50 +175,86 @@ export default class App extends Vue
                     // Parse json and filter it
                     course.assignments = JsonUtils.filterAssignments(response.data);
                 }
-                else
+                else throw new Error(response.data);
-                {
-                    // Show error message TODO: Show it properly
-                    alert(response.data);
-                }
             })
-            .catch(alert);
+            .catch(e => this.showError(`Error: Assignments data failed to load.\n(${e})`));
         });
 
         // Wait for assignments to be ready.
-        pWaitFor(() => this.isAssignmentsReady()).then(() =>
+        pWaitFor(() => this.courses.every(c => c.assignments != null)).then(() =>
         {
-            // When the assignments are ready
+            // Filter courses
-            this.assignmentsReady = true;
+            this.filteredCourses = CourseUtils.getGradedCourses(this.courses);
+
+            // Check grading algorithms
+            this.checkGradingAlgorithms();
         });
     }
 
     /**
-     * Are assignments ready or not
+     * Check the courses' grading algorithms. (Total-mean or percent-type)
-     *
-     * @returns boolean Ready or not
      */
-    private isAssignmentsReady(): boolean
+    private checkGradingAlgorithms()
     {
-        for (const course of this.courses)
+        // Show loading message
+        this.logLoading('4. Checking grading algorithms...');
+
+        // Loop through all the courses
+        for (const course of this.filteredCourses)
         {
-            if (course.assignments == null) return false;
+            // Check if total-average grade is the same with percent-type grade
+            if (course.numericGrade == +GPAUtils.getTotalMeanAverage(course).toFixed(2))
+            {
+                course.grading = {method: 'TOTAL_MEAN', weightingMap: {}};
+            }
+            else
+            {
+                // Request grading scheme for this course
+                App.http.post('/grading', {'assignmentsId': course.assignmentsId}).then(response =>
+                {
+                    // Check success
+                    if (response.success)
+                    {
+                        // Add it to course
+                        course.grading = response.data;
+                    }
+                    else throw new Error(response.data);
+                })
+                .catch(e => this.showError(`Error: Grading data failed to load.\n(${e})`))
+            }
         }
 
-        return true;
+        // Wait for done
+        pWaitFor(() => this.filteredCourses.every(c => c.grading != undefined)).then(() =>
+        {
+            // When the assignments are ready
+            this.assignmentsReady = true;
+
+            // Remove loading
+            this.logLoading('');
+        })
     }
 
     /**
-     * This is called when a navigation tab is clicked
+     * Log a message to loading screen
      *
-     * @param tab Tab name
+     * @param message Message
      */
-    public onNavigate(tab: string)
+    private logLoading(message: string)
     {
-        // Debug output TODO: Remove this
+        if (message == '') this.loading = '';
-        console.log(tab);
+        else this.loading += '\n' + message;
+    }
 
-        // Update selected tab
+    /**
-        this.selectedTab = tab;
+     * Show error message on loading screen
+     *
+     * @param message Error message
+     */
+    private showError(message: string)
+    {
+        this.loadingError = true;
+        this.loading = message;
     }
 
     /**

src/components/app/app.vue

@@ -1,14 +1,21 @@
 <template>
-    <div id="app">
+    <div id="app" class="theme-default">
-        <login v-if="showLogin" v-on:login:token="onLogin" :http="http"></login>
+        <login v-if="showLogin" v-on:login:token="onLogin"></login>
-        <navigation :courses="courses"
+        <navigation :courses="filteredCourses"
-                    v-on:sign-out="signOut()"
+                    :activeIndex.sync="selectedTab"
-                    v-on:navigation:select="onNavigate">
+                    v-on:sign-out="signOut">
         </navigation>
 
-        <div id="app-content">
+        <div id="app-content" v-if="assignmentsReady && loading === ''">
-            <overall :courses="courses" v-if="selectedTab === 'overall' && assignmentsReady"></overall>
+            <overall v-if="selectedTab === 'overall'"
+                     :courses="filteredCourses">
+            </overall>
+            <course-page v-if="selectedTab.split('/')[0] === 'course'"
+                         :course="filteredCourses.find(c => +c.id === +selectedTab.split('/')[1])">
+            </course-page>
         </div>
+
+        <loading v-if="loading !== ''" :text="loading" :error="loadingError"></loading>
     </div>
 </template>
 

src/components/loading/loading.vue

@@ -0,0 +1,116 @@
+<template>
+    <div id="loading">
+        <div id="text" :class="message()">
+            {{message()}}
+
+            <div v-if="!error" class="el-loading-spinner">
+                <svg viewBox="25 25 50 50" class="circular">
+                    <circle cx="50" cy="50" r="20" fill="none" class="path" />
+                </svg>
+            </div>
+
+            <div v-if="error" id="error-details">
+                <span v-for="(line, index) in getText()" :style="`font-size: ${-index === 0 ? 16 : 12}px;`">
+                    {{line}}
+                    <br>
+                </span>
+            </div>
+        </div>
+
+        <div v-if="!error" id="details">
+            <span v-for="(line, index) in getText()" :style="`font-size: ${16 - getText().length + index}px;`">
+                {{line}}
+                <br>
+            </span>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+    import {Component, Prop, Vue} from 'vue-property-decorator';
+
+    @Component({
+        components: {}
+    })
+    export default class Loading extends Vue
+    {
+        // @ts-ignore
+        @Prop() text: string;
+
+        // @ts-ignore
+        @Prop() error: boolean;
+
+        getText()
+        {
+            return this.text.split('\n');
+        }
+
+        message()
+        {
+            return this.error ? 'Error' : 'Loading';
+        }
+    }
+</script>
+
+<style scoped>
+    #loading
+    {
+        width: 100%;
+        height: 100%;
+        position: absolute;
+        top: 0;
+        left: 0;
+        box-shadow: inset 0 0 1px 1px rgba(0,0,0,.1);
+        background: -webkit-linear-gradient(left, rgba(95, 18, 72, 0.4), rgba(42, 81, 117, 0.4) 100%);
+
+        text-align: center;
+    }
+
+    .Error
+    {
+        color: #ffdddd !important;
+    }
+
+    #text
+    {
+        color: white;
+
+        margin: 0;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+
+        font-size: 46px;
+    }
+
+    #details
+    {
+        width: 100%;
+        position: absolute;
+        bottom: 0;
+        left: 0;
+
+        margin-top: -5px;
+        font-size: 16px;
+        color: #f9f9f9;
+    }
+
+    #error-details
+    {
+        font-size: 16px;
+    }
+
+    .el-loading-spinner
+    {
+        top: unset !important;
+        margin-top: 0 !important;
+        width: unset !important;
+        position: unset !important;
+    }
+
+    .el-loading-spinner .path
+    {
+        stroke: white;
+    }
+</style>

src/components/login/login.ts

@@ -1,6 +1,8 @@
 import {Component, Prop, Vue} from 'vue-property-decorator';
 import Constants from '@/constants';
 import {HttpUtils} from '@/utils/http-utils';
+import App from '@/components/app/app';
+import VersionUtils from '@/utils/version-utils';
 
 /**
  * This component handles user login, and obtains data from the server.
@@ -17,14 +19,20 @@ export default class Login extends Vue
     public loading: boolean = false;
     public error: String = '';
 
-    @Prop()
-    public http?: HttpUtils;
-
     /**
      * This is called when the instance is created.
      */
     public created()
     {
+        // Check cookies version
+        if (this.needToUpdateCookies())
+        {
+            console.log('Version Updated! Clearing cookies...');
+
+            // Clear all cookies
+            this.$cookies.keys().forEach(key => this.$cookies.remove(key));
+        }
+
         // Check login cookies
         if (this.$cookies.isKey('va.token'))
         {
@@ -33,6 +41,20 @@ export default class Login extends Vue
         }
     }
 
+    /**
+     * Check version number
+     *
+     * @returns boolean Need to clear cookies or not
+     */
+    public needToUpdateCookies(): boolean
+    {
+        // Version doesn't exist
+        if (!this.$cookies.isKey('va.version')) return true;
+
+        // If the current version is less than the min supported version
+        return VersionUtils.compare(this.$cookies.get('va.version'), Constants.MIN_SUPPORTED_VERSION) == -1;
+    }
+
     /**
      * On click, sends username and password to the server.
      */
@@ -42,14 +64,15 @@ export default class Login extends Vue
         this.loading = true;
 
         // Fetch request
-        (<HttpUtils> this.http).post('/login', {username: this.username, password: this.password})
+        App.http.post('/login', {username: this.username, password: this.password})
         .then(response =>
         {
             // Check success
             if (response.success)
             {
                 // Save token to cookies
-                this.$cookies.set('va.token', response.data, '7d');
+                this.$cookies.set('va.token', response.data, '27d');
+                this.$cookies.set('va.version', Constants.VERSION);
 
                 // Call custom event with token
                 this.$emit('login:token', response.data);

src/components/navigation/navigation.scss

@@ -15,3 +15,36 @@
         border-bottom-width: 0;
     }
 }
+
+#sign-out-button
+{
+    // Float right
+    position: absolute;
+    right: 0;
+
+    // Set width and height
+    height: 60px;
+    width: 110px;
+}
+
+#nav-title
+{
+    // Float left
+    position: absolute;
+    left: 0;
+
+    // Set height
+    height: 60px;
+
+    // Center text
+    align-items: center;
+
+    // Margins
+    margin-left: 14px;
+    margin-right: 8px;
+
+    // Font
+    font-size: 1.25rem;
+    display: inline-flex;
+
+}

src/components/navigation/navigation.ts

@@ -1,5 +1,7 @@
 import {Component, Prop, Vue} from 'vue-property-decorator';
 import Constants from '@/constants';
+import {Course} from '@/components/app/app';
+import {CourseUtils} from '@/utils/course-utils';
 
 /**
  * This component is the top navigation bar
@@ -9,10 +11,41 @@ import Constants from '@/constants';
 })
 export default class Navigation extends Vue
 {
-    public activeIndex: string = 'overall';
+    // @ts-ignore
+    @Prop() activeIndex: string;
 
     @Prop() courses: any;
 
+    /**
+     * This is called when the instance is created.
+     */
+    public created()
+    {
+        // Set history state
+        let url = window.location.pathname;
+        if (url == '/' || url == '') url = '/overall';
+        window.history.replaceState({lastTab: url.substring(1)}, '', url);
+
+        // Update initial index
+        this.updateIndex(url.substring(1));
+
+        // Create history state listener
+        window.onpopstate = e =>
+        {
+            if (e.state)
+            {
+                // Restore previous tab
+                console.log(`onPopState: Current: ${this.activeIndex}, Previous: ${e.state.lastTab}`);
+                this.updateIndex(e.state.lastTab);
+            }
+        };
+    }
+
+    public formatCourseIndex(course: Course)
+    {
+        return CourseUtils.formatTabIndex(course);
+    }
+
     /**
      * This function is called when the selection changes.
      *
@@ -22,10 +55,26 @@ export default class Navigation extends Vue
     public onSelect(index: string, indexPath: string)
     {
         // Update active index
-        this.activeIndex = index;
+        this.updateIndex(index);
 
-        // Call custom event
+        // Debug output TODO: Remove this
-        this.$emit('navigation:select', this.activeIndex);
+        console.log(`onNavigate: Previous: ${this.activeIndex}, New: ${index}`);
+
+        // Check url
+        let url = `/${index}`;
+
+        // Push history state
+        window.history.pushState({lastTab: index}, '', url);
+    }
+
+    /**
+     * Update index
+     *
+     * @param newIndex New index
+     */
+    private updateIndex(newIndex: string)
+    {
+        this.$emit('update:activeIndex', newIndex);
     }
 
     /**

src/components/navigation/navigation.vue

@@ -1,13 +1,18 @@
 <template>
     <div id="navigation">
-        <el-menu class="centered" :default-active="activeIndex" mode="horizontal" @select="onSelect">
+        <el-menu style="margin-bottom: 10px;" class="centered" mode="horizontal"
+                 :default-active="activeIndex" @select="onSelect">
+
+            <!--div id="nav-title">
+                Veracross Analyzer
+            </div-->
 
             <el-menu-item index="overall">Overall</el-menu-item>
 
             <el-submenu index="courses">
                 <template slot="title">Courses</template>
                 <el-menu-item v-for="course in courses"
-                              :index="`course-${course.name}`"
+                              :index="formatCourseIndex(course)"
                               :key="course.name">{{course.name}}</el-menu-item>
             </el-submenu>
 

src/constants.ts

@@ -3,15 +3,55 @@
  */
 export default class Constants
 {
-    /**
+    /** Base url for api access */
-     * Base url for api access
-     */
     public static API_URL: string = 'https://va.hydev.org/api';
 
+    /** Current version */
+    public static VERSION: string = '0.3.5.703';
+
+    /** Minimum version that still supports the same cookies */
+    public static MIN_SUPPORTED_VERSION: string = '0.3.4.561';
+
+    public static GITHUB: string = 'https://github.com/HyDevelop/VeracrossAnalyzer.Client';
+
     public static SPLASH: string =
         '.    ,        ,---.          |                        \n' +
         '|    |.  ,    |---|,---.,---.|    ,   .,---,,---.,---.\n' +
         ' \\  /  ><     |   ||   |,---||    |   | .-\' |---\'|    \n' +
         '  `\'  \'  `    `   \'`   \'`---^`---\'`---|\'---\'`---\'`    \n' +
-        '      v0.1.2.236                  `---\'               '
+        '                                  `---\'               \n' +
+        ` Version v${Constants.VERSION} by Hykilpikonna (YGui21)\n` +
+        ` Github: ${Constants.GITHUB}`;
+
+    // Graph Theme
+    public static THEME =
+    {
+        // Colors
+        colors:
+        [
+            '#19d4ae',
+            '#5ab1ef',
+            '#fa6e86',
+            '#ffb980',
+            '#0067a6',
+            '#c4b4e4',
+            '#d87a80',
+            '#9cbbff',
+            '#d9d0c7',
+            '#87a997',
+            '#d49ea2',
+            '#5b4947',
+            '#7ba3a8',
+            '#fc97af',
+            '#919e8b',
+            '#d7ab82',
+            '#6e7074',
+            '#61a0a8',
+            '#efa18d',
+            '#787464',
+            '#cc7e63',
+            '#724e58',
+            '#4b565b'
+        ]
+    }
 }

src/pages/course/course-page.scss

@@ -0,0 +1,20 @@
+// Card
+.el-card.course-card
+{
+    // Margins
+    margin-right: 20px;
+    margin-left: 20px;
+
+    // Limit name length
+    white-space: nowrap;
+
+    // Expansion color
+    background: #f4f6f9;
+}
+
+.course-card-content.expand
+{
+    // Top shadow
+    // https://stackoverflow.com/questions/17572619/inset-box-shadow-only-on-one-side
+    box-shadow: inset 0 7px 9px -7px rgba(0,0,0,0.1);
+}

src/pages/course/course-page.ts

@@ -0,0 +1,29 @@
+import {Component, Prop, Vue} from 'vue-property-decorator';
+import {Assignment, Course} from '@/components/app/app';
+import CourseHead from '@/pages/overall/overall-course/course-head/course-head.vue';
+import CourseScatter from '@/pages/course/course-scatter/course-scatter';
+
+@Component({
+    components: {CourseHead, CourseScatter}
+})
+export default class CoursePage extends Vue
+{
+    // @ts-ignore
+    @Prop({required: true}) course: Course;
+
+    private unread: number = -1;
+    private unreadAssignments: Assignment[] = [];
+
+    /**
+     * Count the number of unread assignments with cache
+     */
+    countUnread(): number
+    {
+        if (this.unread == -1)
+        {
+            this.unreadAssignments = this.course.assignments.filter(a => a.unread);
+            return this.unread = this.unreadAssignments.length;
+        }
+        else return this.unread;
+    }
+}

src/pages/course/course-page.vue

@@ -0,0 +1,21 @@
+<template>
+    <el-card id="course-card" class="course-card">
+        <course-head :course="course" :unread="countUnread()"></course-head>
+
+        <div class="course-card-content expand">
+            <el-row>
+                <el-col :span="24">
+                    <el-card class="large overall-line-card vertical-center">
+                        <course-scatter :course="course"></course-scatter>
+                    </el-card>
+                </el-col>
+                <el-col :span="0">
+
+                </el-col>
+            </el-row>
+        </div>
+    </el-card>
+</template>
+
+<script src="./course-page.ts" lang="ts"></script>
+<style src="./course-page.scss" lang="scss" scoped></style>

src/pages/course/course-scatter/course-scatter.ts

@@ -0,0 +1,164 @@
+import {Component, Prop, Vue} from 'vue-property-decorator';
+import {Assignment, Course} from '@/components/app/app';
+import {GPAUtils} from '@/utils/gpa-utils';
+import Constants from '@/constants';
+import {FormatUtils} from '@/utils/format-utils';
+import moment from 'moment';
+
+@Component({
+})
+export default class CourseScatter extends Vue
+{
+    private static DOT = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:{color}"></span>';
+
+    // @ts-ignore
+    @Prop({required: true}) course: Course;
+
+    /**
+     * Override options
+     *
+     * @param options Original options (Unused)
+     */
+    afterConfig(options: any)
+    {
+        return this.chartSettings;
+    }
+
+    /**
+     * Generate settings
+     */
+    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 =
+        {
+            // Color
+            color: Constants.THEME.colors,
+
+            // Title
+            title:
+            {
+                show: true,
+                textStyle:
+                {
+                    fontSize: 13
+                },
+                text: 'Assignments',
+                subtext: 'Assignment scores for ' + this.course.name,
+                x: 'center'
+            },
+
+            // X axis represents course names
+            xAxis:
+            {
+                type: 'time',
+                axisLabel:
+                {
+                    formatter: (name: any) => moment(name).format('MMM DD')
+                },
+                max: FormatUtils.toChartDate(new Date())
+            },
+
+            // Y axis represents GPAs and MaxGPAs
+            yAxis:
+            {
+                type: 'value',
+                name: 'Percentage Score',
+                nameLocation: 'center',
+                nameGap: 38,
+                axisLabel:
+                {
+                    formatter: (name: any) => name + '%'
+                },
+                max: 100,
+                min: (value: any) => Math.floor(value.min) - 5
+            },
+
+            // Tooltip
+            tooltip:
+            {
+                trigger: 'axis',
+                axisPointer:
+                {
+                    type: 'cross'
+                },
+                formatter: (ps: any[]) => ps[0].data[0] + '<br>' + ps.map(p =>
+                    `${CourseScatter.DOT.replace('{color}', p.color)}
+                    ${FormatUtils.limit(p.data[2], 22)}: ${p.data[1]}%<br>`).join('')
+            },
+
+            // Legend
+            legend:
+            {
+                bottom: 24,
+                itemWidth: 14,
+                textStyle:
+                {
+                    color: '#777',
+                    fontSize: 11
+                }
+            },
+
+            // Data
+            series: Array.from(map, ([type, assignments]) =>
+            {
+                return {
+                    type: 'scatter',
+                    name: type,
+                    data: CourseScatter.assignmentsData(assignments),
+                    itemStyle: itemStyle
+                }
+            })
+        };
+
+        return settings;
+    }
+
+    /**
+     * Map assignments to {assignmentType, [assignment]} format.
+     */
+    private mapAssignments(): Map<string, Assignment[]>
+    {
+        // Define map
+        let map = new Map();
+
+        // Move data to map
+        this.course.assignments.forEach(a =>
+        {
+            // Null case, create empty array
+            if (!map.has(a.type)) map.set(a.type, []);
+
+            // Put data
+            map.get(a.type).push(a);
+        });
+
+        return map;
+    }
+
+    /**
+     * Convert assignments to series data
+     *
+     * @param assignments Assignments
+     */
+    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]);
+    }
+}

src/pages/course/course-scatter/course-scatter.vue

@@ -0,0 +1,16 @@
+<template>
+    <div id="course-scatter">
+        <ve-scatter height="450px" class="graph" :extend="{heyIUsedCourseObject: this.course.name}" :after-config="afterConfig"></ve-scatter>
+    </div>
+</template>
+
+<script src="./course-scatter.ts" lang="ts"></script>
+<style lang="scss" scoped>
+    #overall-bar
+    {
+        .graph
+        {
+            margin-top: 50px;
+        }
+    }
+</style>

src/pages/overall/graph-overall/graph-overall.ts

@@ -1,21 +0,0 @@
-import {Component, Prop, Vue} from 'vue-property-decorator';
-import {Course} from '@/components/app/app';
-
-@Component({
-})
-export default class GraphOverall extends Vue
-{
-    @Prop({required: true}) chart: any;
-
-    private settings =
-    {
-        series:
-        {
-            smooth: false
-        },
-        yAxis:
-        {
-            min: 70
-        }
-    }
-}

src/pages/overall/graph-overall/graph-overall.vue

@@ -1,9 +0,0 @@
-<template>
-    <div id="graph-overall">
-        <p>Your average score graph all time:</p>
-        <ve-line :data="chart" :extend="settings"></ve-line>
-    </div>
-</template>
-
-<script src="./graph-overall.ts" lang="ts"></script>
-<style src="./graph-overall.scss" lang="scss"></style>

src/pages/overall/overall-bar/overall-bar.ts

@@ -0,0 +1,110 @@
+import {Component, Prop, Vue} from 'vue-property-decorator';
+import {Course} from '@/components/app/app';
+import {GPAUtils} from '@/utils/gpa-utils';
+import Constants from '@/constants';
+import {FormatUtils} from '@/utils/format-utils';
+
+@Component({
+})
+export default class OverallBar extends Vue
+{
+    // @ts-ignore
+    @Prop({required: true}) courses: Course[];
+
+    /**
+     * Generate settings
+     */
+    get chartSettings()
+    {
+        let settings =
+        {
+            // Title
+            title:
+            {
+                show: true,
+                textStyle:
+                {
+                    fontSize: 12
+                },
+                text: 'Course GPA',
+                subtext: 'Current GPA for every course',
+                x: 'center'
+            },
+
+            // X axis represents course names
+            xAxis:
+            {
+                type: 'category',
+                axisLabel: {
+                    interval: 0,
+                    inside: false,
+                    rotate: 90,
+
+                    // Truncate text length
+                    formatter: (value: string) => FormatUtils.limit(value, 16)
+                },
+            },
+
+            // Y axis represents GPAs and MaxGPAs
+            yAxis:
+            {
+                type: 'value'
+            },
+
+            // Data
+            series:
+            [
+                {
+                    type: 'bar',
+                    barGap: '-100%',
+                    data: this.courses.map(course =>
+                    {
+                        return {value: [course.name, GPAUtils.getGP(course, 'A+')],
+                            itemStyle: {color: '#d8d8d8'}}
+                    }),
+                },
+                {
+                    type: 'bar',
+                    barGap: '-100%',
+                    data: this.generateGPData(),
+
+                    label:
+                    {
+                        show: true,
+                        rotate: 90
+                    }
+                }
+            ],
+
+            // Disable tooltip
+            tooltip:
+            {
+                show: false
+            }
+        };
+
+        return settings;
+    }
+
+    /**
+     * Generate GP data for each course
+     */
+    private generateGPData()
+    {
+        let data: any = [];
+
+        this.courses.forEach(course =>
+        {
+            data.push(
+            {
+                value: [course.name, GPAUtils.getGP(course, course.letterGrade)],
+                itemStyle:
+                {
+                    color: Constants.THEME.colors[data.length]
+                }
+            });
+        });
+
+        return data;
+    }
+}

src/pages/overall/overall-bar/overall-bar.vue

@@ -0,0 +1,17 @@
+<template>
+    <div id="overall-bar">
+        <ve-bar height="450px" class="graph"
+                :extend="chartSettings"></ve-bar>
+    </div>
+</template>
+
+<script src="./overall-bar.ts" lang="ts"></script>
+<style lang="scss" scoped>
+    #overall-bar
+    {
+        .graph
+        {
+            margin-top: 50px;
+        }
+    }
+</style>

src/pages/overall/overall-course/course-head/course-head.vue

@@ -0,0 +1,149 @@
+<template>
+    <div id="course-head" class="course-card-content main vertical-center">
+        <el-row>
+            <el-col :span="12" class="course-col-name">
+                <div v-if="clickable" class="course-name clickable" @click="redirect">{{course.name}}</div>
+                <div v-if="!clickable" class="course-name">{{course.name}}</div>
+                <div class="course-teacher">{{course.teacherName}}</div>
+            </el-col>
+            <el-col :span="12" class="course-col-grade">
+                <div class="course-grade">
+                    <span class="letter">{{course.letterGrade}} </span>
+                    <span class="numeric">{{course.numericGrade.toFixed(2)}}</span>
+                    <span class="percent">%</span>
+                </div>
+                <div class="course-updates" @click="redirect" :class="unread === 0 ? 'none' : 'unread'">
+                    <span class="unread-number">{{unread}}</span>
+                    <span class="unread-text" :class="clickable ? 'clickable' : ''">
+                        new update{{unread >= 2 ? 's' : ''}}
+                    </span>
+                </div>
+            </el-col>
+        </el-row>
+    </div>
+</template>
+
+<script lang="ts">
+    import {Component, Prop, Vue} from 'vue-property-decorator';
+    import App, {Course} from '@/components/app/app';
+    import {CourseUtils} from '@/utils/course-utils';
+
+    @Component({
+        components: {}
+    })
+    export default class CourseHead extends Vue
+    {
+        // @ts-ignore
+        @Prop() unread: number;
+
+        // @ts-ignore
+        @Prop() course: Course;
+
+        // @ts-ignore
+        @Prop() clickable: boolean;
+
+        /**
+         * Redirect to the course page
+         */
+        redirect()
+        {
+            if (!this.clickable) return;
+            App.instance.selectedTab = CourseUtils.formatTabIndex(this.course);
+        }
+    }
+</script>
+
+<style lang="scss">
+    // Main card content
+    .course-card-content.main
+    {
+        padding: 0 20px 0 20px;
+        height: 90px;
+
+        // Main color
+        background: white;
+    }
+
+    .course-col-name
+    {
+        // Align left
+        text-align: left;
+        float: left;
+
+        .course-name
+        {
+            overflow: hidden;
+            font-size: 22px;
+            color: var(--main);
+        }
+
+        .course-teacher
+        {
+            font-size: 12px;
+            color: #999999;
+            font-style: italic;
+        }
+    }
+
+    .course-col-grade
+    {
+        // Align right
+        text-align: right;
+        float: right;
+
+        // Adjust position
+        margin-top: -2px;
+
+        .course-grade
+        {
+            font-size: 21px;
+        }
+
+        .course-updates
+        {
+            font-size: 14px;
+
+            .unread-number
+            {
+                display: inline-block;
+                width: 20px;
+                text-align: center;
+                border-radius: 5px;
+
+                padding-left: 3px;
+                padding-right: 3px;
+
+                margin-right: 3px;
+            }
+
+            .unread-text
+            {
+                font-style: italic;
+            }
+        }
+
+        .course-updates.unread
+        {
+            .unread-number
+            {
+                background: var(--unread);
+                color: white;
+            }
+
+            .unread-text
+            {
+                color: var(--unread);
+            }
+        }
+
+        .course-updates.none
+        {
+            color: #999999;
+
+            .unread-number
+            {
+                background: #eeeeee;
+            }
+        }
+    }
+</style>

src/pages/overall/overall-course/overall-course.scss

@@ -0,0 +1,16 @@
+// Card
+.el-card.course-card
+{
+    // Margins
+    margin-right: 20px;
+    margin-left: 20px;
+
+    // Height limit
+    max-height: 250px;
+
+    // Limit name length
+    white-space: nowrap;
+
+    // Expansion color
+    background: #f4f6f9;
+}

src/pages/overall/overall-course/overall-course.ts

@@ -0,0 +1,53 @@
+import {Component, Prop, Vue} from 'vue-property-decorator';
+import App, {Assignment, Course} from '@/components/app/app';
+import {GPAUtils} from '@/utils/gpa-utils';
+import Constants from '@/constants';
+import UnreadEntry from '@/pages/overall/overall-course/unread-entry/unread-entry';
+import CourseHead from '@/pages/overall/overall-course/course-head/course-head.vue';
+
+@Component({
+    components: {UnreadEntry, CourseHead}
+})
+export default class OverallCourse extends Vue
+{
+    // @ts-ignore
+    @Prop({required: true}) course: Course;
+
+    private unread: number = -1;
+    private unreadAssignments: Assignment[] = [];
+
+    /**
+     * Count the number of unread assignments with cache
+     */
+    countUnread(): number
+    {
+        if (this.unread == -1)
+        {
+            this.unreadAssignments = this.course.assignments.filter(a => a.unread);
+            return this.unread = this.unreadAssignments.length;
+        }
+        else return this.unread;
+    }
+
+    /**
+     * Mark an assignment as read
+     */
+    markAsRead(assignment: Assignment)
+    {
+        App.http.post('/mark-as-read', {scoreId: assignment.scoreId})
+        .then(response =>
+        {
+            // Check success
+            if (response.success)
+            {
+                this.unreadAssignments = this.unreadAssignments.filter(a => a != assignment);
+                this.unread = this.unreadAssignments.length;
+            }
+            else
+            {
+                // Show error message TODO: Show it properly
+                alert(response.data)
+            }
+        })
+    }
+}

src/pages/overall/overall-course/overall-course.vue

@@ -0,0 +1,18 @@
+<template>
+    <div id="overall-course">
+        <el-card class="course-card">
+            <course-head :clickable="true" :course="course" :unread="countUnread()"></course-head>
+            <div class="course-card-content expand"
+                 v-if="countUnread() !== 0">
+                <unread-entry v-for="assignment in unreadAssignments"
+                              :assignment="assignment"
+                              :key="assignment.id"
+                              v-on:mark-as-read="markAsRead">
+                </unread-entry>
+            </div>
+        </el-card>
+    </div>
+</template>
+
+<script src="./overall-course.ts" lang="ts"></script>
+<style src="./overall-course.scss" lang="scss" scoped></style>

src/pages/overall/overall-course/unread-entry/unread-entry.scss

@@ -0,0 +1,107 @@
+
+// Row
+.unread-entry
+{
+    height: 40px;
+    padding: 0 10px 0 20px;
+    background: #f5f7fa;
+
+    text-align: left;
+
+    // Date
+    .el-col.date
+    {
+        min-width: 130px;
+
+        span.month
+        {
+            margin-right: 5px;
+        }
+
+        span.now
+        {
+            font-size: 11px;
+            color: #888;
+        }
+    }
+
+    // Description
+    .el-col.description
+    {
+        width: unset;
+
+        span.type
+        {
+            display: inline-block;
+
+            font-size: 13px;
+            font-weight: 700;
+
+            background: #eee;
+            border-left: 2px solid #000;
+
+            height: 22px;
+            line-height: 22px;
+
+            margin-right: 8px;
+        }
+    }
+
+    // Grade
+    .el-col.grade
+    {
+        text-align: right;
+        float: right;
+
+        span.percent
+        {
+            font-style: italic;
+            background: #ffc;
+            color: #555;
+
+            margin-right: 8px;
+
+            .symbol
+            {
+                padding: 0 1px;
+            }
+        }
+
+        // Score you got
+        span.score
+        {
+            background: #f2f2f2;
+            color: #555;
+        }
+
+        // Max score
+        span.max
+        {
+            background: #ddd;
+            color: #333;
+        }
+
+        // Mark as read
+        button.mark-as-read
+        {
+            margin-left: 8px;
+            color: #aaa;
+            padding: 4px;
+        }
+    }
+
+    .entry-box
+    {
+        height: 22px;
+        padding: 0 5px;
+    }
+}
+
+.unread-entry:first-child
+{
+    padding-top: 3px;
+
+    // Top shadow
+    // https://stackoverflow.com/questions/17572619/inset-box-shadow-only-on-one-side
+    box-shadow: inset 0 7px 9px -7px rgba(0,0,0,0.1);
+}

src/pages/overall/overall-course/unread-entry/unread-entry.ts

@@ -0,0 +1,30 @@
+import {Component, Prop, Vue} from 'vue-property-decorator';
+import {Assignment, Course} from '@/components/app/app';
+import moment from 'moment';
+
+@Component({
+})
+export default class UnreadEntry extends Vue
+{
+    // @ts-ignore
+    @Prop({required: true}) assignment: Assignment;
+
+    /**
+     * Format a date to the displayed format
+     *
+     * @param date Date
+     */
+    getMoment(date: string)
+    {
+        return moment(new Date(date));
+    }
+
+    /**
+     * Mark this unread assignment as read
+     */
+    markAsRead()
+    {
+        // Call custom event
+        this.$emit('mark-as-read', this.assignment)
+    }
+}

src/pages/overall/overall-course/unread-entry/unread-entry.vue

@@ -0,0 +1,31 @@
+<template>
+    <div class="unread-entry vertical-center">
+        <el-row class="unread-row">
+            <el-col :span="3" class="date">
+                <span class="month">{{getMoment(assignment.date).format("MMM Do")}}</span>
+                <span class="now">({{getMoment(assignment.date).fromNow()}})</span>
+            </el-col>
+            <el-col :span="15" class="description">
+                <span class="type entry-box"
+                      :style="`border-color: var(--assignment-type-${assignment.typeId})`">
+                    {{assignment.type}}
+                </span>
+                <span class="text">{{assignment.description}}</span>
+            </el-col>
+            <el-col :span="6" class="grade">
+                <span class="percent entry-box">
+                    {{(assignment.score / assignment.scoreMax * 100).toFixed(1)}}
+                    <span class="symbol">%</span>
+                </span>
+                <span class="score entry-box">{{assignment.score}}</span>
+                <span class="max entry-box">{{assignment.scoreMax}}</span>
+                <el-button class="mark-as-read" size="mini" type="text"
+                           icon="el-icon-close" @click="markAsRead">
+                </el-button>
+            </el-col>
+        </el-row>
+    </div>
+</template>
+
+<script src="./unread-entry.ts" lang="ts"></script>
+<style src="./unread-entry.scss" lang="scss" scoped></style>

src/pages/overall/overall-line/overall-line.ts

@@ -0,0 +1,180 @@
+import {Component, Prop, Vue} from 'vue-property-decorator';
+import {Course} from '@/components/app/app';
+
+@Component({
+})
+export default class OverallLine extends Vue
+{
+    // @ts-ignore
+    @Prop({required: true}) courses: Course[];
+
+    private settings =
+    {
+        // Title
+        title:
+        {
+            show: true,
+            textStyle:
+            {
+                fontSize: 12
+            },
+            text: 'Average Grade',
+            subtext: 'Average score trend for every course',
+            x: 'center'
+        },
+        // Legend
+        legend:
+        {
+            show: false,
+            //left: 'auto',
+            //align: 'left',
+            //orient: 'vertical'
+            textStyle:
+            {
+                fontSize: 11
+            },
+            icon: 'circle'
+        },
+        // Zoom bar
+        dataZoom:
+        [
+            // TODO: Calculate real value for startValue
+            {
+                startValue: '9/13/2019'
+            },
+            {
+                type: 'inside'
+            }
+        ],
+        series:
+        {
+            smooth: true
+        },
+        xAxis:
+        {
+            //type: 'time'
+        },
+        yAxis:
+        {
+            min: (value: any) => Math.floor(value.min),
+            max: (value: any) => value.max
+        }
+    };
+
+    /**
+     * Convert assignments list to a graph dataset.
+     */
+    get convertChart()
+    {
+        let courses = this.courses;
+
+        // Compute the column names
+        let columns = courses.map(course => course.name);
+        columns.unshift('date');
+
+        // Find the min date
+        let minDates = courses.map(course => new Date(course.assignments[course.assignments.length - 1].date).getTime());
+        let minDate: Date = new Date(Math.min.apply(null, minDates));
+
+        // Find the dates in between
+        let now = new Date();
+        let dates = [];
+        for (let date = minDate; date <= now; date.setDate(date.getDate() + 1))
+        {
+            dates.push(new Date(date));
+        }
+
+        // Compute the rows data
+        let rows: {[index: string]: any}[] = [];
+        dates.forEach(date =>
+        {
+            // Define row object
+            let row: {[index: string]:any} = {'date': date.toLocaleDateString('en-US')};
+
+            // Loop through courses
+            courses.forEach(course =>
+            {
+                // Total Mean
+                if (course.grading.method == 'TOTAL_MEAN')
+                {
+                    let score = 0;
+                    let max = 0;
+
+                    // Loop through assignments
+                    course.assignments.forEach(assignment =>
+                    {
+                        // If assignment should be displayed
+                        if (assignment.complete != 'Complete') return;
+
+                        // Date is being looked at
+                        let assignmentDate = new Date(assignment.date);
+                        if (assignmentDate.getTime() < date.getTime())
+                        {
+                            // Record scores
+                            score += assignment.score;
+                            max += assignment.scoreMax;
+                        }
+                    });
+
+                    // Add average to the row
+                    row[course.name] = score / max * 100;
+                }
+                else if (course.grading.method == 'PERCENT_TYPE')
+                {
+                    let typeScores: {[index: string]: any} = {};
+                    let typeCounts: {[index: string]: any} = {};
+
+                    // Loop through assignments
+                    course.assignments.forEach(assignment =>
+                    {
+                        // If assignment should be displayed
+                        if (assignment.complete != 'Complete') return;
+
+                        // Date is being looked at
+                        let assignmentDate = new Date(assignment.date);
+                        if (assignmentDate.getTime() < date.getTime())
+                        {
+                            // Record scores
+                            if (typeScores[assignment.type] == undefined) typeScores[assignment.type] = 0;
+                            typeScores[assignment.type] += assignment.score / assignment.scoreMax;
+
+                            if (typeCounts[assignment.type] == undefined) typeCounts[assignment.type] = 0;
+                            typeCounts[assignment.type] ++;
+                        }
+                    });
+
+                    // Count total percentage (This is to avoid less than expected cases)
+                    // Eg. If HW = 25% and Quiz = 75%, I have 1 hw and 0 quiz
+                    // Without total percentage, the avg grade I get is 25%.
+                    let totalPercentage = 0;
+                    for (let type in course.grading.weightingMap)
+                    {
+                        if (typeScores[type] != undefined)
+                        {
+                            totalPercentage += course.grading.weightingMap[type];
+                        }
+                    }
+
+                    // Count
+                    let score = 0;
+                    for (let type in typeScores)
+                    {
+                        let typeFactor = course.grading.weightingMap[type] / totalPercentage;
+                        score += typeScores[type] * typeFactor / typeCounts[type];
+                    }
+
+                    // Add average to the row
+                    if (score != 0) row[course.name] = score * 100;
+                }
+            });
+
+            // Add it to the array
+            rows.push(row);
+        });
+
+        return {
+            columns: columns,
+            rows: rows
+        }
+    }
+}

src/pages/overall/overall-line/overall-line.vue

@@ -0,0 +1,10 @@
+<template>
+    <div id="overall-line">
+        <ve-line :data="convertChart" :extend="settings"></ve-line>
+    </div>
+</template>
+
+<script src="./overall-line.ts" lang="ts"></script>
+<style lang="scss" scoped>
+    
+</style>

src/pages/overall/overall.scss

@@ -1,17 +1,4 @@
 
-// Add some margins
-.el-card
-{
-    margin: 10px;
-    height: 494px;
-    padding: 0;
-
-    // Vertical center
-    display: flex;
-    justify-content: center;
-    flex-direction: column;
-}
-
 .gpa-card
 {
     margin-left: 20px;
@@ -31,7 +18,7 @@
 .gpa.text
 {
     font-size: 35px;
-    font-family: 'Avenir', Helvetica, Arial, sans-serif;
+    font-family: var(--font);
 }
 
 .gpa.max
@@ -46,3 +33,10 @@
 {
     font-size: 11px;
 }
+
+// Cards
+.el-card.overall-bar-card
+{
+    margin-right: 20px;
+    min-width: 170px;
+}

src/pages/overall/overall.ts

@@ -1,155 +1,24 @@
 import {Component, Prop, Vue} from 'vue-property-decorator';
-import GraphOverall from '@/pages/overall/graph-overall/graph-overall';
+import OverallLine from '@/pages/overall/overall-line/overall-line';
+import OverallBar from '@/pages/overall/overall-bar/overall-bar';
+import OverallCourse from '@/pages/overall/overall-course/overall-course';
 import {Course} from '@/components/app/app';
 import {GPAUtils} from '@/utils/gpa-utils';
 
 @Component({
-    components: {GraphOverall}
+    components: {OverallLine, OverallBar, OverallCourse}
 })
 export default class Overall extends Vue
 {
     // @ts-ignore
     @Prop({required: true}) courses: Course[];
 
-    /**
-     * Convert assignments list to a graph dataset.
-     */
-    get convertCharts()
-    {
-        // Null case
-        if (this.courses == null) return [];
-
-        // Filter it
-        let courses: Course[] = this.filterCourses();
-
-        // Compute the column names
-        let columns = ['date'];
-        courses.forEach(course =>
-        {
-            columns.push(course.name);
-        });
-
-        // Find the min date
-        let minDate: Date = new Date();
-        courses.forEach(course =>
-        {
-            if (course.assignments.length == 0) return;
-            let date = new Date(course.assignments[course.assignments.length - 1].date);
-            if (date < minDate) minDate = date;
-        });
-
-        // Find the dates in between
-        let now = new Date();
-        let dates = [];
-        for (let date = minDate; date <= now; date.setDate(date.getDate() + 1))
-        {
-            dates.push(new Date(date));
-        }
-
-        // Initialize course specific variables
-        let courseScores: {[index: string]: any} = {};
-        let courseMaxScores: {[index: string]: any} = {};
-        let courseIndexes: {[index: string]: any} = {};
-        courses.forEach(course =>
-        {
-            courseScores[course.name] = 0;
-            courseMaxScores[course.name] = 0;
-            courseIndexes[course.name] = course.assignments.length - 1;
-        });
-
-        // Compute the rows data
-        let rows: {[index: string]: any}[] = [];
-        dates.forEach(date =>
-        {
-            // Define row object
-            let row: {[index: string]:any} = {'date': date.toLocaleDateString('en-US')};
-
-            // Loop through courses
-            courses.forEach(course =>
-            {
-                // Reversed loop through the assignments
-                for (let r = courseIndexes[course.name]; r >= 0; r--)
-                {
-                    let assignment = course.assignments[r];
-
-                    // If assignment should be displayed
-                    if (assignment.complete != 'Complete') continue;
-
-                    // Date is being looked at
-                    let assignmentDate = new Date(assignment.date);
-                    if (assignmentDate.getTime() == date.getTime())
-                    {
-                        // Record scores
-                        courseScores[course.name] += assignment.score;
-                        courseMaxScores[course.name] += assignment.scoreMax;
-                    }
-
-                    // Not now
-                    else if (assignmentDate > date)
-                    {
-                        courseIndexes[course.name] = r;
-                        break;
-                    }
-                }
-
-                // Add average to the row
-                row[course.name] = courseScores[course.name] / courseMaxScores[course.name] * 100;
-            });
-
-            // Add it to the array
-            rows.push(row);
-        });
-
-        console.log(rows);
-
-        return {
-            columns: columns,
-            rows: rows
-        }
-    }
-
-    /**
-     * Return a list of courses that are graphed
-     */
-    private filterCourses(): Course[]
-    {
-        // Define result
-        let result: Course[] = [];
-
-        // Filter through courses
-        this.courses.forEach(course =>
-        {
-            // Skip future or past courses
-            if (course.status != 'active') return;
-
-            // Skip courses without levels
-            if (course.level == 'None') return;
-
-            // Skip courses without assignments
-            if (course.assignments.length == 0) return;
-
-            // Add it to the list
-            result.push(course);
-        });
-
-        return result;
-    }
-
     /**
      * This function is called to get gpa since I can't import another
      * class in the Vue file.
      */
     public getGPA()
     {
-        let gpa = GPAUtils.getGPA(this.courses);
+        return GPAUtils.getGPA(this.courses);
-        // let result = '' + gpa.gpa;
-
-        /* Not accurate
-        if (!gpa.accurate)
-        {
-            result = `(${result})`;
-        }*/
-
-        return gpa;
     }
 }

src/pages/overall/overall.vue

@@ -2,7 +2,7 @@
     <div id="overall">
         <el-row>
             <el-col :span="4">
-                <el-card class="gpa-card">
+                <el-card class="large gpa-card vertical-center">
                     <div style="padding: 14px;">
                         <span class="gpa header">GPA:</span>
                         <span class="gpa text">{{getGPA().gpa}}</span>
@@ -13,15 +13,24 @@
                     </div>
                 </el-card>
             </el-col>
-            <el-col :span="20">
+            <el-col :span="14">
-                <el-card style="margin-right: 20px">
+                <el-card class="large overall-line-card vertical-center">
-                    <graph-overall :chart="convertCharts"></graph-overall>
+                    <overall-line :courses="courses"></overall-line>
+                </el-card>
+            </el-col>
+            <el-col :span="6">
+                <el-card class="large overall-bar-card vertical-center">
+                    <overall-bar :courses="courses"></overall-bar>
                 </el-card>
             </el-col>
         </el-row>
-        <div class=""></div>
+
+        <overall-course v-for="course in courses"
+                        :course="course"
+                        :key="course.id">
+        </overall-course>
     </div>
 </template>
 
 <script src="./overall.ts" lang="ts"></script>
-<style src="./overall.scss" lang="scss"></style>
+<style src="./overall.scss" lang="scss" scoped></style>

src/utils/course-utils.ts

@@ -0,0 +1,48 @@
+import {Course} from '@/components/app/app';
+
+export class CourseUtils
+{
+    /**
+     * Return a list of courses that are graphed
+     *
+     * @param original Original course list
+     * @return Course[] Filtered course list
+     */
+    public static getGradedCourses(original: Course[]): Course[]
+    {
+        // Define result
+        let result: Course[] = [];
+
+        // Filter through courses
+        original.forEach(course =>
+        {
+            // Skip future or past courses
+            if (course.status != 'active') return;
+
+            // Skip courses without levels
+            if (course.level == 'None') return;
+
+            // Skip courses without graded assignments
+            if (course.assignments.filter(a => a.complete == 'Complete').length == 0) return;
+            
+            // Skip if there are no grading scale
+            // if (course.grading.method == 'NOT_GRADED') return;
+
+            // Add it to the list
+            result.push(course);
+        });
+
+        return result;
+    }
+
+    /**
+     * Format course to tab index string
+     *
+     * @param course Course object
+     * @return string Tab index
+     */
+    public static formatTabIndex(course: Course): string
+    {
+        return `course/${course.id}/${course.name.toLowerCase().split(' ').join('-')}`;
+    }
+}

src/utils/format-utils.ts

@@ -0,0 +1,29 @@
+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
+     *
+     * @param str String
+     * @param length Max length
+     */
+    static limit(str: string, length: number): string
+    {
+        return str.length <= length ? str : str.substr(0, length - 2) + '...'
+    }
+}

src/utils/gpa-utils.ts

@@ -102,4 +102,29 @@ export class GPAUtils
 
         return -1;
     }
+
+    /**
+     * Calculate the total-mean (total/max) average
+     *
+     * @param course Course
+     */
+    public static getTotalMeanAverage(course: Course)
+    {
+        let score = 0;
+        let max = 0;
+
+        // Loop through assignments
+        course.assignments.forEach(assignment =>
+        {
+            // If assignment should be displayed
+            if (assignment.complete != 'Complete') return;
+
+            // Record scores
+            score += assignment.score;
+            max += assignment.scoreMax;
+        });
+
+        // Return
+        return score / max * 100;
+    }
 }

src/utils/http-utils.ts

@@ -4,11 +4,6 @@ export class HttpUtils
 {
     public token: string = '';
 
-    constructor (token: string)
-    {
-        this.token = token;
-    }
-
     public post(node: string, body: any): Promise<any>
     {
         // Add token

src/utils/json-utils.ts

@@ -1,4 +1,4 @@
-import {Grade} from '@/components/app/app';
+import {Assignment} from '@/components/app/app';
 
 export default class JsonUtils
 {
@@ -6,23 +6,28 @@ export default class JsonUtils
      * This method filters the information provided in an assignments json.
      *
      * @param assignments Assignments object
-     * @returns Grade[] Filtered assignment grade object list
+     * @returns Assignment[] Filtered assignment grade object list
      */
-    public static filterAssignments(assignments: any): Grade[]
+    public static filterAssignments(assignments: any): Assignment[]
     {
-        let result: Grade[] = [];
+        let result: Assignment[] = [];
 
         assignments.assignments.forEach((assignment: any) =>
         {
             result.push(
             {
+                id: assignment.assignment_id,
+                scoreId: assignment.score_id,
                 type: assignment.assignment_type,
+                typeId: assignment.assignment_type_id,
                 description: assignment.assignment_description,
                 date: assignment._date,
                 complete: assignment.completion_status,
                 include: assignment.include_in_calculated_grade == 1,
                 display: assignment.display_grade == 1,
 
+                unread: assignment.is_unread == 1,
+
                 scoreMax: assignment.maximum_score,
                 score: +assignment.raw_score
             });

src/utils/version-utils.ts

@@ -0,0 +1,41 @@
+export default class VersionUtils
+{
+    /**
+     * Compare two version numbers
+     *
+     * Eg.
+     *   compare('0.1.2', '0.1.3') = -1
+     *   compare('1.0.0', '0.1.3') = 1
+     *   compare('0.0.1', '0.0.1') = 0
+     *
+     * @param ver1 Version 1
+     * @param ver2 Version 2
+     * @return number (-1 if ver1 < ver2), (1 if ver1 > ver2), (0 if equal)
+     */
+    public static compare(ver1: string, ver2: string): number
+    {
+        // Equal case
+        if (ver1 == ver2) return 0;
+
+        // Split
+        let split1 = ver1.split('.');
+        let split2 = ver2.split('.');
+
+        // Detect each number
+        for (let i in split1)
+        {
+            // Get numbers
+            let num1 = split1[i];
+            let num2 = split2[i];
+
+            // Current number is equal
+            if (num1 == num2) continue;
+
+            // Current number is different
+            return +num1 < +num2 ? -1 : 1;
+        }
+
+        // Equal
+        return 0;
+    }
+}