From 38a4157ac670a1bf291f49bd7732ce9ffaceca79 Mon Sep 17 00:00:00 2001
From: Patrick Leo Tardif <plt@rdif.me>
Date: Mon, 9 Nov 2015 18:30:55 -0800
Subject: [PATCH] Adding y-axis format option

---
 panoramix/forms.py                   | 2 ++
 panoramix/static/widgets/viz_nvd3.js | 3 +++
 panoramix/viz.py                     | 1 +
 3 files changed, 6 insertions(+)

diff --git a/panoramix/forms.py b/panoramix/forms.py
index 2f204a1a50c83..3527598024b9b 100644
--- a/panoramix/forms.py
+++ b/panoramix/forms.py
@@ -130,6 +130,8 @@ def __init__(self, viz):
                 description="Based on granularity, number of time periods to compare against"),
             'compare_suffix': TextField('Comparison suffix',
                 description="Suffix to apply after the percentage display"),
+            'y_axis_format': TextField('Y axis format',
+                description="D3 format syntax for y axis"),
             'markup_type': SelectField(
                 "Markup Type",
                 choices=self.choicify(['markdown', 'html']),
diff --git a/panoramix/static/widgets/viz_nvd3.js b/panoramix/static/widgets/viz_nvd3.js
index 29ec245ad810d..4a3b00d424200 100644
--- a/panoramix/static/widgets/viz_nvd3.js
+++ b/panoramix/static/widgets/viz_nvd3.js
@@ -137,6 +137,9 @@ function viz_nvd3(data_attribute) {
         if (viz.form_data.x_log_scale) {
           chart.xScale(d3.scale.log());
         }
+        if (viz.form_data.y_axis_format) {
+          chart.yAxis.tickFormat(d3.format(viz.form_data.y_axis_format));
+        }
 
         chart.duration(0);
 
diff --git a/panoramix/viz.py b/panoramix/viz.py
index 80e575ef20385..4295a4a35891d 100644
--- a/panoramix/viz.py
+++ b/panoramix/viz.py
@@ -420,6 +420,7 @@ class NVD3TimeSeriesViz(NVD3Viz):
         ('show_brush', 'show_legend'),
         ('rich_tooltip', 'y_axis_zero'),
         ('y_log_scale', 'contribution'),
+        'y_axis_format'
     ]
 
     def get_df(self, query_obj=None):