don't show finished project tasks in planning, fix glpi-project#1389

orthagh · Jul 3, 2017 · ec42665 · ec42665
1 parent cf911a8
commit ec42665
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/inc/projecttask.class.php b/inc/projecttask.class.php
@@ -1299,11 +1299,22 @@ static function populatePlanning($options=array()) {
                      AND ";
       }
 
+      $DONE_EVENTS = '';
+      if (!$options['display_done_events']) {
+         $DONE_EVENTS = "`glpi_projecttasks`.`percent_done` < 100
+                         AND (glpi_projectstates.is_finished = 0
+                              OR glpi_projectstates.is_finished IS NULL)
+                         AND ";
+      }
+
       $query = "SELECT `glpi_projecttasks`.*
                 FROM `glpi_projecttaskteams`
                 INNER JOIN `glpi_projecttasks`
                   ON (`glpi_projecttasks`.`id` = `glpi_projecttaskteams`.`projecttasks_id`)
+                LEFT JOIN `glpi_projectstates`
+                  ON (`glpi_projecttasks`.`projectstates_id` = `glpi_projectstates`.`id`)
                 WHERE $ASSIGN
+                      $DONE_EVENTS
                       '$begin' < `glpi_projecttasks`.`plan_end_date`
                       AND '$end' > `glpi_projecttasks`.`plan_start_date`
                 ORDER BY `glpi_projecttasks`.`plan_start_date`";