X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=31057c2f3c1293f3909a952d2b525f49caa54107;hp=fe0325e95a76603faf3c3954169408d5aa2f1960;hb=3d6f3f3d89c16df61d6c25746464ac98b8f93f3c;hpb=29141d6efc4c8a069094195112e84197dc18422a

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index fe0325e9..31057c2f 100644
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -7,6 +7,7 @@
  *
 CREATE TABLE  core_notify  (
   `id` int(11)  NOT NULL AUTO_INCREMENT,
+  `recur_id` INT(11) NOT NULL;
   `act_when` DATETIME NOT NULL,
   `onid` int(11)  NOT NULL DEFAULT 0,
   `ontable` varchar(128)  NOT NULL DEFAULT '',
@@ -28,6 +29,7 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
 
     public $__table = 'core_notify';                     // table name
     public $id;                              // int(11)  not_null primary_key auto_increment
+    public $recur_id;                        // int(11) not_null
     public $act_when;                        // datetime(19)  not_null multiple_key binary
     public $onid;                            // int(11)  not_null
     public $ontable;                         // string(128)  not_null
@@ -35,7 +37,10 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
     public $msgid;                           // string(128)  not_null
     public $sent;                            // datetime(19)  not_null binary
     public $event_id;                        // int(11)  
-
+    public $watch_id;                        // int(11)  
+    public $trigger_person_id;                 // int(11)
+    public $trigger_event_id;              // int(11)  
+    public $evtype;                         // event type (or method to call)fall
     
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -59,13 +64,30 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
             return $set;
         }
         $c = DB_DataObject::factory($this->ontable);
+        if ($this->onid == 0) {
+            return $c; // empty dataobject.
+        }
+        
         $c->autoJoin();
+        
         if ($c->get($this->onid)) {
             return $c;
         }
         return false;
         
     }
+    
+    
+    function act_start($set = false)
+    {
+        if ($set === false) {
+            return $this->act_start;
+        }
+        $this->act_when = $set;
+        $this->act_start = $set;
+        return $set;
+    }
+    
     function event()
     {
 
@@ -98,4 +120,33 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         }
         
     }
+    
+    function applyFilters($q, $au, $roo)
+    {
+        if (isset($q['ontable']) && !in_array($q['ontable'], array('Person', 'Events' . 'core_watch'))) {
+            // this will only work on tables not joined to ours.
+            
+            //DB_DAtaObject::DebugLevel(1);
+            // then we can build a join..
+            $d = DB_DataObject::Factory($q['ontable']);
+            $d->autoJoin();
+            //$this->selectAdd($d->_query['data_select']); -- this will cause the same dataIndex...
+            $this->_join .= "
+                LEFT JOIN {$d->tableName()} ON {$this->tableName()}.onid = {$d->tableName()}.id
+                {$d->_join}
+            "; 
+            $this->selectAs($d, 'core_notify_%s');
+        } 
+        if (isset($q['query']['person_id_name']) ) {
+            $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'");
+             
+        }
+        
+        
+        
+        
+        
+        
+    }
+    
 }