vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #11246 from prssanna/child-table-row-index

Browse source 
feat(Report Builder): Ability to show child table row index number
This commit is contained in:
mergify[bot] 2020-08-13 12:25:45 +00:00 • committed by GitHub
commit 1fd2dcdf52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
frappe/public/js/frappe/views/reports/report_view.js
View file

@ -836,8 +836,15 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
const child_table_fields = frappe.meta.get_docfields(cdt).filter(standard_fields_filter);
out[cdt] = child_table_fields;
});
// add index column for child tables
out[cdt].push({
label: __('Index'),
fieldname: 'idx',
fieldtype: 'Int',
parent: cdt
});
});
return out;
}
@ -857,7 +864,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
.map(df => ({
label: __(df.label),
value: df.fieldname,
checked: this.fields.find(f => f[0] === df.fieldname)
checked: this.fields.find(f => f[0] === df.fieldname && f[1] === this.doctype)
}))
});
@ -936,6 +943,15 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
docfield = this.group_by_control.get_group_by_docfield();
}
// child table index column
if (fieldname === 'idx' && doctype !== this.doctype) {
docfield = {
label: "Index",
fieldtype: "Int",
parent: doctype,
};
}
if (!docfield) {
docfield = frappe.model.get_std_field(fieldname, true);