einundzwanzig/einundzwanzig-portal
1
0
Fork 0
mirror of https://github.com/Einundzwanzig-Podcast/einundzwanzig-portal.git synced 2025-12-11 06:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

sort by coursesEvents

Browse Source
This commit is contained in:
Benjamin Takats
2023-01-15 15:02:15 +01:00
parent bceae06176
commit 002879b375
3 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Livewire/School/EventTable.php
View File

@@ -30,6 +30,7 @@ class EventTable extends Component
'course', 'course',
'venue.city.country', 'venue.city.country',
]) ])
->where('from', '>=', now())
->where(fn($query) => $query ->where(fn($query) => $query
->whereHas('venue.city.country', ->whereHas('venue.city.country',
fn($query) => $query->where('countries.code', $this->country->code)) fn($query) => $query->where('countries.code', $this->country->code))
@@ -41,6 +42,7 @@ class EventTable extends Component
'coords' => [$event->venue->city->latitude, $event->venue->city->longitude], 'coords' => [$event->venue->city->latitude, $event->venue->city->longitude],
]), ]),
'events' => CourseEvent::query() 'events' => CourseEvent::query()
->where('from', '>=', now())
->get() ->get()
->map(fn($event) => [ ->map(fn($event) => [
'id' => $event->id, 'id' => $event->id,

4
app/Http/Livewire/School/LecturerLandingPage.php
View File

@@ -22,14 +22,18 @@ class LecturerLandingPage extends Component
{ {
return view('livewire.school.lecturer-landing-page', [ return view('livewire.school.lecturer-landing-page', [
'courseEvents' => CourseEvent::query() 'courseEvents' => CourseEvent::query()
->where('from', '>=', now())
->whereHas('course', function ($query) { ->whereHas('course', function ($query) {
$query->where('lecturer_id', $this->lecturer->id); $query->where('lecturer_id', $this->lecturer->id);
}) })
->orderBy('from')
->get(), ->get(),
'events' => CourseEvent::query() 'events' => CourseEvent::query()
->where('from', '>=', now())
->whereHas('course', function ($query) { ->whereHas('course', function ($query) {
$query->where('lecturer_id', $this->lecturer->id); $query->where('lecturer_id', $this->lecturer->id);
}) })
->orderBy('from')
->get() ->get()
->map(fn($event) => [ ->map(fn($event) => [
'id' => $event->id, 'id' => $event->id,

1
app/Http/Livewire/Tables/EventTable.php
View File

@@ -166,6 +166,7 @@ class EventTable extends DataTableComponent
->withCount([ ->withCount([
'registrations', 'registrations',
]) ])
->where('from', '>=', now())
->whereHas('venue.city.country', ->whereHas('venue.city.country',
fn($query) => $query->where('countries.code', $this->country)); fn($query) => $query->where('countries.code', $this->country));
} }