diff --git a/src/components/app/app.ts b/src/components/app/app.ts index 3af1b18..8ed2f8b 100644 --- a/src/components/app/app.ts +++ b/src/components/app/app.ts @@ -1,7 +1,7 @@ import {Component, Vue} from 'vue-property-decorator'; import Login from '@/components/login/login'; import Navigation from '@/components/navigation/navigation'; -import Overall from '@/pages/overall/overall'; +import Overall from '@/pages/overall/overall.vue'; import Constants from '@/constants'; import JsonUtils from '@/utils/json-utils'; import pWaitFor from 'p-wait-for'; diff --git a/src/pages/overall/overall-course/assignment-entry/assignment-entry.vue b/src/pages/overall/overall-course/assignment-entry/assignment-entry.vue index 15d50c9..20693f5 100644 --- a/src/pages/overall/overall-course/assignment-entry/assignment-entry.vue +++ b/src/pages/overall/overall-course/assignment-entry/assignment-entry.vue @@ -5,6 +5,7 @@ {{getMoment(assignment.date).format("MMM Do")}} ({{getMoment(assignment.date).fromNow()}}) + @@ -12,6 +13,7 @@ {{assignment.description}} + {{(assignment.score / assignment.scoreMax * 100).toFixed(1)}} @@ -19,6 +21,7 @@ {{assignment.score}} {{assignment.scoreMax}} + diff --git a/src/pages/overall/overall.ts b/src/pages/overall/overall.ts deleted file mode 100644 index e96711c..0000000 --- a/src/pages/overall/overall.ts +++ /dev/null @@ -1,23 +0,0 @@ -import {Component, Prop, Vue} from 'vue-property-decorator'; -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: {OverallLine, OverallBar, OverallCourse} -}) -export default class Overall extends Vue -{ - @Prop({required: true}) courses: Course[]; - - /** - * This function is called to get gpa since I can't import another - * class in the Vue file. - */ - public getGPA() - { - return GPAUtils.getGPA(this.courses); - } -} diff --git a/src/pages/overall/overall.vue b/src/pages/overall/overall.vue index a3fd41f..6044be5 100644 --- a/src/pages/overall/overall.vue +++ b/src/pages/overall/overall.vue @@ -32,5 +32,30 @@ - + +