Merge pull request #194 from Leantime/reportQueryBug

query issues
Leantime · Apr 1, 2020 · 60b8260 · 60b8260
2 parents 66d53c6 + 2b01f0d
commit 60b8260
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/domain/ideas/repositories/class.ideas.php b/src/domain/ideas/repositories/class.ideas.php
@@ -325,10 +325,10 @@ public function getCanvasItemsById($id)
  zp_canvas_items
  
  LEFT JOIN zp_user AS t1 ON zp_canvas_items.author = t1.id
- LEFT JOIN zp_tickets AS progressTickets ON progressTickets.dependingTicketId = zp_canvas_items.milestoneId
+ LEFT JOIN zp_tickets AS progressTickets ON progressTickets.dependingTicketId = zp_canvas_items.milestoneId AND progressTickets.type <> 'milestone' AND progressTickets.type <> 'subtask'
  LEFT JOIN zp_tickets AS milestone ON milestone.id = zp_canvas_items.milestoneId
  LEFT JOIN zp_comment ON zp_canvas_items.id = zp_comment.moduleId and zp_comment.module = 'idea'
- WHERE zp_canvas_items.canvasId = :id AND progressTickets.type <> 'milestone' AND progressTickets.type <> 'subtask'
+ WHERE zp_canvas_items.canvasId = :id 
  GROUP BY zp_canvas_items.id
  ORDER BY zp_canvas_items.sortindex";
 
@@ -383,10 +383,10 @@ public function getSingleCanvasItem($id)
  END AS percentDone
  FROM 
  zp_canvas_items
- LEFT JOIN zp_tickets AS progressTickets ON progressTickets.dependingTicketId = zp_canvas_items.milestoneId
+ LEFT JOIN zp_tickets AS progressTickets ON progressTickets.dependingTicketId = zp_canvas_items.milestoneId AND progressTickets.type <> 'milestone' AND progressTickets.type <> 'subtask'
  LEFT JOIN zp_tickets AS milestone ON milestone.id = zp_canvas_items.milestoneId
  LEFT JOIN zp_user AS t1 ON zp_canvas_items.author = t1.id
- WHERE zp_canvas_items.id = :id AND progressTickets.type <> 'milestone' AND progressTickets.type <> 'subtask'
+ WHERE zp_canvas_items.id = :id 
  ";
 
  $stmn = $this->db->database->prepare($sql);

diff --git a/src/domain/leancanvas/repositories/class.leancanvas.php b/src/domain/leancanvas/repositories/class.leancanvas.php
@@ -312,10 +312,10 @@ public function getCanvasItemsById($id)
  zp_canvas_items
  
  LEFT JOIN zp_user AS t1 ON zp_canvas_items.author = t1.id
- LEFT JOIN zp_tickets AS progressTickets ON progressTickets.dependingTicketId = zp_canvas_items.milestoneId
+ LEFT JOIN zp_tickets AS progressTickets ON progressTickets.dependingTicketId = zp_canvas_items.milestoneId AND progressTickets.type <> 'milestone' AND progressTickets.type <> 'subtask' 
  LEFT JOIN zp_tickets AS milestone ON milestone.id = zp_canvas_items.milestoneId
  LEFT JOIN zp_comment ON zp_canvas_items.id = zp_comment.moduleId and zp_comment.module = 'leancanvasitem'
- WHERE zp_canvas_items.canvasId = :id AND progressTickets.type <> 'milestone' AND progressTickets.type <> 'subtask' 
+ WHERE zp_canvas_items.canvasId = :id 
  GROUP BY zp_canvas_items.id
  ORDER BY zp_canvas_items.box, zp_canvas_items.sortindex";
 
@@ -370,10 +370,10 @@ public function getSingleCanvasItem($id)
  END AS percentDone
  FROM 
  zp_canvas_items 
- LEFT JOIN zp_tickets AS progressTickets ON progressTickets.dependingTicketId = zp_canvas_items.milestoneId
+ LEFT JOIN zp_tickets AS progressTickets ON progressTickets.dependingTicketId = zp_canvas_items.milestoneId AND progressTickets.type <> 'milestone' AND progressTickets.type <> 'subtask'
  LEFT JOIN zp_tickets AS milestone ON milestone.id = zp_canvas_items.milestoneId
  LEFT JOIN zp_user AS t1 ON zp_canvas_items.author = t1.id
- WHERE zp_canvas_items.id = :id AND progressTickets.type <> 'milestone' AND progressTickets.type <> 'subtask'
+ WHERE zp_canvas_items.id = :id 
  ";
 
  $stmn = $this->db->database->prepare($sql);

diff --git a/src/domain/retrospectives/repositories/class.retrospectives.php b/src/domain/retrospectives/repositories/class.retrospectives.php
@@ -287,10 +287,10 @@ public function getCanvasItemsById($id)
  zp_canvas_items
  
  LEFT JOIN zp_user AS t1 ON zp_canvas_items.author = t1.id
- LEFT JOIN zp_tickets AS progressTickets ON progressTickets.dependingTicketId = zp_canvas_items.milestoneId
+ LEFT JOIN zp_tickets AS progressTickets ON progressTickets.dependingTicketId = zp_canvas_items.milestoneId AND progressTickets.type <> 'milestone' AND progressTickets.type <> 'subtask'
  LEFT JOIN zp_tickets AS milestone ON milestone.id = zp_canvas_items.milestoneId
  LEFT JOIN zp_comment ON zp_canvas_items.id = zp_comment.moduleId and zp_comment.module = 'retrospective'
- WHERE zp_canvas_items.canvasId = :id AND progressTickets.type <> 'milestone' AND progressTickets.type <> 'subtask'
+ WHERE zp_canvas_items.canvasId = :id
  GROUP BY zp_canvas_items.id
  ORDER BY zp_canvas_items.box, zp_canvas_items.sortindex";
 
@@ -345,10 +345,10 @@ public function getSingleCanvasItem($id)
  END AS percentDone
  FROM 
  zp_canvas_items
- LEFT JOIN zp_tickets AS progressTickets ON progressTickets.dependingTicketId = zp_canvas_items.milestoneId
+ LEFT JOIN zp_tickets AS progressTickets ON progressTickets.dependingTicketId = zp_canvas_items.milestoneId AND progressTickets.type <> 'milestone' AND progressTickets.type <> 'subtask'
  LEFT JOIN zp_tickets AS milestone ON milestone.id = zp_canvas_items.milestoneId
  LEFT JOIN zp_user AS t1 ON zp_canvas_items.author = t1.id
- WHERE zp_canvas_items.id = :id AND progressTickets.type <> 'milestone' AND progressTickets.type <> 'subtask'
+ WHERE zp_canvas_items.id = :id 
  ";
 
  $stmn = $this->db->database->prepare($sql);