From 47f0547e6028060e0ac65c782613fd11cac33331 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Thu, 18 Jun 2015 02:16:47 +0200
Subject: [PATCH] saimod todo - fixed problem with todo counting

---
 sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php | 9 +++++++--
 sai/modules/saimod_sys_todo/saimod_sys_todo.php          | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php
index 9d4cb38..db4e15a 100644
--- a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT.php
@@ -5,7 +5,12 @@ class SYS_SAIMOD_TODO_COUNT extends \SYSTEM\DB\QP {
     protected static function query(){
         return new \SYSTEM\DB\QQuery(get_class(),
 //pg            
-'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_todo::NAME_PG.' WHERE '.\SYSTEM\DBD\system_todo::FIELD_STATE.'=?;',
+'TODO',
 //mys
-'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' WHERE '.\SYSTEM\DBD\system_todo::FIELD_STATE.'=?;'
+'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_todo::NAME_MYS.' as todo'.
+' LEFT JOIN '.\SYSTEM\DBD\system_todo_assign::NAME_MYS.' as assign ON todo.'.\SYSTEM\DBD\system_todo::FIELD_ID.'=assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_TODO.
+' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as creator ON todo.'.\SYSTEM\DBD\system_todo::FIELD_USER.'=creator.'.\SYSTEM\DBD\system_user::FIELD_ID.
+' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.' as assignee ON assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.'=assignee.'.\SYSTEM\DBD\system_user::FIELD_ID.
+' WHERE '.\SYSTEM\DBD\system_todo::FIELD_STATE.'=?'.
+' AND (todo.'.\SYSTEM\DBD\system_todo::FIELD_MESSAGE.' LIKE ? OR creator.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ? OR  assignee.'.\SYSTEM\DBD\system_user::FIELD_USERNAME.' LIKE ?);'
 );}}
diff --git a/sai/modules/saimod_sys_todo/saimod_sys_todo.php b/sai/modules/saimod_sys_todo/saimod_sys_todo.php
index 3e1a1a2..7562bd8 100644
--- a/sai/modules/saimod_sys_todo/saimod_sys_todo.php
+++ b/sai/modules/saimod_sys_todo/saimod_sys_todo.php
@@ -97,7 +97,7 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule {
                 $vars['filter_report'] = 'active';
                 break;
             default:
-                $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT::Q1(array($state))['count'];
+                $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT::Q1(array($state,$search,$search,$search))['count'];
                 $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_LIST::QQ(array($state,$search,$search,$search,$userid));
                 $vars['filter_all'] = 'active';
                 break;