X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=95a14e1eb45a174ff7715a5f232bca3cdde8f65c;hb=fbfe51d177173a95c6d475e74ba9064b6a838a4d;hp=12f0e8de5d610fd7128227d04a6b43df1ad9fa86;hpb=0831225d1c0dd570b91c2b04a966c23baf61216c;p=Pman.Core

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 12f0e8de..95a14e1e 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 '',
@@ -17,8 +18,8 @@ CREATE TABLE  core_notify  (
   PRIMARY KEY (`id`),
   INDEX `lookup`(`act_when`, `msgid`)
 );
-*/
- 
+**/
+
 require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_notify extends DB_DataObject 
@@ -26,30 +27,47 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
+    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
+    public $person_id;                       // int(11)  not_null
+    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
     
-    public $__table = 'core_notify';         
-    public $act_when;                        
-    
-    public $ontable;                         
-    public $onid;                            
-    
-    public $person_id;                       
+    /* the code above is auto generated do not remove the tag below */
+    ###END_AUTOCODE
     
-    public $msgid;   // message id after it has been sent. -- empty if not sent..
-    public $sent;    // date it was sent.?? or last effort..
-    public $bounced; // 1 - failed to send (??) // 2 = we got a bounce.
-
-
-    function person()
+    function person($set = false)
     {
+        if ($set !== false) {
+            $this->person_id = is_object($set) ? $set->id : $set;
+            return;
+        }
         $c = DB_DataObject::Factory('Person');
         $c->get($this->person_id);
         return $c;
         
     }
-    function object()
+    function object($set = false)
     {
+        if ($set !== false) {
+            $this->ontable = $set->tableName();
+            $this->onid = $set->id;
+            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;
@@ -57,5 +75,77 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         return false;
         
     }
-  
-}
\ No newline at end of file
+    
+    
+    function act_start($set = false)
+    {
+        if ($set === false) {
+            return $this->act_start;
+        }
+        $this->act_when = $set;
+        $this->act_start = $set;
+        return $set;
+    }
+    
+    function event()
+    {
+
+        $c = DB_DataObject::factory('Events');
+        
+        if ($c->get($this->event_id)) {
+            return $c;
+        }
+        return false;
+        
+    }
+    function delivered()
+    {
+        return !empty($msgid);
+    }
+    
+    function status() // used by commandline reporting at present..
+    {
+        switch($this->event_id) {
+            case -1:
+                return 'DELIVERED';
+            case 0:
+                return 'PENDING';
+            default:
+                $p ='';
+                if (strtotime($this->act_when) > time()) {
+                    $p = "RETRY: {$this->act_when} ";
+                }
+                return  $p. $this->event()->remarks;
+        }
+        
+    }
+    
+    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->_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'])}%'");
+             
+        }
+        
+        
+        
+        
+        
+        
+    }
+    
+}