Skip to content

Commit 9232de7

Browse files
committed
workflowoverview: show also 0 courses in exclude trigger. Make instancenames in supplugin form of active workflows static
1 parent 903aea0 commit 9232de7

File tree

5 files changed

+34
-11
lines changed

5 files changed

+34
-11
lines changed

classes/local/form/form_step_instance.php

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,16 +111,22 @@ public function definition() {
111111
$mform->addElement('header', 'step_settings_header', get_string('step_settings_header', 'tool_lifecycle'));
112112

113113
$elementname = 'instancename';
114-
$mform->addElement('text', $elementname, get_string('step_instancename', 'tool_lifecycle'));
115-
$mform->addHelpButton($elementname, 'step_instancename', 'tool_lifecycle');
116-
$mform->setType($elementname, PARAM_TEXT);
117-
$mform->addRule($elementname, get_string('maximumchars', '', 100), 'maxlength', 100, 'client');
118-
$mform->addRule($elementname, null, 'required');
114+
if ($this->workflowid && !workflow_manager::is_editable($this->workflowid)) {
115+
$mform->addElement('static', $elementname, get_string('step_instancename', 'tool_lifecycle'));
116+
$mform->setType($elementname, PARAM_TEXT);
117+
} else {
118+
$mform->addElement('text', $elementname, get_string('step_instancename', 'tool_lifecycle'));
119+
$mform->addHelpButton($elementname, 'step_instancename', 'tool_lifecycle');
120+
$mform->setType($elementname, PARAM_TEXT);
121+
$mform->addRule($elementname, get_string('maximumchars', '', 100), 'maxlength', 100, 'client');
122+
$mform->addRule($elementname, null, 'required');
123+
}
119124

120125
$elementname = 'subpluginnamestatic';
121126
$mform->addElement('static', $elementname, get_string('step_subpluginname', 'tool_lifecycle'));
122127
$mform->addHelpButton($elementname, 'step_subpluginname', 'tool_lifecycle');
123128
$mform->setType($elementname, PARAM_TEXT);
129+
124130
$elementname = 'subpluginname';
125131
$mform->addElement('hidden', $elementname);
126132
$mform->setType($elementname, PARAM_TEXT);

classes/local/form/form_trigger_instance.php

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,17 @@ public function definition() {
118118
$mform->addElement('header', 'trigger_settings_header', get_string('trigger_settings_header', 'tool_lifecycle'));
119119

120120
$elementname = 'instancename';
121-
$mform->addElement('text', $elementname, get_string('trigger_instancename', 'tool_lifecycle'));
122-
$mform->addHelpButton($elementname, 'trigger_instancename', 'tool_lifecycle');
123-
$mform->setType($elementname, PARAM_TEXT);
124-
$mform->addRule($elementname, get_string('maximumchars', '', 100), 'maxlength', 100, 'client');
125-
$mform->addRule($elementname, null, 'required');
121+
if ($this->workflowid && !workflow_manager::is_editable($this->workflowid)) {
122+
$mform->addElement('static', $elementname,
123+
get_string('trigger_instancename', 'tool_lifecycle'));
124+
$mform->setType($elementname, PARAM_TEXT);
125+
} else {
126+
$mform->addElement('text', $elementname, get_string('trigger_instancename', 'tool_lifecycle'));
127+
$mform->addHelpButton($elementname, 'trigger_instancename', 'tool_lifecycle');
128+
$mform->setType($elementname, PARAM_TEXT);
129+
$mform->addRule($elementname, get_string('maximumchars', '', 100), 'maxlength', 100, 'client');
130+
$mform->addRule($elementname, null, 'required');
131+
}
126132

127133
$elementname = 'subpluginnamestatic';
128134
$mform->addElement('static', $elementname,

styles.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ span.tool_lifecycle-hint {
3232
text-align: center;
3333
border: 1px solid #aaa;
3434
border-radius: 8px;
35-
min-width: 220px;
35+
min-width: 260px;
3636
background-color: white;
3737
}
3838

@@ -47,6 +47,7 @@ span.tool_lifecycle-hint {
4747

4848
#lifecycle-workflow-details .workflow-trigger {
4949
max-width: 300px;
50+
min-width: 260px;
5051
margin: 8px;
5152
}
5253

templates/overview_trigger.mustache

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,13 @@
6767
</span>
6868
</a>
6969
{{/excludedcourses}}
70+
{{^excludedcourses}}
71+
{{#exclude}}
72+
<span class="btn btn-outline-danger">
73+
0
74+
</span>
75+
{{/exclude}}
76+
{{/excludedcourses}}
7077
{{/additionalinfo}}
7178
{{/automatic}}
7279
{{^automatic}}

workflowoverview.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
use tool_lifecycle\local\manager\delayed_courses_manager;
3939
use tool_lifecycle\local\manager\lib_manager;
4040
use tool_lifecycle\local\manager\process_manager;
41+
use tool_lifecycle\local\manager\settings_manager;
4142
use tool_lifecycle\local\manager\step_manager;
4243
use tool_lifecycle\local\manager\trigger_manager;
4344
use tool_lifecycle\local\manager\workflow_manager;
@@ -267,6 +268,8 @@
267268
$trigger->classfires = "border-danger";
268269
$trigger->additionalinfo = $amounts[$trigger->sortindex]->additionalinfo ?? "-";
269270
} else {
271+
$settings = settings_manager::get_settings($trigger->id, settings_type::TRIGGER);
272+
$trigger->exclude = $settings['exclude'] ?? false;
270273
if ($response != trigger_response::triggertime()) {
271274
if ($amounts[$trigger->sortindex]->triggered) {
272275
$trigger->classfires = "border-success";

0 commit comments

Comments
 (0)