Compare commits

...

93 Commits

Author SHA1 Message Date
Hykilpikonna 6204efd453 [U] Release v0.4.3.1006 2019-11-09 22:15:31 -05:00
Hykilpikonna db083732b0 [M] Rename course-type-radar to type-radar 2019-11-09 22:14:41 -05:00
Hykilpikonna 4974049c0b [S] Make background lighter 2019-11-09 22:11:02 -05:00
Hykilpikonna 857192ee6d [S] Add text shadows 2019-11-09 22:10:45 -05:00
Hykilpikonna 90d07b1faa [S] Make font size larger 2019-11-09 22:10:33 -05:00
Hykilpikonna 4abe02da94 [+] Color the indicator texts 2019-11-09 22:10:16 -05:00
Hykilpikonna adca4b41e2 [+] Add percent score after indicator 2019-11-09 22:10:08 -05:00
Hykilpikonna 4d9d8e0be5 [S] Darken line color 2019-11-09 21:58:39 -05:00
Hykilpikonna 546ad81f7c [+] Colorize split area 2019-11-09 21:58:23 -05:00
Hykilpikonna 1eff27ad26 [S] Center color gradient 2019-11-09 21:49:40 -05:00
Hykilpikonna f540e03a56 [S] Adjust the graph down 10% 2019-11-09 21:47:34 -05:00
Hykilpikonna af925741b4 [S] Make graph smaller 2019-11-09 21:47:18 -05:00
Hykilpikonna 08bb24cac4 [O] Use percentage score instead of score 2019-11-09 21:47:06 -05:00
Hykilpikonna 8a9ca83e68 [O] Optimize graph with baseSettings 2019-11-09 21:46:47 -05:00
Hykilpikonna e6b6a73f1f [O] Optimize type adverage with pre-calculated percent 2019-11-09 21:35:18 -05:00
Hykilpikonna ceca351b07 [+] Include percent score in AssignmentType 2019-11-09 21:34:28 -05:00
Hykilpikonna 4e14730db6 [S] Change the graph symbol to circle 2019-11-09 21:24:13 -05:00
Hykilpikonna 3b0e291df4 [S] Make radar only take half the screen 2019-11-09 21:23:54 -05:00
Hykilpikonna 6bcb2577f7 [+] Add area gradient 2019-11-09 21:23:34 -05:00
Hykilpikonna 54e54b89e9 [+] Display tooltip 2019-11-09 21:23:14 -05:00
Hykilpikonna 0085d384fd [+] Display data in radar graph 2019-11-09 21:23:07 -05:00
Hykilpikonna 3b4e40261f [O] Use scoreMax instead 2019-11-09 21:22:31 -05:00
Hykilpikonna eb8715867e [+] Add radar indicator 2019-11-09 21:03:12 -05:00
Hykilpikonna 1bcfdf5648 [+] Add radar component in course page 2019-11-09 20:55:56 -05:00
Hykilpikonna 429de6553b [+] Create course-type-radar 2019-11-09 20:55:39 -05:00
Hykilpikonna fce47648c8 [O] Remove unnecessary getAssignmentTypes() 2019-11-09 20:45:30 -05:00
Hykilpikonna f6d44dd1f2 [O] Remove unnecessary complete verification 2019-11-09 20:45:12 -05:00
Hykilpikonna 4fe0a54277 [O] Remove unnecessary average() method 2019-11-09 20:44:57 -05:00
Hykilpikonna e8bf21e60c [F] Fix type name display 2019-11-09 20:44:37 -05:00
Hykilpikonna 472df39ac8 [O] Pass in AssignmentType object for AssignmentTypeHead component 2019-11-09 20:44:23 -05:00
Hykilpikonna ae94f54a7b [O] Cache assignment types 2019-11-09 20:39:24 -05:00
Hykilpikonna 8c9f0a0e83 [O] Optimize caching 2019-11-09 20:37:56 -05:00
Hykilpikonna cb22baf120 [+] Calculate type score and weight 2019-11-09 20:33:32 -05:00
Hykilpikonna 0525aae98a [+] Create method to get assignment types 2019-11-09 20:25:18 -05:00
Hykilpikonna 4c87cb2947 [F] Fix null pointer 2019-11-09 20:21:57 -05:00
Hykilpikonna 076a1ee52e [O] Return graded assignments by default 2019-11-09 20:21:09 -05:00
Hykilpikonna 7bd9e97396 [S] Remove ugly circle between data points 2019-11-09 20:05:52 -05:00
Hykilpikonna aa014bcdab [+] Create AssignmentType interface 2019-11-09 19:47:56 -05:00
Hykilpikonna ee308d29ff [S] Optimize x axis label 2019-11-09 19:39:53 -05:00
Hykilpikonna 35ef2144b7 [O] Limit minimum zoom 2019-11-09 19:29:45 -05:00
Hykilpikonna 6dc2a21e8f [+] Add back tooltip 2019-11-09 17:42:03 -05:00
Hykilpikonna 343c921eb2 [+] Add y axis label 2019-11-09 17:40:15 -05:00
Hykilpikonna f54dfba058 [F] Fix scatter plot out of bounds issue 2019-11-09 17:39:58 -05:00
Hykilpikonna a7d7ef44a6 [-] Remove debug output 2019-11-09 17:35:29 -05:00
Hykilpikonna 793d7444b2 [O] Add back the term lines and mark areas 2019-11-09 17:35:22 -05:00
Hykilpikonna eaf4d2ce7b [O] Make y max an integer 2019-11-09 17:32:17 -05:00
Hykilpikonna 79e615ee46 [O] Use graded courses only 2019-11-09 17:31:32 -05:00
Hykilpikonna 40353cfd35 [O] Generate settings on created 2019-11-09 17:31:22 -05:00
Hykilpikonna 2be2ce98e6 [F] Fix date conversion 2019-11-09 17:27:45 -05:00
Hykilpikonna 6659f65763 [F] Fix multiple assignment creating multiple dates issue 2019-11-09 17:19:30 -05:00
Hykilpikonna 5b3ba4db07 [+] Create method to convert data points to date points 2019-11-09 17:11:35 -05:00
Hykilpikonna a05281f4e4 [+] Separate method to generate series 2019-11-09 17:10:54 -05:00
Hykilpikonna 2f95548fb3 [+] Create method to get series for course 2019-11-09 17:10:37 -05:00
Hykilpikonna 96ee9e9265 [O] Default to 2 decimal places 2019-11-09 17:05:06 -05:00
Hykilpikonna 9026b9d3a9 [-] Remove deprecated convertChart() 2019-11-09 17:02:53 -05:00
Hykilpikonna 67e38dd554 [F] Fix tooltip date representation 2019-11-09 16:59:52 -05:00
Hykilpikonna 7ffef67e42 [F] Parse time instead of date 2019-11-09 16:57:12 -05:00
Hykilpikonna 0d195cfb7f [F] Fix invalid date 2019-11-09 16:56:22 -05:00
Hykilpikonna 0d3e9c0840 [O] Remove toChartDate, use timestamp instead 2019-11-09 16:53:53 -05:00
Hykilpikonna 6c600f31f8 [O] Change assignment.date to time 2019-11-09 16:50:48 -05:00
Hykilpikonna a05a44aaef [+] Add assignments.length > 0 as a condition 2019-11-09 16:49:30 -05:00
Hykilpikonna 31d3a5a09e [+] Filter graded courses 2019-11-09 16:48:45 -05:00
Hykilpikonna 30293cd261 [O] Encapsulate method to get graded assignments 2019-11-09 16:31:36 -05:00
Hykilpikonna 9a279b3417 [O] Use afterconfig 2019-11-09 16:24:00 -05:00
Hykilpikonna 4a7ff0ea55 [O] Use base settings in overall-line 2019-11-09 16:23:41 -05:00
Hykilpikonna fd341e9d33 [O] Use basesettings in course-scatter 2019-11-09 16:15:21 -05:00
Hykilpikonna bdacc8dd9e [+] Create function to generate base settings 2019-11-09 16:14:58 -05:00
Hykilpikonna ad2c8a1ee8 [M] Move dot to graph utils 2019-11-09 16:12:44 -05:00
Hykilpikonna 1f58818a1a [S] Dim markline brightness 2019-11-09 16:06:28 -05:00
Hykilpikonna 09442cbfba [+] Add mark areas and lines in scatter plot 2019-11-09 16:05:55 -05:00
Hykilpikonna 91e10d1fa8 [+] Add opacity param to markline generation 2019-11-09 16:05:25 -05:00
Hykilpikonna 80267feb54 [O] Separate series creation with the main settings 2019-11-09 16:00:57 -05:00
Hykilpikonna f4ee2dadb6 [M] Move markarea to GraphUtils 2019-11-09 15:51:05 -05:00
Hykilpikonna d698f3d13a [M] Move markline stuff to GraphUtils 2019-11-09 15:47:30 -05:00
Hykilpikonna 82cb845061 [S] Make line animation faster 2019-11-09 15:43:53 -05:00
Hykilpikonna 940738307b [F] Fix term 1 graph displaying dates after term 2 2019-11-09 15:41:54 -05:00
Hykilpikonna df011787e1 [S] Change line color 2019-11-09 15:41:12 -05:00
Hykilpikonna 0af393a1e4 [+] Put in actual term dates 2019-11-09 15:37:52 -05:00
Hykilpikonna 6504cc033b [+] Encapsulate method to get term end date 2019-11-09 15:32:25 -05:00
Hykilpikonna c6ccc5e311 [F] Fix: All year graph begins at term 2 2019-11-09 15:28:48 -05:00
Hykilpikonna 3a8899507f [+] Encapsulate method to get begin date of a term 2019-11-09 15:28:21 -05:00
Hykilpikonna 2b7026c4ce [F] Fix: Make starting time not exceed the beginning of a term 2019-11-09 15:24:41 -05:00
Hykilpikonna a3fd822252 [S] Remove quater line arrow symbol 2019-11-09 15:05:57 -05:00
Hykilpikonna f9d7fa398f [+] Add quater line label 2019-11-09 14:59:38 -05:00
Hykilpikonna 7ffc445bba [+] Show quater lines 2019-11-09 14:55:47 -05:00
Hykilpikonna 8e9f6a4bb7 [O] Optimize date data type 2019-11-09 14:55:37 -05:00
Hykilpikonna 05cb560c8c [-] Disable legend 2019-11-09 14:54:35 -05:00
Hykilpikonna 53a57234a0 [-] Remove unused legend 2019-11-09 14:54:02 -05:00
Hykilpikonna 6af6bb0959 [O] Optimize time display 2019-11-09 14:47:32 -05:00
Hykilpikonna 089aad7398 [O] Optimize date formatting 2019-11-09 14:47:22 -05:00
Hykilpikonna 937e89ce5f [M] Move assignment interface from app.ts to course.ts 2019-11-09 14:38:57 -05:00
Hykilpikonna b0685ffd6b [M] Move util classes to /logic 2019-11-09 14:32:45 -05:00
Hykilpikonna 18dee50b96 [F] Force desktop view on mobile devices 2019-11-09 14:32:10 -05:00
26 changed files with 589 additions and 376 deletions
+2 -1
View File
@@ -3,7 +3,8 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<!--meta name="viewport" content="width=device-width,initial-scale=1.0"-->
<meta name="viewport" content="width=1024">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<title>Veracross Analyzer</title>
+2 -25
View File
@@ -4,36 +4,13 @@ import Navigation from '@/components/navigation/navigation';
import Overall from '@/pages/overall/overall.vue';
import Constants from '@/constants';
import pWaitFor from 'p-wait-for';
import {HttpUtils} from '@/utils/http-utils';
import {GPAUtils} from '@/utils/gpa-utils';
import {HttpUtils} from '@/logic/utils/http-utils';
import {GPAUtils} from '@/logic/utils/gpa-utils';
import Loading from '@/components/loading/loading.vue';
import CoursePage from '@/pages/course/course-page.vue';
import Course from '@/logic/course';
/**
* Objects of this interface represent assignment grades.
*/
export interface Assignment
{
id: number
scoreId: number
type: string
typeId: number
description: string
date: Date
complete: string
include: boolean
display: boolean
unread: boolean
scoreMax: number
score: number
gradingPeriod: number
}
@Component({
components: {Login, Navigation, Overall, Loading, CoursePage},
})
+1 -1
View File
@@ -1,7 +1,7 @@
import {Component, Vue} from 'vue-property-decorator';
import Constants from '@/constants';
import App from '@/components/app/app';
import VersionUtils from '@/utils/version-utils';
import VersionUtils from '@/logic/utils/version-utils';
/**
* This component handles user login, and obtains data from the server.
+2 -2
View File
@@ -1,7 +1,7 @@
import {Component, Prop, Vue} from 'vue-property-decorator';
import App from '@/components/app/app';
import {CourseUtils} from '@/utils/course-utils';
import {FormatUtils} from '@/utils/format-utils';
import {CourseUtils} from '@/logic/utils/course-utils';
import {FormatUtils} from '@/logic/utils/format-utils';
import pWaitFor from 'p-wait-for';
import Course from '@/logic/course';
+9 -2
View File
@@ -7,7 +7,7 @@ export default class Constants
public static API_URL: string = 'https://va.hydev.org/api';
/** Current version */
public static VERSION: string = '0.4.2.912';
public static VERSION: string = '0.4.3.1006';
/** Minimum version that still supports the same cookies */
public static MIN_SUPPORTED_VERSION: string = '0.3.4.561';
@@ -56,6 +56,13 @@ export default class Constants
};
// Terms (TODO: Actually get the terms dynamically
public static TERMS = [new Date('Sep 04 2019'), new Date('Nov 01 2019'), new Date('Feb 02 2020')];
public static TERMS =
[
new Date('Sep 04 2019'),
new Date('Nov 03 2019'),
new Date('Jan 19 2020'),
new Date('Mar 22 2020'),
new Date('Jun 05 2020'),
];
public static CURRENT_TERM = 1;
}
+119 -34
View File
@@ -1,9 +1,42 @@
import {Assignment} from '@/components/app/app';
import JsonUtils from '@/utils/json-utils';
import {FormatUtils} from '@/utils/format-utils';
import {CourseUtils} from '@/utils/course-utils';
import JsonUtils from '@/logic/utils/json-utils';
import {FormatUtils} from '@/logic/utils/format-utils';
import {CourseUtils} from '@/logic/utils/course-utils';
import Navigation from '@/components/navigation/navigation';
import {GPAUtils} from '@/utils/gpa-utils';
import {GPAUtils} from '@/logic/utils/gpa-utils';
/**
* Objects of this interface represent assignment grades.
*/
export interface Assignment
{
id: number
scoreId: number
type: string
typeId: number
description: string
time: number
complete: string
include: boolean
display: boolean
unread: boolean
scoreMax: number
score: number
gradingPeriod: number
}
export interface AssignmentType
{
id: number
name: string
weight: number
scoreMax: number
score: number
percent: number
}
export default class Course
{
@@ -79,7 +112,7 @@ export default class Course
this.rawAssignments = JsonUtils.filterAssignments(data);
// Sort by date (Latest is at 0)
this.rawAssignments.sort((a, b) => b.date.getTime() - a.date.getTime());
this.rawAssignments.sort((a, b) => b.time - a.time);
// Filter assignments into terms
let termAssignments: Assignment[][] = [[], [], [], []];
@@ -104,7 +137,7 @@ export default class Course
if (this.level == 'None' || this.level == 'Unknown' || this.scaleUp == -1) return false;
// Skip courses without graded assignments
if (this.assignments.filter(a => a.complete == 'Complete').length == 0) return false;
if (this.assignments.length == 0) return false;
// Skip if there are no grading scale
// if (course.grading.method == 'NOT_GRADED') return;
@@ -116,7 +149,7 @@ export default class Course
/**
* Get assignments of the selected time
*/
get assignments(): Assignment[]
get rawSelectedAssignments(): Assignment[]
{
let timeCode = Navigation.instance.getSelectedGradingPeriod();
@@ -130,30 +163,42 @@ export default class Course
return this.computed.termAssignments[timeCode];
}
// TODO: Optimize this
private letterGradeComputed = false;
private _cacheAssignments: Assignment[];
/**
* Get graded assignments
*/
get assignments(): Assignment[]
{
if (this._cacheAssignments == null)
this._cacheAssignments = this.rawSelectedAssignments.filter(a => a.complete == 'Complete');
return this._cacheAssignments;
}
private _cacheLetterGrade: string;
/**
* Get letter grade
*/
get letterGrade(): string
{
// Cached
if (this.rawLetterGrade != undefined && this.letterGradeComputed)
return this.rawLetterGrade;
this.letterGradeComputed = true;
if (this._cacheLetterGrade == null)
{
// Get scale
let scale = GPAUtils.findScale(this.numericGrade);
// Get scale
let scale = GPAUtils.findScale(this.numericGrade);
// Scale not found
if (scale == undefined) return this._cacheLetterGrade = '--';
// Scale not found
if (scale == undefined) return this.rawLetterGrade = '--';
// Cache
this._cacheLetterGrade = scale.letter;
}
// Return
return this.rawLetterGrade = scale.letter;
return this._cacheLetterGrade;
}
private numericGradeComputed = false;
private _cacheNumericGrade: number;
/**
* Get numeric grade
@@ -161,21 +206,61 @@ export default class Course
get numericGrade(): number
{
// Cached
if (this.rawNumericGrade != undefined && this.numericGradeComputed)
return this.rawNumericGrade;
this.numericGradeComputed = true;
// Calculate
if (this.grading.method == 'PERCENT_TYPE')
if (this._cacheNumericGrade == null)
{
return this.rawNumericGrade = GPAUtils.getPercentTypeAverage(this, this.assignments);
}
if (this.grading.method == 'TOTAL_MEAN')
{
return this.rawNumericGrade = GPAUtils.getTotalMeanAverage(this.assignments);
// Calculate
if (this.grading.method == 'PERCENT_TYPE')
{
this._cacheNumericGrade = GPAUtils.getPercentTypeAverage(this, this.assignments);
}
else if (this.grading.method == 'TOTAL_MEAN')
{
this._cacheNumericGrade = GPAUtils.getTotalMeanAverage(this.assignments);
}
else this._cacheNumericGrade = -1;
}
// Error
return -1;
return this._cacheNumericGrade;
}
private _cacheAssignmentTypes: AssignmentType[];
/**
* Get assignment types
*/
get assignmentTypes(): AssignmentType[]
{
if (this._cacheAssignmentTypes == null)
{
// Get all types
let types = this.assignments.map(a => a.type);
// Remove duplicates
types = types.filter((type, i, a) => a.indexOf(type) == i);
// Get total possible score for weight calculation
let totalScoreMax = this.assignments.reduce((sum, a) => sum + a.scoreMax, 0);
// For every type...
this._cacheAssignmentTypes = types.map(type =>
{
// Get assignments of the type
let typeAssignments = this.assignments.filter(a => a.type == type);
// Count scores and max scores
let score = typeAssignments.reduce((sum, a) => sum + a.score, 0);
let scoreMax = typeAssignments.reduce((sum, a) => sum + a.scoreMax, 0);
// Calculate weight
let weight = this.grading.method == 'PERCENT_TYPE'
? this.grading.weightingMap[type] : scoreMax / totalScoreMax;
// Return
return {name: type, id: typeAssignments[0].typeId, weight: weight,
scoreMax: scoreMax, score: score, percent: +(score / scoreMax * 100).toFixed(2)}
})
}
return this._cacheAssignmentTypes;
}
}
@@ -1,4 +1,6 @@
import Course from '@/logic/course';
import Navigation from '@/components/navigation/navigation';
import Constants from '@/constants';
const LEVEL_AP = {level: 'AP', scaleUp: 1};
const LEVEL_H = {level: 'H', scaleUp: 0.75};
@@ -64,4 +66,24 @@ export class CourseUtils
// Really unknown
return undefined;
}
/**
* Get the begin date of the selected term
*/
static getTermBeginDate()
{
let selected = Navigation.instance.getSelectedGradingPeriod();
return selected == -1 ? Constants.TERMS[0] : Constants.TERMS[selected];
}
/**
* Get the end date of the selected term
*/
static getTermEndDate()
{
let selected = Navigation.instance.getSelectedGradingPeriod();
return selected == -1 ? Constants.TERMS[3] : Constants.TERMS[selected + 1];
}
}
@@ -2,20 +2,6 @@ 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
*
@@ -1,5 +1,4 @@
import Course from '@/logic/course';
import {Assignment} from '@/components/app/app';
import Course, {Assignment} from '@/logic/course';
export interface Scale
{
@@ -136,7 +135,7 @@ export class GPAUtils
});
// Return
return score / max * 100;
return +(score / max * 100).toFixed(2);
}
/**
@@ -186,6 +185,6 @@ export class GPAUtils
}
// Add average to the row
return score * 100;
return +(score * 100).toFixed(2);
}
}
+73
View File
@@ -0,0 +1,73 @@
import Constants from '@/constants';
export default class GraphUtils
{
static DOT = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:{color}"></span>';
/**
* Base settings
*
* @param title
* @param subtitle
*/
static getBaseSettings(title?: String, subtitle?: String)
{
return {
// Color
color: Constants.THEME.colors,
// Title
title:
{
show: title != null,
textStyle:
{
fontSize: 13
},
text: title,
subtext: subtitle,
x: 'center'
},
}
}
/**
* Get term mark lines
*/
static getTermLines()
{
return {
silent: true,
symbol: 'none',
lineStyle: {color: Constants.THEME.colors[2]},
animationDuration: 500,
data: Constants.TERMS.map((term, index) =>
{
return {xAxis: term.getTime(), label: {formatter: `Term ${index + 1}`}}
})
}
}
/**
* Get mark areas for percentage scores
*/
static getGradeMarkAreas(opacity: number)
{
return {
silent: true,
data:
[
// Above 100
[{itemStyle: {color: 'rgba(230,253,255)', opacity: opacity}, yAxis: 120}, {yAxis: 100}],
// 90 to 100
[{itemStyle: {color: 'rgba(241,255,237)', opacity: opacity}, yAxis: 100}, {yAxis: 90}],
// 80 to 90
[{itemStyle: {color: 'rgba(255,250,216)', opacity: opacity}, yAxis: 90}, {yAxis: 80}],
// 70 to 80
[{itemStyle: {color: 'rgba(255,225,199)', opacity: opacity}, yAxis: 80}, {yAxis: 70}],
// Below 70 (Fail)
[{itemStyle: {color: 'rgb(255,190,184)', opacity: opacity}, yAxis: 70}, {yAxis: -100}]
]
}
}
}
@@ -1,4 +1,4 @@
import {Assignment} from '@/components/app/app';
import {Assignment} from '@/logic/course';
export default class JsonUtils
{
@@ -18,7 +18,7 @@ export default class JsonUtils
type: assignment.assignment_type,
typeId: assignment.assignment_type_id,
description: assignment.assignment_description,
date: new Date(assignment._date),
time: new Date(assignment._date).getTime(),
complete: assignment.completion_status,
include: assignment.include_in_calculated_grade == 1,
display: assignment.display_grade == 1,
@@ -2,8 +2,8 @@
<div id="assignment-type-head">
<el-card :body-style="{padding: '0px'}">
<div id="type-info-card">
<span id="type-name">{{typeName}}</span>
<span id="type-average">Average: {{average.toFixed(2)}}%</span>
<span id="type-name">{{type.name}}</span>
<span id="type-average">Average: {{type.percent}}%</span>
</div>
<AssignmentEntry v-for="assignment of filteredAssignments" :key="assignment.id"
@@ -16,27 +16,21 @@
<script lang="ts">
import {Component, Prop, Vue} from 'vue-property-decorator';
import {Assignment} from '@/components/app/app';
import AssignmentEntry from '@/pages/overall/overall-course/assignment-entry/assignment-entry.vue';
import {Assignment, AssignmentType} from '@/logic/course';
@Component({
components: {AssignmentEntry}
})
export default class AssignmentTypeHead extends Vue
{
@Prop({required: true}) typeName: string;
@Prop({required: true}) type: AssignmentType;
@Prop({required: true}) assignments: Assignment[];
get filteredAssignments()
{
// Filter assignments to only this type
return this.assignments.filter(a => a.complete == 'Complete' && a.type == this.typeName);
}
get average()
{
return this.filteredAssignments.reduce((a, b) => a + b.score, 0) /
this.filteredAssignments.reduce((a, b) => a + b.scoreMax, 0) * 100;
return this.assignments.filter(a => a.typeId == this.type.id);
}
}
</script>
+17 -20
View File
@@ -14,8 +14,20 @@
</el-col>
</el-row>
<AssignmentTypeHead v-for="type in getAssignmentTypes()" :key="type"
:type-name="type" :assignments="course.assignments">
<el-row>
<el-col :span="12">
<el-card class="large overall-line-card vertical-center" body-style="padding: 0">
<CourseTypeRadar :course="course"></CourseTypeRadar>
</el-card>
</el-col>
<el-col :span="12">
Hi
</el-col>
</el-row>
<AssignmentTypeHead v-for="type in course.assignmentTypes" :key="type.id"
:type="type" :assignments="course.assignments">
</AssignmentTypeHead>
</div>
</el-card>
@@ -23,15 +35,15 @@
<script lang="ts">
import {Component, Prop, Vue} from 'vue-property-decorator';
import {Assignment} 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';
import AssignmentEntry from '@/pages/overall/overall-course/assignment-entry/assignment-entry.vue';
import AssignmentTypeHead from '@/pages/course/assignment-type-head/assignment-type-head.vue';
import Course from '@/logic/course';
import Course, {Assignment} from '@/logic/course';
import TypeRadar from '@/pages/course/course-type-radar/type-radar';
@Component({
components: {AssignmentEntry, CourseHead, CourseScatter, AssignmentTypeHead}
components: {CourseTypeRadar: TypeRadar, AssignmentEntry, CourseHead, CourseScatter, AssignmentTypeHead}
})
export default class CoursePage extends Vue
{
@@ -52,21 +64,6 @@
}
else return this.unread;
}
/**
* Get all the types of the assignments.
*/
getAssignmentTypes(): string[]
{
// Get all types
let types = this.course.assignments.map(a => a.type);
// Remove duplicates
types = types.filter((type, i, a) => a.indexOf(type) == i);
// Return it
return types;
}
}
</script>
@@ -1,16 +1,14 @@
import {Component, Prop, Vue} from 'vue-property-decorator';
import {Assignment} from '@/components/app/app';
import Constants from '@/constants';
import {FormatUtils} from '@/utils/format-utils';
import {FormatUtils} from '@/logic/utils/format-utils';
import moment from 'moment';
import Course from '@/logic/course';
import Course, {Assignment} from '@/logic/course';
import GraphUtils from '@/logic/utils/graph-utils';
@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>';
@Prop({required: true}) course: Course;
/**
@@ -28,40 +26,11 @@ 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 =
{
// Color
color: Constants.THEME.colors,
// Title
title:
{
show: true,
textStyle:
{
fontSize: 13
},
text: 'Assignments',
subtext: 'Assignment scores for ' + this.course.name,
x: 'center'
},
// Base settings
...GraphUtils.getBaseSettings('Assignments', 'Assignment scores for ' + this.course.name),
// X axis represents course names
xAxis:
@@ -71,7 +40,7 @@ export default class CourseScatter extends Vue
{
formatter: (name: any) => moment(name).format('MMM DD')
},
max: FormatUtils.toChartDate(new Date())
max: new Date().getTime()
},
// Y axis represents GPAs and MaxGPAs
@@ -85,8 +54,8 @@ export default class CourseScatter extends Vue
{
formatter: (name: any) => name + '%'
},
max: 100,
min: (value: any) => Math.floor(value.min) - 5
min: (value: any) => Math.floor(value.min) - 5,
max: (value: any) => Math.min(Math.ceil(value.max), 110)
},
// Tooltip
@@ -97,8 +66,8 @@ export default class CourseScatter extends Vue
{
type: 'cross'
},
formatter: (ps: any[]) => ps[0].data[0] + '<br>' + ps.map(p =>
`${CourseScatter.DOT.replace('{color}', p.color)}
formatter: (ps: any[]) => moment(ps[0].data[0]).format('MMM DD, YYYY') + '<br>' + ps.map(p =>
`${GraphUtils.DOT.replace('{color}', p.color)}
${FormatUtils.limit(p.data[2], 22)}: ${p.data[1]}%<br>`).join('')
},
@@ -115,20 +84,53 @@ 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
}
});
// Push other stuff
series.push(
{
type: 'line',
markLine: GraphUtils.getTermLines(),
markArea: GraphUtils.getGradeMarkAreas(0.4)
});
return series;
}
/**
* Map assignments to {assignmentType, [assignment]} format.
*/
@@ -158,6 +160,6 @@ export default class CourseScatter extends Vue
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]);
.map(a => [a.time, (a.score / a.scoreMax * 100).toFixed(2), a.description]);
}
}
@@ -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>
@@ -0,0 +1,114 @@
import {Component, Prop, Vue} from 'vue-property-decorator';
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
export default class TypeRadar extends Vue
{
@Prop({required: true}) course: Course;
/**
* Override options
*
* @param options Original options (Unused)
*/
afterConfig(options: any)
{
return this.chartSettings;
}
/**
* Generate settings
*/
get chartSettings()
{
// Create settings
let settings =
{
...GraphUtils.getBaseSettings('Type Radar',
'Assignment type grades for ' + this.course.name),
// Radar settings
radar:
{
// shape: 'circle',
name:
{
textStyle:
{
fontSize: 14,
textShadowColor: '#cfcfcf',
textShadowBlur: 2,
textShadowOffsetX: 1,
textShadowOffsetY: 1,
color: '#fff',
backgroundColor: '#f6f6f6',
borderRadius: 3,
padding: [3, 5]
}
},
splitArea:
{
areaStyle:
{
color:
[
'rgb(255,161,151)',
'rgb(255,190,184)',
'rgba(255,225,199)',
'rgba(255,250,216)',
'rgba(241,255,237)',
],
opacity: 0.4
}
},
indicator: this.course.assignmentTypes.map((t, i) => {return {
name: `${t.name}\n${t.percent}%`,
max: 100,
color: Constants.THEME.colors[i]
}}),
radius: '60%',
center: ['50%', '60%']
},
tooltip: {},
// Data
series:
{
type: 'radar',
data:
[
{
name: 'Score',
symbol: 'circle',
areaStyle:
{
color:
{
type: 'radial',
x: 0.5, y: 0.6, r: 0.5,
colorStops:
[
{offset: 0, color: '#ffa0a0'},
{offset: 0.5, color: '#fffead'},
{offset: 1, color: '#d1ffde'}
],
global: false // 缺省为 false
},
opacity: 0.2
},
value: this.course.assignmentTypes.map(t => t.percent)
}
]
},
color: '#6771c1'
};
return settings;
}
}
@@ -0,0 +1,16 @@
<template>
<div id="course-scatter">
<ve-radar height="450px" class="graph" :extend="{a: this.course.name}" :after-config="afterConfig"></ve-radar>
</div>
</template>
<script src="./type-radar.ts" lang="ts"></script>
<style lang="scss" scoped>
#overall-bar
{
.graph
{
margin-top: 50px;
}
}
</style>
+2 -2
View File
@@ -1,8 +1,8 @@
import {Component, Prop, Vue} from 'vue-property-decorator';
import Course from '@/logic/course';
import {GPAUtils} from '@/utils/gpa-utils';
import {GPAUtils} from '@/logic/utils/gpa-utils';
import Constants from '@/constants';
import {FormatUtils} from '@/utils/format-utils';
import {FormatUtils} from '@/logic/utils/format-utils';
@Component({
})
@@ -5,8 +5,8 @@
<el-row class="unread-row">
<el-col :span="3" class="date">
<span class="month">{{getMoment(assignment.date).format("MMM D")}}</span>
<span class="now">({{getMoment(assignment.date).fromNow()}})</span>
<span class="month">{{getMoment(assignment.time).format("MMM D")}}</span>
<span class="now">({{getMoment(assignment.time).fromNow()}})</span>
</el-col>
<el-col :span="15" class="description">
@@ -36,8 +36,8 @@
<script lang="ts">
import {Component, Prop, Vue} from 'vue-property-decorator';
import {Assignment} from '@/components/app/app';
import moment from 'moment';
import {Assignment} from '@/logic/course';
@Component
export default class AssignmentEntry extends Vue
@@ -53,7 +53,7 @@
*
* @param date Date
*/
getMoment(date: string)
getMoment(date: number)
{
return moment(new Date(date));
}
@@ -26,7 +26,7 @@
<script lang="ts">
import {Component, Prop, Vue} from 'vue-property-decorator';
import Course from '@/logic/course';
import {CourseUtils} from '@/utils/course-utils';
import {CourseUtils} from '@/logic/utils/course-utils';
import Navigation from '@/components/navigation/navigation';
@Component
@@ -1,8 +1,8 @@
import {Component, Prop, Vue} from 'vue-property-decorator';
import App, {Assignment} from '@/components/app/app';
import App from '@/components/app/app';
import AssignmentEntry from '@/pages/overall/overall-course/assignment-entry/assignment-entry.vue';
import CourseHead from '@/pages/overall/overall-course/course-head/course-head.vue';
import Course from '@/logic/course';
import Course, {Assignment} from '@/logic/course';
@Component({
components: {UnreadEntry: AssignmentEntry, CourseHead}
+137 -197
View File
@@ -1,224 +1,164 @@
import {Component, Prop, Vue} from 'vue-property-decorator';
import moment from 'moment';
import Course from '@/logic/course';
import Course, {Assignment} from '@/logic/course';
import Constants from '@/constants';
import Navigation from '@/components/navigation/navigation';
import {CourseUtils} from '@/logic/utils/course-utils';
import GraphUtils from '@/logic/utils/graph-utils';
import {GPAUtils} from '@/logic/utils/gpa-utils';
@Component({
})
@Component
export default class OverallLine extends Vue
{
@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,
textStyle:
{
fontSize: 11
},
icon: 'circle'
},
// Zoom bar
dataZoom:
[
{
startValue: moment().subtract(30, 'days').format('M/D/YYYY')
},
{
type: 'inside'
}
],
series:
{
smooth: true,
// Mark area
markArea:
{
silent: true,
data:
[
// Above 100
[
{
yAxis: 120,
itemStyle: {color: 'rgba(230,253,255,0.09)'}
}, {yAxis: 100}
],
// 90 to 100
[
{
yAxis: 100,
itemStyle: {color: 'rgba(241,255,237,0.09)'}
}, {yAxis: 90}
],
// 80 to 90
[
{
yAxis: 90,
itemStyle: {color: 'rgba(255,250,216,0.09)'}
}, {yAxis: 80}
],
// 70 to 80
[
{
yAxis: 80,
itemStyle: {color: 'rgba(255,225,199,0.1)'}
}, {yAxis: 70}
],
// Below 70 (Fail)
[
{
yAxis: 70,
itemStyle: {color: 'rgb(255,190,184, 0.09)'}
}, {yAxis: -100}
]
]
}
},
xAxis:
{
//type: 'time'
},
yAxis:
{
min: (value: any) => Math.floor(value.min),
max: (value: any) => Math.min(value.max, 110)
}
};
chartCache: any;
filteredCourses: Course[];
settings: any;
/**
* Convert assignments list to a graph dataset.
* When this component is created
*/
get convertChart()
created()
{
// Caching
if (this.chartCache != undefined) return this.chartCache;
// Filter courses
this.filteredCourses = this.courses.filter(c => c.isGraded && c.assignments.length > 0);
let courses = this.courses.filter(c => c.assignments.length > 0);
// Generate settings
this.settings =
{
...GraphUtils.getBaseSettings('Average Grade', 'Average score trend for every course'),
// Compute the column names
let columns = courses.map(course => course.name);
columns.unshift('date');
// Zoom bar
dataZoom:
[
{
type: 'slider',
startValue: Math.max(moment().subtract(30, 'days').toDate().getTime(),
CourseUtils.getTermBeginDate().getTime()),
// Minimum zoom: 1 week
minValueSpan: 7 * 24 * 60 * 60 * 1000
}
],
// Tooltip
tooltip:
{
trigger: 'axis'
},
// Axis
xAxis:
{
type: 'time',
axisLabel:
{
formatter: (name: any) => moment(name).format('MMM DD')
},
},
yAxis:
{
axisLabel:
{
formatter: (name: any) => name + '%'
},
min: (value: any) => Math.floor(value.min),
max: (value: any) => Math.min(Math.ceil(value.max), 110)
},
// Series data
series: this.series()
}
}
/**
* Override options
*
* @param options Original options (Unused)
*/
afterConfig(options: any)
{
return this.settings;
}
/**
* Generate series data
*/
private series()
{
// Each course
let series: any[] = this.filteredCourses.map(course => this.getCourseSeries(course));
// Push other stuff
series.push(
{
type: 'line',
markLine: GraphUtils.getTermLines(),
markArea: GraphUtils.getGradeMarkAreas(0.4)
});
return series
}
/**
* Generate series data for a course
*
* @param course
*/
private getCourseSeries(course: Course)
{
// Graded assignments
let assignments = course.assignments.slice().reverse();
// Create series
return {
name: course.name,
type: 'line',
smooth: true,
symbol: 'circle', // circle, diamond, emptyCircle, none
data: this.toDateRange([...assignments.map(a => a.time)].map((time, i) =>
{
// Find subset before this assignment
let subset = assignments.filter(a => a.time <= time);
// Find grade
if (course.grading.method == 'PERCENT_TYPE')
return [time, GPAUtils.getPercentTypeAverage(course, subset)];
if (course.grading.method == 'TOTAL_MEAN')
return [time, GPAUtils.getTotalMeanAverage(subset)];
}))
}
}
/**
* Convert point data to date range data.
* Eg. [[Mon, 10], [Wed, 5]] to [[Mon, 10], [Tue, 10], [Wed, 5]]
*
* @param data
*/
private toDateRange(data: any[])
{
// Find the min date
let minDates = courses.map(course => course.assignments[course.assignments.length - 1].date.getTime());
let minDates = this.courses.map(course => course.assignments[course.assignments.length - 1].time);
let minDate: Date = new Date(Math.min.apply(null, minDates));
// Find the dates in between
let now = new Date();
let dates = [];
let now = new Date(Math.min(new Date().getTime(), CourseUtils.getTermEndDate().getTime()));
let dates: number[] = [];
for (let date = minDate; date <= now; date.setDate(date.getDate() + 1))
{
dates.push(new Date(date));
dates.push(new Date(date).getTime());
}
// Compute the rows data
let rows: {[index: string]: any}[] = [];
dates.forEach(date =>
let lastValue: any = null;
return dates.map(date =>
{
// Define row object
let row: {[index: string]:any} = {'date': date.toLocaleDateString('en-US')};
// Data point on this specific date
let thisValue = data.find(a => a[0] == date);
// 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
if (assignment.date.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
if (assignment.date.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);
// None
if (thisValue == null) return [date, lastValue == null ? null : lastValue[1]];
else return [date, (lastValue = thisValue)[1]];
});
return this.chartCache =
{
columns: columns,
rows: rows
}
}
}
@@ -1,6 +1,6 @@
<template>
<div id="overall-line">
<ve-line :data="convertChart" :extend="settings"></ve-line>
<ve-line :extend="{a: this.courses}" :after-config="afterConfig"></ve-line>
</div>
</template>
+1 -1
View File
@@ -44,7 +44,7 @@
import OverallBar from '@/pages/overall/overall-bar/overall-bar';
import OverallCourse from '@/pages/overall/overall-course/overall-course';
import Course from '@/logic/course';
import {GPAUtils} from '@/utils/gpa-utils';
import {GPAUtils} from '@/logic/utils/gpa-utils';
@Component({
components: {OverallLine, OverallBar, OverallCourse}