diff --git a/setup/web_widget_json_graph/odoo/addons/web_widget_json_graph b/setup/web_widget_json_graph/odoo/addons/web_widget_json_graph new file mode 120000 index 000000000..83f4c9df3 --- /dev/null +++ b/setup/web_widget_json_graph/odoo/addons/web_widget_json_graph @@ -0,0 +1 @@ +../../../../web_widget_json_graph \ No newline at end of file diff --git a/setup/web_widget_json_graph/setup.py b/setup/web_widget_json_graph/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/web_widget_json_graph/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) diff --git a/web_widget_json_graph/static/src/js/web_widget_json_graph.js b/web_widget_json_graph/static/src/js/web_widget_json_graph.js index 65ab6e6de..b6f103a6b 100644 --- a/web_widget_json_graph/static/src/js/web_widget_json_graph.js +++ b/web_widget_json_graph/static/src/js/web_widget_json_graph.js @@ -1,52 +1,45 @@ -odoo.define('web.web_widget_json_graph', function (require) { +odoo.define("web.web_widget_json_graph", function (require) { "use strict"; - var AbstractField = require('web.AbstractField'); - var field_registry = require('web.field_registry'); + var AbstractField = require("web.AbstractField"); + var field_registry = require("web.field_registry"); var JSONGraphWidget = AbstractField.extend({ - template: 'JSONGraph', - cssLibs: [ - '/web/static/lib/nvd3/nv.d3.css' - ], + template: "JSONGraph", + cssLibs: ["/web/static/lib/nvd3/nv.d3.css"], jsLibs: [ - '/web/static/lib/nvd3/d3.v3.js', - '/web/static/lib/nvd3/nv.d3.js', - '/web/static/src/js/libs/nvd3.js' + "/web/static/lib/nvd3/d3.v3.js", + "/web/static/lib/nvd3/nv.d3.js", + "/web/static/src/js/libs/nvd3.js", ], _render: function () { var info = JSON.parse(this.value); - /*jsl:ignore*/ + /* Jsl:ignore*/ /* Ignoring lint erros caused by nv and d3 variables from NVD3.js */ if (info) { nv.addGraph(function () { - var chart = nv.models.lineChart() - .useInteractiveGuideline(true); - chart.xAxis - .axisLabel(info.label_x) - .tickFormat(d3.format(',r')); + var chart = nv.models.lineChart().useInteractiveGuideline(true); + chart.xAxis.axisLabel(info.label_x).tickFormat(d3.format(",r")); - chart.yAxis - .axisLabel(info.label_y) - .tickFormat(d3.format('.02f')); + chart.yAxis.axisLabel(info.label_y).tickFormat(d3.format(".02f")); - d3.select('.nv_content svg') + d3.select(".nv_content svg") .datum(info.data) - .transition().duration(500) + .transition() + .duration(500) .call(chart); nv.utils.windowResize(chart.update); return chart; }); } - /*jsl:end*/ + /* Jsl:end*/ }, _destroy: function () { return this._super(); }, }); - field_registry.add('json_graph', JSONGraphWidget); - + field_registry.add("json_graph", JSONGraphWidget); }); diff --git a/web_widget_json_graph/static/src/scss/web_widget_json_graph.scss b/web_widget_json_graph/static/src/scss/web_widget_json_graph.scss index 56ca90b24..33334a70e 100644 --- a/web_widget_json_graph/static/src/scss/web_widget_json_graph.scss +++ b/web_widget_json_graph/static/src/scss/web_widget_json_graph.scss @@ -20,7 +20,7 @@ stroke-width: 1.5px; } - .oe_list_content>tbody>tr>td.oe_list_field_cell { + .oe_list_content > tbody > tr > td.oe_list_field_cell { white-space: normal; } diff --git a/web_widget_json_graph/static/src/xml/web_widget_json_graph.xml b/web_widget_json_graph/static/src/xml/web_widget_json_graph.xml index 0e983967d..b4f7597f1 100644 --- a/web_widget_json_graph/static/src/xml/web_widget_json_graph.xml +++ b/web_widget_json_graph/static/src/xml/web_widget_json_graph.xml @@ -1,9 +1,9 @@ - +
- +
diff --git a/web_widget_json_graph/views/assets.xml b/web_widget_json_graph/views/assets.xml index 933c38736..93326ab67 100644 --- a/web_widget_json_graph/views/assets.xml +++ b/web_widget_json_graph/views/assets.xml @@ -1,10 +1,21 @@ - + -