X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_group.php;h=a048f9d9d1f03b656b0680c761b8ccb746e54806;hb=051d0cd596a664dba8a5641e9be848159b25ca34;hp=2a86e8e504e718e7a25f8ee71e85247b8b6db791;hpb=6d742ab2110833b1ff82740d10b6b0a040137525;p=Pman.Core

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 2a86e8e5..a048f9d9 100644
--- a/DataObjects/Core_group.php
+++ b/DataObjects/Core_group.php
@@ -40,6 +40,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
     // group types??
     function applyFilters($q, $au, $roo)
     {
+        var_dump($q); 
         if (!empty($q['query']['name_starts'])) {
             $v = $this->escape($q['query']['name_starts']);
             $this->whereAdd("{$this->tableName()}.name like '{$v}%'");
@@ -50,22 +51,57 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
             $core_group = DB_DataObject::factory('core_group');
             
             if($core_group->get('name', $q['_count_member_by_name'])){
-                $roo->jdata($core_group->memberCount());
+                $roo->jok($core_group->memberCount());
             }
         }
-        $cgm = DB_DataObject::Factory('core_group_member')->tableName();;
         
-         $this->selectAdd("
+        if(!empty($q['_with_member_id'])){
+            $this->selectAdd("
+                COALESCE(
+                    (SELECT id from core_group_member
+                        WHERE ...
+                        
+                        LIMIT 1
+                    ),0) as ....
+                    ");
+        }
+        
+        
+        $cp = DB_DataObject::Factory('core_person')->tableName();
+        $cgm = DB_DataObject::Factory('core_group_member')->tableName();
+        
+        $this->selectAdd("
            (
-            SELECT 
-                count(user_id) 
-            FROM 
-                {$cgm}
-            WHERE 
-                {$this->tableName()}.id = {$cgm}.group_id
-            ) 
-            AS group_member_count            
+            SELECT COUNT(${cgm}.user_id) 
+                FROM 
+                    {$cgm}
+                LEFT JOIN
+                    {$cp}
+                ON
+                    ${cp}.id = {$cgm}.user_id
+                WHERE
+                    ${cgm}.group_id = {$this->tableName()}.id
+                AND
+                    ${cp}.active = 1
+                ) AS group_member_count            
         ");
+        
+        /*WHERE 
+            {$this->tableName()}.id = core_group_member.group_id
+            AND
+                core_group_member.user_id = core_person.id
+            AND
+                core_person.active = 1    
+        )*/ 
+        
+//        $this->whereAdd("{$this->tableName()}.id = core_group_member.group_id");
+//        $this->whereAdd("core_group_member.user_id = core_person.id");
+//        $this->whereAdd("core_person.active = 1");
+     
+    
+        /*$cgmDBObj->joinAdd($cpObj);
+        $this->joinAdd($cgmDBObj);
+        DB_DataObject::debugLevel();*/
     }
 
     function toEventString() {
@@ -152,7 +188,8 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
         $gm = DB_Dataobject::factory('core_group_member');
         $gm->group_id = $this->id;
         $gm->autoJoin();
-        PDO_DAtaObject::DebugLevel(1)
+        $gm->whereAdd('join_user_id_id.active = 1');
+        //PDO_DAtaObject::DebugLevel(1); 
         return $gm->count();
     }
 
@@ -160,6 +197,8 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
     {
         $gm = DB_Dataobject::factory('core_group_member');
         $gm->group_id = $this->id;
+        $gm->autoJoin();
+        $gm->whereAdd('join_user_id_id.active = 1');
         return $gm->fetchAll('user_id');
 
     }