Merge branch 'driprelease_1.0.0'

marcusgreen · Oct 24, 2023 · 0601911 · 0601911
2 parents c58feaa + c0ed738
commit 0601911
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/driprelease_form.php b/driprelease_form.php
@@ -115,12 +115,12 @@ public function definition() {
         $group[] = $mform->createElement('text', 'sessionlength', get_string('sessionlength', 'tool_driprelease'),
                 ['value' => $driprelease->sessionlength, 'size' => 3]   );
 
-        $mform->addGroup($group, 'sessiongroup', get_string('sessionlength', 'tool_driprelease') . '&nbsp;&nbsp;', '', false, []);
-        $mform->addRule('sessiongroup', null, 'required', null, 'client');
-        $mform->setType('sessionlength', PARAM_INT);
+        $mform->addElement('text', 'sessionlength', get_string('sessionlength', 'tool_driprelease'),
+            ['value' => $driprelease->sessionlength, 'size' => 2]);
+        $mform->addRule('sessionlength', null, 'required', null, 'client');
 
-        $mform->setType('sessiongroup', PARAM_RAW);
-        $mform->addHelpButton('sessiongroup', 'session', 'tool_driprelease');
+        $mform->setType('sessionlength', PARAM_RAW);
+        $mform->addHelpButton('sessionlength', 'session', 'tool_driprelease');
 
         $mform->addElement('text', 'activitiespersession', get_string('activitiespersession', 'tool_driprelease'), ['size' => '3']);
         $mform->addRule('activitiespersession', null, 'required', null, 'client');
@@ -164,7 +164,7 @@ public function validation($fromform, $tabledata) {
         $modulecount = count($this->modules);
         $errors = [];
         $activitiespersession = $fromform['activitiespersession'];
-        $sessionlength = $fromform['sessiongroup']['sessionlength'];
+        $sessionlength = $fromform['sessionlength'];
         $duration = round(($fromform['schedulefinish'] - $fromform['schedulestart']) / DAYSECS);
 
         if ($duration < 1) {

diff --git a/tests/behat/basic_test.feature b/tests/behat/basic_test.feature
@@ -58,6 +58,7 @@ Feature: Drip release modifies activity availability
 
     And I click on "Edit settings" "link" in the "Quiz1" activity
     And I expand all fieldsets
+    And I pause
     And I set the field "Completion tracking" to "Show activity as complete when conditions are met"
     And I set the field "completionusegrade" to "1"
     And I press "Save and return to course"