From dca23eed4697d43420f372751a980310518db9d1 Mon Sep 17 00:00:00 2001 From: Pawan Kumar Date: Wed, 7 Apr 2021 10:32:47 +0530 Subject: [PATCH] sort hours within date --- project_report/report/project_timesheet_report.py | 2 +- project_report/static/src/js/graph_renderer.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/project_report/report/project_timesheet_report.py b/project_report/report/project_timesheet_report.py index 10623da..b59bea0 100755 --- a/project_report/report/project_timesheet_report.py +++ b/project_report/report/project_timesheet_report.py @@ -9,7 +9,7 @@ class ProjectTimelineReport(models.Model): _name = "project.timesheet.report" _description = "Project Timesheet Report" - _order = 'start_date desc, project_id desc' + _order = 'start_date desc, duration desc' _auto = False start_date = fields.Date(string='Start Time', readonly=True) diff --git a/project_report/static/src/js/graph_renderer.js b/project_report/static/src/js/graph_renderer.js index 4cec265..a914d3a 100755 --- a/project_report/static/src/js/graph_renderer.js +++ b/project_report/static/src/js/graph_renderer.js @@ -297,6 +297,8 @@ var MAX_LEGEND_LENGTH = 25 * (1 + config.device.size_class); var label = data.labels[item.index]; var value; var boxColor; + console.log('11111', dataset); + console.log('222222', dataset.originIndex); if (this.state.mode === 'bar') { label = this._relabelling(label, dataset.originIndex); if (this.state.processedGroupBy.length > 1 || this.state.origins.length > 1) {