From d47f4d50d9b4f8dae1cc251588c8a61ce8299386 Mon Sep 17 00:00:00 2001
From: NinaHerrmann <nina.herrmann@uni-muenster.de>
Date: Mon, 10 Jun 2024 16:25:35 +0200
Subject: [PATCH 01/12] added setting - coursecategorydepth

---
 lang/en/tool_lifecycle.php | 2 ++
 settings.php               | 4 ++++
 version.php                | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/lang/en/tool_lifecycle.php b/lang/en/tool_lifecycle.php
index 1d96728d..8cdb5d8b 100644
--- a/lang/en/tool_lifecycle.php
+++ b/lang/en/tool_lifecycle.php
@@ -52,6 +52,8 @@
 $string['config_backup_path'] = 'Path of the lifecycle backup folder';
 $string['config_backup_path_desc'] = 'This settings defines the storage location of the backups created by the backup step.
 The path has to be specified as an absolute path on your server.';
+$string['config_coursecategorydepth'] = 'Depth of categories to be shown in the interaction table.';
+$string['config_coursecategorydepth_desc'] = 'By default the first category is shown when teachers manage the status of their courses on the view.php. The setting enables to show not the first level of categories but subcategories.';
 $string['config_delay_duration'] = 'Default duration of a course delay';
 $string['config_delay_duration_desc'] = 'This setting defines the default delay duration of a workflow
 in case one of its processes is rolled back or finishes.
diff --git a/settings.php b/settings.php
index 3f37c086..85bdacbe 100644
--- a/settings.php
+++ b/settings.php
@@ -46,6 +46,10 @@
         get_string('config_showcoursecounts', 'tool_lifecycle'),
         get_string('config_showcoursecounts_desc', 'tool_lifecycle'),
         1));
+    $settings->add(new admin_setting_configtext('tool_lifecycle/coursecategorydepth',
+        get_string('config_coursecategorydepth', 'tool_lifecycle'),
+        get_string('config_coursecategorydepth_desc', 'tool_lifecycle'),
+        1, PARAM_INT));
 
     $ADMIN->add('lifecycle_category', new admin_externalpage('tool_lifecycle_workflow_drafts',
         get_string('workflow_drafts_header', 'tool_lifecycle'),
diff --git a/version.php b/version.php
index e8f6b54a..8e954246 100644
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die;
 
 $plugin->maturity = MATURITY_BETA;
-$plugin->version  = 2024042300;
+$plugin->version  = 2024042301;
 $plugin->component = 'tool_lifecycle';
 $plugin->requires = 2022112800; // Requires Moodle 4.1+.
 $plugin->release   = 'v4.4-r1';

From 7d5329f4c0149d8bec437050680c369e1860abed Mon Sep 17 00:00:00 2001
From: NinaHerrmann <nina.herrmann@uni-muenster.de>
Date: Mon, 10 Jun 2024 17:49:16 +0200
Subject: [PATCH 02/12] Advanced tha category setting to have either a
 specified level or the _closest_ level

---
 lang/en/tool_lifecycle.php |  2 ++
 settings.php               | 13 +++++++++++--
 version.php                |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lang/en/tool_lifecycle.php b/lang/en/tool_lifecycle.php
index 8cdb5d8b..cdf3d511 100644
--- a/lang/en/tool_lifecycle.php
+++ b/lang/en/tool_lifecycle.php
@@ -58,6 +58,8 @@
 $string['config_delay_duration_desc'] = 'This setting defines the default delay duration of a workflow
 in case one of its processes is rolled back or finishes.
 The delay duration determines how long a course will be excepted from being processed again in either of the cases.';
+$string['config_enablecategoryhierachy'] = 'Enable to show a specified level of the course category hierarchy in the interaction table.';
+$string['config_enablecategoryhierachy_desc'] = 'By default the directly assigned course category is shown when teachers manage the status of their courses on the view.php. The setting enables to show a specified level of the course category tree.';
 $string['config_showcoursecounts'] = 'Show amount of courses which will be triggered';
 $string['config_showcoursecounts_desc'] = 'The workflow overview page by default shows the amount of courses which will be
 triggered by the configured triggers which can be load heavy. Disable this option if you experience issues loading the workflow
diff --git a/settings.php b/settings.php
index 85bdacbe..a4d4fb55 100644
--- a/settings.php
+++ b/settings.php
@@ -46,10 +46,19 @@
         get_string('config_showcoursecounts', 'tool_lifecycle'),
         get_string('config_showcoursecounts_desc', 'tool_lifecycle'),
         1));
