fixes #688 (#754) (#755)

* work around broken ui for branched plugins and older verions of Stud.IP (<5.1)

* take care of scheduling with alternate schedules and changed dates

* remove obsolete code

* Revert "work around broken ui for branched plugins and older verions of Stud.IP (<5.1)"

This reverts commit 7b3b277.

* add migration

Author: tgloeggl

classes/OCRestClient/SchedulerClient.php

@@ -37,12 +37,7 @@ public function scheduleEventForSeminar($course_id, $resource_id, $termin_id)
         $media_package = $ingest_client->addDCCatalog($media_package, $metadata['dublincore']);
         $tmp_event_id  = $this->gen_uuid();
 
-        try {
-            OCModel::scheduleRecording($course_id, $resource_id, $termin_id, $tmp_event_id);
-        } catch (PDOException $error) {
-            // assume that scheduling is already under way - so just return false
-            return false;
-        }
+        OCModel::scheduleRecording($course_id, $resource_id, $termin_id, $tmp_event_id);
 
         $result = $ingest_client->schedule($media_package, $metadata['device_capabilities'], $metadata['workflow']);
 
@@ -137,13 +132,17 @@ public function updateEventForSeminar($course_id, $resource_id, $termin_id, $eve
         $event = OCScheduledRecordings::find($event_id);
         $date  = CourseDate::find($termin_id);
 
-        if ($date->date != $event->start) {
+        // check if the course_dates are still the same, otherwise update them
+        if ($date->date != $event->coursedate_start
+            || $date->end_time != $event->coursedate_end
+        ) {
+            $event->coursedate_start = $date->date;
+            $event->coursedate_end = $date->end_time;
+
+            // also reset any custom made changes to the recording length, to prevent any unwanted effects for alternate schedules (if even activated)
             $event->start = $date->date;
-            $event->store();
-        }
+            $event->end   = $date->date;
 
-        if ($date->end_time != $event->end) {
-            $event->end = $date->end_time;
             $event->store();
         }
 

controllers/course.php

@@ -327,7 +327,6 @@ public function config_action()
 
         Navigation::activateItem('course/opencast');
         $navigation = Navigation::getItem('/course/opencast');
-        $navigation->setImage(new Icon('../../' . $this->dispatcher->trails_root . '/images/opencast-black.svg'));
 
         $this->set_title($this->_('Opencast Konfiguration'));
         $this->response->add_header('X-Title', rawurlencode($this->_('Serie mit Veranstaltung verknüpfen')));
@@ -394,7 +393,6 @@ public function scheduler_action()
 
         Navigation::activateItem('course/opencast/scheduler');
         $navigation = Navigation::getItem('/course/opencast');
-        $navigation->setImage(new Icon('../../' . $this->dispatcher->trails_root . '/images/opencast-black.svg'));
 
         $this->set_title($this->_('Opencast Aufzeichnungen planen'));
 

cronjobs/refresh_scheduled_events.php

@@ -87,7 +87,10 @@ public function execute($last_result, $parameters = [])
                     unset($opencast_events[$se['event_id']]);
                     unset($curated_events[$se['event_id']]);
 
-                    if ($cd->room_booking->resource_id == $se['resource_id']) {
+                    if ($cd->room_booking->resource_id == $se['resource_id']
+                        || $cd->room_booking->date     != $se['coursedate_start']
+                        || $cd->room_booking->end_time != $se['coursedate_end'])
+                    {
                         $scheduler_client = SchedulerClient::create($se['seminar_id']);
                         $scheduler_client->updateEventForSeminar($se['seminar_id'], $se['resource_id'], $se['date_id'], $se['event_id']);
 

migrations/049_add_course_date_fields_for_events.php

@@ -0,0 +1,31 @@
+<?php
+class AddCourseDateFieldsForEvents extends Migration
+{
+    public function up()
+    {
+        $db = DBManager::get();
+
+        // only execute this migration if columns are missing
+        $results = $db->query("SHOW COLUMNS FROM `oc_scheduled_recordings` LIKE 'coursedate_start'");
+        if (empty($results->fetchAll())) {
+            $db->exec('ALTER TABLE oc_scheduled_recordings
+                ADD `coursedate_end` int(11) AFTER `end`,
+                ADD `coursedate_start` int(11) AFTER `end`
+            ');
+
+            // update all entries to fill new coursedate-fields
+            $db->exec('UPDATE oc_scheduled_recordings
+                SET coursedate_start = start, coursedate_end = end
+                WHERE 1
+            ');
+        }
+    }
+
+    public function down()
+    {
+        $db->exec('ALTER TABLE oc_scheduled_recordings
+            DROP `coursedate_end` ,
+            DROP `coursedate_start`
+        ');
+    }
+}

models/OCModel.php

@@ -170,9 +170,9 @@ public static function scheduleRecording($course_id, $resource_id, $date_id, $ev
 
         $stmt = DBManager::get()->prepare("INSERT INTO
                 oc_scheduled_recordings (seminar_id, series_id, date_id,
-                    resource_id, start, end, capture_agent, event_id, status,
+                    resource_id, `start`, `end`, coursedate_start, coursedate_end, capture_agent, event_id, `status`,
                     mktime)
-                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
+                VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");
 
         $success = $stmt->execute([
             $course_id,
@@ -181,6 +181,8 @@ public static function scheduleRecording($course_id, $resource_id, $date_id, $ev
             $resource_id,
             $date->date,
             $date->end_time,
+            $date->date,
+            $date->end_time,
             $ca['capture_agent'],
             $event_id,
             'scheduled',