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

diff --git a/DataObjects/Core_group.php b/DataObjects/Core_group.php
index 1fb155bc..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,10 +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());
             }
         }
         
+        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(${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() {
@@ -139,6 +187,9 @@ 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');
+        //PDO_DAtaObject::DebugLevel(1); 
         return $gm->count();
     }
 
@@ -146,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');
 
     }
@@ -159,8 +212,8 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
 
     function addMember($person,$roo = false)
     {
-        if ($this->name != "Empty Group") {
-            $roo->jerr('Cannot the person into the empty group');
+        if ($this->name == "Empty Group") {
+            $roo->jerr('Cannot add the person into Empty Group');
         }
         $gm = DB_Dataobject::factory('core_group_member');
         $gm->group_id = $this->id;
@@ -199,8 +252,6 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
         // groups databse is hard coded to person.. so this should not be used for other tables.????
         $p = DB_Dataobject::factory( 'core_person' );
 
-
-
         $p->whereAdd('id IN ('. implode(',', $ids) .')');
         $p->active = 1;
 
@@ -253,7 +304,7 @@ class Pman_Core_DataObjects_Core_group extends DB_DataObject
 
     function initGroups()
     {
-
+        
         $g = DB_DataObject::factory($this->tableName());
         $g->type = 0;
         $g->name = 'Administrators';