Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[IMP] show conversion rate in kanban tooltip and overdue opportunity date deadline in red #22074

Closed
wants to merge 2 commits into from
Closed

[IMP] show conversion rate in kanban tooltip and overdue opportunity date deadline in red #22074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc36797
[IMP] crm: show date_deadline in kanban if overdue then make date_dea…
dbh-odoo Dec 19, 2017
8e9541a
[IMP] web, crm: show conversion rate in tooltip for kanban stages
dbh-odoo Dec 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions addons/crm/views/crm_lead_views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@
<field name="priority" eval="1"/>
<field name="arch" type="xml">
<kanban default_group_by="stage_id" class="o_kanban_small_column o_opportunity_kanban" on_create="quick_create" quick_create_view="crm.quick_create_opportunity_form">
<field name="stage_id" options='{"group_by_tooltip": {"requirements": "Description", "legend_priority": "Use of stars"}}'/>
<field name="stage_id" options='{"conversion_rate_tooltip": True, "group_by_tooltip": {"requirements": "Description", "legend_priority": "Use of stars"}}'/>
<field name="color"/>
<field name="priority"/>
<field name="planned_revenue"/>
Expand All @@ -340,10 +340,11 @@
<field name="company_currency"/>
<field name="activity_state" />
<field name="activity_ids" />
<field name="date_deadline"/>
<progressbar field="activity_state" colors='{"planned": "success", "today": "warning", "overdue": "danger"}' sum_field="planned_revenue" help="This bar allows to filter the opportunities based on scheduled activities."/>
<templates>
<t t-name="kanban-box">
<div t-attf-class="#{kanban_color(record.color.raw_value)} oe_kanban_global_click">
<div t-attf-class="#{(record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())) and 'oe_kanban_color_1' or kanban_color(record.color.raw_value)} oe_kanban_global_click">
<div class="o_dropdown_kanban dropdown">

<a class="dropdown-toggle btn" data-toggle="dropdown" href="#" >
Expand All @@ -366,6 +367,9 @@
</div>
<div class="text-muted o_kanban_record_subtitle">
<t t-if="record.planned_revenue.raw_value"><field name="planned_revenue" widget="monetary" options="{'currency_field': 'company_currency'}"/><span t-if="record.partner_id.value">,</span></t> <span t-if="record.partner_id.value"> <t t-esc="record.partner_id.value"/></span>
<div t-attf-class="#{(record.date_deadline.raw_value and record.date_deadline.raw_value lt (new Date())) and 'oe_kanban_text_red' or ''}">
<field name="date_deadline"/>
</div>
</div>

