subh_pal_org
/
cor
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pawan_branch' into 'development' 

sort hours within date

See merge request prakash.jain/cor-odoo!167
This commit is contained in:
pawan.sharma 2021-04-06 22:04:03 -07:00
parent 9dd2bcdb23 dca23eed46
commit 0f03e1d76d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project_report/report/project_timesheet_report.py
View File

@ -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)

2
project_report/static/src/js/graph_renderer.js
View File

@ -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) {