Merge pull request rrze-mmz#42 from rrze-mmz/39-correct-dark-mode-tex…

…t-visibility-on-the-lecturers-image-page Dark mode bugfixes
stefanosgeo · Feb 1, 2024 · 6bb097d · 6bb097d
2 parents d8ddf81 + c169696
commit 6bb097d
Show file tree

Hide file tree

Showing 6 changed files with 153 additions and 144 deletions.
diff --git a/app/Http/Controllers/Frontend/HomeController.php b/app/Http/Controllers/Frontend/HomeController.php
@@ -15,20 +15,21 @@ class HomeController extends Controller
      */
     public function __invoke(): View
     {
+        $series = Series::whereHas('clips.assets')->isPublic()
+            ->with(['owner', 'presenters', 'clips' => function (ContractsBuilder $query) {
+                $query->whereHas('assets');
+            }, 'clips.assets'])
+            ->withLastPublicClip()
+            ->orderByDesc(Clip::select('recording_date')
+                ->whereColumn('series_id', 'series.id')
+                ->has('assets')
+                ->limit(1)
+                ->orderByDesc('recording_date'))
+            ->limit(16)
+            ->get();
 
         return view('frontend.homepage.index', [
-            'series' => Series::whereHas('clips.assets')->isPublic()
-                ->with(['owner', 'presenters', 'clips' => function (ContractsBuilder $query) {
-                    $query->whereHas('assets');
-                }, 'clips.assets'])
-                ->withLastPublicClip()
-                ->orderByDesc(Clip::select('recording_date')
-                    ->whereColumn('series_id', 'series.id')
-                    ->has('assets')
-                    ->limit(1)
-                    ->orderByDesc('recording_date'))
-                ->limit(16)
-                ->get(),
+            'series' => $series,
             'clips' => Clip::with(['assets', 'presenters'])
                 ->public()
                 ->whereHas('assets')

diff --git a/app/Services/OpencastService.php b/app/Services/OpencastService.php
@@ -126,7 +126,7 @@ public function getSeries(Series $series)
      */
     public function getEventsByStatus(
         OpencastWorkflowState $state,
-        Series $series = null,
+        ?Series $series = null,
         int $limit = 20,
     ): Collection {
         $runningWorkflows = collect();
@@ -213,7 +213,7 @@ public function getEventsByStatusAndByDate(
         return $events;
     }
 
-    public function getEventsWaitingForTrimming(Series $series = null)
+    public function getEventsWaitingForTrimming(?Series $series = null): Collection
     {
         $series = (is_null($series)) ? '' : $series->opencast_series_id;
         //     /admin-ng/event/events.json?filter=comments:OPEN,status:EVENTS.EVENTS.STATUS.PROCESSED&limit=10&offset=0&sort=start_date:ASC
@@ -232,6 +232,10 @@ public function getEventsWaitingForTrimming(Series $series = null)
             Log::error($exception);
         }
 
+        if ($trimmingEvents->isEmpty()) {
+            $trimmingEvents['results'] = [];
+        }
+
         return collect($trimmingEvents['results']);
     }