X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FEvents.php;h=edecb2e33b32c3ff862091872b4d5579fcd557c1;hb=b5a9ee22e0949d7f54647d248f40e5c4ead12662;hp=ed093ff7f678dc7281466dad837e0a9f3deae7b9;hpb=2e4c37563f377701c9cd18fce771bccc3cd767b6;p=Pman.Core

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index ed093ff7..edecb2e3 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -41,15 +41,16 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         if(!empty($q['person_table'])){
             $jt = DB_DataObject::factory($q['person_table']);
 
-            $et = DB_DataObject::factory($tn);
+            
             
             if(!array_key_exists("{$jt->tableName()}_id", $this->tableColumns())){ // coz we have triiger on mysql...
                 
                 $keys = $jt->keys();
             
                 $this->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.{$keys[0]}=Events.person_id)";
-                $this->selectAdd("(select count(*) from Events where Events.dup_id = evet.id) as cnt ");
-                $this->selectAs($et,'%s','evet');
+                
+                $this->selectAdd();
+                $this->selectAs();
 
                 $this->selectAs($jt, 'person_id_%s', 'join_person_id_id');
 
@@ -88,6 +89,16 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         if (!empty($q['query']['to'])) {
             $dt = date('Y-m-d' , strtotime($q['query']['to']));
             $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(*) from Events where Events.dup_id = evet.evet_id) as cnt ");        	   
+        	   //$this->selectAs($et,'%s','evet');
+        	   
+            
+            
         }
         /*
         if (!empty($q['query']['grouped']) && $q['query']['grouped'] == 'gr') {