Fix Laravel Pint formatting
This commit is contained in:
@@ -3,7 +3,6 @@
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use App\Models\BaseModel;
|
||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
||||
use Illuminate\Support\Facades\Schema;
|
||||
|
||||
@@ -21,13 +20,14 @@ class SubjectCurriculum extends BaseModel
|
||||
'created_at',
|
||||
'updated_at',
|
||||
];
|
||||
|
||||
public $timestamps = true;
|
||||
|
||||
protected $casts = [
|
||||
'class_id' => 'integer',
|
||||
'unit_number' => 'integer',
|
||||
'created_at' => 'datetime',
|
||||
'updated_at' => 'datetime',
|
||||
'class_id' => 'integer',
|
||||
'unit_number' => 'integer',
|
||||
'created_at' => 'datetime',
|
||||
'updated_at' => 'datetime',
|
||||
];
|
||||
|
||||
/* ============================================================
|
||||
@@ -59,7 +59,7 @@ class SubjectCurriculum extends BaseModel
|
||||
public function scopeForSchoolYear(Builder $q, ?string $schoolYear): Builder
|
||||
{
|
||||
$schoolYear = trim((string) $schoolYear);
|
||||
if ($schoolYear === '' || !Schema::hasColumn($this->getTable(), 'school_year')) {
|
||||
if ($schoolYear === '' || ! Schema::hasColumn($this->getTable(), 'school_year')) {
|
||||
return $q;
|
||||
}
|
||||
|
||||
@@ -69,7 +69,7 @@ class SubjectCurriculum extends BaseModel
|
||||
public function scopeOrdered(Builder $q): Builder
|
||||
{
|
||||
return $q->orderBy('unit_number', 'asc')
|
||||
->orderBy('chapter_name', 'asc');
|
||||
->orderBy('chapter_name', 'asc');
|
||||
}
|
||||
|
||||
/* ============================================================
|
||||
@@ -112,7 +112,7 @@ class SubjectCurriculum extends BaseModel
|
||||
->get()
|
||||
->map(fn ($r) => [
|
||||
'unit_number' => (int) $r->unit_number,
|
||||
'unit_title' => (string) ($r->unit_title ?? ''),
|
||||
'unit_title' => (string) ($r->unit_title ?? ''),
|
||||
])
|
||||
->all();
|
||||
}
|
||||
@@ -131,7 +131,7 @@ class SubjectCurriculum extends BaseModel
|
||||
->orderBy('chapter_name', 'asc')
|
||||
->distinct()
|
||||
->pluck('chapter_name')
|
||||
->filter(fn ($v) => $v !== null && trim((string)$v) !== '')
|
||||
->filter(fn ($v) => $v !== null && trim((string) $v) !== '')
|
||||
->values()
|
||||
->all();
|
||||
}
|
||||
@@ -146,11 +146,11 @@ class SubjectCurriculum extends BaseModel
|
||||
$req = $updating ? 'sometimes' : 'required';
|
||||
|
||||
return [
|
||||
'class_id' => [$req, 'integer', 'min:1'],
|
||||
'subject' => [$req, 'string', 'max:120'],
|
||||
'unit_number' => ['nullable', 'integer', 'min:0'],
|
||||
'unit_title' => ['nullable', 'string', 'max:255'],
|
||||
'chapter_name' => ['nullable', 'string', 'max:255'],
|
||||
'class_id' => [$req, 'integer', 'min:1'],
|
||||
'subject' => [$req, 'string', 'max:120'],
|
||||
'unit_number' => ['nullable', 'integer', 'min:0'],
|
||||
'unit_title' => ['nullable', 'string', 'max:255'],
|
||||
'chapter_name' => ['nullable', 'string', 'max:255'],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user