codechecker issues

Author: bluetom

db/upgrade.php

@@ -48,8 +48,8 @@ function tool_lifecycle_fix_workflow_sortindex() {
 function tool_lifecycle_upgrade_removedir(string $dir): void {
     $it = new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS);
     $files = new RecursiveIteratorIterator($it, RecursiveIteratorIterator::CHILD_FIRST);
-    foreach($files as $file) {
-        if ($file->isDir()){
+    foreach ($files as $file) {
+        if ($file->isDir()) {
             rmdir($file->getPathname());
         } else {
             unlink($file->getPathname());
@@ -575,7 +575,7 @@ function xmldb_tool_lifecycle_upgrade($oldversion) {
                 $dbman->add_field($table, $field);
             }
         }
-        
+
         // Define field "includesitecourse" to be added to tool_lifecycle_workflow.
         $table = new xmldb_table('tool_lifecycle_workflow');
         $field = new xmldb_field('includesitecourse', XMLDB_TYPE_INTEGER, '5', null, null, null, '0', 'delayforallworkflows');

lang/de/tool_lifecycle.php

@@ -182,8 +182,10 @@
 $string['overview:add_trigger'] = 'Trigger hinzufügen';
 $string['overview:add_trigger_help'] = 'Es kann nur eine Instanz jedes Triggertyps hinzugefügt werden.';
 $string['overview:trigger'] = 'Trigger';
-$string['overview:trigger_help'] = 'Ein Kurs fängt nur dann an, einen Workflow zu durchlaufen, wenn alle Trigger des Workflows dies übereinstimmend (UND-Verknüpfung) aussagen.<br><br>
-In den hier genannten Zahlen werden Kurse, die verzögert werden oder sich bereits in anderen Workflows befinden, nicht mitgezählt.<br>
+$string['overview:trigger_help'] = 'Ein Kurs fängt nur dann an, einen Workflow zu durchlaufen, wenn alle Trigger des Workflows dies übereinstimmend (UND-Verknüpfung) aussagen.
+
+In den hier genannten Zahlen werden Kurse, die verzögert werden oder sich bereits in anderen Workflows befinden, nicht mitgezählt.
+
 Trotzdem sind die Zahlen nur approximiert, da es sein könnte, dass die Kurse vor diesem einen anderen Workflow auslösen.';
 $string['pluginname'] = 'Kurs-Lebenszyklus';
 $string['plugintitle'] = 'Kurs-Lebenszyklus';
@@ -268,7 +270,7 @@
 $string['workflow_duplicate_title'] = '{$a} (Kopie)';
 $string['workflow_finishdelay'] = 'Kursauschluss bei Beendigung';
 $string['workflow_finishdelay_help'] = 'Dieser Wert beschreibt die Zeit, bis wieder ein Prozess für diesen Workflow und einen Kurs
- gestartet werden kann, nachdem der Kurs einen Prozess dieses Workflows beendingt hat.';
+ gestartet werden kann, nachdem der Kurs einen Prozess dieses Workflows beendigt hat.';
 $string['workflow_is_running'] = 'Workflow läuft.';
 $string['workflow_not_removeable'] = 'Es ist nicht möglich, diese Workflow-Instanz zu entfernen. Vielleicht hat sie noch laufende Prozesse?';
 $string['workflow_processes'] = 'Aktive Prozesse';

lang/en/tool_lifecycle.php

@@ -182,8 +182,10 @@
 $string['overview:add_trigger'] = 'Add trigger';
 $string['overview:add_trigger_help'] = 'You can only add one instance of each trigger type.';
 $string['overview:trigger'] = 'Trigger';
-$string['overview:trigger_help'] = 'A course will only trigger a workflow, if all triggers agree on it (AND operation).<br><br>
-Courses which are delayed, or already in another workflow are not included in the displayed counts.<br>
+$string['overview:trigger_help'] = 'A course will only trigger a workflow, if all triggers agree on it (AND operation).
+
+Courses which are delayed, or already in another workflow are not included in the displayed counts.
+
 Still, these numbers are only approximates, since it could be that a course is excluded by another workflow, or will trigger another workflow before this one.';
 $string['pluginname'] = 'Life Cycle';
 $string['plugintitle'] = 'Course Life Cycle';

templates/workflowoverview.mustache

@@ -83,17 +83,17 @@
                 {{/showdetails}}
             </span>
             <h4 class="pr-5">{{title}}
-                {{#includedelayedcourses}}<sup><i class="fas fa-calendar-plus" style="font-size:14px;" data-toggle="tooltip" title="{{#str}} includedelayedcourses, tool_lifecycle{{/str}}"></i></sup>{{/includedelayedcourses}}
-                {{#includesitecourse}}<sup><i class="fas fa-home" style="font-size:14px;" data-toggle="tooltip" title="{{#str}} includesitecourse, tool_lifecycle{{/str}}"></i></sup>{{/includesitecourse}}</h4>
-            <span>{{#str}} workflow_rollbackdelay, tool_lifecycle{{/str}}: <strong>{{rollbackdelay}}</strong> {{{rollbackhelp}}}</span><br>
-            <span>{{#str}} workflow_finishdelay, tool_lifecycle{{/str}}: <strong>{{finishdelay}}</strong> {{{finishhelp}}}</span><br>
+                {{#includedelayedcourses}}<sup><i class="fas fa-calendar-plus" style="font-size:0.7em;" data-toggle="tooltip" title="{{#str}} includedelayedcourses, tool_lifecycle{{/str}}"></i></sup>{{/includedelayedcourses}}
+                {{#includesitecourse}}<sup><i class="fas fa-home" style="font-size:0.7em;" data-toggle="tooltip" title="{{#str}} includesitecourse, tool_lifecycle{{/str}}"></i></sup>{{/includesitecourse}}</h4>
+            <span>{{#str}} workflow_rollbackdelay, tool_lifecycle{{/str}}: <strong>{{rollbackdelay}}</strong> <span data-toggle="tooltip" title="{{#str}} details:rollbackdelay_help, tool_lifecycle{{/str}}"><i class="fa fa-circle-question {{#isactive}}text-white{{/isactive}}"></i></span></span><br>
+            <span>{{#str}} workflow_finishdelay, tool_lifecycle{{/str}}: <strong>{{finishdelay}}</strong> <span data-toggle="tooltip" title="{{#str}} details:finishdelay_help, tool_lifecycle{{/str}}"><i class="fa fa-circle-question {{#isactive}}text-white{{/isactive}}"></i></span></span><br>
             <span>{{# delayglobally }}{{#str}}details:globaldelay_yes, tool_lifecycle{{/str}}{{/ delayglobally }}
                 {{^delayglobally}}{{#str}}details:globaldelay_no, tool_lifecycle{{/str}}{{/delayglobally}}</span>
             <div class="mt-2">{{{addinstance}}}</div>
         </div>
         {{#counttriggers}}
         <div class="wf-trigger-block workflow-item">
-            <h5 class="my-2">{{#str}} trigger, tool_lifecycle{{/str}} {{{triggerhelp}}}</h5>
+            <h5 class="my-2">{{#str}} trigger, tool_lifecycle{{/str}} <span data-toggle="tooltip" title="{{#str}} overview:trigger_help, tool_lifecycle{{/str}}"><i class="fa fa-circle-question"></i></span></h5>
             {{#showcoursecounts}}
               {{#automatic}}
                   <div class="mb-2 mx-2">
@@ -108,7 +108,7 @@
               {{/automatic}}
               {{^automatic}}
                 <div class="mb-2 mx-2">
-                    {{#str}} manualtriggerenvolved, tool_lifecycle {{/str}} {{{manualtriggerenvolvedhelp}}}
+                    {{#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}}
             {{/showcoursecounts}}

workflowoverview.php

@@ -316,10 +316,6 @@
 }
 
 $data = [
-    'rollbackhelp' => $OUTPUT->help_icon('details:rollbackdelay', 'tool_lifecycle', null),
-    'finishhelp' => $OUTPUT->help_icon('details:finishdelay', 'tool_lifecycle', null),
-    'triggerhelp' => $OUTPUT->help_icon('overview:trigger', 'tool_lifecycle', null),
-    'manualtriggerenvolvedhelp' => $OUTPUT->help_icon('manualtriggerenvolved', 'tool_lifecycle', null),
     'editsettingslink' => (new moodle_url(urls::EDIT_WORKFLOW, ['wf' => $workflow->id]))->out(false),
     'title' => $workflow->title,
     'rollbackdelay' => format_time($workflow->rollbackdelay),