3
0
Fork 0

[IMP] web_widget_json_graph: black, isort, prettier

15.0-ocabot-merge-pr-2789-by-pedrobaeza-bump-patch
Francisco Javier Luna Vazquez 2022-05-19 15:51:00 -05:00
parent dd30b9b249
commit b9c1cae096
6 changed files with 42 additions and 31 deletions

View File

@ -0,0 +1 @@
../../../../web_widget_json_graph

View File

@ -0,0 +1,6 @@
import setuptools
setuptools.setup(
setup_requires=['setuptools-odoo'],
odoo_addon=True,
)

View File

@ -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);
});

View File

@ -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;
}

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8" ?>
<odoo>
<t t-name="JSONGraph">
<div class="oe_form_field_json_graph">
<div class="nv_content">
<svg/>
<svg />
</div>
</div>
</t>

View File

@ -1,10 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<template id="assets_backend" name="web_widget_json_graph assets" inherit_id="web.assets_backend">
<template
id="assets_backend"
name="web_widget_json_graph assets"
inherit_id="web.assets_backend"
>
<xpath expr="." position="inside">
<script type="text/javascript" src="/web_widget_json_graph/static/src/js/web_widget_json_graph.js"></script>
<link rel="stylesheet" type="text/scss" href="/web_widget_json_graph/static/src/scss/web_widget_json_graph.scss"/>
<script
type="text/javascript"
src="/web_widget_json_graph/static/src/js/web_widget_json_graph.js"
/>
<link
rel="stylesheet"
type="text/scss"
href="/web_widget_json_graph/static/src/scss/web_widget_json_graph.scss"
/>
</xpath>
</template>