diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..ef1c2b95 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +# web_widget_bokeh_chart +bokeh==0.12.7 diff --git a/web_widget_bokeh_chart/README.rst b/web_widget_bokeh_chart/README.rst index e4e7ddf2..6e17ed60 100644 --- a/web_widget_bokeh_chart/README.rst +++ b/web_widget_bokeh_chart/README.rst @@ -38,19 +38,19 @@ To insert a Bokeh chart in a view proceed as follows: bokeh_chart = fields.Text( string='Bokeh Chart', - compute=_compute_bokeh_chart) + compute='_compute_bokeh_chart', + ) #. In its computed method do:: def _compute_bokeh_chart(self): for rec in self: # Design your bokeh figure: - p = figure() + p = figure() # import that as `from bokeh.plotting import figure` line = p.line([0, 2], [1, 8], line_width=5) # (...) - # Get the html components and convert them to string into the field. - script, div = components(p) - rec.bokeh_chart = '%s%s' % (div, script) + # `p.html.data` contains both markup and the script of a chart. + rec.bokeh_chart = p.html.data #. In the view, add something like this wherever you want to display your bokeh chart:: @@ -80,6 +80,7 @@ Contributors * Jordi Ballester Alomar * Lois Rilo Antelo +* Artem Kostyuk Maintainer ---------- diff --git a/web_widget_bokeh_chart/__init__.py b/web_widget_bokeh_chart/__init__.py index 40a96afc..e69de29b 100644 --- a/web_widget_bokeh_chart/__init__.py +++ b/web_widget_bokeh_chart/__init__.py @@ -1 +0,0 @@ -# -*- coding: utf-8 -*- diff --git a/web_widget_bokeh_chart/__manifest__.py b/web_widget_bokeh_chart/__manifest__.py index f2550631..493965e4 100644 --- a/web_widget_bokeh_chart/__manifest__.py +++ b/web_widget_bokeh_chart/__manifest__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2017 Eficent Business and IT Consulting Services S.L. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).# @@ -8,7 +7,7 @@ "summary": "This widget allows to display charts using Bokeh library.", "author": "Eficent, " "Odoo Community Association (OCA)", - "version": "10.0.1.0.0", + "version": "11.0.1.0.0", "website": "https://github.com/OCA/web", "depends": ["web"], "data": [ diff --git a/web_widget_bokeh_chart/static/src/js/web_widget_bokeh_chart.js b/web_widget_bokeh_chart/static/src/js/web_widget_bokeh_chart.js index f2523c5e..b96b1798 100644 --- a/web_widget_bokeh_chart/static/src/js/web_widget_bokeh_chart.js +++ b/web_widget_bokeh_chart/static/src/js/web_widget_bokeh_chart.js @@ -1,20 +1,16 @@ odoo.define('web_widget_bokeh_chart', function (require) { "use strict"; - var core = require('web.core'); - var form_common = require('web.form_common'); - var formats = require('web.formats'); - var Model = require('web.Model'); + var fieldRegistry = require('web.field_registry'); + var AbstractField = require('web.AbstractField'); - var QWeb = core.qweb; - - var BokehChartWidget = form_common.AbstractField.extend({ - render_value: function() { - var val = this.get('value'); + var BokehChartWidget = AbstractField.extend({ + start: function() { + var val = this.value; this.$el.html(val); } }); - core.form_widget_registry.add('bokeh_chart', BokehChartWidget); + fieldRegistry.add('bokeh_chart', BokehChartWidget); return { BokehChartWidget: BokehChartWidget };