From 767aa5e3086b2f8a9fa01c32f01c3a9c5f0f2124 Mon Sep 17 00:00:00 2001 From: projectsodoo Date: Wed, 17 Feb 2021 14:18:49 +0530 Subject: [PATCH] description and graph js udpated --- .../static/src/js/graph_controller.js | 41 +++++++++++++++++++ sub_project/models/sub_project.py | 2 +- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/project_report/static/src/js/graph_controller.js b/project_report/static/src/js/graph_controller.js index bcc90fa..0ce9dee 100755 --- a/project_report/static/src/js/graph_controller.js +++ b/project_report/static/src/js/graph_controller.js @@ -7,6 +7,47 @@ odoo.define("project_report.GraphController", function(require) { this._super.apply(this, arguments); }, + /** + * Makes sure that the buttons in the control panel matches the current + * state (so, correct active buttons and stuff like that). + * + * @override + */ + updateButtons: function () { + if (!this.$buttons) { + return; + } + var state = this.model.get(); + this.$buttons.find('.o_graph_button').removeClass('active'); + this.$buttons + .find('.o_graph_button[data-mode="' + state.mode + '"]') + .addClass('active'); + this.$buttons + .find('.o_graph_button[data-mode="stack"]') + .data('stacked', state.stacked) + .toggleClass('active', state.stacked) + .toggleClass('o_hidden', state.mode !== 'bar' && state.mode !== 'horizontalBar'); + this.$buttons + .find('.o_graph_button[data-order]') + .toggleClass('o_hidden', state.mode === 'pie' || !!Object.keys(state.timeRanges).length) + .filter('.o_graph_button[data-order="' + state.orderBy + '"]') + .toggleClass('active', !!state.orderBy); + + if (this.withButtons) { + this._attachDropdownComponents(); + } + }, + + //-------------------------------------------------------------------------- + // Handlers + //-------------------------------------------------------------------------- + + /** + * Do what need to be done when a button from the control panel is clicked. + * + * @private + * @param {MouseEvent} ev + */ _onButtonClick: function (ev) { var $target = $(ev.target); if ($target.hasClass('o_graph_button')) { diff --git a/sub_project/models/sub_project.py b/sub_project/models/sub_project.py index 7537cb6..ad1d6b2 100755 --- a/sub_project/models/sub_project.py +++ b/sub_project/models/sub_project.py @@ -3,7 +3,7 @@ from odoo import api, fields, models class SubProject(models.Model): _inherit = "project.project" - _description = "Sub Project" + #_description = "Sub Project" is_sub_project = fields.Boolean("Is Sub Project") sub_project = fields.Many2many('project.project', 'project_subproject_rel', 'project_id',