From 3bf49a28294fafec66fdd556f3a9532b1668493b Mon Sep 17 00:00:00 2001
From: prakash <prakash.jain@sunarctechnologies.com>
Date: Tue, 9 Nov 2021 19:58:54 +0530
Subject: [PATCH] Report order by enddatetime added

---
 project_report/report/project_timesheet_report.py    | 12 +++++++++---
 .../report/project_timesheet_report_views.xml        |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/project_report/report/project_timesheet_report.py b/project_report/report/project_timesheet_report.py
index 5987a6f..f9367c9 100755
--- a/project_report/report/project_timesheet_report.py
+++ b/project_report/report/project_timesheet_report.py
@@ -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,
diff --git a/project_report/report/project_timesheet_report_views.xml b/project_report/report/project_timesheet_report_views.xml
index 5682060..19d340a 100755
--- a/project_report/report/project_timesheet_report_views.xml
+++ b/project_report/report/project_timesheet_report_views.xml
@@ -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>