WebSVN – Moodle – Diff – /reportbuilder/classes/table/system_report_table.php

 use html_writer;
 use moodle_exception;
 use stdClass;
 use core_reportbuilder\{manager, system_report};
 use core_reportbuilder\local\models\report;
+use core_reportbuilder\local\report\column;
 /**
  * System report dynamic table class
+ *
         // TODO: can probably be removed pending MDL-72974.
         $PAGE->set_context($this->persistent->get_context());
         $fields = $this->report->get_base_fields();
-        $fields = $this->report->get_base_fields();
+        $groupby = [];
         $maintable = $this->report->get_main_table();
         $maintablealias = $this->report->get_main_table_alias();
         if ($this->is_downloading()) {
             $columns = array_diff_key($columns,
                 array_flip($this->report->get_exclude_columns_for_download()));
+        }
+        // If we are aggregating any columns, we should group by the remaining ones.
+        $aggregatedcolumns = array_filter($columns, fn(column $column): bool => !empty($column->get_aggregation()));
+        $hasaggregatedcolumns = !empty($aggregatedcolumns);
+        if ($hasaggregatedcolumns) {
+            $groupby = $fields;
+        }
-        $columnheaders = $columnsattributes = [];
+        $columnheaders = $columnattributes = $columnicons = [];
         // Check whether report has checkbox toggle defined, note that select all is excluded during download.
         if (($checkbox = $this->report->get_checkbox_toggleall(true)) && !$this->is_downloading()) {
             // Specify whether column should behave as a user fullname column unless the column has a custom title set.
             if (preg_match('/^user:fullname.*$/', $column->get_unique_identifier()) && !$column->has_custom_title()) {
                 $this->userfullnamecolumns[] = $column->get_column_alias();
+            }
+            // We need to determine for each column whether we should group by its fields, to support aggregation.
+            $columnaggregation = $column->get_aggregation();
+            if ($hasaggregatedcolumns && (empty($columnaggregation) || $columnaggregation::column_groupby())) {
+                $groupby = array_merge($groupby, $column->get_groupby_sql());
+            }
             // Add each columns fields, joins and params to our report.
             $fields = array_merge($fields, $column->get_fields());
             $joins = array_merge($joins, $column->get_joins());
             $params = array_merge($params, $column->get_params());
             // Disable sorting for some columns.
             if (!$column->get_is_sortable()) {
                 $this->no_sorting($column->get_column_alias());
             }
             // Generate column attributes/icons for the table.
-            // Generate column attributes to be included in each cell.
+            $columnattributes[$column->get_column_alias()] = $column->get_attributes();
-            $columnsattributes[$column->get_column_alias()] = $column->get_attributes();
+            $columnicons[] = $column->get_help_icon();
+        }
         // If the report has any actions then append appropriate column, note that actions are excluded during download.
         if ($this->report->has_actions() && !$this->is_downloading()) {
             $columnheaders['actions'] = html_writer::tag('span', get_string('actions', 'core_reportbuilder'), [
-                'class' => 'sr-only',
+                'class' => 'visually-hidden',
             ]);
             $this->no_sorting('actions');
         }
         $this->define_columns(array_keys($columnheaders));
-        $this->define_columns(array_keys($columnheaders));
+        $this->define_headers(array_values($columnheaders));
         $this->define_headers(array_values($columnheaders));
         // Add column attributes/icons to the table.
         $this->pageable(true);
         $this->set_default_per_page($this->report->get_default_per_page());
         // Initialise table SQL properties.
         $fieldsql = implode(', ', $fields);
-        $this->init_sql($fieldsql, "{{$maintable}} {$maintablealias}", $joins, $where, $params);
+        $this->init_sql($fieldsql, "{{$maintable}} {$maintablealias}", $joins, $where, $params, $groupby);
+    }
     /**
      */
     private function format_row_actions(stdClass $row): string {
         global $OUTPUT;
+        $menu = new action_menu();
-        $menu = new action_menu();
+        $menu->set_menu_trigger(
+            $OUTPUT->pix_icon('i/menu', get_string('actions', 'core_reportbuilder')),
+            'btn btn-icon d-flex no-caret',
-        $menu->set_menu_trigger($OUTPUT->pix_icon('a/setting', get_string('actions', 'core_reportbuilder')));
+        );
         $actions = array_filter($this->report->get_actions(), function($action) use ($row) {
             // Only return dividers and action items who can be displayed for current users.
             );
+        }
         return '';
+    }
+    /**
+     * Check if the user has the capability to access this table.
+     *
+     * @return bool Return true if capability check passed.
+     */
+    public function has_capability(): bool {
+        try {
+            $this->report->require_can_view();
+            return true;
+        } catch (\core_reportbuilder\exception\report_access_exception $e) {
+            return false;
+        }
+    }

Proyectos de Subversion Moodle

(root)/reportbuilder/classes/table/system_report_table.php – Rev 1 → 1441