-    $settings->add(new admin_setting_configtext('tool_lifecycle/coursecategorydepth',
+    $settingenablehierachy = new admin_setting_configcheckbox('tool_lifecycle/enablecategoryhierachy',
+        get_string('config_enablecategoryhierachy', 'tool_lifecycle'),
+        get_string('config_enablecategoryhierachy_desc', 'tool_lifecycle'),
+        false);
+    // $settingenablehierachy->set_updatedcallback('tool_lifecycle_');
+    $settings->add($settingenablehierachy);
+    $coursehierachysetting = new admin_setting_configtext('tool_lifecycle/coursecategorydepth',
         get_string('config_coursecategorydepth', 'tool_lifecycle'),
         get_string('config_coursecategorydepth_desc', 'tool_lifecycle'),
-        1, PARAM_INT));
+        0, PARAM_INT);
+    $coursehierachysetting->add_dependent_on('tool_lifecycle/enablecategoryhierachy');
+    $settings->add($coursehierachysetting);
+    $settings->hide_if('tool_lifecycle/coursecategorydepth', 'tool_lifecycle/enablecategoryhierachy', 'notchecked');
 
     $ADMIN->add('lifecycle_category', new admin_externalpage('tool_lifecycle_workflow_drafts',
         get_string('workflow_drafts_header', 'tool_lifecycle'),
diff --git a/version.php b/version.php
index 8e954246..790a03d1 100644
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
 defined('MOODLE_INTERNAL') || die;
 
 $plugin->maturity = MATURITY_BETA;
-$plugin->version  = 2024042301;
+$plugin->version  = 2024042302;
 $plugin->component = 'tool_lifecycle';
 $plugin->requires = 2022112800; // Requires Moodle 4.1+.
 $plugin->release   = 'v4.4-r1';

From 0bc75706246abe7c99b48bd7c034b6a55d864185 Mon Sep 17 00:00:00 2001
From: NinaHerrmann <nina.herrmann@uni-muenster.de>
Date: Tue, 11 Jun 2024 11:55:14 +0200
Subject: [PATCH 03/12] changed the interaction table to get all course
 categories in case a specific level of the coures hierachy should be
 displayed

---
 .../table/interaction_attention_table.php     | 39 +++++++++++++++++--
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/classes/local/table/interaction_attention_table.php b/classes/local/table/interaction_attention_table.php
index 2624831d..cf3acb88 100644
--- a/classes/local/table/interaction_attention_table.php
+++ b/classes/local/table/interaction_attention_table.php
@@ -40,6 +40,12 @@
  */
 class interaction_attention_table extends interaction_table {
 
+    /**
+     * In case a specific course category should be shown, all course categories are fetched once ...
+     * ... to find the suitable category later.
+     * @var \stdClass
+     */
+    private $coursecategories;
     /**
      * Constructor for deactivated_workflows_table.
      * @param int $uniqueid Unique id of this table.
@@ -51,15 +57,18 @@ public function __construct($uniqueid, $courseids, $filterdata = null) {
         global $PAGE, $DB;
 
         $fields = "p.id as processid, c.id as courseid, c.fullname as coursefullname, c.shortname as courseshortname, " .
-            "c.startdate, cc.name as category , s.id as stepinstanceid, s.instancename as stepinstancename, ".
-            "s.subpluginname as subpluginname";
+            "c.startdate, cc.name as category, cc.path as categorypath, s.id as stepinstanceid, " .
+            "s.instancename as stepinstancename, s.subpluginname as subpluginname";
         $from = '{tool_lifecycle_process} p join ' .
             '{course} c on p.courseid = c.id join ' .
             '{tool_lifecycle_step} s ' .
             'on p.workflowid = s.workflowid AND p.stepindex = s.sortindex ' .
             'left join {course_categories} cc on c.category = cc.id';
         $ids = implode(',', $courseids);
-
+        if (get_config('tool_lifecycle', 'enablecategoryhierachy')) {
+            // We have to get the complete category tree.
+            $this->coursecategories = $DB->get_records_sql('SELECT id, name, depth, path, parent FROM {course_categories} ');
+        }
         $where = ['FALSE'];
         if ($ids) {
             $where = ['p.courseid IN (' . $ids . ')'];
@@ -124,6 +133,30 @@ public function col_tools($row) {
         return $output;
     }
 
+    /**
+     * Dependent on the setting either returns the closest category or the category that is on the specified depth,
+     * if the category depth is not reached the last category is returned.
+     * @param $row
+     * @return string
+     * @throws \dml_exception
+     */
+    public function col_category($row): String {
+        $categorydepth = get_config('tool_lifecycle', 'enablecategoryhierachy');
+        if ($categorydepth == false) {
+            return $row->category;
+        } else {
+            $categorydepth = (int) get_config('tool_lifecycle', 'coursecategorydepth');
+            $categoryhierachy = explode('/', substr($row->categorypath, 1));
+            $categoryhierachy = array_map('intval', $categoryhierachy);
+            if (isset($categoryhierachy[$categorydepth])) {
+                $category = $this->coursecategories[$categoryhierachy[$categorydepth]];
+                return $category->name;
+            } else {
+                $category = $this->coursecategories[end($categoryhierachy)];
+                return $category->name;
+            }
+        }
+    }
     /**
      * Render date column.
      * @param object $row Row data.

From eae2d5dd9a7c15ee81c76365bee0f96479de1bf8 Mon Sep 17 00:00:00 2001
From: NinaHerrmann <nina.herrmann@uni-muenster.de>
Date: Tue, 11 Jun 2024 11:59:06 +0200
Subject: [PATCH 04/12] updated phpdoc comment

---
 classes/local/table/interaction_attention_table.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/local/table/interaction_attention_table.php b/classes/local/table/interaction_attention_table.php
index cf3acb88..67cfb714 100644
--- a/classes/local/table/interaction_attention_table.php
+++ b/classes/local/table/interaction_attention_table.php
@@ -136,8 +136,8 @@ public function col_tools($row) {
     /**
      * Dependent on the setting either returns the closest category or the category that is on the specified depth,
      * if the category depth is not reached the last category is returned.
-     * @param $row
-     * @return string
+     * @param object $row Row data.
+     * @return string category name
      * @throws \dml_exception
      */
     public function col_category($row): String {

From 81e461b3d05f544396c7b87a02049640866476ce Mon Sep 17 00:00:00 2001
From: NinaHerrmann <nina.herrmann@uni-muenster.de>
Date: Tue, 11 Jun 2024 14:23:25 +0200
Subject: [PATCH 05/12] added a behat test to test the matrix of possible
 settings for categories to be displayed

---
 settings.php                    |  1 -
 tests/behat/interaction.feature | 29 ++++++++++++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/settings.php b/settings.php
index a4d4fb55..22e6f8f0 100644
--- a/settings.php
+++ b/settings.php
@@ -50,7 +50,6 @@
         get_string('config_enablecategoryhierachy', 'tool_lifecycle'),
         get_string('config_enablecategoryhierachy_desc', 'tool_lifecycle'),
         false);
-    // $settingenablehierachy->set_updatedcallback('tool_lifecycle_');
     $settings->add($settingenablehierachy);
     $coursehierachysetting = new admin_setting_configtext('tool_lifecycle/coursecategorydepth',
         get_string('config_coursecategorydepth', 'tool_lifecycle'),
diff --git a/tests/behat/interaction.feature b/tests/behat/interaction.feature
index 6b4885ac..72ebaf4b 100644
--- a/tests/behat/interaction.feature
+++ b/tests/behat/interaction.feature
@@ -5,11 +5,19 @@ Feature: Add a workflow with an email step and test the interaction as a teacher
     Given the following "users" exist:
       | username | firstname | lastname | email |
       | teacher1 | Teacher | 1 | teacher1@example.com |
+    And the following "categories" exist:
+      | name   | category  | idnumber |
+      | Cat1   | 0         | 1        |
+      | Cat2   | 0         | 2        |
+      | Cat02  | 2         | 02       |
+      | Cat01  | 1         | 01       |
+      | Cat001 | 01        | 001      |
+      | Cat002 | 01        | 002      |
     And the following "courses" exist:
       | fullname | shortname | category | startdate       |
-      | Course 1 | C1        | 0        | ##2 days ago## |
-      | Course 2 | C2        | 0        | ##4 days ago##  |
-      | Course 3 | C3        | 0        | ##4 days ago##  |
+      | Course 1 | C1        | 0        | ##2 days ago##  |
+      | Course 2 | C2        | 001      | ##4 days ago##  |
+      | Course 3 | C3        | 02       | ##4 days ago##  |
     And the following "course enrolments" exist:
       | user     | course | role           |
       | teacher1 | C1     | editingteacher |
@@ -44,8 +52,12 @@ Feature: Add a workflow with an email step and test the interaction as a teacher
     And I press "Activate"
     And I log out
 
-  Scenario: Test interaction of email step
-    Given I log in as "teacher1"
+  Scenario Outline: Test interaction of email step
+    Given the following config values are set as admin:
+      | config                 | value     | plugin         |
+      | enablecategoryhierachy | <config>  | tool_lifecycle |
+      | coursecategorydepth    | <config1> | tool_lifecycle |
+    And I log in as "teacher1"
     When I am on lifecycle view
     Then I should see "Course 1" in the "tool_lifecycle_remaining" "table"
     And I should see "Course 2" in the "tool_lifecycle_remaining" "table"
@@ -57,6 +69,8 @@ Feature: Add a workflow with an email step and test the interaction as a teacher
     And I should see "Course 3" in the "tool_lifecycle_interaction" "table"
     And I should see the tool "Keep course" in the "Course 2" row of the "tool_lifecycle_interaction" table
     And I should see the tool "Keep course" in the "Course 3" row of the "tool_lifecycle_interaction" table
+    And I should see "<category1>" in the "tool_lifecycle_interaction" "table"
+    And I should see "<category2>" in the "tool_lifecycle_interaction" "table"
     When I click on the tool "Keep course" in the "Course 2" row of the "tool_lifecycle_interaction" table
     Then I should see "Course 1" in the "tool_lifecycle_remaining" "table"
     And I should see "Course 2" in the "tool_lifecycle_remaining" "table"
@@ -67,3 +81,8 @@ Feature: Add a workflow with an email step and test the interaction as a teacher
     Then I should see "Course 1" in the "tool_lifecycle_remaining" "table"
     And I should see "Course 2" in the "tool_lifecycle_remaining" "table"
     And I should not see "Course 3"
+    Examples:
+      | config | config1 | category1 | category2 |
+      | 0      | 0       | Cat001    | Cat02     |
+      | 1      | 0       | Cat1      | Cat2      |
+      | 1      | 2       | Cat001    | Cat02     |
\ No newline at end of file

From 5e5f73d27107051cbe4dd345b4bd768f343a514b Mon Sep 17 00:00:00 2001
From: NinaHerrmann <nina.herrmann@uni-muenster.de>
Date: Tue, 11 Jun 2024 14:28:48 +0200
Subject: [PATCH 06/12] newline at end of file

---
 tests/behat/interaction.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/behat/interaction.feature b/tests/behat/interaction.feature
index 72ebaf4b..6dd950fb 100644
--- a/tests/behat/interaction.feature
+++ b/tests/behat/interaction.feature
@@ -85,4 +85,4 @@ Feature: Add a workflow with an email step and test the interaction as a teacher
       | config | config1 | category1 | category2 |
       | 0      | 0       | Cat001    | Cat02     |
       | 1      | 0       | Cat1      | Cat2      |
-      | 1      | 2       | Cat001    | Cat02     |
\ No newline at end of file
+      | 1      | 2       | Cat001    | Cat02     |

From 568383e3f75823c6afd6b8e5ea8f11b8b2e84be0 Mon Sep 17 00:00:00 2001
From: NinaHerrmann <nina.herrmann@uni-muenster.de>
Date: Tue, 11 Jun 2024 14:35:28 +0200
Subject: [PATCH 07/12] added german lang strings

---
 lang/de/tool_lifecycle.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lang/de/tool_lifecycle.php b/lang/de/tool_lifecycle.php
index a92d11a1..8d7b9efe 100644
--- a/lang/de/tool_lifecycle.php
+++ b/lang/de/tool_lifecycle.php
@@ -45,10 +45,14 @@
 $string['backupcreated'] = 'Erstellt am';
 $string['backupworkflow'] = 'Workflow sichern';
 $string['cannot_trigger_workflow_manually'] = 'Der Workflow konnte nicht manuell ausgelöst werden.';
+$string['config_coursecategorydepth'] = 'Tiefe der Kurskategorien, die in der Interaktionstabelle angezeigt werden sollen.';
+$string['config_coursecategorydepth_desc'] = 'Standardmäßig wird die erste Kategorie angezeigt, wenn Lehrkräfte den Status ihrer Kurse in der view.php verwalten. Die Einstellung ermöglicht es, nicht die erste Ebene der Kategorien, sondern Unterkategorien anzuzeigen.';
 $string['config_delay_duration'] = 'Standardlänge eines Kursausschlusses';
 $string['config_delay_duration_desc'] = 'Diese Einstellung definiert den Standardlänge einer Kursausschlusses in einem Workflow
  falls ein Prozess des Workflows zurückgesetzt oder beendigt wird. Die Länge des Kursausschlusses besagt, wie lange es dauert, bis
  der Kurs wieder vom Workflow bearbeitet wird.';
+$string['config_enablecategoryhierachy'] = 'Aktivieren Sie diese Option, um eine bestimmte Ebene der Kurskategorienhierarchie in der Interaktionstabelle anzuzeigen.';
+$string['config_enablecategoryhierachy_desc'] = 'Standardmäßig wird die direkt zugewiesene Kurskategorie angezeigt, wenn Lehrkräfte den Status ihrer Kurse in der view.php verwalten. Die Einstellung ermöglicht es, eine bestimmte Ebene des Kurskategorienbaums anzuzeigen.';
 $string['config_showcoursecounts'] = 'Zeige Anzahl der Kurse, die getriggert werden';
 $string['config_showcoursecounts_desc'] = 'Die Workflow-Konfigurationsseite zeigt normalerweise die Anzahl an Kursen, die durch
 die konfigurierten Trigger getriggert werden, was Performance-Probleme verursachen kann. Bei Performance-Problemen kann dies hiermit

From e8717cf249da329346d4bf1602ffc56a2dbad859 Mon Sep 17 00:00:00 2001
From: NinaHerrmann <nina.herrmann@uni-muenster.de>
Date: Tue, 11 Jun 2024 14:36:06 +0200
Subject: [PATCH 08/12] cleaned up according to cbf (not use todo but
 enhancement)

---
 classes/local/backup/restore_lifecycle_workflow.php | 2 +-
 classes/local/manager/interaction_manager.php       | 2 +-
 classes/local/manager/workflow_manager.php          | 2 +-
 classes/view_controller.php                         | 4 ++--
 step/email/interactionlib.php                       | 2 +-
 step/email/lib.php                                  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/classes/local/backup/restore_lifecycle_workflow.php b/classes/local/backup/restore_lifecycle_workflow.php
index 5e9b1fe9..cd05dba4 100644
--- a/classes/local/backup/restore_lifecycle_workflow.php
+++ b/classes/local/backup/restore_lifecycle_workflow.php
@@ -87,7 +87,7 @@ public function execute(bool $force = false) {
             $this->check_subplugin_validity();
             if (empty($this->errors) || $force) {
                 // If all loaded data is valid, the new workflow and the steps can be stored in the database.
-                // If we force the import, we empty the errors;
+                // If we force the import, we empty the errors.
                 $this->errors = [];
                 $this->persist();
             }
diff --git a/classes/local/manager/interaction_manager.php b/classes/local/manager/interaction_manager.php
index 87ecfff8..f263fb8a 100644
--- a/classes/local/manager/interaction_manager.php
+++ b/classes/local/manager/interaction_manager.php
@@ -170,7 +170,7 @@ public static function get_process_status_message($processid) {
         }
 
         if ($process->stepindex == 0) {
-            // TODO: Rethink behaviour for multiple triggers.
+            // Software enhancement: Rethink behaviour for multiple triggers.
             $trigger = trigger_manager::get_triggers_for_workflow($process->workflowid)[0];
             $triggerlib = lib_manager::get_trigger_lib($trigger->subpluginname);
             return $triggerlib->get_status_message();
diff --git a/classes/local/manager/workflow_manager.php b/classes/local/manager/workflow_manager.php
index 4d395090..b30d54e7 100644
--- a/classes/local/manager/workflow_manager.php
+++ b/classes/local/manager/workflow_manager.php
@@ -257,7 +257,7 @@ public static function activate_workflow($workflowid) {
         $transaction = $DB->start_delegated_transaction();
         $workflow = self::get_workflow($workflowid);
         if (!self::is_active($workflow->id)) {
-            // TODO: Rethink behaviour for multiple triggers.
+            // Software enhancement: Rethink behaviour for multiple triggers.
             $trigger = trigger_manager::get_triggers_for_workflow($workflowid)[0];
             $lib = lib_manager::get_trigger_lib($trigger->subpluginname);
             $workflow->manual = $lib->is_manual_trigger();
diff --git a/classes/view_controller.php b/classes/view_controller.php
index b0696515..9f964e90 100644
--- a/classes/view_controller.php
+++ b/classes/view_controller.php
@@ -57,7 +57,7 @@ public function handle_view($renderer, $filterdata) {
         $courses = get_user_capability_course('tool/lifecycle:managecourses', null, false);
         if (!$courses) {
             echo 'no courses';
-            // TODO show error.
+            // Software enhancement show error.
             return;
         }
 
@@ -142,7 +142,7 @@ public function handle_interaction($action, $processid, $stepid) {
      */
     public function handle_trigger($triggerid, $courseid) {
         global $PAGE;
-        // TODO check if trigger to triggerid exists.
+        // Software enhancement check if trigger to triggerid exists.
         // Check if trigger is manual.
         $trigger = trigger_manager::get_instance($triggerid);
         $lib = lib_manager::get_trigger_lib($trigger->subpluginname);
diff --git a/step/email/interactionlib.php b/step/email/interactionlib.php
index 8d71b69b..65054d19 100644
--- a/step/email/interactionlib.php
+++ b/step/email/interactionlib.php
@@ -126,7 +126,7 @@ public function get_due_date($processid, $stepid) {
                 $date += $settings['responsetimeout'];
             }
         }
-        // TODO default format -- seconds -> not in this class !
+        // Software enhancement default format -- seconds -> not in this class !
         return date('d.m.Y', $date);
     }
 
diff --git a/step/email/lib.php b/step/email/lib.php
index f25b78bb..8779107c 100644
--- a/step/email/lib.php
+++ b/step/email/lib.php
@@ -124,7 +124,7 @@ public function post_processing_bulk_operation() {
                     $subject = $parsedsettings['subject'];
                     $content = $parsedsettings['content'];
                     $contenthtml = $parsedsettings['contenthtml'];
-                    // TODO: use course info to parse content template!
+                    // Software enhancement: use course info to parse content template!
                     email_to_user($user, \core_user::get_noreply_user(), $subject, $content, $contenthtml);
                     $DB->delete_records('lifecyclestep_email',
                     ['instanceid' => $step->id,

From 490286e6d2e79fe4a644e40c5225ff6c073aa907 Mon Sep 17 00:00:00 2001
From: NinaHerrmann <nina.herrmann@uni-muenster.de>
Date: Tue, 11 Jun 2024 15:06:04 +0200
Subject: [PATCH 09/12] codechecker...

---
 step/email/lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/step/email/lib.php b/step/email/lib.php
index a204014c..fb19c2c7 100644
--- a/step/email/lib.php
+++ b/step/email/lib.php
@@ -129,7 +129,7 @@ public function post_processing_bulk_operation() {
                     mtrace("E-mail to user {$user->id} failed.");
                 }
                 $DB->delete_records('lifecyclestep_email',
-                    ['instanceid' => $step->id, 'touser' => $user->id, ]);
+                    ['instanceid' => $step->id, 'touser' => $user->id]);
                 $transaction->allow_commit();
             }
         }

From f7bf4f51cfd6dd53823be6cace862f876bfa694b Mon Sep 17 00:00:00 2001
From: NinaHerrmann <nina.herrmann@uni-muenster.de>
Date: Tue, 11 Jun 2024 16:01:09 +0200
Subject: [PATCH 10/12] new lang strings @justusdieckmann

---
 lang/de/tool_lifecycle.php | 4 ++--
 lang/en/tool_lifecycle.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lang/de/tool_lifecycle.php b/lang/de/tool_lifecycle.php
index 8d7b9efe..375c8fe8 100644
--- a/lang/de/tool_lifecycle.php
+++ b/lang/de/tool_lifecycle.php
@@ -45,13 +45,13 @@
 $string['backupcreated'] = 'Erstellt am';
 $string['backupworkflow'] = 'Workflow sichern';
 $string['cannot_trigger_workflow_manually'] = 'Der Workflow konnte nicht manuell ausgelöst werden.';
-$string['config_coursecategorydepth'] = 'Tiefe der Kurskategorien, die in der Interaktionstabelle angezeigt werden sollen.';
+$string['config_coursecategorydepth'] = 'Tiefe der Kurskategorien, die in der Interaktionstabelle angezeigt werden sollen';
 $string['config_coursecategorydepth_desc'] = 'Standardmäßig wird die erste Kategorie angezeigt, wenn Lehrkräfte den Status ihrer Kurse in der view.php verwalten. Die Einstellung ermöglicht es, nicht die erste Ebene der Kategorien, sondern Unterkategorien anzuzeigen.';
 $string['config_delay_duration'] = 'Standardlänge eines Kursausschlusses';
 $string['config_delay_duration_desc'] = 'Diese Einstellung definiert den Standardlänge einer Kursausschlusses in einem Workflow
  falls ein Prozess des Workflows zurückgesetzt oder beendigt wird. Die Länge des Kursausschlusses besagt, wie lange es dauert, bis
  der Kurs wieder vom Workflow bearbeitet wird.';
-$string['config_enablecategoryhierachy'] = 'Aktivieren Sie diese Option, um eine bestimmte Ebene der Kurskategorienhierarchie in der Interaktionstabelle anzuzeigen.';
+$string['config_enablecategoryhierachy'] = 'Kurskategorienhierarchie in der Interaktionstabelle spezifizieren';
 $string['config_enablecategoryhierachy_desc'] = 'Standardmäßig wird die direkt zugewiesene Kurskategorie angezeigt, wenn Lehrkräfte den Status ihrer Kurse in der view.php verwalten. Die Einstellung ermöglicht es, eine bestimmte Ebene des Kurskategorienbaums anzuzeigen.';
 $string['config_showcoursecounts'] = 'Zeige Anzahl der Kurse, die getriggert werden';
 $string['config_showcoursecounts_desc'] = 'Die Workflow-Konfigurationsseite zeigt normalerweise die Anzahl an Kursen, die durch
diff --git a/lang/en/tool_lifecycle.php b/lang/en/tool_lifecycle.php
index cdf3d511..af1b212e 100644
--- a/lang/en/tool_lifecycle.php
+++ b/lang/en/tool_lifecycle.php
@@ -52,13 +52,13 @@
 $string['config_backup_path'] = 'Path of the lifecycle backup folder';
 $string['config_backup_path_desc'] = 'This settings defines the storage location of the backups created by the backup step.
 The path has to be specified as an absolute path on your server.';
-$string['config_coursecategorydepth'] = 'Depth of categories to be shown in the interaction table.';
+$string['config_coursecategorydepth'] = 'Depth of categories to be shown in the interaction table';
 $string['config_coursecategorydepth_desc'] = 'By default the first category is shown when teachers manage the status of their courses on the view.php. The setting enables to show not the first level of categories but subcategories.';
 $string['config_delay_duration'] = 'Default duration of a course delay';
 $string['config_delay_duration_desc'] = 'This setting defines the default delay duration of a workflow
 in case one of its processes is rolled back or finishes.
 The delay duration determines how long a course will be excepted from being processed again in either of the cases.';
-$string['config_enablecategoryhierachy'] = 'Enable to show a specified level of the course category hierarchy in the interaction table.';
+$string['config_enablecategoryhierachy'] = 'Show a specified level of the course category hierarchy in the interaction table';
 $string['config_enablecategoryhierachy_desc'] = 'By default the directly assigned course category is shown when teachers manage the status of their courses on the view.php. The setting enables to show a specified level of the course category tree.';
 $string['config_showcoursecounts'] = 'Show amount of courses which will be triggered';
 $string['config_showcoursecounts_desc'] = 'The workflow overview page by default shows the amount of courses which will be

From 67da437abdcc3b70e13b10c8f0fa89d374900419 Mon Sep 17 00:00:00 2001
From: Justus Dieckmann <justusdieckmann@wwu.de>
Date: Tue, 11 Jun 2024 16:19:11 +0200
Subject: [PATCH 11/12] Also use category depth setting for remaining courses
 table

---
 .../table/interaction_attention_table.php     | 34 ----------------
 .../table/interaction_remaining_table.php     |  2 +-
 classes/local/table/interaction_table.php     | 39 +++++++++++++++++++
 3 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/classes/local/table/interaction_attention_table.php b/classes/local/table/interaction_attention_table.php
index 67cfb714..e67b7a86 100644
--- a/classes/local/table/interaction_attention_table.php
+++ b/classes/local/table/interaction_attention_table.php
@@ -40,12 +40,6 @@
  */
 class interaction_attention_table extends interaction_table {
 
-    /**
-     * In case a specific course category should be shown, all course categories are fetched once ...
-     * ... to find the suitable category later.
-     * @var \stdClass
-     */
-    private $coursecategories;
     /**
      * Constructor for deactivated_workflows_table.
      * @param int $uniqueid Unique id of this table.
@@ -65,10 +59,6 @@ public function __construct($uniqueid, $courseids, $filterdata = null) {
             'on p.workflowid = s.workflowid AND p.stepindex = s.sortindex ' .
             'left join {course_categories} cc on c.category = cc.id';
         $ids = implode(',', $courseids);
-        if (get_config('tool_lifecycle', 'enablecategoryhierachy')) {
-            // We have to get the complete category tree.
-            $this->coursecategories = $DB->get_records_sql('SELECT id, name, depth, path, parent FROM {course_categories} ');
-        }
         $where = ['FALSE'];
         if ($ids) {
             $where = ['p.courseid IN (' . $ids . ')'];
@@ -133,30 +123,6 @@ public function col_tools($row) {
         return $output;
     }
 
-    /**
-     * Dependent on the setting either returns the closest category or the category that is on the specified depth,
-     * if the category depth is not reached the last category is returned.
-     * @param object $row Row data.
-     * @return string category name
-     * @throws \dml_exception
-     */
-    public function col_category($row): String {
-        $categorydepth = get_config('tool_lifecycle', 'enablecategoryhierachy');
-        if ($categorydepth == false) {
-            return $row->category;
-        } else {
-            $categorydepth = (int) get_config('tool_lifecycle', 'coursecategorydepth');
-            $categoryhierachy = explode('/', substr($row->categorypath, 1));
-            $categoryhierachy = array_map('intval', $categoryhierachy);
-            if (isset($categoryhierachy[$categorydepth])) {
-                $category = $this->coursecategories[$categoryhierachy[$categorydepth]];
-                return $category->name;
-            } else {
-                $category = $this->coursecategories[end($categoryhierachy)];
-                return $category->name;
-            }
-        }
-    }
     /**
      * Render date column.
      * @param object $row Row data.
diff --git a/classes/local/table/interaction_remaining_table.php b/classes/local/table/interaction_remaining_table.php
index 710ffa68..adcf34c8 100644
--- a/classes/local/table/interaction_remaining_table.php
+++ b/classes/local/table/interaction_remaining_table.php
@@ -58,7 +58,7 @@ public function __construct($uniqueid, $courseids) {
         // We need to do this, so that courses without any action have a smaller timestamp than courses with an recorded action.
         // Otherwise, it would mess up the sorting.
         $fields = "c.id as courseid, p.id AS processid, c.fullname AS coursefullname, c.shortname AS courseshortname, " .
-                  "c.startdate, cc.name AS category, COALESCE(l.time, 0) AS lastmodified, l.userid, " .
+                  "c.startdate, cc.name AS category, cc.path as categorypath, COALESCE(l.time, 0) AS lastmodified, l.userid, " .
                   "l.action, s.subpluginname, ";
         if ($CFG->branch >= 311) {
             $fields .= \core_user\fields::for_name()->get_sql('u', false, '', '', false)->selects;
diff --git a/classes/local/table/interaction_table.php b/classes/local/table/interaction_table.php
index 60d54c9f..c5966ac0 100644
--- a/classes/local/table/interaction_table.php
+++ b/classes/local/table/interaction_table.php
@@ -42,12 +42,26 @@
  */
 abstract class interaction_table extends \table_sql {
 
+    /**
+     * In case a specific course category should be shown, all course categories are fetched once ...
+     * ... to find the suitable category later.
+     * @var \stdClass
+     */
+    private $coursecategories;
+
     /**
      * Constructor for interaction_table.
      * @param int $uniqueid Unique id of this table.
      */
     public function __construct($uniqueid) {
+        global $DB;
         parent::__construct($uniqueid);
+
+        if (get_config('tool_lifecycle', 'enablecategoryhierachy')) {
+            // We have to get the complete category tree.
+            $this->coursecategories = $DB->get_records_sql('SELECT id, name, depth, path, parent FROM {course_categories} ');
+        }
+
         $this->set_attribute('class', $this->attributes['class'] . ' ' . $uniqueid);
     }
 
@@ -107,6 +121,31 @@ public function col_status($row) {
         return '';
     }
 
+    /**
+     * Dependent on the setting either returns the closest category or the category that is on the specified depth,
+     * if the category depth is not reached the last category is returned.
+     * @param object $row Row data.
+     * @return string category name
+     * @throws \dml_exception
+     */
+    public function col_category($row): String {
+        $categorydepth = get_config('tool_lifecycle', 'enablecategoryhierachy');
+        if ($categorydepth == false) {
+            return $row->category;
+        } else {
+            $categorydepth = (int) get_config('tool_lifecycle', 'coursecategorydepth');
+            $categoryhierachy = explode('/', substr($row->categorypath, 1));
+            $categoryhierachy = array_map('intval', $categoryhierachy);
+            if (isset($categoryhierachy[$categorydepth])) {
+                $category = $this->coursecategories[$categoryhierachy[$categorydepth]];
+                return $category->name;
+            } else {
+                $category = $this->coursecategories[end($categoryhierachy)];
+                return $category->name;
+            }
+        }
+    }
+
     /**
      * This function is not part of the public api.
      */

From acbd9ad4606603ed801e9d6ad36bc686532b7c95 Mon Sep 17 00:00:00 2001
From: NinaHerrmann <nina.herrmann@uni-muenster.de>
Date: Tue, 11 Jun 2024 16:54:12 +0200
Subject: [PATCH 12/12] added behat for course remaining table

---
 tests/behat/interaction.feature | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/behat/interaction.feature b/tests/behat/interaction.feature
index 6dd950fb..215f0c0e 100644
--- a/tests/behat/interaction.feature
+++ b/tests/behat/interaction.feature
@@ -80,6 +80,7 @@ Feature: Add a workflow with an email step and test the interaction as a teacher
     And I am on lifecycle view
     Then I should see "Course 1" in the "tool_lifecycle_remaining" "table"
     And I should see "Course 2" in the "tool_lifecycle_remaining" "table"
+    And I should see "<category1>" in the "tool_lifecycle_remaining" "table"
     And I should not see "Course 3"
     Examples:
       | config | config1 | category1 | category2 |