Show number of new videos in my courses, close #668 (#842)

Co-authored-by: Dennis Benz <[email protected]>

OpenCast.class.php

@@ -7,6 +7,7 @@
 
 use Opencast\Models\Helpers;
 use Opencast\Models\SeminarSeries;
+use Opencast\Models\Videos;
 
 use Opencast\AppFactory;
 use Opencast\RouteMap;
@@ -124,8 +125,9 @@ public function _n($string0, $string1, $n)
     /**
      * This method takes care of the Navigation
      *
-     * @param string   course_id
-     * @param string   last_visit
+     * @param string    $course_id
+     * @param int       $last_visit
+     * @param string    $user_id
      */
     public function getIconNavigation($course_id, $last_visit, $user_id = null)
     {
@@ -137,6 +139,21 @@ public function getIconNavigation($course_id, $last_visit, $user_id = null)
         );
         $navigation->setImage(Icon::create('video2'));
 
+        // Get number of new videos since last visit
+        $new_videos = Videos::getNumberOfNewCourseVideos($course_id, $last_visit, $user_id);
+
+        if ($new_videos > 0) {
+            if ($new_videos == 1) {
+                $text = $this->_('neues Video');
+            } else {
+                $text = $this->_('neue Videos');
+            }
+            $navigation->setImage(Icon::create('video2', Icon::ROLE_ATTENTION, [
+                'title' => $new_videos . ' ' . $text,
+            ]));
+            $navigation->setBadgeNumber($new_videos);
+        }
+
         return $navigation;
     }
 

app/controllers/course.php

@@ -21,6 +21,7 @@ public function before_filter(&$action, &$args)
     {
         parent::before_filter($action, $args);
         $this->course_id = Context::getId();
+        object_set_visit_module($this->plugin->getPluginId());
     }
 
     /**

lib/Models/PlaylistVideos.php

@@ -2,7 +2,7 @@
 
 namespace Opencast\Models;
 
-class PlaylistVideos extends \SimpleORMap
+class PlaylistVideos extends UPMap
 {
     protected static function configure($config = [])
     {

lib/Models/Videos.php

@@ -370,6 +370,51 @@ protected static function getFilteredVideos($query, $filters)
         ];
     }
 
+    /**
+     * Count number of new videos in a course since last visit
+     *
+     * @param string    $course_id  course id
+     * @param int       $last_visit time of last visit
+     * @param string    $user_id    user id
+     *
+     * @return int number of new videos
+     */
+    public static function getNumberOfNewCourseVideos($course_id, $last_visit, $user_id = null) {
+        global $perm;
+
+        $sql = 'SELECT COUNT(DISTINCT video.id) 
+                FROM `oc_video` AS video
+                INNER JOIN `oc_playlist_video` AS opv ON (opv.video_id = video.id)
+                INNER JOIN `oc_playlist` AS op ON (op.id = opv.playlist_id)
+                INNER JOIN `oc_playlist_seminar` AS ops ON (ops.playlist_id = op.id)';
+
+        $where = 'WHERE ops.seminar_id = :course_id
+                  AND (UNIX_TIMESTAMP(video.chdate) > :last_visit OR UNIX_TIMESTAMP(opv.mkdate) > :last_visit)
+                  AND video.trashed = 0
+                  AND video.token IS NOT NULL
+                  AND video.state IS NULL 
+                  AND video.available = 1';
+
+        if (!$perm->have_perm('dozent', $user_id)) {
+            $sql .= ' LEFT JOIN oc_playlist_seminar_video AS opsv ON (opsv.playlist_seminar_id = ops.id AND opsv.video_id = opv.video_id)';
+
+            $where .= ' AND (opsv.visibility IS NULL AND opsv.visible_timestamp IS NULL AND ops.visibility = "visible"
+                       OR opsv.visibility = "visible" AND opsv.visible_timestamp IS NULL
+                       OR opsv.visible_timestamp < NOW()) ';
+        }
+
+        $sql .= $where;
+
+        $stmt = \DBManager::get()->prepare($sql);
+
+        $stmt->execute([
+            'course_id' => $course_id,
+            'last_visit' => $last_visit,
+        ]);
+
+        return (int) $stmt->fetchColumn();
+    }
+
     public static function findByToken($token)
     {
         return self::findOneBySQL('token = ?', [$token]);

migrations/079_add_playlist_video_dates.php

@@ -0,0 +1,30 @@
+<?php
+
+class AddPlaylistVideoDates extends Migration
+{
+    public function description()
+    {
+        return 'Add mkdate and chdate columns to table playlist video';
+    }
+
+    public function up()
+    {
+        $db = DBManager::get();
+
+        $db->exec("ALTER TABLE `oc_playlist_video`
+            ADD COLUMN `chdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP(),
+            ADD COLUMN `mkdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP()
+        ");
+
+        SimpleOrMap::expireTableScheme();
+    }
+
+    public function down()
+    {
+        $db = DBManager::get();
+
+        $db->exec("ALTER TABLE `oc_playlist_video` DROP COLUMN `chdate`, DROP COLUMN `mkdate`");
+
+        SimpleOrMap::expireTableScheme();
+    }
+}