Merge branch 'MDL-75383-master' of https://github.com/call-learning/moodle

mod/bigbluebuttonbn/classes/output/view_page.php

@@ -16,6 +16,7 @@
 
 namespace mod_bigbluebuttonbn\output;
 
+use core\check\result;
 use core\output\notification;
 use mod_bigbluebuttonbn\instance;
 use mod_bigbluebuttonbn\local\config;
@@ -24,6 +25,7 @@ use renderable;
 use renderer_base;
 use stdClass;
 use templatable;
+use tool_task\check\cronrunning;
 
 /**
  * View Page template renderable.
@@ -97,11 +99,22 @@ class view_page implements renderable, templatable {
             $templatedata->room = $roomdata;
         }
 
+        $templatedata->recordingwarnings = [];
+        $check = new cronrunning();
+        $result = $check->get_result();
+        if ($result->status != result::OK && $this->instance->is_moderator()) {
+            $templatedata->recordingwarnings[] = (new notification(
+                get_string('view_message_cron_disabled', 'mod_bigbluebuttonbn',
+                    $result->get_summary()),
+                notification::NOTIFY_ERROR,
+                false
+            ))->export_for_template($output);
+        }
         if ($this->instance->is_feature_enabled('showrecordings') && $this->instance->is_recorded()) {
             $recordings = new recordings_session($this->instance);
             $templatedata->recordings = $recordings->export_for_template($output);
         } else if ($this->instance->is_type_recordings_only()) {
-            $templatedata->recordingwarning = (new notification(
+            $templatedata->recordingwarnings[] = (new notification(
                 get_string('view_message_recordings_disabled', 'mod_bigbluebuttonbn'),
                 notification::NOTIFY_WARNING,
                 false

mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php

@@ -470,6 +470,8 @@ $string['view_message_conference_in_progress'] = 'The session is in progress.';
 $string['view_message_conference_has_ended'] = 'The session has ended.';
 $string['view_message_tab_close'] = 'This tab/window must be closed manually';
 $string['view_message_recordings_disabled'] = 'Recordings are disabled on the server. BigBlueButton activities of type \'Recordings only\' cannot be used.';
+$string['view_message_cron_disabled'] = 'The scheduled task to fetch pending recordings has not been run for a while.
+ Please contact the site administrator with the following information: {$a}.';
 $string['view_message_importrecordings_disabled'] = 'Import recording links is disabled on the server.';
 
 $string['view_groups_selection_warning'] = 'There is a room for each group and you have access to more than one. Be sure to select the correct one.';

mod/bigbluebuttonbn/templates/recordings_table.mustache

@@ -31,6 +31,11 @@
         <div>
             <h4>{{$title}}{{/title}}</h4>
         </div>
+        <div class="mt-3">
+            {{#recordingwarnings}}
+                {{>core/notification}}
+            {{/recordingwarnings}}
+        </div>
         <div>
             {{#search}}
                 {{>mod_bigbluebuttonbn/search_input_recordings}}
@@ -46,6 +51,11 @@
     {{/has_recordings}}
     {{^has_recordings}}
         <div id="bigbluebuttonbn_recordings_table">{{#str}}view_message_norecordings, mod_bigbluebuttonbn{{/str}}</div>
+        <div class="mt-3">
+            {{#recordingwarnings}}
+                {{>core/notification}}
+            {{/recordingwarnings}}
+        </div>
     {{/has_recordings}}
 </div>
 

mod/bigbluebuttonbn/templates/view_page.mustache

@@ -59,10 +59,6 @@
     {{>mod_bigbluebuttonbn/recordings_session}}
 {{/recordings}}
 
-{{#recordingwarning}}
-  {{>core/notification}}
-{{/recordingwarning}}
-
 {{#js}}
 require(['mod_bigbluebuttonbn/rooms'], function(rooms) {
     // Register action on all buttons.