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

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index f9e8a548..37838a90 100644
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -64,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)
@@ -100,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:
@@ -122,24 +129,50 @@ 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->_join .= "
-//                LEFT JOIN {$d->tableName()} ON {$this->tableName()}.onid = {$d->tableName()}.id
-//                {$d->_join}
-//            "; 
-//        } 
-//        if (isset($q['query']['person_id_name']) ) {
-//            $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'");
-//             
-//        }
-//        
+        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;
+            }
+        }
+