mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-74342 reportbuilder: remove unnecessary template/dataset values.

Browse Source
This commit is contained in:
Paul Holden 2022-03-29 09:46:55 +01:00
parent a896ea6473
commit dcda9c08e2
7 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reportbuilder/amd/build/audience.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
reportbuilder/amd/build/audience.min.js.map
View File

File diff suppressed because one or more lines are too long

10
reportbuilder/amd/src/audience.js
View File

@ -84,15 +84,9 @@ const addAudienceCard = (className, title) => {
const editAudienceCard = audienceCard => {
const pendingPromise = new Pending('core_reportbuilder/audience:edit');
const audienceForm = initAudienceCardForm(audienceCard);
const audienceFormData = {
reportid: reportId,
id: audienceCard.dataset.instanceid,
classname: audienceCard.dataset.classname
};
// Load audience form with data for editing, then toggle visible controls in the card.
audienceForm.load(audienceFormData)
const audienceForm = initAudienceCardForm(audienceCard);
audienceForm.load({id: audienceCard.dataset.instanceid})
.then(() => {
const audienceFormContainer = audienceCard.querySelector(reportSelectors.regions.audienceFormContainer);
const audienceDescription = audienceCard.querySelector(reportSelectors.regions.audienceDescription);

23
reportbuilder/classes/form/audience.php
View File

@ -131,7 +131,7 @@ class audience extends dynamic_form {
$audience = $audience::create($formdata->reportid, $configdata);
} else {
// Editing audience.
$audience->update_configdata($configdata, true);
$audience->update_configdata($configdata);
}
$persistent = $audience->get_persistent();
@ -149,17 +149,22 @@ class audience extends dynamic_form {
*/
public function set_data_for_dynamic_submission(): void {
$audience = $this->get_audience();
if ($audience->get_persistent()->get('id') !== 0) {
// Populate form with exisiting data.
$persistent = $audience->get_persistent();
// Populate form data based on whether we are editing/creating an audience.
if ($persistent->get('id') !== 0) {
$formdata = [
'id' => $audience->get_persistent()->get('id'),
'reportid' => $audience->get_persistent()->get('reportid'),
];
$formdata += $audience->get_configdata();
'id' => $persistent->get('id'),
'reportid' => $persistent->get('reportid'),
'classname' => $persistent->get('classname'),
] + $audience->get_configdata();
} else {
$formdata['reportid'] = $this->optional_param('reportid', null, PARAM_INT);
$formdata = [
'reportid' => $this->optional_param('reportid', null, PARAM_INT),
'classname' => $this->optional_param('classname', null, PARAM_RAW_TRIMMED),
];
}
$formdata['classname'] = $this->optional_param('classname', null, PARAM_RAW_TRIMMED);
$this->set_data($formdata);
}

1
reportbuilder/classes/output/dynamictabs/audience.php
View File

@ -111,7 +111,6 @@ class audience extends base {
$editable = new audience_heading_editable($persistent->get('id'));
$params = [
'identifier' => $persistent->get('classname'),
'instanceid' => $persistent->get('id'),
'description' => $reportaudience->get_description(),
'heading' => $reportaudience->get_name(),

2
reportbuilder/templates/local/audience/form.mustache
View File

@ -32,7 +32,7 @@
"form": "form"
}
}}
<div class="instance-card" data-classname="{{identifier}}" data-instanceid="{{instanceid}}" data-title="{{heading}}" data-region="audience-card">
<div class="instance-card" data-instanceid="{{instanceid}}" data-title="{{heading}}" data-region="audience-card">
{{#showormessage}}
<span class="audience-separator d-flex mb-3 justify-content-center align-items-center small text-muted font-weight-bold">
{{#str}} or, core_reportbuilder {{/str}}

1
reportbuilder/templates/local/dynamictabs/audience.mustache
View File

@ -26,7 +26,6 @@
"hasinstances": 1,
"instances": [{
"instanceid": 1,
"classname": "some\\class\\name",
"heading": "Title",
"headingeditable": "Title (edit me)",
"showormessage": 1,