From 8af0c320c689051a991ca6eeb9df9c4064d7cd3f Mon Sep 17 00:00:00 2001 From: Jacek Pyziak Date: Tue, 29 Apr 2025 00:53:07 +0200 Subject: [PATCH] feat: Add project filtering to task query in Tasks class --- .vscode/ftp-kr.sync.cache.json | 32 ++++++++++++++++---------------- autoload/factory/class.Tasks.php | 4 ++++ 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.vscode/ftp-kr.sync.cache.json b/.vscode/ftp-kr.sync.cache.json index f09780b..baf0703 100644 --- a/.vscode/ftp-kr.sync.cache.json +++ b/.vscode/ftp-kr.sync.cache.json @@ -28,8 +28,8 @@ }, "class.Cron.php": { "type": "-", - "size": 9078, - "lmtime": 1744750480403, + "size": 9096, + "lmtime": 1745269340417, "modified": false }, "class.DbModel.php": { @@ -95,8 +95,8 @@ }, "class.Tasks.php": { "type": "-", - "size": 16360, - "lmtime": 1744581157874, + "size": 16529, + "lmtime": 1745269305993, "modified": false }, "class.Users.php": { @@ -133,20 +133,20 @@ }, "class.Projects.php": { "type": "-", - "size": 27175, - "lmtime": 0, + "size": 27334, + "lmtime": 1745261880238, "modified": false }, "class.Tasks.php": { "type": "-", - "size": 18757, - "lmtime": 1744582081660, + "size": 20791, + "lmtime": 1745269325909, "modified": false }, "class.Users.php": { "type": "-", - "size": 2020, - "lmtime": 0, + "size": 2075, + "lmtime": 1745259639804, "modified": false }, "class.Wiki.php": { @@ -297,8 +297,8 @@ "Simple-Gant-master": { "frappe-gantt.css": { "type": "-", - "size": 6233, - "lmtime": 1744498267948, + "size": 6562, + "lmtime": 1745265437709, "modified": false }, "frappe-gantt.js": { @@ -374,14 +374,14 @@ }, "main_view.php": { "type": "-", - "size": 31767, - "lmtime": 1744581620678, + "size": 31639, + "lmtime": 1745260051438, "modified": false }, "task_edit.php": { "type": "-", - "size": 7891, - "lmtime": 1744321858310, + "size": 8855, + "lmtime": 1745269287931, "modified": false }, "task_popup.php": { diff --git a/autoload/factory/class.Tasks.php b/autoload/factory/class.Tasks.php index afd9eab..0b7d34a 100644 --- a/autoload/factory/class.Tasks.php +++ b/autoload/factory/class.Tasks.php @@ -52,6 +52,10 @@ class Tasks $sql = ''; } + if ( $projects ) { + $sql .= ' AND project_id IN (' . implode( ',', $projects ) . ') '; + } + if ( $user_id != 1 ) { $sql_query = 'SELECT ' . 't.id, t.name, t.date_start, t.date_end, t.status, t.client_id, parent_id, priority '