diff --git a/web_graph_improved/README.md b/web_graph_improved/README.md deleted file mode 100644 index e9632a4073c3..000000000000 --- a/web_graph_improved/README.md +++ /dev/null @@ -1,15 +0,0 @@ -Charts, Improved. -================= - -Improve the charting capabilities of Odoo. - -Implemented features: - * Plot multiple variables (called measures in the odoo client) with bar charts - using grouped bars. - -Planned: - * Plot multiple measures on line charts - * Scatter/Bubble chart - * Sunburst ("grouped Pie chart") - * Bullet Chart - * Stacked bar chart diff --git a/web_graph_improved/__init__.py b/web_graph_improved/__init__.py deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/web_graph_improved/__openerp__.py b/web_graph_improved/__openerp__.py deleted file mode 100644 index a131e4f2456f..000000000000 --- a/web_graph_improved/__openerp__.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# Author: Leonardo Donelli @ Creativi Quadrati -# Copyright (C) 2014 Leonardo Donelli -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -{ - 'name': 'Better Charts', - 'version': '8.0.0.1.0', - 'category': 'Web', - 'summary': 'Improves graph views.', - 'author': "Leonardo Donelli,Odoo Community Association (OCA)", - 'license': 'AGPL-3', - 'website': 'http://learts.glaucus.in', - 'depends': ['web_graph'], - 'data': ['view/graph_improved_view.xml'], - 'installable': False, - 'auto_install': False, -} diff --git a/web_graph_improved/static/description/icon.png b/web_graph_improved/static/description/icon.png deleted file mode 100644 index 3a0328b516c4..000000000000 Binary files a/web_graph_improved/static/description/icon.png and /dev/null differ diff --git a/web_graph_improved/static/src/js/web_graph_improved.js b/web_graph_improved/static/src/js/web_graph_improved.js deleted file mode 100644 index 56cfc5750c0b..000000000000 --- a/web_graph_improved/static/src/js/web_graph_improved.js +++ /dev/null @@ -1,82 +0,0 @@ -openerp.web_graph_improved = function(instance) { - - instance.web_graph.Graph.include({ - bar: function() { - var self = this, - dim_x = this.pivot.rows.groupby.length, - dim_y = this.pivot.cols.groupby.length, - show_controls = (this.width > 400 && this.height > 300 && dim_x + dim_y >=2), - data; - - // No groupby - if ((dim_x === 0) && (dim_y === 0)) { - data = [{key: _t('Total'), values:[{ - x: _t('Total'), - y: this.pivot.get_total()[0], - }]}]; - // Only column groupbys - } else if ((dim_x === 0) && (dim_y >= 1)){ - data = _.map(this.pivot.get_cols_with_depth(1), function (header) { - return { - key: header.title, - values: [{x:header.title, y: self.pivot.get_total(header)[0]}] - }; - }); - // Just 1 row groupby - } else if ((dim_x === 1) && (dim_y === 0)) { - data = _.map(self.pivot.measures, function(measure, i) { - var series = _.map(self.pivot.main_row().children, function (pt) { - var value = self.pivot.get_total(pt)[i], - title = (pt.title !== undefined) ? pt.title : _t('Undefined'); - return {x: title, y: value}; - }); - return {key: self.pivot.measures[i].string, values:series}; - }); - // 1 row groupby and some col groupbys - } else if ((dim_x === 1) && (dim_y >= 1)) { - data = _.map(this.pivot.get_cols_with_depth(1), function (colhdr) { - var values = _.map(self.pivot.get_rows_with_depth(1), function (header) { - return { - x: header.title || _t('Undefined'), - y: self.pivot.get_values(header.id, colhdr.id)[0] || 0 - }; - }); - return {key: colhdr.title || _t('Undefined'), values: values}; - }); - // At least two row groupby - } else { - var keys = _.uniq(_.map(this.pivot.get_rows_with_depth(2), function (hdr) { - return hdr.title || _t('Undefined'); - })); - data = _.map(keys, function (key) { - var values = _.map(self.pivot.get_rows_with_depth(1), function (hdr) { - var subhdr = _.find(hdr.children, function (child) { - return ((child.title === key) || ((child.title === undefined) && (key === _t('Undefined')))); - }); - return { - x: hdr.title || _t('Undefined'), - y: (subhdr) ? self.pivot.get_total(subhdr)[0] : 0 - }; - }); - return {key:key, values: values}; - }); - } - - nv.addGraph(function () { - var chart = nv.models.multiBarChart() - .stacked(self.bar_ui === 'stack') - .showControls(show_controls); - - d3.select(self.svg) - .datum(data) - .attr('width', self.width) - .attr('height', self.height) - .call(chart); - - nv.utils.windowResize(chart.update); - return chart; - }); - - } - }); -} diff --git a/web_graph_improved/view/graph_improved_view.xml b/web_graph_improved/view/graph_improved_view.xml deleted file mode 100644 index 5131e37f1925..000000000000 --- a/web_graph_improved/view/graph_improved_view.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - -