fix behat test

Author: bluetom

classes/local/form/form_step_instance.php

@@ -115,6 +115,7 @@ public function definition() {
         $mform->addHelpButton($elementname, 'step_instancename', 'tool_lifecycle');
         $mform->setType($elementname, PARAM_TEXT);
         $mform->addRule($elementname, get_string('maximumchars', '', 100), 'maxlength', 100, 'client');
+        $mform->addRule($elementname, null, 'required');
 
         $elementname = 'subpluginnamestatic';
         $mform->addElement('static', $elementname, get_string('step_subpluginname', 'tool_lifecycle'));

classes/local/form/form_trigger_instance.php

@@ -122,6 +122,7 @@ public function definition() {
         $mform->addHelpButton($elementname, 'trigger_instancename', 'tool_lifecycle');
         $mform->setType($elementname, PARAM_TEXT);
         $mform->addRule($elementname, get_string('maximumchars', '', 100), 'maxlength', 100, 'client');
+        $mform->addRule($elementname, null, 'required');
 
         $elementname = 'subpluginnamestatic';
         $mform->addElement('static', $elementname,

classes/processor.php

@@ -356,7 +356,7 @@ public function get_count_of_courses_to_trigger_for_workflow($workflow) {
             $settings = settings_manager::get_settings($trigger->id, settings_type::TRIGGER);
             $trigger->exclude = $settings['exclude'] ?? false;
             $obj = new \stdClass();
-            $lib = lib_manager::get_automatic_trigger_lib($trigger->subpluginname);
+            $lib = lib_manager::get_trigger_lib($trigger->subpluginname);
             if ($lib->is_manual_trigger()) {
                 $obj->automatic = false;
             } else {

templates/workflowoverview.mustache

@@ -134,10 +134,17 @@
 
         <div class="wf-trigger-block workflow-item nextrun">
             <h5 class="my-2">{{#str}} courseselectionrun_title, tool_lifecycle{{/str}} <span data-toggle="tooltip" title="{{#str}} overview:timetrigger_help, tool_lifecycle{{/str}}"><i class="fa fa-circle-question"></i></span></h5>
+            {{#automatic}}
             <div class="mb-2 mx-2">
                 {{#str}} nextrun, tool_lifecycle, {{{nextrun}}} {{/str}}<br>
                 <span class="text-muted">{{#str}} lastrun, tool_lifecycle, {{lastrun}} {{/str}}</span>
             </div>
+            {{/automatic}}
+            {{^automatic}}
+                <div class="mb-2 mx-2">
+                    {{#str}} manualtriggerenvolved, tool_lifecycle {{/str}} <span data-toggle="tooltip" title="{{#str}} manualtriggerenvolved_help, tool_lifecycle{{/str}}"><i class="fa fa-circle-question"></i></span>
+                </div>
+            {{/automatic}}
             {{#counttimetriggers}}
                 <div class="workflow wf-trigger-wrapper">
 

trigger/manual/lang/de/lifecycletrigger_manual.php

@@ -28,6 +28,8 @@
 $string['setting_capability'] = 'Berechtigung';
 $string['setting_capability_help'] = 'Die Moodle-Berechtigung, die ein Nutzer benötigt, um einen Workflow mit diesem Trigger zu sehen und auszulösen, z.B. "enrol/manual:enrol". Bitte schauen Sie sich die Moodle Access API für Details an.';
 $string['setting_displayname'] = 'Aktionsname';
+$string['setting_displayname_default'] = 'Benutzer-Freigabe';
 $string['setting_displayname_help'] = 'Der Name für die Triggeraktion, der dem Nutzer angezeigt wird.';
 $string['setting_icon'] = 'Icon';
+$string['setting_icon_default'] = 'e/tick';
 $string['setting_icon_help'] = 'Das Moodle-Icon das dem Nutzer für diesen Trigger angezeigt wird, z.B. "e/tick". Die ganze Liste möglicher Icons kann in der Moodle-Dokumentation gefunden werden.';

trigger/manual/lang/en/lifecycletrigger_manual.php

@@ -28,6 +28,8 @@
 $string['setting_capability'] = 'Capability';
 $string['setting_capability_help'] = 'The Moodle capability needed to see and invoke a workflow using this trigger, e.g. "enrol/manual:enrol". Please see Moodle access API documentation for details.';
 $string['setting_displayname'] = 'Action name';
+$string['setting_displayname_default'] = 'User Confirmation';
 $string['setting_displayname_help'] = 'A name for the trigger action displayed to the user.';
 $string['setting_icon'] = 'Icon';
+$string['setting_icon_default'] = 'e/tick';
 $string['setting_icon_help'] = 'The Moodle icon to be showed to the user for this trigger, e.g. "e/tick". A full list of possible icons can be found at Moodle documentation.';

trigger/manual/lib.php

@@ -66,13 +66,17 @@ public function extend_add_instance_form_definition($mform) {
         );
         $mform->addHelpButton($elementname, 'setting_icon', 'lifecycletrigger_manual');
         $mform->setType($elementname, PARAM_SAFEPATH);
+        $mform->addRule($elementname, null, 'required');
+        $mform->setDefault($elementname, get_string('setting_icon_default', 'lifecycletrigger_manual'));
 
         $elementname = 'displayname';
         $mform->addElement(
             'text', $elementname, get_string('setting_displayname', 'lifecycletrigger_manual')
         );
         $mform->addHelpButton($elementname, 'setting_displayname', 'lifecycletrigger_manual');
         $mform->setType($elementname, PARAM_TEXT);
+        $mform->addRule($elementname, null, 'required');
+        $mform->setDefault($elementname, get_string('setting_displayname_default', 'lifecycletrigger_manual'));
 
         $elementname = 'capability';
         $capabilities = get_all_capabilities();
@@ -86,23 +90,7 @@ public function extend_add_instance_form_definition($mform) {
         );
         $mform->addHelpButton($elementname, 'setting_capability', 'lifecycletrigger_manual');
         $mform->setType($elementname, PARAM_CAPABILITY);
-    }
-
-    /**
-     * Make all fields required.
-     * @param array $error Array containing all errors.
-     * @param array $data Data passed from the moodle form to be validated.
-     * @return void the extended error array.
-     * @throws \coding_exception
-     */
-    public function extend_add_instance_form_validation(&$error, $data) {
-        parent::extend_add_instance_form_validation($error, $data);
-        $requiredsettings = $this->instance_settings();
-        foreach ($requiredsettings as $setting) {
-            if (!array_key_exists($setting->name, $data) || empty($data[$setting->name])) {
-                $error[$setting->name] = get_string('required');
-            }
-        }
+        $mform->addRule($elementname, null, 'required');
     }
 
 }

workflowoverview.php

@@ -207,9 +207,6 @@
     // Mustache cannot handle arrays which have other keys therefore a new array is build.
     // FUTURE: Nice to have Icon for each subplugin.
     $trigger = (object)(array) $trigger; // Cast to normal object to be able to set dynamic properties.
-    $lib = lib_manager::get_automatic_trigger_lib($trigger->subpluginname);
-    $response = $lib->check_course();
-    $timetrigger = $response == trigger_response::triggertime();
     $actionmenu = new action_menu([
         new action_menu_link_secondary(
             new moodle_url(urls::EDIT_ELEMENT, ['type' => settings_type::TRIGGER, 'elementid' => $trigger->id]),
@@ -223,14 +220,15 @@
         );
     }
     $trigger->actionmenu = $OUTPUT->render($actionmenu);
+    $response = $amounts[$trigger->sortindex]->response ?? '';
     if ($showdetails) {
         if ($trigger->automatic = $amounts[$trigger->sortindex]->automatic) {
             $sqlresult = trigger_manager::get_trigger_sqlresult($trigger);
             if ($sqlresult == "false") {
                 $trigger->classfires = "border-danger";
                 $trigger->additionalinfo = $amounts[$trigger->sortindex]->additionalinfo ?? "-";
             } else {
-                if (!$timetrigger) {
+                if ($response != trigger_response::triggertime()) {
                     if ($amounts[$trigger->sortindex]->triggered) {
                         $trigger->classfires = "border-success";
                     } else if ($amounts[$trigger->sortindex]->excluded) {
@@ -243,7 +241,7 @@
         }
         $displaytotaltriggered &= $trigger->automatic;
     }
-    if ($timetrigger) {
+    if ($response == trigger_response::triggertime()) {
         $displaytimetriggers[] = $trigger;
         if (isset($amounts[$trigger->sortindex]->lastrun)) {
             $lastrun = $amounts[$trigger->sortindex]->lastrun;