fix issues on examdraft view and event print page

app/Controllers/View/ExamDraftController.php

@@ -102,11 +102,9 @@ class ExamDraftController extends BaseController
             session()->set('class_section_id', $selectedClass);
         }
 
-        $allDrafts = $this->examDraftModel
-            ->select($this->draftSelectColumns())
-            ->select('cs.class_section_name')
-            ->join('classSection cs', 'cs.class_section_id = exam_drafts.class_section_id', 'left')
-            ->where($this->authorIdColumn, $teacherId)
+        $classSectionIds = array_map(static fn($a) => (int) $a['class_section_id'], $assignments);
+
+        $allDrafts = $this->visibleTeacherDraftsQuery($teacherId, $classSectionIds)
             ->orderBy('created_at', 'DESC')
             ->findAll();
 
@@ -117,10 +115,10 @@ class ExamDraftController extends BaseController
                     $row['final_pdf_file'] = $pdf;
                 }
             }
+            $row = $this->attachTeacherDraftContext($row, $teacherId);
         }
         unset($row);
 
-        $classSectionIds = array_map(static fn($a) => (int) $a['class_section_id'], $assignments);
         $legacyExams = [];
         // Guard against missing schema column in older databases
         if ($this->hasIsLegacyColumn) {
@@ -129,8 +127,9 @@ class ExamDraftController extends BaseController
 
             $legacyQuery = $this->examDraftModel
                 ->select($this->draftSelectColumns())
-                ->select('cs.class_section_name')
+                ->select('cs.class_section_name, u.firstname AS teacher_first, u.lastname AS teacher_last')
                 ->join('classSection cs', 'cs.class_section_id = exam_drafts.class_section_id', 'left')
+                ->join('users u', 'u.id = exam_drafts.' . $this->authorIdColumn, 'left')
                 ->where('exam_drafts.is_legacy', 1)
                 ->where('exam_drafts.status', 'legacy')
                 ->where('exam_drafts.final_file IS NOT NULL', null, false);
@@ -143,6 +142,11 @@ class ExamDraftController extends BaseController
                 ->orderBy('cs.class_section_name', 'ASC')
                 ->orderBy('exam_drafts.created_at', 'DESC')
                 ->findAll();
+
+            foreach ($legacyExams as &$row) {
+                $row = $this->attachTeacherDraftContext($row, $teacherId);
+            }
+            unset($row);
         } else {
             // Legacy column absent, show all drafts and skip legacy tab query
             $drafts = $allDrafts;
@@ -768,10 +772,11 @@ class ExamDraftController extends BaseController
             return $this->response->setStatusCode(401);
         }
 
-        $drafts = $this->examDraftModel
-            ->select($this->draftSelectColumns())
-            ->select('id, status, acceptance_type, updated_at, reviewed_at')
-            ->where($this->authorIdColumn, $teacherId)
+        $assignments = $this->teacherClassModel->getClassAssignmentsByUserId($teacherId, $this->schoolYear);
+        $classSectionIds = array_map(static fn($a) => (int) $a['class_section_id'], $assignments);
+
+        $drafts = $this->visibleTeacherDraftsQuery($teacherId, $classSectionIds)
+            ->select('exam_drafts.id, exam_drafts.status, exam_drafts.acceptance_type, exam_drafts.updated_at, exam_drafts.reviewed_at')
             ->orderBy('updated_at', 'DESC')
             ->findAll();
 
@@ -817,6 +822,58 @@ class ExamDraftController extends BaseController
         return $validIds[0] ?? 0;
     }
 
+    private function visibleTeacherDraftsQuery(int $teacherId, array $classSectionIds)
+    {
+        $query = $this->examDraftModel
+            ->select($this->draftSelectColumns())
+            ->select('cs.class_section_name, u.firstname AS teacher_first, u.lastname AS teacher_last')
+            ->join('classSection cs', 'cs.class_section_id = exam_drafts.class_section_id', 'left')
+            ->join('users u', 'u.id = exam_drafts.' . $this->authorIdColumn, 'left');
+
+        if (empty($classSectionIds)) {
+            return $query->where('exam_drafts.' . $this->authorIdColumn, $teacherId);
+        }
+
+        $query->groupStart()
+            ->where('exam_drafts.' . $this->authorIdColumn, $teacherId)
+            ->orGroupStart()
+                ->whereIn('exam_drafts.class_section_id', $classSectionIds)
+                ->where('exam_drafts.' . $this->authorIdColumn . ' !=', $teacherId)
+                ->where('exam_drafts.status !=', 'draft');
+
+        if ($this->schoolYear !== '') {
+            $query->where('exam_drafts.school_year', $this->schoolYear);
+        }
+        if ($this->semester !== '') {
+            $query->where('exam_drafts.semester', $this->semester);
+        }
+
+        $query->groupEnd()
+            ->groupEnd();
+
+        return $query;
+    }
+
+    private function attachTeacherDraftContext(array $row, int $viewerId): array
+    {
+        $isOwn = $this->draftTeacherId($row) === $viewerId;
+        $row['is_own_submission'] = $isOwn;
+        $row['teacher_display_name'] = $isOwn ? 'You' : $this->draftTeacherName($row);
+
+        return $row;
+    }
+
+    private function draftTeacherName(array $draft): string
+    {
+        $name = trim(((string) ($draft['teacher_first'] ?? '')) . ' ' . ((string) ($draft['teacher_last'] ?? '')));
+        if ($name !== '') {
+            return $name;
+        }
+
+        $teacherId = $this->draftTeacherId($draft);
+        return $teacherId > 0 ? 'Teacher #' . $teacherId : 'Teacher';
+    }
+
     private function statusBadgeMap(): array
     {
         return [