fix logic and tests, update docker CI file
This commit is contained in:
@@ -7,6 +7,39 @@ use Illuminate\Validation\Rule;
|
||||
|
||||
class UpdateEnrollmentStatusesRequest extends ApiFormRequest
|
||||
{
|
||||
public function validationData(): array
|
||||
{
|
||||
$data = $this->all();
|
||||
|
||||
if (array_key_exists('enrollment_status', $data)) {
|
||||
return $data;
|
||||
}
|
||||
|
||||
$raw = $this->getContent() ?: '';
|
||||
if ($raw !== '') {
|
||||
$json = json_decode($raw, true);
|
||||
if (is_array($json)) {
|
||||
return array_merge($data, $json);
|
||||
}
|
||||
|
||||
parse_str($raw, $parsed);
|
||||
if (is_array($parsed)) {
|
||||
return array_merge($data, $parsed);
|
||||
}
|
||||
}
|
||||
|
||||
$queryString = (string) $this->server->get('QUERY_STRING', '');
|
||||
if ($queryString !== '') {
|
||||
$parsedQuery = [];
|
||||
parse_str($queryString, $parsedQuery);
|
||||
if (is_array($parsedQuery)) {
|
||||
return array_merge($data, $parsedQuery);
|
||||
}
|
||||
}
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
public function authorize(): bool
|
||||
{
|
||||
return auth()->check();
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests;
|
||||
namespace App\Http\Requests\Assignment;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use App\Http\Requests\ApiFormRequest;
|
||||
|
||||
class StoreAssignmentRequest extends FormRequest
|
||||
class StoreAssignmentRequest extends ApiFormRequest
|
||||
{
|
||||
public function authorize(): bool
|
||||
{
|
||||
@@ -15,10 +15,10 @@ class StoreAssignmentRequest extends FormRequest
|
||||
{
|
||||
return [
|
||||
'student_id' => ['required', 'integer', 'exists:students,id'],
|
||||
'class_section_id' => ['required', 'integer', 'exists:class_sections,id'],
|
||||
'class_section_id' => ['required', 'integer', 'exists:classSection,class_section_id'],
|
||||
'semester' => ['required', 'string', 'max:50'],
|
||||
'school_year' => ['required', 'string', 'max:50'],
|
||||
'description' => ['nullable', 'string'],
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
namespace App\Http\Requests\AttendanceTracking;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use App\Http\Requests\ApiFormRequest;
|
||||
|
||||
class ComposeAttendanceEmailRequest extends FormRequest
|
||||
class ComposeAttendanceEmailRequest extends ApiFormRequest
|
||||
{
|
||||
public function authorize(): bool
|
||||
{
|
||||
@@ -20,4 +20,4 @@ class ComposeAttendanceEmailRequest extends FormRequest
|
||||
'incident_date' => ['nullable', 'date_format:Y-m-d'],
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
namespace App\Http\Requests\AttendanceTracking;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use App\Http\Requests\ApiFormRequest;
|
||||
|
||||
class ParentsInfoRequest extends FormRequest
|
||||
class ParentsInfoRequest extends ApiFormRequest
|
||||
{
|
||||
public function authorize(): bool
|
||||
{
|
||||
@@ -24,4 +24,4 @@ class ParentsInfoRequest extends FormRequest
|
||||
'student_id' => $this->query('student_id'),
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
namespace App\Http\Requests\AttendanceTracking;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use App\Http\Requests\ApiFormRequest;
|
||||
|
||||
class RecordAttendanceTrackingRequest extends FormRequest
|
||||
class RecordAttendanceTrackingRequest extends ApiFormRequest
|
||||
{
|
||||
public function authorize(): bool
|
||||
{
|
||||
@@ -23,4 +23,4 @@ class RecordAttendanceTrackingRequest extends FormRequest
|
||||
'school_year' => ['nullable', 'string'],
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
namespace App\Http\Requests\AttendanceTracking;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use App\Http\Requests\ApiFormRequest;
|
||||
|
||||
class SaveAttendanceNotificationNoteRequest extends FormRequest
|
||||
class SaveAttendanceNotificationNoteRequest extends ApiFormRequest
|
||||
{
|
||||
public function authorize(): bool
|
||||
{
|
||||
@@ -23,4 +23,4 @@ class SaveAttendanceNotificationNoteRequest extends FormRequest
|
||||
'variant' => ['nullable', 'string'],
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
namespace App\Http\Requests\AttendanceTracking;
|
||||
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use App\Http\Requests\ApiFormRequest;
|
||||
|
||||
class SendAttendanceManualEmailRequest extends FormRequest
|
||||
class SendAttendanceManualEmailRequest extends ApiFormRequest
|
||||
{
|
||||
public function authorize(): bool
|
||||
{
|
||||
@@ -23,4 +23,4 @@ class SendAttendanceManualEmailRequest extends FormRequest
|
||||
'incident_date' => ['nullable', 'date_format:Y-m-d'],
|
||||
];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user