WebSVN – Moodle – Diff – /reportbuilder/classes/local/entities/course.php

     protected function get_default_entity_title(): lang_string {
         return new lang_string('entitycourse', 'core_reportbuilder');
+    }
-    /**
-     * Get custom fields helper
-     *
+    /**
-     * @return custom_fields
-     */
-    protected function get_custom_fields(): custom_fields {
-        $customfields = new custom_fields($this->get_table_alias('course') . '.id', $this->get_entity_name(),
-            'core_course', 'course');
-        $customfields->add_joins($this->get_joins());
-        return $customfields;
-    }
-    /**
-     * Initialise the entity, adding all course and custom course fields
+     * Initialise the entity
+     *
      * @return base
      */
+    public function initialise(): base {
+        $tablealias = $this->get_table_alias('course');
-    public function initialise(): base {
+        $customfields = (new custom_fields(
+            "{$tablealias}.id",
+            $this->get_entity_name(),
+            'core_course',
+            'course',
+        ))
-        $customfields = $this->get_custom_fields();
+            ->add_joins($this->get_joins());
         $columns = array_merge($this->get_all_columns(), $customfields->get_columns());
         foreach ($columns as $column) {
+            $this->add_column($column);
             $this->add_column($column);
         // All the filters defined by the entity can also be used as conditions.
         $filters = array_merge($this->get_all_filters(), $customfields->get_filters());
         foreach ($filters as $filter) {
             'timemodified' => new lang_string('timemodified', 'core_reportbuilder'),
         ];
+    }
-    /**
-     * Check if this field is sortable
-     *
-     * @param string $fieldname
-     * @return bool
-     */
-    protected function is_sortable(string $fieldname): bool {
-        // Some columns can't be sorted, like longtext or images.
-        $nonsortable = [
-            'summary',
-        ];
-        return !in_array($fieldname, $nonsortable);
-    }
     /**
      * Return appropriate column type for given user field
+     *
      * @param string $coursefield
      * @return int
                 $fieldtype = column::TYPE_TIMESTAMP;
                 break;
             case 'summary':
                 $fieldtype = column::TYPE_LONGTEXT;
                 break;
-            case 'groupmode':
-                $fieldtype = column::TYPE_INTEGER;
-                break;
-            case 'calendartype':
-            case 'idnumber':
-            case 'format':
-            case 'fullname':
-            case 'lang':
-            case 'shortname':
-            case 'theme':
             default:
                 $fieldtype = column::TYPE_TEXT;
                 break;
+        }
      * These are all the columns available to use in any report that uses this entity.
+     *
      * @return column[]
      */
     protected function get_all_columns(): array {
-        global $DB;
         $coursefields = $this->get_course_fields();
         $tablealias = $this->get_table_alias('course');
         $contexttablealias = $this->get_table_alias('context');
             $columns[] = $column;
+        }
-        foreach ($coursefields as $coursefield => $coursefieldlang) {
-            $columntype = $this->get_course_field_type($coursefield);
-            $columnfieldsql = "{$tablealias}.{$coursefield}";
-            if ($columntype === column::TYPE_LONGTEXT && $DB->get_dbfamily() === 'oracle') {
-                $columnfieldsql = $DB->sql_order_by_text($columnfieldsql, 1024);
         foreach ($coursefields as $coursefield => $coursefieldlang) {
             $column = (new column(
                 $coursefield,
                 $coursefieldlang,
                 $this->get_entity_name()
             ))
                 ->add_joins($this->get_joins())
-                ->set_type($columntype)
+                ->set_type($this->get_course_field_type($coursefield))
-                ->add_field($columnfieldsql, $coursefield)
+                ->add_field("{$tablealias}.{$coursefield}")
                 ->add_callback([$this, 'format'], $coursefield)
-                ->set_is_sortable($this->is_sortable($coursefield));
+                ->set_is_sortable(true);
             // Join on the context table so that we can use it for formatting these columns later.
      * Returns list of all available filters
+     *
      * @return array
      */
     protected function get_all_filters(): array {
-        global $DB;
         $filters = [];
         $tablealias = $this->get_table_alias('course');
         $fields = $this->get_course_fields();
-        foreach ($fields as $field => $name) {
-            $filterfieldsql = "{$tablealias}.{$field}";
-            if ($this->get_course_field_type($field) === column::TYPE_LONGTEXT) {
-                $filterfieldsql = $DB->sql_cast_to_char($filterfieldsql);
-            }
         foreach ($fields as $field => $name) {
             $optionscallback = [static::class, 'get_options_for_' . $field];
             if (is_callable($optionscallback)) {
                 $filterclass = select::class;
             } else if ($this->get_course_field_type($field) === column::TYPE_BOOLEAN) {
             $filter = (new filter(
                 $filterclass,
                 $field,
                 $name,
                 $this->get_entity_name(),
-                $filterfieldsql
+                "{$tablealias}.{$field}"
             ))
                 ->add_joins($this->get_joins());
             // Populate filter options by callback, if available.
      * List of options for the field theme.
+     *
      * @return array
      */
     public static function get_options_for_theme(): array {
-        return array_map(
+        return ['' => get_string('forceno')] + array_map(
             fn(theme_config $theme) => $theme->get_theme_name(),
             get_list_of_themes(),
         );
+    }
      * List of options for the field lang.
+     *
      * @return array
      */
     public static function get_options_for_lang(): array {
-        return get_string_manager()->get_list_of_translations();
+        return ['' => get_string('forceno')] + get_string_manager()->get_list_of_translations();
+    }
     /**
      * List of options for the field.
+     *
      * @return array
      */
     public static function get_options_for_calendartype(): array {
-        return \core_calendar\type_factory::get_list_of_calendar_types();
+        return ['' => get_string('forceno')] + \core_calendar\type_factory::get_list_of_calendar_types();
+    }
     /**
             return format::boolean_as_text($value);
+        }
         // If the column has corresponding filter, determine the value from its options.
         $options = $this->get_options_for($fieldname);
-        if ($options !== null && array_key_exists($value, $options)) {
+        if ($options !== null && $value !== null && array_key_exists($value, $options)) {
             return $options[$value];
+        }

Proyectos de Subversion Moodle

(root)/reportbuilder/classes/local/entities/course.php – Rev 1 → 1441