[IMP] web: graph view improvements

This commit extends the support of comparison mode for the graph view
and refine the tooltips and rendering in line mode.
The graph view code has also been slightly refactored.

Task ID: 1946138

2 files changed, 4 insertions, 3 deletions

diff --git a/addons/web/static/src/js/views/control_panel/control_panel_model.js b/addons/web/static/src/js/views/control_panel/control_panel_model.js
index ad0d80de7a3..f2e28858ba3 100644
--- a/addons/web/static/src/js/views/control_panel/control_panel_model.js
+++ b/addons/web/static/src/js/views/control_panel/control_panel_model.js
@@ -893,6 +893,7 @@ var ControlPanelModel = mvc.Model.extend({
             }
             context = {
                 timeRangeMenuData: {
+                    comparisonField: filter.fieldName,
                     timeRange: timeRange,
                     timeRangeDescription: timeRangeDescription,
                     comparisonTimeRange: comparisonTimeRange,
diff --git a/addons/web/static/src/js/views/control_panel/search/groupby_menu_mixin.js b/addons/web/static/src/js/views/control_panel/search/groupby_menu_mixin.js
index 56d43ee6708..dc7a5dc3cc8 100644
--- a/addons/web/static/src/js/views/control_panel/search/groupby_menu_mixin.js
+++ b/addons/web/static/src/js/views/control_panel/search/groupby_menu_mixin.js
@@ -42,7 +42,7 @@ var GroupByMenuMixin = {
             return groupableFields[fieldName].string;
         });
         this.groupableFields = groupableFields;
-        var groupBys = this._getGroupBys(this.model.get().groupedBy);
+        var groupBys = this._getGroupBys(this.model.get().groupBy);
         this.groupByMenu = new GroupByMenu(this, groupBys, this.groupableFields);
         this.groupByMenu.insertAfter($node.find('div:first'));
     },
@@ -110,7 +110,7 @@ var GroupByMenuMixin = {
     _onItemOptionClicked: function (ev) {
         var fieldName = ev.data.id;
         var optionId = ev.data.optionId;
-        var activeGroupBys = this.model.get().groupedBy;
+        var activeGroupBys = this.model.get().groupBy;
         var currentOptionId = activeGroupBys.reduce(
             function (optionId, groupby) {
                 if (groupby.split(':')[0] === fieldName){
@@ -140,7 +140,7 @@ var GroupByMenuMixin = {
      */
     _onMenuItemClicked: function (ev) {
         var fieldName = ev.data.id;
-        var activeGroupBys = this.model.get().groupedBy;
+        var activeGroupBys = this.model.get().groupBy;
         var groupByFieldNames = _.map(activeGroupBys, function (groupby) {
             return groupby.split(':')[0];
         });