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

Report order by enddatetime added

This commit is contained in:
prakash 2021-11-09 19:58:54 +05:30
parent af75e3e127
commit 3bf49a2829
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
project_report/report/project_timesheet_report.py
View File

@ -10,11 +10,12 @@ class ProjectTimelineReport(models.Model):
_name = "project.timesheet.report"
_description = "Project Timesheet Report"
#_order = 'start_date desc, duration, project_id desc'
_order = 'start_datetime desc, duration, project_id desc'
_order = 'start_datetime desc, end_datetime asc'
_auto = False
start_date = fields.Date(string='Start Time', readonly=True)
start_datetime = fields.Datetime("Start DateTime", required=True)
end_datetime = fields.Datetime("End DateTime", required=True)
employee_id = fields.Many2one('hr.employee', string='Employee', readonly=True)
project_id = fields.Many2one('project.project', string='Project', readonly=True)
sub_project = fields.Many2one('project.project', string='Sub Project', readonly=True)
@ -32,8 +33,12 @@ class ProjectTimelineReport(models.Model):
@api.model
def search_read(self, domain=None, fields=None, offset=0,limit=None, order=None):
if order and isinstance(order, str):
order = order.replace("timestamp ", "start_datetime ")
if order and isinstance(order, str) and order=='timestamp ASC':
#order = order.replace("timestamp ", "start_datetime ")
order = "start_datetime asc, end_datetime asc"
if order and isinstance(order, str) and order=='timestamp DESC':
#order = order.replace("timestamp ", "start_datetime ")
order = "start_datetime desc, end_datetime asc"
res = super(ProjectTimelineReport, self).search_read(domain, fields, offset, limit, order)
return res
@ -82,6 +87,7 @@ class ProjectTimelineReport(models.Model):
ROW_NUMBER() OVER() as id,
aal.start_datetime::date as start_date,
aal.start_datetime as start_datetime,
aal.end_datetime as end_datetime,
aal.employee_id,
aal.project_id,
aal.sub_project,

1
project_report/report/project_timesheet_report_views.xml
View File

@ -16,6 +16,7 @@
<field name="timestamp"/>
<field name="description"/>
<field name="start_datetime" invisible="1"/>
<field name="end_datetime" invisible="1"/>
</tree>
</field>
</record>