merge prod to main

app/Controllers/View/ScoreController.php

@@ -1287,14 +1287,14 @@ class ScoreController extends Controller
 public function viewStudentScore()
 {
     $parentId = session()->get('user_id');
-    $userType = $_SESSION['user_type'];
+    $userType = session()->get('user_type') ?? '';
     $firstParentId = null;
     $releaseFall = $this->getParentScoresReleasedForSemester('Fall');
     $releaseSpring = $this->getParentScoresReleasedForSemester('Spring');
     $releaseAny = $releaseFall || $releaseSpring;
 
     // Identify the firstparent based on user type
-    if ($userType === 'primary') {
+    if ($userType === 'primary' || $userType === '') {
         $firstParentId = $parentId;
     } elseif ($userType === 'secondary') {
         $parentData = $this->db->table('parents')
@@ -1378,6 +1378,7 @@ $students = $this->db->table('students')
                 $releaseScores = (strcasecmp($semester, 'Fall') === 0) ? $releaseFall
                     : ((strcasecmp($semester, 'Spring') === 0) ? $releaseSpring : $releaseAny);
                 $scores[$selectedYear][$semester][$studentId] = [
+                    'student_id' => $studentId,
                     'school_id' => $student['school_id'],
                     'student_firstname' => $student['firstname'],
                     'student_lastname' => $student['lastname'],