X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=87b5a74ce6cfa1f63cc54f8c87e4debbe239e38d;hb=960e3f15f3e5b55365c4d382b8882d144f222592;hp=f7ec69376a2310b77dd5ef6fdc19f3dac8b100b3;hpb=4ac4082577a2e070bc886dcd50ac9e83b666d771;p=Pman.Core

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index f7ec6937..87b5a74c 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
@@ -38,7 +40,7 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
     public $watch_id;                        // int(11)  
     public $trigger_person_id;                 // int(11)
     public $trigger_event_id;              // int(11)  
-    public $evtype;                         // event type                       
+    public $evtype;                         // event type (or method to call)fall
     
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -62,17 +64,24 @@ 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 beforeDelete($dependants_array, $roo) {
+        if ($this->delivered()) {
+            $roo->jerr("you can not delete a record of a successfull delivery");
+        }
+    }
     
     
     function act_start($set = false)
@@ -98,14 +107,14 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
     }
     function delivered()
     {
-        return !empty($msgid);
+        return !empty($this->msgid);
     }
     
     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:
@@ -117,4 +126,58 @@ 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']);
+            $ji = $d->autoJoin();
+            //print_R($jinfo);
+            // 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;
+            }
+        }
+        
+        
+        
+        
+        
+        
+    }
+    
 }