X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=fd7ece8ebf6dbcd25e6af3fe3ff9a817e9e53932;hb=af88561c2c3db4fdbee16380202e9f1b912355e4;hp=b4ba1c259ebd7d8901ec7380b980712a68dbf3d7;hpb=a3820b8ace7bd9fd03ab4401d5aa0e63d416817e;p=Pman.Core

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index b4ba1c25..fd7ece8e 100644
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -64,20 +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.
         }
         
-        if(!$c->get($this->onid)){
-            return false;
-        }
-        
-        
-        //$c->autoJoin();
+        $c->autoJoin();
         
-        return $c;
+        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)
@@ -103,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:
@@ -131,7 +135,11 @@ 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();
+            $ji = $d->autoJoin();
+            //print_R($jinfo);
+            // get cols
+            
+            
             //$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
@@ -143,6 +151,25 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
             $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;
+            }
+        }