mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-17 21:49:15 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-76769' of https://github.com/paulholden/moodle

Browse Source
This commit is contained in:
Huong Nguyen 2023-06-30 16:07:12 +07:00
commit ac3f0f3622
No known key found for this signature in database
GPG Key ID: 40D88AB693A3E72A
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
reportbuilder/classes/local/helpers/custom_fields.php
View File

@ -100,6 +100,40 @@ class custom_fields {
return array_values($this->joins);
}
/**
* Get table alias for given custom field
*
* The entity name is used to ensure the alias differs when the entity is used multiple times within the same report, each
* having their own table alias/join
*
* @param field_controller $field
* @return string
*/
private function get_table_alias(field_controller $field): string {
static $aliases = [];
$aliaskey = "{$this->entityname}_{$field->get('id')}";
if (!array_key_exists($aliaskey, $aliases)) {
$aliases[$aliaskey] = database::generate_alias();
}
return $aliases[$aliaskey];
}
/**
* Get table join for given custom field
*
* @param field_controller $field
* @return string
*/
private function get_table_join(field_controller $field): string {
$customdatatablealias = $this->get_table_alias($field);
return "LEFT JOIN {customfield_data} {$customdatatablealias}
ON {$customdatatablealias}.fieldid = {$field->get('id')}
AND {$customdatatablealias}.instanceid = {$this->tablefieldalias}";
}
/**
* Gets the custom fields columns for the report.
*
@ -114,7 +148,7 @@ class custom_fields {
foreach ($categorieswithfields as $fieldcategory) {
$categoryfields = $fieldcategory->get_fields();
foreach ($categoryfields as $field) {
$customdatatablealias = database::generate_alias();
$customdatatablealias = $this->get_table_alias($field);
$datacontroller = data_controller::create(0, null, $field);
$datafield = $datacontroller->datafield();
@ -135,9 +169,7 @@ class custom_fields {
$this->entityname
))
->add_joins($this->get_joins())
->add_join("LEFT JOIN {customfield_data} {$customdatatablealias} " .
"ON {$customdatatablealias}.fieldid = " . $field->get('id') . " " .
"AND {$customdatatablealias}.instanceid = {$this->tablefieldalias}")
->add_join($this->get_table_join($field))
->add_fields($selectfields)
->set_type($columntype)
->set_is_sortable($columntype !== column::TYPE_LONGTEXT)
@ -197,7 +229,7 @@ class custom_fields {
foreach ($categorieswithfields as $fieldcategory) {
$categoryfields = $fieldcategory->get_fields();
foreach ($categoryfields as $field) {
$customdatatablealias = database::generate_alias();
$customdatatablealias = $this->get_table_alias($field);
$datacontroller = data_controller::create(0, null, $field);
$datafield = $datacontroller->datafield();
@ -211,9 +243,7 @@ class custom_fields {
"{$customdatatablealias}.{$datafield}"
))
->add_joins($this->get_joins())
->add_join("LEFT JOIN {customfield_data} {$customdatatablealias} " .
"ON {$customdatatablealias}.fieldid = " . $field->get('id') . " " .
"AND {$customdatatablealias}.instanceid = {$this->tablefieldalias}");
->add_join($this->get_table_join($field));
// Options are stored inside configdata json string and we need to convert it to array.
if ($field->get('type') === 'select') {

4
reportbuilder/classes/local/helpers/user_profile_fields.php
View File

@ -113,7 +113,7 @@ class user_profile_fields {
}
/**
* Generate table alias for given profile field
* Get table alias for given profile field
*
* The entity name is used to ensure the alias differs when the entity is used multiple times within the same report, each
* having their own table alias/join
@ -133,7 +133,7 @@ class user_profile_fields {
}
/**
* Generate table join for given profile field
* Get table join for given profile field
*
* @param profile_field_base $profilefield
* @return string