Update app/services/grade_service.ts
This commit is contained in:
parent
bf8c8d2e8a
commit
11ffda9995
1 changed files with 2 additions and 2 deletions
|
|
@ -44,7 +44,7 @@ export class GradeService {
|
|||
.where('studentId', userId)
|
||||
.where('date', '>=', startDate.toJSDate())
|
||||
.where('date', '<', endDate.toJSDate())
|
||||
.whereNotNull('garde')
|
||||
.whereNotNull('grade')
|
||||
.preload('subject')
|
||||
.orderBy('date', 'asc')
|
||||
}
|
||||
|
|
@ -54,7 +54,7 @@ export class GradeService {
|
|||
.where('studentId', userId)
|
||||
.where('subjectId', subjectId)
|
||||
.where('date', '<', beforeDate.toJSDate())
|
||||
.whereNotNull('garde')
|
||||
.whereNotNull('grade')
|
||||
return colles.length ? this.calculateAverage(colles) : 0
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue