mirror of
https://github.com/Einundzwanzig-Podcast/einundzwanzig-portal.git
synced 2025-12-11 06:46:47 +00:00
sort by coursesEvents
This commit is contained in:
@@ -26,29 +26,31 @@ class EventTable extends Component
|
||||
{
|
||||
return view('livewire.school.event-table', [
|
||||
'markers' => CourseEvent::query()
|
||||
->with([
|
||||
'course',
|
||||
'venue.city.country',
|
||||
])
|
||||
->where(fn($query) => $query
|
||||
->whereHas('venue.city.country',
|
||||
fn($query) => $query->where('countries.code', $this->country->code))
|
||||
)
|
||||
->get()
|
||||
->map(fn($event) => [
|
||||
'id' => $event->id,
|
||||
'name' => $event->course->name,
|
||||
'coords' => [$event->venue->city->latitude, $event->venue->city->longitude],
|
||||
]),
|
||||
->with([
|
||||
'course',
|
||||
'venue.city.country',
|
||||
])
|
||||
->where('from', '>=', now())
|
||||
->where(fn($query) => $query
|
||||
->whereHas('venue.city.country',
|
||||
fn($query) => $query->where('countries.code', $this->country->code))
|
||||
)
|
||||
->get()
|
||||
->map(fn($event) => [
|
||||
'id' => $event->id,
|
||||
'name' => $event->course->name,
|
||||
'coords' => [$event->venue->city->latitude, $event->venue->city->longitude],
|
||||
]),
|
||||
'events' => CourseEvent::query()
|
||||
->get()
|
||||
->map(fn($event) => [
|
||||
'id' => $event->id,
|
||||
'startDate' => $event->from,
|
||||
'endDate' => $event->to,
|
||||
'location' => $event->course->name,
|
||||
'description' => $event->venue->name,
|
||||
]),
|
||||
->where('from', '>=', now())
|
||||
->get()
|
||||
->map(fn($event) => [
|
||||
'id' => $event->id,
|
||||
'startDate' => $event->from,
|
||||
'endDate' => $event->to,
|
||||
'location' => $event->course->name,
|
||||
'description' => $event->venue->name,
|
||||
]),
|
||||
])->layout('layouts.app', [
|
||||
'SEOData' => new SEOData(
|
||||
title: __('Dates'),
|
||||
|
||||
@@ -22,14 +22,18 @@ class LecturerLandingPage extends Component
|
||||
{
|
||||
return view('livewire.school.lecturer-landing-page', [
|
||||
'courseEvents' => CourseEvent::query()
|
||||
->where('from', '>=', now())
|
||||
->whereHas('course', function ($query) {
|
||||
$query->where('lecturer_id', $this->lecturer->id);
|
||||
})
|
||||
->orderBy('from')
|
||||
->get(),
|
||||
'events' => CourseEvent::query()
|
||||
->where('from', '>=', now())
|
||||
->whereHas('course', function ($query) {
|
||||
$query->where('lecturer_id', $this->lecturer->id);
|
||||
})
|
||||
->orderBy('from')
|
||||
->get()
|
||||
->map(fn($event) => [
|
||||
'id' => $event->id,
|
||||
|
||||
@@ -164,10 +164,11 @@ class EventTable extends DataTableComponent
|
||||
{
|
||||
return CourseEvent::query()
|
||||
->withCount([
|
||||
'registrations',
|
||||
])
|
||||
'registrations',
|
||||
])
|
||||
->where('from', '>=', now())
|
||||
->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
|
||||
|
||||
Reference in New Issue
Block a user