From 5cf73c439083988cd0f7be0f41abe635bce56bd0 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 17 Jun 2019 17:32:38 +0530
Subject: [PATCH] fix(charts): bump frappe charts to 1.2.2

---
 frappe/core/page/dashboard/dashboard.css               | 9 ++++++---
 frappe/core/page/dashboard/dashboard.js                | 4 ++--
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py | 4 ++--
 package.json                                           | 2 +-
 yarn.lock                                              | 8 ++++----
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.css b/frappe/core/page/dashboard/dashboard.css
index 20b352f77a..cc3a3b5df0 100644
--- a/frappe/core/page/dashboard/dashboard.css
+++ b/frappe/core/page/dashboard/dashboard.css
@@ -6,12 +6,15 @@
 }
 
 .chart-container {
-    padding: 15px;
+    margin: 15px;
+    margin-top: 30px;
+    margin-left: 0px;
 }
 
-.chart-container > .title {
+.frappe-chart > text.title {
     margin: 0px;
-    font-size: 14px;
+    font-size: 14px !important;
+    font-weight: bold;
 }
 
 .chart-loading-state {
diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index bbd5a643fe..f3b8b76ea6 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -227,13 +227,13 @@ class DashboardChart {
 			"Bar": "bar",
 		};
 		let chart_args = {
-			title: this.chart_doc.chart_name.bold(),
+			title: this.chart_doc.chart_name,
 			data: this.data,
 			type: chart_type_map[this.chart_doc.type],
 			colors: [this.chart_doc.color || "light-blue"],
 			axisOptions: {
 				xIsSeries: this.chart_doc.timeseries
-			},
+			}
 		};
 		this.chart_container.find('.chart-loading-state').addClass('hide');
 
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 29a05c1047..ff54f95031 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -5,7 +5,7 @@
 from __future__ import unicode_literals
 import frappe, json
 from frappe.core.page.dashboard.dashboard import cache_source, get_from_date_from_timespan
-from frappe.utils import nowdate, add_to_date, getdate, get_last_day
+from frappe.utils import nowdate, add_to_date, getdate, get_last_day, formatdate
 from frappe.model.document import Document
 
 @frappe.whitelist()
@@ -59,7 +59,7 @@ def get(chart_name, from_date=None, to_date=None, refresh = None):
 	result = add_missing_values(result, timegrain, from_date, to_date)
 
 	return {
-		"labels": [r[0].strftime('%Y-%m-%d') for r in result],
+		"labels": [formatdate(r[0].strftime('%Y-%m-%d')) for r in result],
 		"datasets": [{
 			"name": chart.name,
 			"values": [r[1] for r in result]
diff --git a/package.json b/package.json
index 04e01bf601..4a20548deb 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "cookie": "^0.3.1",
     "express": "^4.16.2",
     "fast-deep-equal": "^2.0.1",
-    "frappe-charts": "^1.2.0",
+    "frappe-charts": "^1.2.2",
     "frappe-datatable": "^1.13.3",
     "frappe-gantt": "^0.1.0",
     "fuse.js": "^3.2.0",
diff --git a/yarn.lock b/yarn.lock
index a4613bc782..957b355d95 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1753,10 +1753,10 @@ fragment-cache@^0.2.1:
   dependencies:
     map-cache "^0.2.2"
 
-frappe-charts@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-1.2.0.tgz#05616e656825e6736b5f617a16c6e1a8ce76d0c2"
-  integrity sha512-yj47OIDaU9BCpV3gpcLE1rG5r0gCPPr3DUzwxG2DQj9vGLcLRHmNixmsF9pXZOOiOy1M/UeBrCL7l9I0JoGzMQ==
+frappe-charts@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-1.2.2.tgz#2af592c1dfce07554b8278ad2fb330922fbcd5d8"
+  integrity sha512-TrZ/JPqvr/RWHKW0fneh3dDzKPm3d+oDEMJj8aREbOWXNhOOIwfonp0uLwo8hxyGEZPwpDAKqs0154GgahSXkA==
 
 frappe-datatable@^1.13.3:
   version "1.13.3"