DataObjects/Core_event_audit.php

[Pman.Core] / DataObjects / Core_notify.php

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 5bb0863..f7f945f 100644 (file)
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -40,16 +40,29 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
     /* 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;
@@ -57,7 +70,20 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         return false;
         
     }
+    
+    
+    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');
         
@@ -72,15 +98,19 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         return !empty($msgid);
     }
     
-    function status()
+    function status() // used by commandline reporting at present..
     {
         switch($this->event_id) {
             case -1:
-                'DELIVERED';
+                return 'DELIVERED';
             case 0:
-                'PENDING';
+                return 'PENDING';
             default:
-                $e = $this->event();
+                $p ='';
+                if (strtotime($this->act_when) > time()) {
+                    $p = "RETRY: {$this->act_when} ";
+                }
+                return  $p. $this->event()->remarks;
         }
         
     }