feat: add grades chart
This commit is contained in:
parent
3058fe2ea2
commit
4820a7a793
2 changed files with 11 additions and 3 deletions
|
|
@ -56,6 +56,14 @@ export class GradeService {
|
||||||
return colles.length ? this.calculateAverage(colles) : 0
|
return colles.length ? this.calculateAverage(colles) : 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private serializeGrades(colles: Colle[]) {
|
||||||
|
return colles.map((colle) => ({
|
||||||
|
date: colle.date.toMillis(),
|
||||||
|
subject: colle.subject.name,
|
||||||
|
grade: colle.grade,
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
public async getMonthGrade(userId: number, startDate: DateTime) {
|
public async getMonthGrade(userId: number, startDate: DateTime) {
|
||||||
const colles = await this.getColles(userId, startDate, 1)
|
const colles = await this.getColles(userId, startDate, 1)
|
||||||
const subjects = this.getSubjects(colles)
|
const subjects = this.getSubjects(colles)
|
||||||
|
|
@ -87,7 +95,7 @@ export class GradeService {
|
||||||
periodStartDate = periodEndDate
|
periodStartDate = periodEndDate
|
||||||
}
|
}
|
||||||
|
|
||||||
return { grades: results, subjects }
|
return { averages: results, subjects, grades: this.serializeGrades(colles) }
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getPeriodGrade(userId: number, startDate: DateTime, months: number = 0) {
|
public async getPeriodGrade(userId: number, startDate: DateTime, months: number = 0) {
|
||||||
|
|
@ -124,7 +132,7 @@ export class GradeService {
|
||||||
index++
|
index++
|
||||||
}
|
}
|
||||||
|
|
||||||
return { grades: results, subjects }
|
return { averages: results, subjects, grades: this.serializeGrades(colles) }
|
||||||
}
|
}
|
||||||
|
|
||||||
private reduce(subjectAverages: SubjectPerformance[]) {
|
private reduce(subjectAverages: SubjectPerformance[]) {
|
||||||
|
|
|
||||||
2
build.sh
2
build.sh
|
|
@ -1,2 +1,2 @@
|
||||||
docker build -t git.lamy-charrier.fr/khollise/api:v1.0 .
|
docker build -t git.lamy-charrier.fr/khollise/api:v1.0 .
|
||||||
# docker push git.lamy-charrier.fr/khollise/api:v1.0
|
docker push git.lamy-charrier.fr/khollise/api:v1.0
|
||||||
Loading…
Add table
Reference in a new issue