fix logic and tests, update docker CI file
This commit is contained in:
@@ -163,7 +163,7 @@ class TeacherSubmissionReportService
|
||||
->where('class_section_id', $classSectionId)
|
||||
->where('semester', $semester)
|
||||
->where('school_year', $schoolYear)
|
||||
->where('date', $today)
|
||||
->whereDate('date', $today)
|
||||
->first();
|
||||
|
||||
$attendanceSubmitted = $attendanceRow
|
||||
@@ -187,7 +187,7 @@ class TeacherSubmissionReportService
|
||||
$midtermCommentStatus = $this->support->submissionStatus(count($midtermCommentStudents), $expected);
|
||||
$participationStatus = $this->support->submissionStatus(count($participationStudents), $expected);
|
||||
$ptapCommentStatus = $this->support->submissionStatus(count($ptapCommentStudents), $expected);
|
||||
$attendanceStatus = $this->support->attendanceStatus($attendanceSubmitted);
|
||||
$attendanceStatus = $this->support->attendanceStatus($attendanceSubmitted, $expected);
|
||||
|
||||
$statusDetails = [
|
||||
'midterm_score_status' => $midtermScoreStatus,
|
||||
@@ -282,4 +282,4 @@ class TeacherSubmissionReportService
|
||||
|
||||
return $historyMap;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user