[U] Pre-release v0.1.2.236

src/components/login/login.ts

@@ -4,6 +4,7 @@ import {HttpUtils} from '@/utils/http-utils';
 
 /**
  * This component handles user login, and obtains data from the server.
+ * TODO: Press enter to login
  */
 @Component({
     components: {},
@@ -70,4 +71,12 @@ export default class Login extends Vue
             this.loading = false;
         });
     }
+
+    /**
+     * This is called when the user hits enter in the input boxes.
+     */
+    public onEnter()
+    {
+        this.onLoginClick();
+    }
 }

src/components/login/login.vue

@@ -8,13 +8,15 @@
 
                 <el-input v-model="username"
                           placeholder="School Username"
-                          :class="{'input-error': error !== ''}">
+                          :class="{'input-error': error !== ''}"
+                          @keyup.enter.native="onEnter">
                 </el-input>
 
                 <el-input v-model="password"
                           placeholder="Veracross Password"
                           show-password=""
-                          :class="{'input-error': error !== ''}">
+                          :class="{'input-error': error !== ''}"
+                          @keyup.enter.native="onEnter">
                 </el-input>
 
                 <div class="el-form-item__error custom">{{error}}</div>

src/constants.ts

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

src/pages/overall/overall.scss

@@ -12,18 +12,37 @@
     flex-direction: column;
 }
 
-.span-gpa-header
+.gpa-card
+{
+    margin-left: 20px;
+    min-width: 136px;
+}
+
+.gpa
+{
+    display: block;
+}
+
+.gpa.header
 {
     font-size: 14px;
 }
 
-.span-gpa
+.gpa.text
 {
     font-size: 35px;
     font-family: 'Avenir', Helvetica, Arial, sans-serif;
 }
 
-.gpa-time
+.gpa.max
 {
-    font-size: 14px;
+    margin-top: -10px;
+    margin-bottom: 10px;
+    font-size: 12px;
+    color: #409eff;
+}
+
+.gpa.time
+{
+    font-size: 11px;
 }

src/pages/overall/overall.ts

@@ -11,6 +11,9 @@ export default class Overall extends Vue
     // @ts-ignore
     @Prop({required: true}) courses: Course[];
 
+    /**
+     * Convert assignments list to a graph dataset.
+     */
     get convertCharts()
     {
         // Null case
@@ -133,12 +136,13 @@ export default class Overall extends Vue
     }
 
     /**
-     * This function is called to get gpa as a string.
+     * 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);
-        let result = '' + gpa.gpa;
+        // let result = '' + gpa.gpa;
 
         /* Not accurate
         if (!gpa.accurate)
@@ -146,6 +150,6 @@ export default class Overall extends Vue
             result = `(${result})`;
         }*/
 
-        return result;
+        return gpa;
     }
 }

src/pages/overall/overall.vue

@@ -2,15 +2,13 @@
     <div id="overall">
         <el-row>
             <el-col :span="4">
-                <el-card style="margin-left: 20px">
+                <el-card class="gpa-card">
                     <div style="padding: 14px;">
-                        <span class="span-gpa-header">GPA:</span>
+                        <span class="gpa header">GPA:</span>
-                        <br>
+                        <span class="gpa text">{{getGPA().gpa}}</span>
-                        <span class="span-gpa">{{getGPA()}}</span>
+                        <span class="gpa max">(Out of {{getGPA().max}})</span>
-                        <div class="bottom clearfix gpa-time">
+                        <div class="bottom clearfix gpa time">
-                            <time class="time">{{ new Date().toDateString() }}</time>
+                            <time>{{ new Date().toDateString() }}</time>
-                            <br>
-                            <el-button type="text" class="button">Button</el-button>
                         </div>
                     </div>
                 </el-card>

src/utils/gpa-utils.ts

@@ -31,7 +31,7 @@ export class GPAUtils
      *
      * @param coursesOriginal List of courses
      */
-    public static getGPA(coursesOriginal: Course[]): {gpa: number, accurate: boolean}
+    public static getGPA(coursesOriginal: Course[]): {gpa: number, accurate: boolean, max: number}
     {
         // Clone array
         let courses: Course[] = [];
@@ -42,7 +42,7 @@ export class GPAUtils
         // Remove all courses that does not have a grade
         coursesOriginal.forEach(course =>
         {
-            if (course.numericGrade == null || course.numericGrade == 0)
+            if (course.letterGrade == null || course.letterGrade == '')
             {
                 accurate = false;
             }
@@ -55,35 +55,39 @@ export class GPAUtils
         // If no course have grade, return -1
         if (courses.length == 0)
         {
-            return {gpa: -1, accurate: false};
+            return {gpa: -1, accurate: false, max: -1};
         }
 
         // Count total GPA
         let totalGPA = 0;
+        let maxTotal = 0;
         courses.forEach(course =>
         {
-            totalGPA += this.getGP(course);
+            totalGPA += this.getGP(course, course.letterGrade);
+            maxTotal += this.getGP(course, 'A+');
         });
 
         // Get average GPA, round to two decimal places
         let gpa = Math.round(totalGPA / courses.length * 100) / 100;
+        let maxGPA = Math.round(maxTotal / courses.length * 100) / 100;
 
         // Return results
-        return {gpa: gpa, accurate: accurate};
+        return {gpa: gpa, accurate: accurate, max: maxGPA};
     }
 
     /**
      * Calculate GPA for a course
      *
      * @param course Course
+     * @param letterGrade Letter grade
      */
-    public static getGP(course: Course): number
+    public static getGP(course: Course, letterGrade?: string): number
     {
         // Find the GPA for this course.
         for (let scale of this.SCALE)
         {
             // Letter grades are the same
-            if (scale[this.LETTER] == course.letterGrade)
+            if (scale[this.LETTER] == letterGrade)
             {
                 // Get grade and add it
                 let grade = <number> scale[this.GPA];