From 2c76aec1195a4a0cdc28a84d3119220c4f7ee6f8 Mon Sep 17 00:00:00 2001 From: Ben Cornwell-Mott Date: Fri, 22 Jul 2016 09:56:29 -0700 Subject: [PATCH 1/3] Added Google Chart to compare quotes in Print view --- .../quoted_item_comparison.html | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.html diff --git a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.html b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.html new file mode 100644 index 00000000000..4cc54db7eaf --- /dev/null +++ b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.html @@ -0,0 +1,110 @@ + + + + + + +
+ {%= frappe.boot.letter_heads[frappe.defaults.get_default("letter_head")] %} +
+

{%= __(report.report_name) %}

+

{%= filters.item %}

+ +
+ + + + {% for(var i=0, l=report.columns.length; i{%= report.columns[i].label %} + {% } %} + + + + + + {% for(var i=0, l=data.length; i + + {% for(var j=0,m=report.columns.length; j{%= data[i][report.columns[j].field] %} + {% } %} + + + {% } %} + +
+ +

Analysis Chart

+
+ + + +

Printed On {%= dateutil.str_to_user(dateutil.get_datetime_as_string()) %}

\ No newline at end of file From fe11e71084873fa162135949a88ddf3a49adaa99 Mon Sep 17 00:00:00 2001 From: Ben Cornwell-Mott Date: Fri, 22 Jul 2016 10:02:41 -0700 Subject: [PATCH 2/3] Removed hover tooltip --- .../report/quoted_item_comparison/quoted_item_comparison.html | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.html b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.html index 4cc54db7eaf..aff388af4a9 100644 --- a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.html +++ b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.html @@ -64,6 +64,7 @@ width: 652, height: 450, isStacked: false, + enableInteractivity: false, hAxis: {logScale: true, minValue: 1,viewWindow:{ min: 1 } } }; From 590d2d524b6d8f8f4b63c8e30c8d3bd23d1192a7 Mon Sep 17 00:00:00 2001 From: Ben Cornwell-Mott Date: Mon, 25 Jul 2016 18:03:01 -0700 Subject: [PATCH 3/3] Updated html file to use c3.js instead of Google Charts --- .../quoted_item_comparison.html | 135 ++++++++++-------- 1 file changed, 78 insertions(+), 57 deletions(-) diff --git a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.html b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.html index aff388af4a9..e26636ea773 100644 --- a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.html +++ b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.html @@ -1,75 +1,96 @@ - + + + + + + + @@ -104,7 +125,7 @@

Analysis Chart

-
+