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

Merge pull request #4524 from pratu16x7/update-charts

Browse source 
Update charts version
This commit is contained in:
Prateeksha Singh 2017-11-24 14:19:51 +05:30 • committed by GitHub
commit b1e25ee7f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/public/js/frappe/form/dashboard.js
View file

@ -339,7 +339,7 @@ frappe.ui.form.Dashboard = Class.extend({
type: 'heatmap',
height: 100,
start: new Date(moment().subtract(1, 'year').toDate()),
count_label: frappe.model.scrub(this.frm.doctype) + "s",
count_label: "interactions",
discrete_domains: 0,
data: {}
});
@ -409,7 +409,8 @@ frappe.ui.form.Dashboard = Class.extend({
$.extend(args, {
parent: '.form-graph',
type: 'line',
height: 140
height: 140,
colors: ['green']
});
this.show();

2
frappe/public/js/lib/frappe-charts/frappe-charts.min.iife.js
View file

File diff suppressed because one or more lines are too long

7
frappe/utils/goal.py
View file

@ -98,7 +98,7 @@ def get_monthly_goal_graph_data(title, doctype, docname, goal_value_field, goal_
summary_values = [
{
'title': _("This month"),
'color': 'green',
'color': '#ffa00a',
'value': formatted_value
}
]
@ -114,12 +114,12 @@ def get_monthly_goal_graph_data(title, doctype, docname, goal_value_field, goal_
summary_values += [
{
'title': _("Goal"),
'color': 'blue',
'color': '#5e64ff',
'value': formatted_goal
},
{
'title': _("Completed"),
'color': 'green',
'color': '#28a745',
'value': str(int(round(float(current_month_value)/float(goal)*100))) + "%"
}
]
@ -131,7 +131,6 @@ def get_monthly_goal_graph_data(title, doctype, docname, goal_value_field, goal_
'data': {
'datasets': [
{
'color': 'green',
'values': values,
'formatted': values_formatted
}