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

         // Track the index of conditions/filters as we iterate over them.
         $conditionindex = $filterindex = 0;
         // For each condition, we need to ensure their values are always accounted for in the report.
         $conditionvalues = $this->report->get_condition_values();
-        foreach ($this->report->get_active_conditions() as $condition) {
+        foreach ($this->report->get_active_conditions(false) as $condition) {
             [$conditionsql, $conditionparams] = $this->get_filter_sql($condition, $conditionvalues, 'c' . $conditionindex++);
             if ($conditionsql !== '') {
                 $joins = array_merge($joins, $condition->get_joins());
                 $wheres[] = "({$conditionsql})";
         // Add unique table joins.
         $from .= ' ' . implode(' ', array_unique($joins));
-        $this->set_sql($fields, $from, $wheresql, $params);
-        $counttablealias = database::generate_alias();
-        $this->set_count_sql("
-            SELECT COUNT(1)
-              FROM (SELECT {$fields}
-                      FROM {$from}
-                     WHERE {$wheresql}
                            {$this->groupbysql}
-                   ) {$counttablealias}", $params);
+        $this->set_sql($fields, $from, $wheresql, $params);
+    }
+    }
     /**
      * Generate suitable SQL for the table
+     *
      * @param bool $includesort
      * @return string
      */
-    protected function get_table_sql(): string {
+    protected function get_table_sql(bool $includesort = true): string {
         $sql = "SELECT {$this->sql->fields} FROM {$this->sql->from} WHERE {$this->sql->where} {$this->groupbysql}";
         $sort = $this->get_sql_sort();
-        if ($sort) {
+        if ($includesort && ($sort = $this->get_sql_sort())) {
             $sql .= " ORDER BY {$sort}";
+        }
      */
     public function query_db($pagesize, $useinitialsbar = true): void {
         global $DB;
-        if (!$this->is_downloading()) {
-            $this->pagesize($pagesize, $DB->count_records_sql($this->countsql, $this->countparams));
+        if (!$this->is_downloading()) {
+            // Initially set the page size, so the following SQL read has correct values.
+            $this->pagesize($pagesize, 0);
+            $countedcolumn = database::generate_alias();
+            $countedrecordset = $DB->get_counted_recordset_sql(
+                $this->get_table_sql(false),
+                $countedcolumn,
+                $this->get_sql_sort(),
+                $this->sql->params,
+                (int) $this->get_page_start(),
+                (int) $this->get_page_size(),
+            );
+            // Now set the total page size.
+            $countedsize = (int) ($countedrecordset->current()->{$countedcolumn} ?? 0);
+            $this->pagesize($pagesize, $countedsize);
             $this->rawdata = $DB->get_recordset_sql($this->get_table_sql(), $this->sql->params, $this->get_page_start(),
-                $this->get_page_size());
+            $this->rawdata = $countedrecordset;
         } else {
             $this->rawdata = $DB->get_recordset_sql($this->get_table_sql(), $this->sql->params);
+        }
+    }
+    /**
+     * Return total row count for report table. Note we'd typically use {@see query_db} and then read the {@see totalrows}
+     * property to reduce DB calls, however we can use this method when we specifically don't also need to obtain all data
+     *
+     * @return int
+     */
+    public function get_total_row_count(): int {
+        global $DB;
+        $counttablesql = $this->get_table_sql(false);
+        $counttablealias = database::generate_alias();
+        return $DB->count_records_sql(
+            "SELECT COUNT(1) FROM ({$counttablesql}) {$counttablealias}",
+            $this->sql->params,
+        );
+    }
     /**
      * Override parent method of the same, to ensure that any columns with custom sort fields are accounted for
+     *
         // Iterate over all sorted report columns, replace with columns own fields if applicable.
         foreach ($sortedcolumns as $alias => $order) {
             $column = $columnsbyalias[$alias] ?? null;
-            // If the column is not being aggregated and defines custom sort fields, then use them.
-            if ($column && !$column->get_aggregation() &&
+            // If the column is not being aggregated and defines custom sort fields, then use them.
-                    ($sortfields = $column->get_sort_fields())) {
             if ($column && !$column->get_aggregation() && ($sortfields = $column->get_sort_fields())) {
+                foreach ($sortfields as $sortfield) {
-                foreach ($sortfields as $sortfield) {
+                    if (!array_key_exists($sortfield, $columnsortby)) {
+                        $columnsortby[$sortfield] = $order;
+                    }
+                }
+            } else if (array_key_exists($alias, $sortedcolumnsfullname)) {
+                // Ensure that magic fullname sorted columns refer to correct alias.
+                foreach ($columnsbyalias as $column) {
+                    $sortfieldalias = array_filter(
+                        $column->get_sort_fields(),
+                        fn(string $key) => preg_match("/^c[\d]+_{$alias}$/", $key),
+                    );
+                    if (count($sortfieldalias) > 0) {
+                        $columnsortby[reset($sortfieldalias)] = $order;
+                        break;
                     $columnsortby[$sortfield] = $order;
+                }
             } else {
                 $columnsortby[$alias] = $order;
+            }
-        }
-        // Now ensure that any fullname sorted columns have duplicated aliases removed.
-        $columnsortby = array_filter($columnsortby, static function(string $alias) use ($sortedcolumnsfullname): bool {
-            if (preg_match('/^c[\d]+_(?<column>.*)$/', $alias, $matches)) {
-                return !array_key_exists($matches['column'], $sortedcolumnsfullname);
-            }
-            return true;
         }, ARRAY_FILTER_USE_KEY);
         return static::construct_order_by($columnsortby);
+    }
         // Render button to allow user to reset table preferences.
         echo $this->render_reset_button();
         $this->wrap_html_start();
-        $this->set_caption($this->report::get_name(), ['class' => 'sr-only']);
+        $this->set_caption($this->report::get_name(), ['class' => 'visually-hidden']);
-        echo html_writer::start_tag('div');
+        echo html_writer::start_tag('div', ['class' => 'table-responsive']);

Proyectos de Subversion Moodle

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