exclude trigger: show excluded 0 as well

Author: bluetom

trigger/customfielddelay/lang/de/lifecycletrigger_customfielddelay.php

@@ -27,6 +27,7 @@
 $string['customfield_help'] = 'Der Trigger prüft den Wert dieses nutzerdefinierten Kursfeldes vom Typ Datum.';
 $string['delay'] = 'Zeitraum nach dem Datum des nutzerdefinierten Kursfeldes';
 $string['delay_help'] = 'Der Prozess startet sobald der angegebene Zeitraum nach dem nutzerdefinierten Kursfeld-Datum abgelaufen ist.';
+$string['missingfield'] = 'Nutzerdefiniertes Kursfeld "{$a}" vom Typ Datum ist in diesem Moodle nicht vorhanden und muss zuerst angelegt werden.';
 $string['plugindescription'] = 'Der Trigger löst aus sobald der angegebene Zeitraum nach dem nutzerdefinierten Kursfeld-Datum abgelaufen ist.';
 $string['pluginname'] = 'Nutzerdefiniertes Kursfeld Typ Datum - Trigger';
 $string['privacy:metadata'] = 'Dieses Subplugin speichert keine persönlichen Daten.';

trigger/customfielddelay/lang/en/lifecycletrigger_customfielddelay.php

@@ -27,6 +27,7 @@
 $string['customfield_help'] = 'The trigger checks the value saved in the course for this customfield of type date.';
 $string['delay'] = 'Delay from customfield date of course until starting a process';
 $string['delay_help'] = 'The trigger will be invoked if the time passed since the customfield date of the course is longer than this delay.';
+$string['missingfield'] = 'Customfield "{$a}" of type date is missing in this Moodle. Please create it first.';
 $string['plugindescription'] = 'Triggers if the value of a specifiable datetype customfield is after a point in the future.';
 $string['pluginname'] = 'Customfield date delay trigger';
 $string['privacy:metadata'] = 'The lifecycletrigger_customfielddelay plugin does not store any personal data.';

trigger/customfielddelay/lib.php

@@ -58,7 +58,7 @@ public function get_course_recordset_where($triggerid) {
         $fieldname = settings_manager::get_settings($triggerid, settings_type::TRIGGER)['customfield'];
         if (!($field = $DB->get_record('customfield_field', ['shortname' => $fieldname, 'type' => 'date']))) {
             throw new \moodle_exception('missingfield',
-                'moodle', '', $fieldname);
+                'lifecycletrigger_customfielddelay', '', $fieldname);
         }
         $where = "{course}.id in (select cxt.instanceid from {context} cxt join {customfield_data} d " .
                     "ON d.contextid = cxt.id AND cxt.contextlevel=" . CONTEXT_COURSE . " " .

workflowoverview.php

@@ -277,7 +277,7 @@
                         $trigger->classfires = "border-danger";
                     }
                     $trigger->tooltip = "";
-                    if ($trigger->excludedcourses = $amounts[$trigger->sortindex]->excluded) {
+                    if ($trigger->excludedcourses = $amounts[$trigger->sortindex]->excluded || $trigger->exclude) {
                         $trigger->tooltip = get_string('courses_will_be_excluded',
                             'tool_lifecycle', $trigger->excludedcourses);
                     } else {