<div class="o_kanban_record_bottom">
Expand Down
19 changes: 17 additions & 2 deletions addons/web/static/src/js/views/kanban/kanban_column.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,7 @@ var KanbanColumn = Widget.extend({
this.$header.find('.o_column_title').text(title);

this.$el.toggleClass('o_column_folded', this.folded && !config.device.isMobile);
var tooltip = this.data.count + _t(' records');
tooltip = '<p>' + tooltip + '</p>' + this.tooltipInfo;
var tooltip = this.getTooltip()
this.$header.find('.o_kanban_header_title').tooltip({html: true}).attr('data-original-title', tooltip);
if (!this.remaining) {
this.$('.o_kanban_load_more').remove();
Expand Down Expand Up @@ -210,12 +209,28 @@ var KanbanColumn = Widget.extend({
this.quickCreateWidget.cancel();
}
},
/**
* Generate the tooltip.
*/
getTooltip: function() {
var tooltip = this.data.count + _t(' records');
return '<p>' + tooltip + '</p>' + this.tooltipInfo;;
},
/**
* @returns {Boolean} true iff the column is empty
*/
isEmpty: function () {
return !this.records.length;
},
/**
* Update current tooltip with conversion rate.
* @param {integer} rate percentage of conversion rate
*/
updateConversionTooltip: function(rate) {
var tooltip = this.getTooltip();
tooltip += _.str.sprintf('<div>%s %% %s</div>', rate, _t('conversion'));
this.$header.find('.o_kanban_header_title').attr('data-original-title', tooltip);
},

//--------------------------------------------------------------------------
// Private
Expand Down
23 changes: 17 additions & 6 deletions addons/web/static/src/js/views/kanban/kanban_controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ var KanbanController = BasicController.extend({
var grouped = data.groupedBy.length;
if (grouped) {
var columnState = this.model.getColumn(id);
return this.renderer.updateColumn(columnState.id, columnState);
return this.renderer.updateColumn(columnState.id, columnState, {state: data})
.then(this.renderer.updateConversionTooltip.bind(this.renderer));
}
return this.renderer.updateRecord(this.model.get(id));
},
Expand Down Expand Up @@ -152,10 +153,13 @@ var KanbanController = BasicController.extend({
.then(function (column_db_ids) {
return self._resequenceRecords(column.db_id, event.data.ids)
.then(function () {
var state = self.model.get(self.handle);
var defs = []
_.each(column_db_ids, function (db_id) {
var data = self.model.get(db_id);
self.renderer.updateColumn(db_id, data);
var data = _.findWhere(state.data, {id: db_id});
defs.push(self.renderer.updateColumn(db_id, data, {state: state}));
});
$.when.apply($, defs).then(self.renderer.updateConversionTooltip.bind(self.renderer));
});
}).fail(this.reload.bind(this));
},
Expand Down Expand Up @@ -328,8 +332,10 @@ var KanbanController = BasicController.extend({
var self = this;
var column = event.target;
this.model.loadMore(column.db_id).then(function (db_id) {
var data = self.model.get(db_id);
self.renderer.updateColumn(db_id, data);
var state = self.model.get(self.handle);
var data = _.findWhere(state.data, {id: db_id});
self.renderer.updateColumn(db_id, data, {state: state})
.then(self.renderer.updateConversionTooltip.bind(self.renderer));
self._updateEnv();
});
},
Expand Down Expand Up @@ -360,6 +366,7 @@ var KanbanController = BasicController.extend({
if (event.data.openRecord) {
self.trigger_up('open_record', {id: db_id, mode: 'edit'});
}
self.renderer.updateConversionTooltip();
});
};

Expand Down Expand Up @@ -399,6 +406,9 @@ var KanbanController = BasicController.extend({
var state = this.model.get(this.handle, {raw: true});
var model = state.fields[state.groupedBy[0]].relation;
this.model.resequence(model, event.data.ids, this.handle).then(function () {
state = self.model.get(self.handle);
self.renderer.updateState(state, {noRender: true})
.then(self.renderer.updateConversionTooltip.bind(self.renderer));
self._updateEnv();
});
},
Expand All @@ -416,7 +426,8 @@ var KanbanController = BasicController.extend({
var options = {
openQuickCreate: !!event.data.openQuickCreate,
};
self.renderer.updateColumn(db_id, data, options);
self.renderer.updateColumn(db_id, data, options)
.then(self.renderer.updateConversionTooltip.bind(self.renderer));
self._updateEnv();
});
},
Expand Down
24 changes: 24 additions & 0 deletions addons/web/static/src/js/views/kanban/kanban_renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,22 @@ var KanbanRenderer = BasicRenderer.extend({
});
});
},
/**
* Computes conversion rate and update tooltip of all columns with conversion rate.
*/
updateConversionTooltip: function() {
var self = this;
var totalRecords = _.reduce(this.state.data, function(total, data){ return total + data.count; }, 0);
if (this.columnOptions.conversion_rate_tooltip && totalRecords) {
var previousColumnRecords = 0;
_.map(this.state.data, function(group) {
var column = _.findWhere(self.widgets, {db_id: group.id});
var rate = ((totalRecords-previousColumnRecords) / totalRecords * 100).toFixed(2);
column.updateConversionTooltip(rate);
previousColumnRecords += group.count;
});
}
},
/**
* Updates a given record with its new state.
*
Expand Down Expand Up @@ -283,10 +299,16 @@ var KanbanRenderer = BasicRenderer.extend({
}
});

// Add conversion rate tooltip on all columns
if (this.columnOptions.conversion_rate_tooltip) {
this.updateConversionTooltip();
}

// remove previous sorting
if(this.$el.sortable('instance') !== undefined) {
this.$el.sortable('destroy');
}

if (this.groupedByM2O) {
// Enable column sorting
this.$el.sortable({
Expand Down Expand Up @@ -417,12 +439,14 @@ var KanbanRenderer = BasicRenderer.extend({
this.groupedByM2O = groupByFieldAttrs && (groupByFieldAttrs.type === 'many2one');
var relation = this.groupedByM2O && groupByFieldAttrs.relation;
var groupByTooltip = groupByFieldInfo && groupByFieldInfo.options.group_by_tooltip;
var conversionRateTooltip = groupByFieldInfo && groupByFieldInfo.options.conversion_rate_tooltip;
this.columnOptions = _.extend(this.columnOptions, {
draggable: draggable,
group_by_tooltip: groupByTooltip,
groupedBy: groupByField,
grouped_by_m2o: this.groupedByM2O,
relation: relation,
conversion_rate_tooltip: conversionRateTooltip,
});
this.createColumnEnabled = this.groupedByM2O && this.columnOptions.group_creatable;
},
Expand Down
30 changes: 30 additions & 0 deletions addons/web/static/tests/views/kanban_tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2966,6 +2966,36 @@ QUnit.module('Views', {
kanban.destroy();
});

QUnit.test('conversion_rate_tooltip option for kanban tooltip', function (assert) {
assert.expect(5);
var kanban = createView({
View: KanbanView,
model: 'partner',
data: this.data,
arch: '<kanban class="o_kanban_test" default_group_by="state">' +
'<field name="state" ' +
'options=\'{"conversion_rate_tooltip": True}\'/>' +
'<templates><t t-name="kanban-box">' +
'<div><field name="foo"/></div>' +
'</t></templates></kanban>',
});

assert.ok(kanban.$('.o_kanban_view').hasClass('o_kanban_grouped'),
"should have classname 'o_kanban_grouped'");
assert.strictEqual(kanban.$('.o_kanban_group').length, 3, "should have " + 3 + " columns");
assert.strictEqual(kanban.$('.o_kanban_group:first .o_kanban_header_title').data('original-title'),
"<p>1 records</p><div>100.00 % conversion</div>",
"first column should have a tooltip with the number of records, and conversion rate 100.00 %");
assert.strictEqual(kanban.$('.o_kanban_group:eq(1) .o_kanban_header_title').data('original-title'),
"<p>1 records</p><div>75.00 % conversion</div>",
"second column should have a tooltip with the number of records, and conversion rate 75.00 %");
assert.strictEqual(kanban.$('.o_kanban_group:eq(2) .o_kanban_header_title').data('original-title'),
"<p>2 records</p><div>50.00 % conversion</div>",
"third column should have a tooltip with the number of records, and conversion rate 50.00 %");

kanban.destroy();
});

QUnit.test('move a record then put it again in the same column', function (assert) {
assert.expect(6);

Expand Down