Refactor

classes/filter_form.php

@@ -52,9 +52,6 @@ public function check_access_for_dynamic_submission(): void {
     }
 
     public function set_data_for_dynamic_submission(): void {
-        // Since this runs after definition(), we are not using it, as the form's composition already depends on the data loaded.
-        global $DB;
-
         $datalynx_id = $this->_ajaxformdata["d"];
         $filter_id = $this->_ajaxformdata["fid"];
 
@@ -74,14 +71,6 @@ public function set_data_for_dynamic_submission(): void {
     }
 
     public function process_dynamic_submission() {
-
-        $datalynx_id = $this->_ajaxformdata["d"];
-        $filter_id = $this->_ajaxformdata["fid"];
-
-        if ($datalynx_id == null || $filter_id == null) {
-            return;
-        }
-
         $this->_df = \mod_datalynx\datalynx::get_datalynx_by_instance($datalynx_id);
         $fm = $this->_df->get_filter_manager();
         $this->_filter = $fm->get_filter_from_id($filter_id);

datalynx.js

@@ -13,7 +13,6 @@
 // You should have received a copy of the GNU General Public License
 // Along with Moodle. If not, see <http:// Www.gnu.org/licenses/>.
 
-
 /**
  * @package mod_datalynx
  * @copyright 2013 onwards David Bogner, Michael Pollak, Ivan Sakic and others.

field/field_class.php

@@ -847,15 +847,6 @@ public function is_datalynx_content() {
     protected function filearea($suffix = null) {
         return false;
     }
-
-    // TODO: Git PR to move this to the base class.
-    public function get_argument_count(string $operator) {
-        if ($operator === "") { // "Empty" operator
-            return 0;
-        } else {
-            return 1;
-        }
-    }
 }
 
 /**
@@ -1036,14 +1027,6 @@ public function parse_search($formdata, $i) {
     public static function is_customfilterfield() {
         return true;
     }
-
-    public function get_argument_count(string $operator) {
-        if ($operator === "") { // "Empty" operator
-            return 0;
-        } else {
-            return 1;
-        }
-    }
 }
 
 /**

field/select/field_class.php

@@ -59,12 +59,4 @@ public function get_search_value($value) {
             return '';
         }
     }
-
-    public function get_argument_count(string $operator) {
-        if ($operator === "") { // "Empty" operator
-            return 0;
-        } else {
-            return 1;
-        }
-    }
 }

index.php

@@ -168,4 +168,4 @@
 
 echo html_writer::empty_tag('br');
 echo html_writer::tag('div', html_writer::table($table), array('class' => 'no-overflow'));
-echo $OUTPUT->footer();
+echo $OUTPUT->footer();