fix creating backup by changing to mode_general (#233), fix amount indicator delayed courses, fix missing courses error page (#228)

Author: bluetom

classes/local/manager/backup_manager.php

@@ -68,8 +68,8 @@ public static function create_course_backup($courseid) {
         }
         // Perform Backup.
         $bc = new \backup_controller(\backup::TYPE_1COURSE, $courseid, \backup::FORMAT_MOODLE,
-            \backup::INTERACTIVE_NO, \backup::MODE_AUTOMATED, get_admin()->id);
-        $bc->execute_plan();  // Execute backup.
+            \backup::INTERACTIVE_NO, \backup::MODE_GENERAL, get_admin()->id);
+        $bc->execute_plan(); // Execute backup.
         $results = $bc->get_results(); // Get the file information needed.
         /* @var $file \stored_file instance of the backup file*/
         $file = $results['backup_destination'];

classes/local/table/process_errors_table.php

@@ -56,7 +56,7 @@ public function __construct() {
                 'rollback' => get_string('rollback', 'tool_lifecycle'),
         ];
 
-        $fields = 'c.fullname as course, w.title as workflow, s.instancename as step, pe.*';
+        $fields = 'c.id, c.fullname as course, w.title as workflow, s.instancename as step, pe.*';
 
         $from = '{tool_lifecycle_proc_error} pe ' .
             'JOIN {tool_lifecycle_workflow} w ON pe.workflowid = w.id ' .

classes/tabs.php

@@ -71,9 +71,18 @@ public static function get_tabrow($activelink = false, $deactivatelink = false,
         $i = $DB->count_records_sql($sql);
         $deactivatedewf = \html_writer::span($i, $i > 0 ? $classnotnull : $classnull);
 
+        $time = time();
         // Get number of delayed courses.
-        $sql = "select count(id)
-        from {tool_lifecycle_delayed}";
+        $sql = "select count(c.id) from {course} c LEFT JOIN
+        (SELECT dw.courseid, dw.workflowid, w.title as workflow, dw.delayeduntil as workflowdelay,maxtable.wfcount as workflowcount
+         FROM ( SELECT courseid, MAX(dw.id) AS maxid, COUNT(*) AS wfcount FROM {tool_lifecycle_delayed_workf} dw
+            JOIN {tool_lifecycle_workflow} w ON dw.workflowid = w.id
+            WHERE dw.delayeduntil >= $time AND w.timeactive IS NOT NULL GROUP BY courseid ) maxtable JOIN
+             {tool_lifecycle_delayed_workf} dw ON maxtable.maxid = dw.id JOIN
+             {tool_lifecycle_workflow} w ON dw.workflowid = w.id ) wfdelay ON wfdelay.courseid = c.id LEFT JOIN
+            (SELECT * FROM {tool_lifecycle_delayed} d WHERE d.delayeduntil > $time ) d ON c.id = d.courseid JOIN
+            {course_categories} cat ON c.category = cat.id
+        where COALESCE(wfdelay.courseid, d.courseid) IS NOT NULL";
         $i = $DB->count_records_sql($sql);
         $delayedcourses = \html_writer::span($i, $i > 0 ? $classnotnull : $classnull);