From 0d09f22f27a9b47ceacbd3f0c3b295818faef086 Mon Sep 17 00:00:00 2001
From: projectsodoo <prakash.jain@sunarctechnologies.com>
Date: Tue, 2 Mar 2021 23:20:09 +0530
Subject: [PATCH] Timeline order by and label updated

---
 project_report/report/project_timeline_report.py     |  5 +++--
 .../report/project_timeline_report_views.xml         |  2 +-
 project_report/static/src/js/graph_renderer.js       | 12 +++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/project_report/report/project_timeline_report.py b/project_report/report/project_timeline_report.py
index 6318909..78dc9a8 100755
--- a/project_report/report/project_timeline_report.py
+++ b/project_report/report/project_timeline_report.py
@@ -8,7 +8,7 @@ class ProjectTimelineReport(models.Model):
 
     _name = "project.timeline.report"
     _description = "Project Timeline Report"
-    #_order = 'project_id'
+    _order = 'project_id desc, timeline_type asc'
     _auto = False
 
     #analytic_account_id = fields.Many2one('account.analytic.account', string='Analytic Account', readonly=True)
@@ -80,6 +80,7 @@ class ProjectTimelineReport(models.Model):
             Where
               PRO.active = 't'
               group by pro.id
+              order by  project_id desc, timeline_type asc
               ) as res
                order by
                project_id desc,
@@ -87,7 +88,7 @@ class ProjectTimelineReport(models.Model):
               --end_date desc,
               --pricing_type,
               --project_type,
-              timeline_type desc
+              timeline_type asc
               --employee_id
         )""" % (self._table,))
 
diff --git a/project_report/report/project_timeline_report_views.xml b/project_report/report/project_timeline_report_views.xml
index 068dd9a..13e23ab 100755
--- a/project_report/report/project_timeline_report_views.xml
+++ b/project_report/report/project_timeline_report_views.xml
@@ -78,7 +78,7 @@
         <field name="res_model">project.timeline.report</field>
         <field name="view_mode">graph,tree,pivot</field>
         <field name="search_view_id" ref="project_timeline_report_view_search"/>
-        <field name="context">{'search_default_group_by_project': 1,'search_default_sdate': 1,'search_default_edate': 1,'search_default_group_by_timeline_type': 1, 'default_res_model':'project.timeline.report', 'search_default_notfixed':1}</field>
+        <field name="context">{'search_default_group_by_project': 1, 'search_default_group_by_timeline_type': 1, 'search_default_notfixed':1, 'search_default_sdate': 1,'search_default_edate': 1, 'default_res_model':'project.timeline.report'}</field>
     </record>
 
     <menuitem id="menu_project_timeline_report"
diff --git a/project_report/static/src/js/graph_renderer.js b/project_report/static/src/js/graph_renderer.js
index 84d7d8c..ead4fc5 100755
--- a/project_report/static/src/js/graph_renderer.js
+++ b/project_report/static/src/js/graph_renderer.js
@@ -145,7 +145,8 @@ var MAX_LEGEND_LENGTH = 25 * (1 + config.device.size_class);
     _getDatasetLabel: function (dataPt) {
         if (_.contains(['bar', 'horizontalBar', 'line'], this.state.mode)) {
             // ([origin] + second to last groupBys) or measure
-            var datasetLabel = dataPt.labels.slice(1).join("/");
+            //var datasetLabel = dataPt.labels.slice(1).join("/");
+            var datasetLabel = dataPt.labels.slice(0).join("/");
             if (this.state.origins.length > 1) {
                 datasetLabel = this.state.origins[dataPt.originIndex] +
                     (datasetLabel ? ('/' + datasetLabel) : '');
@@ -294,6 +295,7 @@ var MAX_LEGEND_LENGTH = 25 * (1 + config.device.size_class);
             label = this._relabelling(label, dataset.originIndex);
             if (this.state.processedGroupBy.length > 1 || this.state.origins.length > 1) {
                 label = label + "/" + dataset.label;
+                label = dataset.label;
             }
             value = this._formatValue(item.yLabel);
             boxColor = dataset.backgroundColor;
@@ -304,7 +306,8 @@ var MAX_LEGEND_LENGTH = 25 * (1 + config.device.size_class);
         } else if (this.state.mode === 'horizontalBar') {
          label = this._relabelling(label, dataset.originIndex);
             if (this.state.processedGroupBy.length > 1 || this.state.origins.length > 1) {
-                label = label + "/" + dataset.label;
+                //label = label + "/" + dataset.label;
+                label = dataset.label;
             }
             value = this._formatValue(item.xLabel);
             boxColor = dataset.backgroundColor;
@@ -770,7 +773,7 @@ var MAX_LEGEND_LENGTH = 25 * (1 + config.device.size_class);
           });
           y[0].backgroundColor = maxA;
           y[1].backgroundColor = self._getColor(1);
-        var zipped_2 = _.zip.apply(null, [y[1].data, y[0].data]);
+        //var zipped_2 = _.zip.apply(null, [y[1].data, y[0].data]);
           }
         });
        }
@@ -778,7 +781,6 @@ var MAX_LEGEND_LENGTH = 25 * (1 + config.device.size_class);
         if (self.resModel == 'project.timeline.report') {
           //var groupedData = _.groupBy(data.datasets, x => x.label.replace('Actual Hours', '').replace('Budgeted Hours', '').split("/")[0]);
           var groupedData = _.groupBy(data.datasets, x => x.label.replace('Actual', '').replace('Budgeted', '').split("/")[0]);
-          console.log("groupedData ", groupedData);
         _.map(groupedData, (y) => {
           if (y.length > 1) {
         var zipped_1 = _.zip.apply(null, [y[0].data, y[1].data]);
@@ -794,7 +796,7 @@ var MAX_LEGEND_LENGTH = 25 * (1 + config.device.size_class);
           });
           y[0].backgroundColor = maxA;
           y[1].backgroundColor = self._getColor(1);
-        var zipped_2 = _.zip.apply(null, [y[1].data, y[0].data]);
+        //var zipped_2 = _.zip.apply(null, [y[1].data, y[0].data]);
           }
         });
        }