fix apply the plan docs/alrahma_api_fix_plan_school_year_only_v7

app/Http/Requests/ClassProgress/ClassProgressIndexRequest.php

@@ -16,7 +16,7 @@ class ClassProgressIndexRequest extends ClassProgressFormRequest
         return [
             'class_section_id' => ['nullable', 'integer', 'min:1'],
             'teacher_id' => ['nullable', 'integer', 'min:1'],
-            'school_year_id' => ['nullable', 'integer', 'min:1'],
+            'school_year_id' => ['prohibited'],
             'school_year' => ['nullable', 'string', 'max:20'],
             'semester' => ['nullable', 'string', 'max:20'],
             'week_start' => ['nullable', 'date_format:Y-m-d'],

app/Http/Requests/Families/FamilyAdminCardRequest.php

@@ -17,6 +17,7 @@ class FamilyAdminCardRequest extends ApiFormRequest
             'student_id' => ['nullable', 'integer', 'min:1'],
             'guardian_id' => ['nullable', 'integer', 'min:1'],
             'school_year' => ['nullable', 'string', 'max:20'],
+            'school_year_id' => ['prohibited'],
             'family_id' => ['nullable', 'integer', 'min:1'],
         ];
     }

app/Http/Requests/Families/FamilyAdminIndexRequest.php

@@ -17,6 +17,7 @@ class FamilyAdminIndexRequest extends ApiFormRequest
             'student_id' => ['nullable', 'integer', 'min:1'],
             'guardian_id' => ['nullable', 'integer', 'min:1'],
             'school_year' => ['nullable', 'string', 'max:20'],
+            'school_year_id' => ['prohibited'],
         ];
     }
 }

app/Http/Requests/Families/FamilyComposeEmailRequest.php

@@ -13,6 +13,10 @@ class FamilyComposeEmailRequest extends ApiFormRequest
         if (! $this->has('html_message') && $this->has('html')) {
             $this->merge(['html_message' => $this->input('html')]);
         }
+
+        if (! $this->has('recipient') && $this->has('to')) {
+            $this->merge(['recipient' => $this->input('to')]);
+        }
     }
 
     public function authorize(): bool
@@ -29,6 +33,7 @@ class FamilyComposeEmailRequest extends ApiFormRequest
             'profile' => ['nullable', 'string', 'max:50'],
             'reply_to_email' => ['nullable', 'email', 'max:255'],
             'reply_to_name' => ['nullable', 'string', 'max:255'],
+            'return_url' => ['nullable', 'string', 'max:2048'],
         ];
     }
 }

app/Http/Requests/Parents/ParentAttendanceRequest.php

@@ -10,7 +10,7 @@ class ParentAttendanceRequest extends ApiFormRequest
     {
         return [
             'school_year' => ['nullable', 'string', 'max:20'],
-            'school_year_id' => ['nullable', 'integer'],
+            'school_year_id' => ['prohibited'],
         ];
     }
 }

app/Http/Requests/Staff/StaffIndexRequest.php

@@ -12,7 +12,10 @@ class StaffIndexRequest extends ApiFormRequest
             'page' => ['nullable', 'integer', 'min:1'],
             'per_page' => ['nullable', 'integer', 'min:1', 'max:100'],
             'role' => ['nullable', 'string', 'max:100'],
+            'status' => ['nullable', 'string', 'max:40'],
+            'search' => ['nullable', 'string', 'max:150'],
             'school_year' => ['nullable', 'string', 'max:20'],
+            'school_year_id' => ['prohibited'],
             'semester' => ['nullable', 'string', 'max:20'],
             'sort_by' => ['nullable', 'in:created_at,lastname,firstname'],
             'sort_dir' => ['nullable', 'in:asc,desc'],

app/Http/Requests/Staff/StaffStoreRequest.php

@@ -14,8 +14,11 @@ class StaffStoreRequest extends ApiFormRequest
             'lastname' => ['required', 'string', 'max:100'],
             'email' => ['required', 'email', 'max:150'],
             'phone' => ['nullable', 'string', 'max:20'],
-            'role_name' => ['required', 'string', 'max:100'],
-            'school_year' => ['nullable', 'string', 'max:20'],
+            'password' => ['nullable', 'string', 'min:8', 'max:120'],
+            'role_id' => ['nullable', 'integer', 'min:1', 'exists:roles,id'],
+            'role_name' => ['nullable', 'required_without:role_id', 'string', 'max:100'],
+            'school_year' => ['required', 'string', 'max:20'],
+            'school_year_id' => ['prohibited'],
             'status' => ['nullable', 'string', 'max:40'],
         ];
     }

app/Http/Requests/Staff/StaffUpdateRequest.php

@@ -13,8 +13,10 @@ class StaffUpdateRequest extends ApiFormRequest
             'lastname' => ['nullable', 'string', 'max:100'],
             'email' => ['nullable', 'email', 'max:150'],
             'phone' => ['nullable', 'string', 'max:20'],
+            'role_id' => ['nullable', 'integer', 'min:1', 'exists:roles,id'],
             'role_name' => ['nullable', 'string', 'max:100'],
             'school_year' => ['nullable', 'string', 'max:20'],
+            'school_year_id' => ['prohibited'],
             'status' => ['nullable', 'string', 'max:40'],
         ];
     }