azalea/VeracrossAnalyzerDemo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[M] Move convertChart() to graph-overall.ts

Browse Source
This commit is contained in:
Hykilpikonna
2019-09-29 15:12:05 -04:00
parent 6459e1c09b
commit 7eb7838f66
4 changed files with 96 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/overall/graph-overall/graph-overall.ts
+94 -1
View File
@@ -5,7 +5,7 @@ import {Course} from '@/components/app/app';
})
export default class GraphOverall extends Vue
{
@Prop({required: true}) chart: any;
@Prop({required: true}) courses: any;
private settings =
{
@@ -40,5 +40,98 @@ export default class GraphOverall extends Vue
{
min: 70
}
};
/**
* Convert assignments list to a graph dataset.
*/
get convertChart()
{
let courses: Course[] = this.courses;
// 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
}
}
}
src/pages/overall/graph-overall/graph-overall.vue
+1 -1
View File
@@ -1,7 +1,7 @@
<template>
<div id="graph-overall">
<p>Your average score graph all time:</p>
<ve-line :data="chart" :extend="settings"></ve-line>
<ve-line :data="convertChart" :extend="settings"></ve-line>
</div>
</template>
src/pages/overall/overall.ts
-97
View File
@@ -12,103 +12,6 @@ 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[] = CourseUtils.getGradedCourses(this.courses);
// 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
}
}
/**
* This function is called to get gpa since I can't import another
* class in the Vue file.
src/pages/overall/overall.vue
+1 -1
View File
@@ -15,7 +15,7 @@
</el-col>
<el-col :span="20">
<el-card style="margin-right: 20px">
<graph-overall :chart="convertCharts"></graph-overall>
<graph-overall :courses="courses"></graph-overall>
</el-card>
</el-col>
</el-row>