feat: Filter assignments and materials by current semester using GeneralSettings.

This commit is contained in:
Yoga Pangestu 2026-03-12 08:13:25 +07:00
parent c8f2ac6c26
commit 35190d7614
3 changed files with 22 additions and 0 deletions

View File

@ -9,10 +9,12 @@
use App\Filament\Resources\Learning\Assignments\Pages\SubmitAssignmentPage;
use App\Filament\Resources\Learning\Assignments\Schemas\AssignmentForm;
use App\Models\Assignment;
use App\Settings\GeneralSettings;
use BackedEnum;
use Filament\Resources\Resource;
use Filament\Schemas\Schema;
use Filament\Support\Icons\Heroicon;
use Illuminate\Database\Eloquent\Builder;
use UnitEnum;
class AssignmentResource extends Resource
@ -36,6 +38,14 @@ public static function form(Schema $schema): Schema
return AssignmentForm::configure($schema);
}
public static function getEloquentQuery(): Builder
{
return parent::getEloquentQuery()
->whereHas('course', function (Builder $query) {
$query->where('semester', app(GeneralSettings::class)->current_semester);
});
}
public static function getPages(): array
{
return [

View File

@ -13,6 +13,7 @@
use App\Models\AssignmentPin;
use App\Models\AssignmentTarget;
use App\Models\StudyGroup;
use App\Settings\GeneralSettings;
use Filament\Actions\Action;
use Filament\Resources\Pages\Page;
use Filament\Schemas\Schema;
@ -44,6 +45,9 @@ public function assignments(): Collection
$q->where('student_id', $studentProfile->id)
->orWhereHas('studyGroup', fn ($sq) => $sq->whereHas('students', fn ($ssq) => $ssq->whereKey($studentProfile->id)));
}, 'studyGroups.students'])
->whereHas('course', function ($q) {
$q->where('semester', app(GeneralSettings::class)->current_semester);
})
->where(function ($query) use ($studentProfile) {
$query->whereHas('students', fn ($q) => $q->whereKey($studentProfile->id))
->orWhereHas('studyGroups', fn ($q) => $q->whereHas('students', fn ($sq) => $sq->whereKey($studentProfile->id)));

View File

@ -258,6 +258,14 @@ public static function getPages(): array
];
}
public static function getEloquentQuery(): Builder
{
return parent::getEloquentQuery()
->whereHas('course', function (Builder $query) {
$query->where('semester', app(GeneralSettings::class)->current_semester);
});
}
public static function getRecordRouteBindingEloquentQuery(): Builder
{
return parent::getRecordRouteBindingEloquentQuery()