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

Merge pull request #10375 from prssanna/chart-types

Browse source 
fix: add missing chart types and don't make type mandatory
This commit is contained in:
Prssanna Desai 2020-05-18 13:46:47 +05:30 • committed by GitHub
commit ef117d2642
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frappe/desk/doctype/dashboard_chart/dashboard_chart.js
View file

@ -92,12 +92,6 @@ frappe.ui.form.on('Dashboard Chart', {
}
});
} else {
if (frm.doc.chart_type == 'Group By') {
frm.set_df_property('type', 'options', ['Line', 'Bar', 'Percentage', 'Pie', 'Donut']);
} else {
frm.set_df_property('type', 'options', ['Line', 'Bar', 'Heatmap']);
}
frm.set_value('document_type', '');
}
},

9
frappe/desk/doctype/dashboard_chart/dashboard_chart.json
View file

@ -128,8 +128,7 @@
"fieldname": "type",
"fieldtype": "Select",
"label": "Type",
"options": "Line\nBar\nHeatmap",
"reqd": 1
"options": "Line\nBar\nPercentage\nPie\nDonut\nHeatmap"
},
{
"fieldname": "column_break_2",
@ -219,7 +218,7 @@
"options": "Dashboard Chart Field"
},
{
"description": "Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"] (the options set here will override the chart options set in the Dashboard)",
"description": "Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"]",
"fieldname": "custom_options",
"fieldtype": "Code",
"label": "Custom Options"
@ -239,7 +238,7 @@
}
],
"links": [],
"modified": "2020-05-01 19:45:01.669384",
"modified": "2020-05-16 15:03:02.455395",
"modified_by": "Administrator",
"module": "Desk",
"name": "Dashboard Chart",
@ -283,4 +282,4 @@
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1
}
}