X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FEvents.php;h=aa786eed1bfc830e5a91287068ea61a35cb5c9df;hb=53904bb95e9e82c17fea5369826f00e738fac5f1;hp=48105eb6f7a5a3f02e0cb6ac948a26c1dc712deb;hpb=0e76d07afa079de28736a08d087aace22640a695;p=Pman.Core

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 48105eb6..aa786eed 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -25,6 +25,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     public $person_id;                       // int(11)  
     public $remarks;                         // blob(65535)  blob
     public $person_table;                    // string(64)
+    public $dupe_id;                    // int(11)
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -73,12 +74,12 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             }
             
             $jt = DB_DataObject::factory($person);
-            $this->whereAdd("
-                    person_table  = '{$jt->tableName()}'
-                    OR
-                    person_table = ''
-                    OR person_table IS NULL"
-            ); // default to  our standard.. - unless otherwise requested..
+            //$this->whereAdd("
+            //        person_table  = '{$jt->tableName()}'
+            //        OR
+            //        person_table = ''
+            //        OR person_table IS NULL"
+            //); // default to  our standard.. - unless otherwise requested..
         }
         
         
@@ -91,13 +92,9 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             $this->whereAdd(" {$tn}.event_when <=  '$dt' ");
         }
         
-        if(!empty($q['dup_check'])){
-        	   $et = DB_DataObject::factory($tn);
-            $this->_join .= "LEFT JOIN {$et->tableName()} AS evet ON (evet.id=Events.id)";
-            $this->selectAdd("(select count(*)+1 from Events where Events.dup_id = evet.id) as cnt ");        	   
-        	   $this->selectAs($et,'%s','evet');
-        	   $this->having('Events.dup_id = 0 ');
-            
+        if(!empty($q['_with_dupe_count'])){
+            $this->dupe_id = 0;        	                   
+            $this->selectAdd("(select count(*)+1 from Events ev_cnt where ev_cnt.dupe_id = {$tn}.id) as dupe_count");
         }
         /*
         if (!empty($q['query']['grouped']) && $q['query']['grouped'] == 'gr') {
@@ -220,6 +217,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             if (!$obj) {
                 $roo->jerr("ontable is invalid");
             }
+            
             if (!method_exists($obj,'relatedWhere')) {
                 $roo->jerr( $q['_related_on_table'] . " Does not have method relatedWhere :" .
                            implode(',', get_class_methods($obj)));
@@ -318,6 +316,9 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         } 
           
         $this->person_name = $au && !empty($au->name) ? $au->name : '';
+        //print_r($au);
+        //exit;
+        //$this->who = $au && !empty($au->name) ? $au->name : '';
         if (empty($au) || (isset($au->id) && empty($au->id))) {
             // not authenticated - and a standard id based object
             $this->person_id = 0;
@@ -327,7 +328,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             $cols = $this->tableColumns();
             $col = isset($cols[$col]) ? $col : 'person_id'; // for BC.... - revert to using person_id
             $this->{$col} = $au->pid();
-            //$this->person_id = $au ? (!empty($au->id) ? $au->id : $au->pid()) : -1;
+            //$this->person_id = $au ? (!empty($au->id) ? $au->id : $au->pid()) : -1;            
         }
         $this->person_table = $au ? $au->tableName() : '';
         $this->ipaddr = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : 'cli';
@@ -424,7 +425,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
                 $this->ipaddr = $_SERVER['HTTP_X_FORWARDED_FOR'];
             }
-        }
+        }        
     }
     
     function beforeUpdate($old, $request,$roo)