Skip to content

Commit

Permalink
minor revisions, better example code.
Browse files Browse the repository at this point in the history
  • Loading branch information
timrichardson committed Oct 3, 2013
1 parent c9c12ac commit ce56647
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 8 deletions.
3 changes: 3 additions & 0 deletions controllers/plugin_google_chart.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,6 @@ def plugin_return_data():
["2007",1500,800],["2008",1600,850],["2009",1800,900]]
return dict(data=data)


def plugin_usage_example():
return dict()
18 changes: 10 additions & 8 deletions views/default/index.html
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@

{{extend 'layout.html'}}
<!-- need to source this in any view which has a LOAD chart -->
<script src="https://www.google.com/jsapi" type="text/javascript"></script>

<!-- In this example, the same data is used for both charts so the data_url is set only once -->
<!-- Here, data and options same for both charts -->
<!-- user_signature works if using logged-in users ... not well tested -->
{{ data_url = URL('plugin_google_chart','plugin_return_data.json',user_signature=True)}}
<div class="span6">
{{
{{ data_url = URL('plugin_google_chart','plugin_return_data.json',user_signature=True)
#options are documented at https://developers.google.com/chart/
options ={'title':'Sales vs Expenses','width':0,'height':0}
}}
}}

<div class="span6">
{{=LOAD('plugin_google_chart','plugin_google_chart.load',ajax=True,
user_signature=True,vars={'type':'bar','data_url':data_url,
'options_dict':options})}}
'options_dict':options})
}}
</div>

<div class="span6">
{{=LOAD('plugin_google_chart','plugin_google_chart.load',user_signature=True,ajax=True,
vars={'type':'column','data_url':data_url,'options_dict':options})}}
vars={'type':'column','data_url':data_url,'options_dict':options})
}}
</div>
24 changes: 24 additions & 0 deletions views/plugin_google_chart/plugin_usage_example.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@

{{extend 'layout.html'}}
<!-- need to source this in any view which has a LOAD chart -->
<script src="https://www.google.com/jsapi" type="text/javascript"></script>

<!-- Here, data and options same for both charts -->
<!-- user_signature works if using logged-in users ... not well tested -->
{{ data_url = URL('plugin_google_chart','plugin_return_data.json',user_signature=True)
#options are documented at https://developers.google.com/chart/
options ={'title':'Sales vs Expenses','width':0,'height':0}
}}

<div class="span6">
{{=LOAD('plugin_google_chart','plugin_google_chart.load',ajax=True,
user_signature=True,vars={'type':'bar','data_url':data_url,
'options_dict':options})
}}
</div>

<div class="span6">
{{=LOAD('plugin_google_chart','plugin_google_chart.load',user_signature=True,ajax=True,
vars={'type':'column','data_url':data_url,'options_dict':options})
}}
</div>

0 comments on commit ce56647

Please sign in to comment.