Project-Pro/crmPRO
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Zaktualizuj zapytania w klasie Tasks, aby filtrować zadania według statusu 3 zamiast 2

Browse Source
This commit is contained in:
Jacek Pyziak
2025-12-29 00:27:23 +01:00
parent adab4009ea
commit 4992c3e7b6
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.vscode/ftp-kr.sync.cache.json vendored
View File

@@ -203,20 +203,20 @@
"layout": { "layout": {
"style.css": { "style.css": {
"type": "-", "type": "-",
"size": 22678, "size": 22693,
"lmtime": 1764183540355, "lmtime": 1765311863239,
"modified": false "modified": false
}, },
"style.css.map": { "style.css.map": {
"type": "-", "type": "-",
"size": 40575, "size": 40598,
"lmtime": 1764183540367, "lmtime": 1765311863239,
"modified": false "modified": false
}, },
"style.scss": { "style.scss": {
"type": "-", "type": "-",
"size": 28194, "size": 28215,
"lmtime": 1764183540380, "lmtime": 1765311862998,
"modified": false "modified": false
} }
}, },

6
autoload/factory/class.Tasks.php
View File

@@ -388,7 +388,7 @@ class Tasks
$results = $mdb -> select( 'crm_client', '*', [ 'ORDER' => [ 'firm' => 'ASC' ] ] ); $results = $mdb -> select( 'crm_client', '*', [ 'ORDER' => [ 'firm' => 'ASC' ] ] );
foreach ( $results as $row ) foreach ( $results as $row )
{ {
$results2 = $mdb -> query( 'SELECT DISTINCT(t.id), t.name, t.pay_rate FROM tasks AS t LEFT JOIN tasks_work AS tw ON t.id = tw.task_id WHERE status != 2 AND client_id = ' . $row['id'] . ' AND tw.date_end BETWEEN \'' . date( 'Y-m-01' ) . ' 00:00:00\' AND \'' . date( 'Y-m-' ) . date( 't' ) . ' 00:00:00\' ORDER BY t.date_add DESC' ) -> fetchAll( \PDO::FETCH_ASSOC ); $results2 = $mdb -> query( 'SELECT DISTINCT(t.id), t.name, t.pay_rate FROM tasks AS t LEFT JOIN tasks_work AS tw ON t.id = tw.task_id WHERE status = 3 AND client_id = ' . $row['id'] . ' AND tw.date_end BETWEEN \'' . date( 'Y-m-01' ) . ' 00:00:00\' AND \'' . date( 'Y-m-' ) . date( 't' ) . ' 00:00:00\' ORDER BY t.date_add DESC' ) -> fetchAll( \PDO::FETCH_ASSOC );
foreach ( $results2 as $row2 ) foreach ( $results2 as $row2 )
{ {
@@ -396,7 +396,7 @@ class Tasks
$row['tasks'][ date( 'Y-m' )][] = $row2; $row['tasks'][ date( 'Y-m' )][] = $row2;
} }
$results2 = $mdb -> query( 'SELECT DISTINCT(t.id), t.name, t.pay_rate FROM tasks AS t LEFT JOIN tasks_work AS tw ON t.id = tw.task_id WHERE status != 2 AND client_id = ' . $row['id'] . ' AND tw.date_end BETWEEN \'' . date( 'Y-m-01', strtotime( '-1 months', time() ) ) . ' 00:00:00\' AND \'' . date( 'Y-m-', strtotime( '-1 months', time() ) ) . date( 't', strtotime( '-1 months', time() ) ) . ' 00:00:00\' ORDER BY t.date_add DESC' ) -> fetchAll( \PDO::FETCH_ASSOC ); $results2 = $mdb -> query( 'SELECT DISTINCT(t.id), t.name, t.pay_rate FROM tasks AS t LEFT JOIN tasks_work AS tw ON t.id = tw.task_id WHERE status = 3 AND client_id = ' . $row['id'] . ' AND tw.date_end BETWEEN \'' . date( 'Y-m-01', strtotime( '-1 months', time() ) ) . ' 00:00:00\' AND \'' . date( 'Y-m-', strtotime( '-1 months', time() ) ) . date( 't', strtotime( '-1 months', time() ) ) . ' 00:00:00\' ORDER BY t.date_add DESC' ) -> fetchAll( \PDO::FETCH_ASSOC );
foreach ( $results2 as $row2 ) foreach ( $results2 as $row2 )
{ {
@@ -404,7 +404,7 @@ class Tasks
$row['tasks'][ date( 'Y-m', strtotime( '-1 months', time() ) )][] = $row2; $row['tasks'][ date( 'Y-m', strtotime( '-1 months', time() ) )][] = $row2;
} }
$results2 = $mdb -> query( 'SELECT DISTINCT(t.id), t.name, t.pay_rate FROM tasks AS t LEFT JOIN tasks_work AS tw ON t.id = tw.task_id WHERE status != 2 AND client_id = ' . $row['id'] . ' AND tw.date_end BETWEEN \'' . date( 'Y-m-01', strtotime( '-2 months', time() ) ) . ' 00:00:00\' AND \'' . date( 'Y-m-', strtotime( '-2 months', time() ) ) . date( 't', strtotime( '-2 months', time() ) ) . ' 00:00:00\' ORDER BY t.date_add DESC' ) -> fetchAll( \PDO::FETCH_ASSOC ); $results2 = $mdb -> query( 'SELECT DISTINCT(t.id), t.name, t.pay_rate FROM tasks AS t LEFT JOIN tasks_work AS tw ON t.id = tw.task_id WHERE status = 3 AND client_id = ' . $row['id'] . ' AND tw.date_end BETWEEN \'' . date( 'Y-m-01', strtotime( '-2 months', time() ) ) . ' 00:00:00\' AND \'' . date( 'Y-m-', strtotime( '-2 months', time() ) ) . date( 't', strtotime( '-2 months', time() ) ) . ' 00:00:00\' ORDER BY t.date_add DESC' ) -> fetchAll( \PDO::FETCH_ASSOC );
foreach ( $results2 as $row2 ) foreach ( $results2 as $row2 )
{ {