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

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 618a9ec9..87b5a74c 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:
@@ -128,17 +135,43 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
             //DB_DAtaObject::DebugLevel(1);
             // then we can build a join..
             $d = DB_DataObject::Factory($q['ontable']);
-            $d->autoJoin();
-            $this->selectAdd($d->_query['data_select']);
+            $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;
+            }
+        }