From 277fd881052708a2fd056efec15c9ed8d27ba6a4 Mon Sep 17 00:00:00 2001
From: rylon <rylon@web.de>
Date: Wed, 10 Jun 2015 17:52:23 +0200
Subject: [PATCH] fixed todo total count

---
 .../qq/SYS_SAIMOD_TODO_COUNT_FREE.php         | 18 ++++++++++++++++
 .../qq/SYS_SAIMOD_TODO_COUNT_MINE.php         | 18 ++++++++++++++++
 .../qq/SYS_SAIMOD_TODO_COUNT_OTHERS.php       | 21 +++++++++++++++++++
 .../qq/SYS_SAIMOD_TODO_COUNT_TYPE.php         | 21 +++++++++++++++++++
 .../saimod_sys_todo/saimod_sys_todo.php       |  9 +++++++-
 5 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php
 create mode 100644 sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_MINE.php
 create mode 100644 sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_OTHERS.php
 create mode 100644 sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_TYPE.php

diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php
new file mode 100644
index 0000000..8064264
--- /dev/null
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_FREE.php
@@ -0,0 +1,18 @@
+<?php
+namespace SYSTEM\DBD;
+
+class SYS_SAIMOD_TODO_COUNT_FREE extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'todo',
+//mys
+'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 assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' IS NULL'.
+' 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/qq/SYS_SAIMOD_TODO_COUNT_MINE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_MINE.php
new file mode 100644
index 0000000..723f8bd
--- /dev/null
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_MINE.php
@@ -0,0 +1,18 @@
+<?php
+namespace SYSTEM\DBD;
+
+class SYS_SAIMOD_TODO_COUNT_MINE extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'todo',
+//mys
+'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 assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ?'.
+' 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/qq/SYS_SAIMOD_TODO_COUNT_OTHERS.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_OTHERS.php
new file mode 100644
index 0000000..4719298
--- /dev/null
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_OTHERS.php
@@ -0,0 +1,21 @@
+<?php
+namespace SYSTEM\DBD;
+
+class SYS_SAIMOD_TODO_COUNT_OTHERS extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'todo',
+//mys
+'SELECT COUNT(*) as count FROM ('.
+' SELECT todo.id'.
+' 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 NOT assign.'.\SYSTEM\DBD\system_todo_assign::FIELD_USER.' = ?'.
+' 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 ?)'.
+' GROUP BY todo.id'.
+') as a;'
+);}}
diff --git a/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_TYPE.php b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_TYPE.php
new file mode 100644
index 0000000..617afbe
--- /dev/null
+++ b/sai/modules/saimod_sys_todo/qq/SYS_SAIMOD_TODO_COUNT_TYPE.php
@@ -0,0 +1,21 @@
+<?php
+namespace SYSTEM\DBD;
+
+class SYS_SAIMOD_TODO_COUNT_TYPE extends \SYSTEM\DB\QP {
+    protected static function query(){
+        return new \SYSTEM\DB\QQuery(get_class(),
+//pg            
+'todo',
+//mys
+'SELECT COUNT(*) as count FROM ('.
+' SELECT todo.id'.
+' 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_TYPE.' = ?'.
+' 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 ?)'.
+' GROUP BY todo.id'.
+') as a;'
+);}}
diff --git a/sai/modules/saimod_sys_todo/saimod_sys_todo.php b/sai/modules/saimod_sys_todo/saimod_sys_todo.php
index d18c368..6324bf1 100644
--- a/sai/modules/saimod_sys_todo/saimod_sys_todo.php
+++ b/sai/modules/saimod_sys_todo/saimod_sys_todo.php
@@ -66,30 +66,37 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule {
         $userid = \SYSTEM\SECURITY\Security::getUser()->id;
         switch($filter){
             case 'mine':
+                $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT_MINE::Q1(array($state,$userid,$search,$search,$search))['count'];
                 $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_LIST_MINE::QQ(array($state,$userid,$search,$search,$search));
                 $vars['filter_mine'] = 'active';
                 break;
             case 'free':
+                $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT_FREE::Q1(array($state,$search,$search,$search))['count'];
                 $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_LIST_FREE::QQ(array($state,$search,$search,$search));
                 $vars['filter_free'] = 'active';
                 break;
             case 'others':
+                $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT_OTHERS::Q1(array($state,$userid,$search,$search,$search))['count'];
                 $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_LIST_OTHERS::QQ(array($state,$userid,$search,$search,$search));
                 $vars['filter_others'] = 'active';
                 break;
             case 'gen':
+                $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT_TYPE::Q1(array($state,\SYSTEM\DBD\system_todo::FIELD_TYPE_EXCEPTION,$search,$search,$search))['count'];
                 $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_LIST_TYPE::QQ(array($state,\SYSTEM\DBD\system_todo::FIELD_TYPE_EXCEPTION,$search,$search,$search,$userid));
                 $vars['filter_gen'] = 'active';
                 break;
             case 'user':
+                $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT_TYPE::Q1(array($state,\SYSTEM\DBD\system_todo::FIELD_TYPE_USER,$search,$search,$search))['count'];
                 $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_LIST_TYPE::QQ(array($state,\SYSTEM\DBD\system_todo::FIELD_TYPE_USER,$search,$search,$search,$userid));
                 $vars['filter_user'] = 'active';
                 break;
             case 'report':
+                $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT_TYPE::Q1(array($state,\SYSTEM\DBD\system_todo::FIELD_TYPE_REPORT,$search,$search,$search))['count'];
                 $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_LIST_TYPE::QQ(array($state,\SYSTEM\DBD\system_todo::FIELD_TYPE_REPORT,$search,$search,$search,$userid));
                 $vars['filter_report'] = 'active';
                 break;
             default:
+                $count = \SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT::Q1(array($state))['count'];
                 $res = \SYSTEM\DBD\SYS_SAIMOD_TODO_LIST::QQ(array($state,$search,$search,$search,$userid));
                 $vars['filter_all'] = 'active';
                 break;
@@ -107,7 +114,7 @@ class saimod_sys_todo extends \SYSTEM\SAI\SaiModule {
             $vars['todo_list_elements'] .=  \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_user_list_element.tpl'), $row);
             $count_filtered++;
         }
-        $vars['count'] = $count_filtered.'/'.\SYSTEM\DBD\SYS_SAIMOD_TODO_COUNT::Q1(array($state))['count'];
+        $vars['count'] = $count_filtered.'/'.$count;
         $vars['state'] = $state == \SYSTEM\DBD\system_todo::FIELD_STATE_OPEN ? 'todo' : 'todo(doto)';
         $vars = array_merge($vars, \SYSTEM\PAGE\text::tag(\SYSTEM\DBD\system_text::TAG_SAI_TODO));
         return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_todo/tpl/todo_list.tpl'), $vars);