[U] Update version number

src/components/app/app.ts

@@ -55,7 +55,7 @@ export default class App extends Vue
     public courses: Course[] = [];
 
     // Currently selected tab
-    public selectedTab: string = "overall";
+    public selectedTab: string = 'overall';
 
     // Are the course assignments loaded from the server.
     public assignmentsReady: boolean = false;
@@ -185,4 +185,16 @@ export default class App extends Vue
         // Update selected tab
         this.selectedTab = tab;
     }
+
+    /**
+     * Sign out
+     */
+    public signOut()
+    {
+        // Clear all cookies
+        this.$cookies.keys().forEach(key => this.$cookies.remove(key));
+
+        // Refresh
+        window.location.reload();
+    }
 }

src/components/app/app.vue

@@ -1,7 +1,10 @@
 <template>
     <div id="app">
         <login v-if="showLogin" v-on:login:token="onLogin" :http="http"></login>
-        <navigation :courses="courses" v-on:navigation:select="onNavigate"></navigation>
+        <navigation :courses="courses"
+                    v-on:sign-out="signOut()"
+                    v-on:navigation:select="onNavigate">
+        </navigation>
 
         <div id="app-content">
             <overall :courses="courses" v-if="selectedTab === 'overall' && assignmentsReady"></overall>

src/components/navigation/navigation.ts

@@ -27,4 +27,13 @@ export default class Navigation extends Vue
         // Call custom event
         this.$emit('navigation:select', this.activeIndex);
     }
+
+    /**
+     * This function is called when the sign out button is clicked.
+     */
+    public signOut()
+    {
+        // Call custom event
+        this.$emit('sign-out');
+    }
 }

src/components/navigation/navigation.vue

@@ -11,6 +11,7 @@
                               :key="course.name">{{course.name}}</el-menu-item>
             </el-submenu>
 
+            <el-button @click="signOut" id="sign-out-button" type="text">Sign Out</el-button>
         </el-menu>
         <div class="line"></div>
     </div>

src/constants.ts

@@ -14,5 +14,5 @@ export default class Constants
         '|    |.  ,    |---|,---.,---.|    ,   .,---,,---.,---.\n' +
         ' \\  /  ><     |   ||   |,---||    |   | .-\' |---\'|    \n' +
         '  `\'  \'  `    `   \'`   \'`---^`---\'`---|\'---\'`---\'`    \n' +
-        '      v1.1.0                      `---\'               '
+        '      v0.1.1.0                    `---\'               '
 }

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

@@ -7,16 +7,15 @@ export default class GraphOverall extends Vue
 {
     @Prop({required: true}) chart: any;
 
-    public chartData =
+    private settings =
     {
-        columns: ['日期', '访问用户', '下单用户', '下单率'],
+        series:
-        rows: [
+        {
-            { '日期': '1/1', '访问用户': 1393, '下单用户': 1093, '下单率': 0.32 },
+            smooth: false
-            { '日期': '1/2', '访问用户': 3530, '下单用户': 3230, '下单率': 0.26 },
+        },
-            { '日期': '1/3', '访问用户': 2923, '下单用户': 2623, '下单率': 0.76 },
+        yAxis:
-            { '日期': '1/4', '访问用户': 1723, '下单用户': 1423, '下单率': 0.49 },
+        {
-            { '日期': '1/5', '访问用户': 3792, '下单用户': 3492, '下单率': 0.323 },
+            min: 70
-            { '日期': '1/6', '访问用户': 4593, '下单用户': 4293, '下单率': 0.78 }
+        }
-        ]
+    }
-    };
 }

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

@@ -1,6 +1,7 @@
 <template>
     <div id="graph-overall">
-        <ve-line :data="chart" :extend="{series: {smooth: false}}"></ve-line>
+        <p>Your average score graph all time:</p>
+        <ve-line :data="chart" :extend="settings"></ve-line>
     </div>
 </template>
 

src/pages/overall/overall.ts

@@ -8,30 +8,28 @@ import {GPAUtils} from '@/utils/gpa-utils';
 })
 export default class Overall extends Vue
 {
-    @Prop({required: true}) courses: any;
+    // @ts-ignore
+    @Prop({required: true}) courses: Course[];
 
     get convertCharts()
     {
         // Null case
         if (this.courses == null) return [];
 
+        // Filter it
+        let courses: Course[] = this.filterCourses();
+
         // Compute the column names
         let columns = ['date'];
-        this.courses.forEach((course: Course) =>
+        courses.forEach(course =>
         {
-            // Ignore non-important courses
-            if (course.status != 'active') return;
-
             columns.push(course.name);
         });
 
         // Find the min date
         let minDate: Date = new Date();
-        this.courses.forEach((course: Course) =>
+        courses.forEach(course =>
         {
-            // Ignore non-important courses
-            if (course.status != 'active') return;
-
             if (course.assignments.length == 0) return;
             let date = new Date(course.assignments[course.assignments.length - 1].date);
             if (date < minDate) minDate = date;
@@ -49,11 +47,8 @@ export default class Overall extends Vue
         let courseScores: {[index: string]: any} = {};
         let courseMaxScores: {[index: string]: any} = {};
         let courseIndexes: {[index: string]: any} = {};
-        this.courses.forEach((course: Course) =>
+        courses.forEach(course =>
         {
-            // Ignore non-important courses
-            if (course.status != 'active') return;
-
             courseScores[course.name] = 0;
             courseMaxScores[course.name] = 0;
             courseIndexes[course.name] = course.assignments.length - 1;
@@ -67,18 +62,18 @@ export default class Overall extends Vue
             let row: {[index: string]:any} = {'date': date.toLocaleDateString('en-US')};
 
             // Loop through courses
-            this.courses.forEach((course: Course) =>
+            courses.forEach(course =>
             {
-                // Ignore non-important courses
-                if (course.status != 'active') return;
-
                 // Reversed loop through the assignments
                 for (let r = courseIndexes[course.name]; r >= 0; r--)
                 {
                     let assignment = course.assignments[r];
-                    let assignmentDate = new Date(assignment.date);
+
+                    // 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
@@ -110,6 +105,36 @@ export default class Overall extends Vue
         }
     }
 
+    /**
+     * 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 as a string.
+     */
     public getGPA()
     {
         let gpa = GPAUtils.getGPA(this.courses);

src/pages/overall/overall.vue

@@ -17,7 +17,6 @@
             </el-col>
             <el-col :span="20">
                 <el-card style="margin-right: 20px">
-                    <p>Your average score graph all time:</p>
                     <graph-overall :chart="convertCharts"></graph-overall>
                 </el-card>
             </el-col>

src/utils/gpa-utils.ts

@@ -42,7 +42,7 @@ export class GPAUtils
         // Remove all courses that does not have a grade
         coursesOriginal.forEach(course =>
         {
-            if (course.numericGrade == null)
+            if (course.numericGrade == null || course.numericGrade == 0)
             {
                 accurate = false;
             }

src/utils/json-utils.ts

@@ -19,7 +19,7 @@ export default class JsonUtils
                 type: assignment.assignment_type,
                 description: assignment.assignment_description,
                 date: assignment._date,
-                complete: assignment.complete_status,
+                complete: assignment.completion_status,
                 include: assignment.include_in_calculated_grade == 1,
                 display: assignment.display_grade == 1,