X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=37838a9009f17a248bcc8d961120f93bd8284fcd;hb=273ebac79faf5ba0b8520f859f5ce807ad6f4d76;hp=7b4ad51f93fcb80659066273571e166301f59096;hpb=4c4993af478d9a4d4f748bebe0183b7e29ac59e3;p=Pman.Core

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 7b4ad51f..37838a90 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,29 +37,65 @@ 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
     
-    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;
         }
         return false;
         
     }
+    function beforeDelete($dependants_array, $roo) {
+        if ($this->delivered()) {
+            $roo->jerr("you can not delete a record of a successfull delivery");
+        }
+    }
+    
+    
+    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');
         
@@ -69,19 +107,77 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
     }
     function delivered()
     {
-        return !empty($msgid);
+        return !empty($this->msgid);
     }
     
-    function status()
+    function status() // used by commandline reporting at present..
     {
         switch($this->event_id) {
             case -1:
-                return 'DELIVERED';
+                return 'DELIVERED';   //not valid..
             case 0:
                 return 'PENDING';
             default:
-                $e = $this->event();
+                $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']);
+            $ji = $d->autoJoin();
+            echo '<PRE>';print_R($ji);
+            // get cols
+            foreach($ji['cols'] as $cname=>$fname) {
+                //$this->selectAdd($fname . ' as ontable_id_' . $cname );
+            }
+            
+            //$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'])}%'");
+             
         }
+         if (!empty($q['query']['status'])) {
+            switch ($q['query']['status']) {
+                
+                case 'SUCCESS';
+                    $this->whereAdd("msgid  != ''");
+                    break;
+                case 'FAILED';
+                    
+                    $this->whereAdd("msgid  = '' AND event_id > 0 AND act_when < NOW()");
+                    
+                    break;
+                case 'PENDING';
+                    $this->whereAdd('event_id = 0 OR (event_id  > 0 AND act_when > NOW() )');
+                    break;
+                case 'ALL':
+                default:
+                    break;
+            }
+        }
+        
+        
+        
+        
+        
         
     }
+    
 }