Fix the SQL query for the backlog graph (#290)

* Fix backlog sql query

* Fix backlog sql query

* Update changelog

* Remove useless distinct

* Update changelog

Author: Lainow

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [UNRELEASED] - 
+
+### Fixed
+
+ - Fix the SQL query for the backlog graph (#290)
+
 ## [1.8.8] - 2025-08-07
 
 ### Fixed

inc/baseclass.class.php

@@ -149,7 +149,7 @@ public function __construct($config = [])
                         "DATE_FORMAT(`date` - INTERVAL (WEEKDAY(`date`)) DAY, '{$this->period_datetime}') as period_l",
                     );
                     $this->criteria_list_date2 = new QueryExpression(
-                        "DATE_FORMAT(`date` - INTERVAL (WEEKDAY(`solvedate`)) DAY, '{$this->period_datetime}') as period_l",
+                        "DATE_FORMAT(`solvedate` - INTERVAL (WEEKDAY(`solvedate`)) DAY, '{$this->period_datetime}') as period_l",
                     );
                     break;
                 case 'month':

inc/helpdeskplus.class.php

@@ -110,31 +110,32 @@ public function __construct($config = [])
             ],
         ];
         $this->criteria_join_gt = [
-            Group_Ticket::getTable() => [
+            Group_Ticket::getTable() . ' AS gt' => [
                 'FKEY' => [
-                    Group_Ticket::getTable() . '.tickets_id',
+                    'gt.tickets_id',
                     Ticket::getTable() . '.id',
                     [
                         'AND' => [
-                            Group_Ticket::getTable() . '.type' => Group_Ticket::ASSIGN,
+                            'gt.type' => Group_Ticket::ASSIGN,
                         ],
                     ],
                 ],
             ],
         ];
         $this->criteria_join_gtr = [
-            Group_Ticket::getTable() => [
+            Group_Ticket::getTable() . ' AS gtr' => [
                 'FKEY' => [
-                    Group_Ticket::getTable() . '.tickets_id',
+                    'gtr.tickets_id',
                     Ticket::getTable() . '.id',
                     [
                         'AND' => [
-                            Group_Ticket::getTable() . '.type' => Group_Ticket::REQUESTER,
+                            'gtr.type' => Group_Ticket::REQUESTER,
                         ],
                     ],
                 ],
             ],
         ];
+
         $this->criteria_select_sla = new QueryExpression(
             "CASE WHEN glpi_slas.definition_time = 'day'
                     AND glpi_tickets.solve_delay_stat <= glpi_slas.number_time * 86400
@@ -346,16 +347,18 @@ public function reportGlineBacklogs($config = [])
                 'SELECT' => [
                     new QueryExpression("DATE_FORMAT(list_date.period_l, '{$this->period_sort}') as period"),
                     new QueryExpression("DATE_FORMAT(list_date.period_l, '{$this->period_label}') as period_name"),
+                    new QueryExpression("COUNT(DISTINCT " . Ticket::getTable() . ".id) as nb"),
                 ],
-                'COUNT' => 'nb',
                 'FROM' => new QuerySubQuery($list_date_table, 'list_date'),
                 'LEFT JOIN' => array_merge(
                     [
                         Ticket::getTable() => [
-                            'OR' => [
-                                Ticket::getTable() . '.solvedate > list_date.period_l',
-                                new QueryExpression(Ticket::getTable() . '.solvedate IS NULL'),
-                                Ticket::getTable() . '.date' => ['<=', 'list_date.period_l'],
+                            'AND' => [
+                                Ticket::getTable() . '.date' => ['<=', new QueryExpression('list_date.period_l')],
+                                'OR' => [
+                                    Ticket::getTable() . '.solvedate' => ['>', new QueryExpression('list_date.period_l')],
+                                    new QueryExpression(Ticket::getTable() . '.solvedate IS NULL'),
+                                ],
                             ],
                         ],
                     ],