From 17ea638e6db9cbe863ead490cf5db0476ef8ce35 Mon Sep 17 00:00:00 2001 From: mreficent Date: Wed, 20 Mar 2019 17:48:27 +0100 Subject: [PATCH] [MIG] web_widget_bokeh_chart: Migration to 12.0 --- requirements.txt | 2 ++ web_widget_bokeh_chart/README.rst | 23 ++++++++-------- web_widget_bokeh_chart/__init__.py | 1 + web_widget_bokeh_chart/__manifest__.py | 6 ++--- .../readme/CONTRIBUTORS.rst | 3 +++ web_widget_bokeh_chart/readme/CREDITS.rst | 4 +++ web_widget_bokeh_chart/readme/DESCRIPTION.rst | 16 ++++++++++++ web_widget_bokeh_chart/readme/INSTALL.rst | 3 +++ web_widget_bokeh_chart/readme/USAGE.rst | 26 +++++++++++++++++++ .../custom-bokeh.scss} | 2 +- .../views/web_widget_bokeh_chart.xml | 6 ++--- 11 files changed, 74 insertions(+), 18 deletions(-) create mode 100644 requirements.txt create mode 100644 web_widget_bokeh_chart/readme/CONTRIBUTORS.rst create mode 100644 web_widget_bokeh_chart/readme/CREDITS.rst create mode 100644 web_widget_bokeh_chart/readme/DESCRIPTION.rst create mode 100644 web_widget_bokeh_chart/readme/INSTALL.rst create mode 100644 web_widget_bokeh_chart/readme/USAGE.rst rename web_widget_bokeh_chart/static/src/{less/custom-bokeh.less => scss/custom-bokeh.scss} (99%) 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 6e17ed60..10d9c9a5 100644 --- a/web_widget_bokeh_chart/README.rst +++ b/web_widget_bokeh_chart/README.rst @@ -1,11 +1,12 @@ -.. image:: https://img.shields.io/badge/licence-LGPL--3-blue.svg - :alt: License LGPL-3 +.. image:: https://img.shields.io/badge/license-LGPL--3-blue.png + :target: https://www.gnu.org/licenses/lgpl + :alt: License: LGPL-3 ====================== Web Widget Bokeh Chart ====================== -This module add the posibility to insert Bokeh charts into Odoo standard views. +This module add the possibility to insert Bokeh charts into Odoo standard views. .. image:: /web_widget_bokeh_chart/static/description/example.png :alt: Bokeh Chart inserted into an Odoo view @@ -27,7 +28,7 @@ Installation You need to install the python bokeh library:: - pip install bokeh==0.12.7 + pip3 install bokeh==0.12.7 Usage ===== @@ -62,10 +63,10 @@ To insert a Bokeh chart in a view proceed as follows: Bug Tracker =========== -Bugs are tracked on `GitHub Issues `_. -In case of trouble, please check there if your issue has already been -reported. If you spotted it first, help us smash it by providing detailed and -welcomed feedback. +Bugs are tracked on `GitHub Issues +`_. In case of trouble, please +check there if your issue has already been reported. If you spotted it first, +help us smash it by providing detailed and welcomed feedback. Credits ======= @@ -85,9 +86,9 @@ Contributors Maintainer ---------- -.. image:: http://odoo-community.org/logo.png +.. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association - :target: http://odoo-community.org + :target: https://odoo-community.org This module is maintained by the OCA. @@ -95,4 +96,4 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -To contribute to this module, please visit http://odoo-community.org. +To contribute to this module, please visit https://odoo-community.org. diff --git a/web_widget_bokeh_chart/__init__.py b/web_widget_bokeh_chart/__init__.py index e69de29b..b9a9d2d7 100644 --- a/web_widget_bokeh_chart/__init__.py +++ b/web_widget_bokeh_chart/__init__.py @@ -0,0 +1 @@ +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). diff --git a/web_widget_bokeh_chart/__manifest__.py b/web_widget_bokeh_chart/__manifest__.py index 69cbddd3..8137fc37 100644 --- a/web_widget_bokeh_chart/__manifest__.py +++ b/web_widget_bokeh_chart/__manifest__.py @@ -1,5 +1,5 @@ # Copyright 2017 Eficent Business and IT Consulting Services S.L. -# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).# +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). { "name": "Web Widget Bokeh Chart", @@ -7,7 +7,7 @@ "summary": "This widget allows to display charts using Bokeh library.", "author": "Eficent, " "Odoo Community Association (OCA)", - "version": "11.0.1.1.0", + "version": "12.0.1.0.0", "website": "https://github.com/OCA/web", "depends": ["web"], "data": [ @@ -17,5 +17,5 @@ "python": ['bokeh'], }, "auto_install": False, - "license": "AGPL-3", + "license": "LGPL-3", } diff --git a/web_widget_bokeh_chart/readme/CONTRIBUTORS.rst b/web_widget_bokeh_chart/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..a3c9f9c4 --- /dev/null +++ b/web_widget_bokeh_chart/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* Jordi Ballester Alomar +* Lois Rilo Antelo +* Artem Kostyuk diff --git a/web_widget_bokeh_chart/readme/CREDITS.rst b/web_widget_bokeh_chart/readme/CREDITS.rst new file mode 100644 index 00000000..bf90244f --- /dev/null +++ b/web_widget_bokeh_chart/readme/CREDITS.rst @@ -0,0 +1,4 @@ +* This module uses the library `Bokeh `__ + which is under the open-source BSD 3-clause "New" or "Revised" License. + Copyright (c) 2012, Anaconda, Inc. +* Odoo Community Association (OCA) diff --git a/web_widget_bokeh_chart/readme/DESCRIPTION.rst b/web_widget_bokeh_chart/readme/DESCRIPTION.rst new file mode 100644 index 00000000..fe1d5c48 --- /dev/null +++ b/web_widget_bokeh_chart/readme/DESCRIPTION.rst @@ -0,0 +1,16 @@ +This module add the possibility to insert Bokeh charts into Odoo standard views. + +.. image:: /web_widget_bokeh_chart/static/description/example.png + :alt: Bokeh Chart inserted into an Odoo view + :width: 600 px + +`Bokeh `__ is a Python interactive visualization +library that targets modern web browsers for presentation. Its goal is to +provide elegant, concise construction of basic exploratory and advanced +custom graphics in the style of D3.js, but also deliver this capability with +high-performance interactivity over very large or streaming datasets. Bokeh +can help anyone who would like to quickly and easily create interactive +plots, dashboards, and data applications. + +If you want to see some samples of bokeh's capabilities follow this `link +`_. diff --git a/web_widget_bokeh_chart/readme/INSTALL.rst b/web_widget_bokeh_chart/readme/INSTALL.rst new file mode 100644 index 00000000..f4983766 --- /dev/null +++ b/web_widget_bokeh_chart/readme/INSTALL.rst @@ -0,0 +1,3 @@ +You need to install the python bokeh library:: + + pip3 install bokeh==0.12.7 diff --git a/web_widget_bokeh_chart/readme/USAGE.rst b/web_widget_bokeh_chart/readme/USAGE.rst new file mode 100644 index 00000000..dc86cbc3 --- /dev/null +++ b/web_widget_bokeh_chart/readme/USAGE.rst @@ -0,0 +1,26 @@ +To insert a Bokeh chart in a view proceed as follows: + +#. Declare a text computed field like this:: + + bokeh_chart = fields.Text( + string='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() # import that as `from bokeh.plotting import figure` + line = p.line([0, 2], [1, 8], line_width=5) + # (...) + # `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:: + +
+ +
diff --git a/web_widget_bokeh_chart/static/src/less/custom-bokeh.less b/web_widget_bokeh_chart/static/src/scss/custom-bokeh.scss similarity index 99% rename from web_widget_bokeh_chart/static/src/less/custom-bokeh.less rename to web_widget_bokeh_chart/static/src/scss/custom-bokeh.scss index 1644a4ab..eb7bfb6f 100644 --- a/web_widget_bokeh_chart/static/src/less/custom-bokeh.less +++ b/web_widget_bokeh_chart/static/src/scss/custom-bokeh.scss @@ -31,4 +31,4 @@ height: inherit !important; width: inherit !important; } -} \ No newline at end of file +} diff --git a/web_widget_bokeh_chart/views/web_widget_bokeh_chart.xml b/web_widget_bokeh_chart/views/web_widget_bokeh_chart.xml index bb62f58a..5d66fe64 100644 --- a/web_widget_bokeh_chart/views/web_widget_bokeh_chart.xml +++ b/web_widget_bokeh_chart/views/web_widget_bokeh_chart.xml @@ -4,9 +4,9 @@