Skip to content

Does not support dict title [#34] #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Does not support dict title [#34] #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90344f9
Does not support dict title [#34]
llby May 7, 2016
52e2224
Does not support dict title [#34]
llby May 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pandas_highcharts/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,10 @@ def serialize_subtitle(df, output, *args, **kwargs):

def serialize_title(df, output, *args, **kwargs):
if "title" in kwargs:
output["title"] = {"text": kwargs["title"]}
if isinstance(kwargs["title"], dict):
output["title"] = kwargs["title"]
else:
output["title"] = {"text": kwargs["title"]}

def serialize_tooltip(df, output, *args, **kwargs):
if 'tooltip' in kwargs:
Expand Down
10 changes: 9 additions & 1 deletion pandas_highcharts/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
{'a': 2, 'b': 4, 'c': 6, 't': datetime.datetime(2015, 1, 2), 's': 's2'}
])


class CoreTest(TestCase):
def test_type(self):
self.assertEqual(type(serialize(df, render_to="chart")), str)
Expand Down Expand Up @@ -74,6 +73,13 @@ def test_type(self):
for yaxis in obj.get('yAxis', []):
self.assertTrue(yaxis.get('tickPositions'))

obj = serialize(df, render_to="chart", output_type="dict", title={"text": 'Chart',"x": -20}, xticks=[1], yticks=[2])
self.assertTrue(obj.get('title', {}).get('text'))
self.assertTrue(obj.get('title', {}).get('x'))
self.assertTrue(obj.get('xAxis', {}).get('tickPositions'))
for yaxis in obj.get('yAxis', []):
self.assertTrue(yaxis.get('tickPositions'))

obj = serialize(df, render_to="chart", output_type="dict", fontsize=12, kind='pie', x='s', y=['a'], tooltip={'pointFormat': '{series.name}: <b>{point.percentage:.1f}%</b>'})
self.assertTrue(obj.get('tooltip'))

Expand All @@ -97,3 +103,5 @@ def test_jsonencoder(self):
self.assertEqual(json_encode(datetime.date(2015, 1, 1)), "1420070400000")
self.assertEqual(json_encode(datetime.datetime(2015, 1, 1)), "1420070400000")
self.assertEqual(json_encode(pandas.tslib.Timestamp(1420070400000000000)), "1420070400000")