DataObjects/Events.php

[Pman.Core] / DataObjects / Events.php

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 046a6ad..edecb2e 100644 (file)
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -37,16 +37,18 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     {
         $tn = $this->tableName();
         // if not empty on_table
+        
         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();
                 $this->selectAs();
 
@@ -87,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') {