|
@@ -457,12 +457,21 @@ class ApiController extends Controller
|
|
}
|
|
}
|
|
|
|
|
|
foreach($teachers as $teacher) {
|
|
foreach($teachers as $teacher) {
|
|
- $remark_time = RemarkDetail::where([
|
|
|
|
|
|
+ $remark = Remark::where([
|
|
['student_id', '=', $student->id],
|
|
['student_id', '=', $student->id],
|
|
['teacher_id', '=', $teacher->id],
|
|
['teacher_id', '=', $teacher->id],
|
|
- ])->orderBy('updated_at', 'desc')->first();
|
|
|
|
- $teacher->remark_time = empty($remark_time) ? '' : substr($remark_time->updated_at, 0, 10);
|
|
|
|
- $teacher->average_score = $student->getThisWeekAverageScore($teacher);
|
|
|
|
|
|
+ ])->first();
|
|
|
|
+ if(!empty($remark)) {
|
|
|
|
+ $remark_time = RemarkDetail::where([
|
|
|
|
+ ['remark_id', '=', $remark->id],
|
|
|
|
+ ['teacher_id', '=', $teacher->id],
|
|
|
|
+ ])->orderBy('updated_at', 'desc')->first();
|
|
|
|
+ $teacher->remark_time = empty($remark_time) ? '' : substr($remark_time->updated_at, 0, 10);
|
|
|
|
+ $teacher->average_score = $student->getThisWeekAverageScore($teacher);
|
|
|
|
+ } else {
|
|
|
|
+ $teacher->remark_time = '';
|
|
|
|
+ $teacher->average_score = 0;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
return response()->json(['status' => 'success', 'titles' => [], 'teachers' => $teachers, 'is_new' => $is_new]);
|
|
return response()->json(['status' => 'success', 'titles' => [], 'teachers' => $teachers, 'is_new' => $is_new]);
|