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

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

@@ -26,29 +26,31 @@ class EventTable extends Component
{ {
return view('livewire.school.event-table', [ return view('livewire.school.event-table', [
'markers' => CourseEvent::query() 'markers' => CourseEvent::query()
->with([ ->with([
'course', 'course',
'venue.city.country', 'venue.city.country',
]) ])
->where(fn($query) => $query ->where('from', '>=', now())
->whereHas('venue.city.country', ->where(fn($query) => $query
fn($query) => $query->where('countries.code', $this->country->code)) ->whereHas('venue.city.country',
) fn($query) => $query->where('countries.code', $this->country->code))
->get() )
->map(fn($event) => [ ->get()
'id' => $event->id, ->map(fn($event) => [
'name' => $event->course->name, 'id' => $event->id,
'coords' => [$event->venue->city->latitude, $event->venue->city->longitude], 'name' => $event->course->name,
]), 'coords' => [$event->venue->city->latitude, $event->venue->city->longitude],
]),
'events' => CourseEvent::query() 'events' => CourseEvent::query()
->get() ->where('from', '>=', now())
->map(fn($event) => [ ->get()
'id' => $event->id, ->map(fn($event) => [
'startDate' => $event->from, 'id' => $event->id,
'endDate' => $event->to, 'startDate' => $event->from,
'location' => $event->course->name, 'endDate' => $event->to,
'description' => $event->venue->name, 'location' => $event->course->name,
]), 'description' => $event->venue->name,
]),
])->layout('layouts.app', [ ])->layout('layouts.app', [
'SEOData' => new SEOData( 'SEOData' => new SEOData(
title: __('Dates'), title: __('Dates'),

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,

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

@@ -164,10 +164,11 @@ class EventTable extends DataTableComponent
{ {
return CourseEvent::query() return CourseEvent::query()
->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));
} }
public function viewHistoryModal($modelId): void public function viewHistoryModal($modelId): void