| xqd
@@ -72,7 +72,7 @@ class Student extends Model
|
|
|
return empty($tmp) ? true : false;
|
|
|
}
|
|
|
|
|
|
- public function getThisWeekAverageScore(Teacher $teacher)
|
|
|
+ public function getThisWeekAverageScore(Remark $remark)
|
|
|
{
|
|
|
$today = Carbon::today();
|
|
|
$this_week_begin = null;
|
| xqd
@@ -83,7 +83,7 @@ class Student extends Model
|
|
|
|
|
|
return RemarkDetail::where([
|
|
|
['student_id', '=', $this['id']],
|
|
|
- ['teacher_id', '=', $teacher['id']],
|
|
|
+ ['remark_id', '=', $remark['id']],
|
|
|
['created_at', '>=', $this_week_begin],
|
|
|
])->get()->avg('score');
|
|
|
}
|