fix teacher attendance

app/Services/Attendance/AttendanceQueryService.php

@@ -123,8 +123,12 @@ class AttendanceQueryService
         ];
     }
 
-    public function teacherAttendanceFormData(?int $userId, int $requestedSectionId = 0): array
-    {
+    public function teacherAttendanceFormData(
+        ?int $userId,
+        int $requestedSectionId = 0,
+        ?string $requestedSchoolYear = null,
+        ?string $requestedSemester = null
+    ): array {
         if (! $userId) {
             throw new RuntimeException('User not logged in.');
         }
@@ -134,8 +138,12 @@ class AttendanceQueryService
             ? trim(($teacher->firstname ?? '').' '.($teacher->lastname ?? ''))
             : 'Unknown Teacher';
 
-        $semester = $this->attendanceService->currentSemester();
-        $schoolYear = $this->attendanceService->currentSchoolYear();
+        $semester = trim((string) $requestedSemester) !== ''
+            ? trim((string) $requestedSemester)
+            : $this->attendanceService->currentSemester();
+        $schoolYear = trim((string) $requestedSchoolYear) !== ''
+            ? trim((string) $requestedSchoolYear)
+            : $this->attendanceService->currentSchoolYear();
 
         $assignments = $this->teacherClass->getClassAssignmentsByUserId($userId, $schoolYear, $semester);
 
@@ -187,7 +195,9 @@ class AttendanceQueryService
             implode(',', array_fill(0, count($sundayDates), '?')).')';
 
         foreach ($students as $student) {
-            $student = is_array($student) ? $student : (array) $student;
+            $student = is_array($student)
+                ? $student
+                : (method_exists($student, 'toArray') ? $student->toArray() : (array) $student);
             unset($student['created_by'], $student['updated_by'], $student['deleted_at']);
 
             $studentId = (int) $student['id'];

app/Services/Attendance/TeacherAttendanceSubmissionService.php

@@ -93,8 +93,11 @@ class TeacherAttendanceSubmissionService
             'semester' => $semester,
             'school_year' => $schoolYear,
         ];
+        $isTeacher = $this->attendancePolicyService->isTeacher($currentUser['roles']);
+        $dayStatus = strtolower((string) ($dayPolicyRow['status'] ?? 'draft'));
 
-        if (! $this->attendancePolicyService->canEditDay($dayPolicyRow, $currentUser)) {
+        if (! $this->attendancePolicyService->canEditDay($dayPolicyRow, $currentUser)
+            && ! ($isTeacher && $dayStatus === 'submitted')) {
             throw new RuntimeException('Attendance is locked for your role.');
         }
 
@@ -137,8 +140,6 @@ class TeacherAttendanceSubmissionService
             }
         }
 
-        $isTeacher = $this->attendancePolicyService->isTeacher($currentUser['roles']);
-
         DB::transaction(function () use (
             $user,
             $assignedTeachers,
@@ -172,6 +173,15 @@ class TeacherAttendanceSubmissionService
                 $position = strtolower((string) ($teacher['position'] ?? 'main'));
                 $position = $position === 'ta' ? 'ta' : 'main';
 
+                if ($isTeacher && DB::table('staff_attendance')
+                    ->where('user_id', $teacherId)
+                    ->whereDate('date', $attendDate)
+                    ->where('semester', $semester)
+                    ->where('school_year', $schoolYear)
+                    ->exists()) {
+                    continue;
+                }
+
                 $staffPayload = [
                     'role_name' => 'Teacher',
                     'status' => strtolower((string) ($teachersData[$teacherId]['status'] ?? 'present')),
@@ -204,10 +214,7 @@ class TeacherAttendanceSubmissionService
                 $existing = $existingByStudent[$studentId] ?? null;
 
                 if ($isTeacher && $existing) {
-                    $lockInfo = $detectExternalSubmission($existing);
-                    if (($lockInfo['locked'] ?? false) === true) {
-                        continue;
-                    }
+                    continue;
                 }
 
                 $this->studentAttendanceWriterService->saveOrUpdateStudentAttendance([