X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fweb_graph%2Fstatic%2Fsrc%2Fjs%2Fgraph.js;h=8a7ac4811b6cf35aa331882930ef14e2287eaaec;hb=457090c1a3bbf4931ef3579cc7ca6d4a6c5765b3;hp=46c739121f968e6e7e71af06d193b1c5b9205b7f;hpb=3e607e8e3c9809a4279d96727a46887eebeeb69c;p=odoo%2Fodoo.git diff --git a/addons/web_graph/static/src/js/graph.js b/addons/web_graph/static/src/js/graph.js index 46c7391..8a7ac48 100644 --- a/addons/web_graph/static/src/js/graph.js +++ b/addons/web_graph/static/src/js/graph.js @@ -4,7 +4,6 @@ /* jshint undef: false */ - openerp.web_graph = function (instance) { 'use strict'; @@ -14,106 +13,113 @@ var QWeb = instance.web.qweb; instance.web.views.add('graph', 'instance.web_graph.GraphView'); - /** - * GraphView view. It mostly contains two widgets (PivotTable and ChartView) - * and some data. - */ instance.web_graph.GraphView = instance.web.View.extend({ - template: 'GraphView', display_name: _lt('Graph'), view_type: 'graph', - mode: 'pivot', // pivot => display pivot table, chart => display chart - events: { - 'click .graph_mode_selection li' : function (event) { - event.preventDefault(); - var view_mode = event.target.attributes['data-mode'].nodeValue; - if (view_mode === 'data') { - this.mode = 'pivot'; - } else { - this.mode = 'chart'; - this.chart_view.set_mode(view_mode); - } - this.display_data(); - }, + init: function(parent, dataset, view_id, options) { + this._super(parent); + this.dataset = dataset; + this.model = new instance.web.Model(dataset.model, {group_by_no_leaf: true}); + this.search_view = parent.searchview; + this.search_view_groupby = []; + this.groupby_mode = 'default'; // 'default' or 'manual' + this.default_row_groupby = []; + this.default_col_groupby = []; + this.search_field = { + get_context: this.proxy('get_context'), + get_domain: function () {}, + get_groupby: function () { }, + }; + }, + + get_context: function (facet) { + var col_group_by = _.map(facet.values.models, function (model) { + return model.attributes.value.attrs.context.col_group_by; + }); + return {col_group_by : col_group_by}; + }, + + start: function () { + var options = {enabled:false}; + this.graph_widget = new openerp.web_graph.Graph(this, this.model, options); + this.graph_widget.appendTo(this.$el); + this.graph_widget.pivot.on('groupby_changed', this, this.proxy('register_groupby')); + return this.load_view(); }, view_loading: function (fields_view_get) { - var self = this; - var model = new instance.web.Model(fields_view_get.model, {group_by_no_leaf: true}); - var options = {}; - options.domain = []; - options.col_groupby = []; - - // get the default groupbys and measure defined in the field view - options.measure = null; - options.row_groupby = []; - _.each(fields_view_get.arch.children, function (field) { - if ('name' in field.attrs) { + var self = this, + arch = fields_view_get.arch, + measure = null, + stacked = false; + + if (arch.attrs.type === 'bar' || !_.has(arch.attrs, 'type')) { + this.graph_widget.mode = 'bar_chart'; + } + if (arch.attrs.stacked === 'True') { + stacked = true; + } + + _.each(arch.children, function (field) { + if (_.has(field.attrs, 'type')) { + switch (field.attrs.type) { + case 'row': + self.default_row_groupby.push(field.attrs.name); + break; + case 'col': + self.default_col_groupby.push(field.attrs.name); + break; + case 'measure': + measure = field.attrs.name; + break; + } + } else { // old style, kept for backward compatibility if ('operator' in field.attrs) { - options.measure = field.attrs.name; + measure = (measure) ? measure : field.attrs.name; } else { - options.row_groupby.push(field.attrs.name); + self.default_row_groupby.push(field.attrs.name); } } }); - - // get the most important fields (of the model) by looking at the - // groupby filters defined in the search view - options.important_fields = []; - var load_view = instance.web.fields_view_get({ - model: model, - view_type: 'search', + this.graph_widget.config({ + measure:measure, + update:false, + bar_ui: (stacked) ? 'stack' : 'group' }); + }, - var important_fields_def = $.when(load_view).then(function (search_view) { - var groups = _.select(search_view.arch.children, function (c) { - return (c.tag == 'group') && (c.attrs.string != 'Display'); - }); + do_search: function (domain, context, group_by) { + var col_groupby = context.col_group_by || [], + options = {domain:domain}; - _.each(groups, function(g) { - _.each(g.children, function (g) { - if (g.attrs.context) { - var field_id = py.eval(g.attrs.context).group_by; - options.important_fields.push(field_id); - } - }); - }); - }); + this.search_view_groupby = group_by; - // get the fields descriptions from the model - var field_descr_def = model.call('fields_get', []) - .then(function (fields) { options.fields = fields; }); - - - return $.when(important_fields_def, field_descr_def) - .then(function () { - self.pivot_table = new PivotTable(model, options); - self.chart_view = new ChartView(model, options); - }) - .then(function () { - return self.pivot_table.appendTo('.graph_main_content'); - }) - .then(function() { - return self.chart_view.appendTo('.graph_main_content'); - }); - }, + if (group_by.length && this.groupby_mode !== 'manual') { + if (_.isEqual(col_groupby, [])) { + col_groupby = this.default_col_groupby; + } + } + if (group_by.length || col_groupby.length) { + this.groupby_mode = 'manual'; + } + if (!this.graph_widget.enabled) { + options.update = false; + options.silent = true; + } - display_data : function () { - if (this.mode === 'pivot') { - this.chart_view.hide(); - this.pivot_table.show(); + if (this.groupby_mode === 'manual') { + options.row_groupby = group_by; + options.col_groupby = col_groupby; } else { - this.pivot_table.hide(); - this.chart_view.show(); + options.row_groupby = _.toArray(this.default_row_groupby); + options.col_groupby = _.toArray(this.default_col_groupby); } - }, + this.graph_widget.pivot.config(options); - do_search: function (domain, context, group_by) { - this.domain = new instance.web.CompoundDomain(domain); - this.pivot_table.set_domain(domain); - this.chart_view.set_domain(domain); - this.display_data(); + if (!this.graph_widget.enabled) { + this.graph_widget.activate_display(); + } }, do_show: function () { @@ -121,344 +127,530 @@ instance.web_graph.GraphView = instance.web.View.extend({ return this._super(); }, -}); - - /** - * BasicDataView widget. Basic widget to manage show/hide functionality - * and to initialize some attributes. It is inherited by PivotTable - * and ChartView widget. - */ -var BasicDataView = instance.web.Widget.extend({ - - need_redraw: false, - - // Input parameters: - // model: model to display - // fields: dictionary returned by field_get on model (desc of model) - // domain: constraints on model records - // row_groupby: groubys on rows (so, row headers in the pivot table) - // col_groupby: idem, but on col - // measure: quantity to display. either a field from the model, or - // null, in which case we use the "count" measure - init: function (model, options) { - this.model = model; - this.fields = options.fields; - this.domain = options.domain; - this.row_groupby = options.row_groupby; - this.col_groupby = options.col_groupby; - this.measure = options.measure; - this.measure_label = options.measure ? options.fields[options.measure].string : 'Quantity'; - this.data = []; - this.need_redraw = true; - this.important_fields = options.important_fields; - }, + register_groupby: function() { + var self = this, + query = this.search_view.query; - get_descr: function (field_id) { - return this.fields[field_id].string; - }, + this.groupby_mode = 'manual'; + if (_.isEqual(this.search_view_groupby, this.graph_widget.pivot.rows.groupby) || + (!_.has(this.search_view, '_s_groupby'))) { + return; + } + var rows = _.map(this.graph_widget.pivot.rows.groupby, function (group) { + return make_facet('GroupBy', group); + }); + var cols = _.map(this.graph_widget.pivot.cols.groupby, function (group) { + return make_facet('ColGroupBy', group); + }); - set_domain: function (domain) { - this.domain = domain; - this.need_redraw = true; + query.reset(rows.concat(cols)); + + function make_facet (category, fields) { + var values, + icon, + backbone_field, + cat_name; + if (!(fields instanceof Array)) { fields = [fields]; } + if (category === 'GroupBy') { + cat_name = 'group_by'; + icon = 'w'; + backbone_field = self.search_view._s_groupby; + } else { + cat_name = 'col_group_by'; + icon = 'f'; + backbone_field = self.search_field; + } + values = _.map(fields, function (field) { + var context = {}; + context[cat_name] = field; + return {label: self.graph_widget.fields[field].string, value: {attrs:{domain: [], context: context}}}; + }); + return {category:category, values: values, icon:icon, field: backbone_field}; + } }, +}); - set_row_groupby: function (row_groupby) { - this.row_groupby = row_groupby; - this.need_redraw = true; - }, +instance.web_graph.Graph = instance.web.Widget.extend({ + template: 'GraphWidget', - set_col_groupby: function (col_groupby) { - this.col_groupby = col_groupby; - this.need_redraw = true; + events: { + 'click .graph_mode_selection li' : 'mode_selection', + 'click .graph_measure_selection li' : 'measure_selection', + 'click .graph_options_selection li' : 'option_selection', + 'click .web_graph_click' : 'header_cell_clicked', + 'click a.field-selection' : 'field_selection', }, - set_measure: function (measure) { - this.measure = measure; - this.need_redraw = true; + init: function(parent, model, options) { + this._super(parent); + this.model = model; + this.important_fields = []; + this.measure_list = []; + this.fields = []; + this.pivot = new openerp.web_graph.PivotTable(model, []); + this.mode = 'pivot'; + if (_.has(options, 'mode')) { this.mode = mode; } + this.enabled = true; + if (_.has(options, 'enabled')) { this.enabled = options.enabled; } + this.visible_ui = true; + this.bar_ui = 'group'; // group or stack + this.config(options || {}); }, - show: function () { - if (this.need_redraw) { - this.draw(); - this.need_redraw = false; + // hide ui/show, stacked/grouped + config: function (options) { + if (_.has(options, 'visible_ui')) { + this.visible_ui = options.visible_ui; } - this.$el.css('display', 'block'); - }, - - hide: function () { - this.$el.css('display', 'none'); - }, - - draw: function() { - }, - - get_data: function (groupby) { - var view_fields = this.row_groupby.concat(this.measure, this.col_groupby); - return query_groups(this.model, view_fields, this.domain, groupby); + if (_.has(options, 'bar_ui')) { + this.bar_ui = options.bar_ui; + } + this.pivot.config(options); }, -}); - - /** - * PivotTable widget. It displays the data in tabular data and allows the - * user to drill down and up in the table - */ -var PivotTable = BasicDataView.extend({ - template: 'pivot_table', - rows: [], - cols: [], - current_row_id : 0, + start: function() { + var self = this; + this.table = $('
'); + this.$('.graph_main_content').append(this.table); + // get the most important fields (of the model) by looking at the + // groupby filters defined in the search view + var options = {model:this.model, view_type: 'search'}, + deferred1 = instance.web.fields_view_get(options).then(function (search_view) { + var groups = _.select(search_view.arch.children, function (c) { + return (c.tag == 'group') && (c.attrs.string != 'Display'); + }); + _.each(groups, function(g) { + _.each(g.children, function (g) { + if (g.attrs.context) { + var field_id = py.eval(g.attrs.context).group_by; + self.important_fields.push(field_id); + } + }); + }); + }); - events: { - 'click .graph_border > a' : function (event) { - var self = this; - event.preventDefault(); - - var dropdown_options = { - fields: _.map(this.important_fields, function (field) { - return {id: field, value: self.fields[field].string}; - }), - row_id: event.target.attributes['data-row-id'].nodeValue, - }; - - this.dropdown = $(QWeb.render('field_selection', dropdown_options)); - - $(event.target).after(this.dropdown); - $('.field-selection').next('.dropdown-menu').toggle(); - }, - 'click a.field-selection' : function (event) { - event.preventDefault(); - this.dropdown.remove(); - var row_id = event.target.attributes['data-row-id'].nodeValue; - var field_id = event.target.attributes['data-field-id'].nodeValue; - this.expand_row(row_id, field_id); - }, - }, + // get the fields descriptions and measure list from the model + var deferred2 = this.model.call('fields_get', []).then(function (fs) { + self.fields = fs; + var temp = _.map(fs, function (field, name) { + return {name:name, type: field.type}; + }); + temp = _.filter(temp, function (field) { + return (((field.type === 'integer') || (field.type === 'float')) && (field.name !== 'id')); + }); + self.measure_list = _.map(temp, function (field) { + return field.name; + }); - init: function (model, options) { - this._super(model, options); - }, + var measure_selection = self.$('.graph_measure_selection'); + _.each(self.measure_list, function (measure) { + var choice = $('').attr('data-choice', measure) + .attr('href', '#') + .append(self.fields[measure].string); + measure_selection.append($('
  • ').append(choice)); + }); + }); - generate_id: function () { - this.current_row_id += 1; - return this.current_row_id - 1; + return $.when(deferred1, deferred2).then(function () { + if (this.enabled) { + this.activate_display(); + } + }); }, - get_row: function (id) { - return _.find(this.rows, function(row) { - return (row.id == id); + activate_display: function () { + this.pivot.on('redraw_required', this, this.proxy('display_data')); + this.pivot.update_data(); + this.enabled = true; + instance.web.bus.on('click', this, function () { + if (this.dropdown) { + this.dropdown.remove(); + this.dropdown = null; + } }); }, - make_cell: function (content, options) { - var attrs = [''); - if (options && options.indent) { - _.each(_.range(options.indent), function () { - attrs.push(''); - }); + if (this.visible_ui) { + this.$('.graph_header').css('display', 'block'); + } else { + this.$('.graph_header').css('display', 'none'); } - if (options && options.foldable) { - attrs.push(' '); + if (this.pivot.no_data) { + var msg = 'No data available. Try to remove any filter or add some data.'; + this.table.append($('' + msg + '')); + } else { + var table_modes = ['pivot', 'heatmap', 'row_heatmap', 'col_heatmap']; + if (_.contains(table_modes, this.mode)) { + this.draw_table(); + } else { + this.$('.graph_main_content').append($('
    ')); + this.svg = this.$('.graph_main_content svg')[0]; + this.width = this.$el.width(); + this.height = Math.min(Math.max(document.documentElement.clientHeight - 116 - 60, 250), Math.round(0.8*this.$el.width())); + this[this.mode](); + } } - return attrs.join(' ') + content + ''; }, - make_row: function (data, parent_id) { - var has_parent = (parent_id !== undefined); - var parent = has_parent ? this.get_row(parent_id) : null; - var path = has_parent ? parent.path.concat(data.attributes.grouped_on) - : [data.attributes.grouped_on]; - + mode_selection: function (event) { + event.preventDefault(); + var mode = event.target.attributes['data-mode'].nodeValue; + this.mode = mode; + this.display_data(); + }, - var indent_level = has_parent ? parent.path.length : 0; + measure_selection: function (event) { + event.preventDefault(); + var measure = event.target.attributes['data-choice'].nodeValue; + var actual_measure = (measure === '__count') ? null : measure; + this.pivot.config({measure:actual_measure}); + }, + option_selection: function (event) { + event.preventDefault(); + switch (event.target.attributes['data-choice'].nodeValue) { + case 'swap_axis': + this.pivot.swap_axis(); + break; + case 'expand_all': + this.pivot.rows.headers = null; + this.pivot.cols.headers = null; + this.pivot.update_data(); + break; + case 'update_values': + this.pivot.update_data(); + break; + case 'export_data': + // Export code... To do... + break; + } + }, - var jquery_row = $(''); - var row_id = this.generate_id(); + header_cell_clicked: function (event) { + event.preventDefault(); + event.stopPropagation(); + var id = event.target.attributes['data-id'].nodeValue, + header = this.pivot.get_header(id), + self = this; - var header = $(this.make_cell(data.attributes.value[1], {is_border:true, indent: indent_level, foldable:true, row_id: row_id})); - jquery_row.html(header); - jquery_row.append(this.make_cell(data.attributes.aggregates[this.measure])); + if (header.is_expanded) { + this.pivot.fold(header); + } else { + if (header.path.length < header.root.groupby.length) { + var field = header.root.groupby[header.path.length]; + this.pivot.expand(id, field); + } else { + if (!this.important_fields.length) { + return; + } + var fields = _.map(this.important_fields, function (field) { + return {id: field, value: self.fields[field].string}; + }); + this.dropdown = $(QWeb.render('field_selection', {fields:fields, header_id:id})); + $(event.target).after(this.dropdown); + this.dropdown.css({position:'absolute', + left:event.pageX, + top:event.pageY}); + this.$('.field-selection').next('.dropdown-menu').toggle(); + } + } + }, - var row = { - id: row_id, - path: path, - value: data.attributes.value[1], - expanded: false, - parent: parent_id, - children: [], - html_tr: jquery_row, - domain: data.model._domain, - }; - this.rows.push(row); // to do, insert it properly + field_selection: function (event) { + var id = event.target.attributes['data-id'].nodeValue, + field_id = event.target.attributes['data-field-id'].nodeValue; + event.preventDefault(); + this.pivot.expand(id, field_id); + }, - if (has_parent) { - parent.children.push(row); - } - return row; +/****************************************************************************** + * Drawing pivot table methods... + ******************************************************************************/ + draw_table: function () { + this.pivot.rows.main.title = 'Total'; + this.pivot.cols.main.title = this.measure_label(); + this.draw_top_headers(); + _.each(this.pivot.rows.headers, this.proxy('draw_row')); }, - expand_row: function (row_id, field_id) { - var self = this; - var row = this.get_row(row_id); - this.row_groupby.push(field_id); - var visible_fields = this.row_groupby.concat(this.col_groupby, this.measure); - - query_groups(this.model, visible_fields, row.domain, [field_id]) - .then(function (data) { - _.each(data, function (datapt) { - var new_row = self.make_row(datapt, row_id); - row.html_tr.after(new_row.html_tr); - }); - row.expanded = true; - var icon = row.html_tr.find('.icon-plus-sign'); - icon.removeClass('icon-plus-sign') - .addClass('icon-minus-sign'); - }); + measure_label: function () { + return (this.pivot.measure) ? this.fields[this.pivot.measure].string : 'Quantity'; + }, + make_border_cell: function (colspan, rowspan) { + return $('').addClass('graph_border') + .attr('colspan', colspan) + .attr('rowspan', rowspan); }, - draw: function () { - this.get_data(this.row_groupby) - .then(this.proxy('build_table')) - .done(this.proxy('_draw')); + make_header_title: function (header) { + return $(' ') + .addClass('web_graph_click') + .attr('href', '#') + .addClass((header.is_expanded) ? 'fa fa-minus-square' : 'fa fa-plus-square') + .append((header.title !== undefined) ? header.title : 'Undefined'); }, - build_table: function (data) { - var self = this; + draw_top_headers: function () { + var self = this, + pivot = this.pivot, + height = _.max(_.map(pivot.cols.headers, function(g) {return g.path.length;})), + header_cells = [[this.make_border_cell(1, height)]]; + + function set_dim (cols) { + _.each(cols.children, set_dim); + if (cols.children.length === 0) { + cols.height = height - cols.path.length + 1; + cols.width = 1; + } else { + cols.height = 1; + cols.width = _.reduce(cols.children, function (sum,c) { return sum + c.width;}, 0); + } + } + + function make_col_header (col) { + var cell = self.make_border_cell(col.width, col.height); + return cell.append(self.make_header_title(col).attr('data-id', col.id)); + } + function make_cells (queue, level) { + var col = queue[0]; + queue = _.rest(queue).concat(col.children); + if (col.path.length == level) { + _.last(header_cells).push(make_col_header(col)); + } else { + level +=1; + header_cells.push([make_col_header(col)]); + } + if (queue.length !== 0) { + make_cells(queue, level); + } + } - this.cols = [{ - path: [], - value: this.measure_label, - expanded: false, - parent: null, - children: [], - html_tds: [], - domain: this.domain, - header: $(this.make_cell(this.measure_label, {is_border:true})), - }]; + set_dim(pivot.cols.main); // add width and height info to columns headers + if (pivot.cols.main.children.length === 0) { + make_cells(pivot.cols.headers, 0); + } else { + make_cells(pivot.cols.main.children, 1); + header_cells[0].push(self.make_border_cell(1, height).append('Total').css('font-weight', 'bold')); + } - _.each(data, function (datapt) { - self.make_row(datapt); + _.each(header_cells, function (cells) { + self.table.append($('').append(cells)); }); }, - _draw: function () { + get_measure_type: function () { + var measure = this.pivot.measure; + return (measure) ? this.fields[measure].type : 'integer'; + }, - this.$el.empty(); - var self = this; + draw_row: function (row) { + var self = this, + pivot = this.pivot, + measure_type = this.get_measure_type(), + html_row = $(''), + row_header = this.make_border_cell(1,1) + .append(this.make_header_title(row).attr('data-id', row.id)) + .addClass('graph_border'); + + for (var i in _.range(row.path.length)) { + row_header.prepend($('', {class:'web_graph_indent'})); + } - var header = '' + - this.fields[this.row_groupby[0]].string + - '' + - this.measure_label + - ''; - this.$el.append(header); + html_row.append(row_header); - _.each(this.rows, function (row) { - self.$el.append(row.html_tr); + _.each(pivot.cols.headers, function (col) { + if (col.children.length === 0) { + var value = pivot.get_value(row.id, col.id), + cell = make_cell(value, col); + html_row.append(cell); + } }); - } -}); - - /** - * ChartView widget. It displays the data in chart form, using the nvd3 - * library. Various modes include bar charts, pie charts or line charts. - */ -var ChartView = BasicDataView.extend({ - template: 'chart_view', - - set_mode: function (mode) { - this.render = this['render_' + mode]; - this.need_redraw = true; - }, + if (pivot.cols.main.children.length > 0) { + var cell = make_cell(pivot.get_total(row), pivot.cols.main) + .css('font-weight', 'bold'); + html_row.append(cell); + } - draw: function () { - var self = this; - this.$el.empty(); - this.$el.append(''); - this.get_data(this.row_groupby).done(function (data) { - self.render(data); - }); - }, + this.table.append(html_row); - format_data: function (datapt) { - var val = datapt.attributes; - return { - x: datapt.attributes.value[1], - y: this.measure ? val.aggregates[this.measure] : val.length, - }; + function make_cell (value, col) { + var color, + total, + cell = $(''); + if ((self.mode === 'pivot') && (row.is_expanded) && (row.path.length <=2)) { + color = row.path.length * 5 + 240; + cell.css('background-color', $.Color(color, color, color)); + } + if (value === undefined) { + return cell; + } + cell.append(instance.web.format_value(value, {type: measure_type})); + if (self.mode === 'heatmap') { + total = pivot.get_total(); + color = Math.floor(50 + 205*(total - value)/total); + cell.css('background-color', $.Color(255, color, color)); + } + if (self.mode === 'row_heatmap') { + total = pivot.get_total(row); + color = Math.floor(50 + 205*(total - value)/total); + cell.css('background-color', $.Color(255, color, color)); + } + if (self.mode === 'col_heatmap') { + total = pivot.get_total(col); + color = Math.floor(50 + 205*(total - value)/total); + cell.css('background-color', $.Color(255, color, color)); + } + return cell; + } }, - render_bar_chart: function (data) { - var formatted_data = [{ - key: 'Bar chart', - values: _.map(data, this.proxy('format_data')), - }]; +/****************************************************************************** + * Drawing charts methods... + ******************************************************************************/ + bar_chart: function () { + var self = this, + dim_x = this.pivot.rows.groupby.length, + dim_y = this.pivot.cols.groupby.length, + data; + + // No groupby ************************************************************** + if ((dim_x === 0) && (dim_y === 0)) { + data = [{key: 'Total', values:[{ + x: 'Total', + y: this.pivot.get_value(this.pivot.rows.main.id, this.pivot.cols.main.id), + }]}]; + // Only column groupbys **************************************************** + } else if ((dim_x === 0) && (dim_y >= 1)){ + data = _.map(this.pivot.get_columns_depth(1), function (header) { + return { + key: header.title, + values: [{x:header.root.main.title, y: self.pivot.get_total(header)}] + }; + }); + // Just 1 row groupby ****************************************************** + } else if ((dim_x === 1) && (dim_y === 0)) { + data = _.map(this.pivot.rows.main.children, function (pt) { + var value = self.pivot.get_value(pt.id, self.pivot.cols.main.id), + title = (pt.title !== undefined) ? pt.title : 'Undefined'; + return {x: title, y: value}; + }); + data = [{key: this.measure_label(), values:data}]; + // 1 row groupby and some col groupbys************************************** + } else if ((dim_x === 1) && (dim_y >= 1)) { + data = _.map(this.pivot.get_columns_depth(1), function (colhdr) { + var values = _.map(self.pivot.get_rows_depth(1), function (header) { + return { + x: header.title || 'Undefined', + y: self.pivot.get_value(header.id, colhdr.id, 0) + }; + }); + return {key: colhdr.title || 'Undefined', values: values}; + }); + // At least two row groupby************************************************* + } else { + var keys = _.uniq(_.map(this.pivot.get_rows_depth(2), function (hdr) { + return hdr.title || 'Undefined'; + })); + data = _.map(keys, function (key) { + var values = _.map(self.pivot.get_rows_depth(1), function (hdr) { + var subhdr = _.find(hdr.children, function (child) { + return ((child.title === key) || ((child.title === undefined) && (key === 'Undefined'))); + }); + return { + x: hdr.title || 'Undefined', + y: (subhdr) ? self.pivot.get_total(subhdr) : 0 + }; + }); + return {key:key, values: values}; + }); + } nv.addGraph(function () { - var chart = nv.models.discreteBarChart() - .tooltips(false) - .showValues(true) - .staggerLabels(true) - .width(650) - .height(400); - - d3.select('.graph_chart svg') - .datum(formatted_data) - .attr('width', 650) - .attr('height', 400) + var chart = nv.models.multiBarChart() + .width(self.width) + .height(self.height) + .stacked(self.bar_ui === 'stack') + .staggerLabels(true); + + d3.select(self.svg) + .datum(data) + .attr('width', self.width) + .attr('height', self.height) .call(chart); nv.utils.windowResize(chart.update); return chart; }); + }, - render_line_chart: function (data) { - var formatted_data = [{ - key: this.measure_label, - values: _.map(data, this.proxy('format_data')) - }]; + line_chart: function () { + var self = this, + dim_x = this.pivot.rows.groupby.length, + dim_y = this.pivot.cols.groupby.length; + + var data = _.map(this.pivot.get_cols_leaves(), function (col) { + var values = _.map(self.pivot.get_rows_depth(dim_x), function (row) { + return {x: row.title, y: self.pivot.get_value(row.id,col.id, 0)}; + }); + var title = _.map(col.path, function (p) { + return p || 'Undefined'; + }).join('/'); + if (dim_y === 0) { + title = self.measure_label(); + } + return {values: values, key: title}; + }); nv.addGraph(function () { var chart = nv.models.lineChart() .x(function (d,u) { return u; }) - .width(600) - .height(300) + .width(self.width) + .height(self.height) .margin({top: 30, right: 20, bottom: 20, left: 60}); - d3.select('.graph_chart svg') - .attr('width', 600) - .attr('height', 300) - .datum(formatted_data) + d3.select(self.svg) + .attr('width', self.width) + .attr('height', self.height) + .datum(data) .call(chart); return chart; }); }, - render_pie_chart: function (data) { - var formatted_data = _.map(data, this.proxy('format_data')); + pie_chart: function () { + var self = this, + dim_x = this.pivot.rows.groupby.length; + + var data = _.map(this.pivot.get_rows_leaves(), function (row) { + var title = _.map(row.path, function (p) { + return p || 'Undefined'; + }).join('/'); + if (dim_x === 0) { + title = self.measure_label; + } + return {x: title, y: self.pivot.get_total(row)}; + }); nv.addGraph(function () { var chart = nv.models.pieChart() .color(d3.scale.category10().range()) - .width(650) - .height(400); + .width(self.width) + .height(self.height); - d3.select('.graph_chart svg') - .datum(formatted_data) + d3.select(self.svg) + .datum(data) .transition().duration(1200) - .attr('width', 650) - .attr('height', 400) + .attr('width', self.width) + .attr('height', self.height) .call(chart); nv.utils.windowResize(chart.update); @@ -468,36 +660,12 @@ var ChartView = BasicDataView.extend({ }); -/** - * Query the server and return a deferred which will return the data - * with all the groupbys applied (this is done for now, but the goal - * is to modify read_group in order to allow eager and lazy groupbys - */ -function query_groups (model, fields, domain, groupbys) { - return model.query(fields) - .filter(domain) - .group_by(groupbys) - .then(function (results) { - var non_empty_results = _.filter(results, function (group) { - return group.attributes.length > 0; - }); - if (groupbys.length <= 1) { - return non_empty_results; - } else { - var get_subgroups = $.when.apply(null, _.map(non_empty_results, function (result) { - var new_domain = result.model._domain; - var new_groupings = groupbys.slice(1); - return query_groups(model, fields,new_domain, new_groupings).then(function (subgroups) { - result.subgroups_data = subgroups; - }); - })); - return get_subgroups.then(function () { - return non_empty_results; - }); - } - }); -} +}; + + + + + -};