X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=e5c17ee7e2136ca136a60a5115479d016c9ff655;hb=0f051553a65f31981af05b560e0baf9cf6998781;hp=2776ce4a8b8b1eb473251ff9e07cb406e5b47d63;hpb=a4a42dae2ef33c8597b6b192654486d0b3c27d9a;p=Pman.Core

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 2776ce4a..e5c17ee7 100644
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -41,18 +41,35 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
     public $trigger_person_id;                 // int(11)
     public $trigger_event_id;              // int(11)  
     public $evtype;                         // event type (or method to call)fall
-    
+    public $act_start;
+    public $person_table;
+
+
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
     
     function person($set = false)
     {
         if ($set !== false) {
-            $this->person_id = is_object($set) ? $set->id : $set;
+            $this->person_table = is_object($set) ? $set->tableName() : '';
+            
+            $person_table = empty($this->person_table) ? 'Person' : $this->person_table;
+            $col = $person_table  == "Person" ? 'person_id' : $person_table . '_id';
+            
+            $this->{$col} = is_object($set) ? $set->id : $set;
             return;
         }
-        $c = DB_DataObject::Factory('Person');
-        $c->get($this->person_id);
+        static $cache  =array();
+        $person_table = empty($this->person_table) ? 'Person' : $this->person_table;
+        $col = $person_table == "Person" ? 'person_id' : $person_table . '_id';
+        
+        if (isset($cache[$person_table .':'. $this->{$col}])) {
+            return $cache[$person_table .':'. $this->{$col}];
+        }
+        
+        $c = DB_DataObject::Factory($person_table);
+        $c->get($this->{$col});
+        $cache[$person_table .':'. $this->{$col}] = $c;
         return $c;
         
     }
@@ -77,11 +94,42 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         return false;
         
     }
+    
+    function lookup($obj, $person, $evtype='')
+    {
+        $x = DB_DataObject::Factory($this->tableName());
+        $x->object($obj);
+        $x->person($person);
+        if (!empty($evtype)) {
+            $x->evtype = $evtype;
+        }
+        if ($x->count() != 1) {
+            return false;
+        }
+        $x->find(true);
+        return $x;
+        
+    }
+    
+    
     function beforeDelete($dependants_array, $roo) {
         if ($this->delivered()) {
             $roo->jerr("you can not delete a record of a successfull delivery");
         }
     }
+    function  beforeInsert($request,$roo)
+    {
+        if (empty($request['act_when']) && !empty($request['act_start'])) {
+            $this->act_start($request['act_start']);
+        }
+        
+    }
+    function beforeUpdate($old, $request,$roo)
+    {
+        if (empty($request['act_when']) && !empty($request['act_start'])) {
+            $this->act_start($request['act_start']);
+        }
+    }
     
     
     function act_start($set = false)
@@ -149,6 +197,41 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         }
         
     }
+    /**
+     * current state of process
+     *
+     * 0 = pending
+     * 1 = delivered
+     * -1 = failed
+     *
+     *
+     */
+    function state()
+    {
+           
+        if ($this->msgid != '') {
+            return 1;
+        }
+        
+        // msgid is empty now..
+        // if act_when is greater than now, then it's still pending.
+        if (strtotime($this->act_when) > time()) {
+            return 0; 
+        }
+        
+        // event id can be filled in with a failed attempt.
+        
+        if ($this->event_id > 0) {
+            return -1;
+        }
+        
+        // event id is empty, and act_when is in the past... not sent yet..
+        
+        return 0; // pending
+        
+        
+    }
+    
     
     function applyFilters($q, $au, $roo)
     {
@@ -172,7 +255,7 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
             "; 
             $this->selectAs($d, 'core_notify_%s');
         } 
-        if (isset($q['query']['person_id_name']) ) {
+        if (!empty($q['query']['person_id_name']) ) {
             $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'");
              
         }
@@ -201,10 +284,33 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
             }
         }
         
+        if(!empty($q['_evtype_align'])){
+            $this->selectAdd("
+                (SELECT
+                        display_name
+                FROM
+                        core_enum
+                WHERE
+                        etype = 'Core.NotifyType'
+                    AND
+                        name = core_notify.evtype
+                    AND
+                        active = 1
+                ) AS evtype_align
+            ");
+        }
         
+        if(!empty($q['from'])){
+            $this->whereAdd("
+                act_when >= '{$q['from']}'
+            ");
+        }
         
-        
-        
+        if(!empty($q['to'])){
+            $this->whereAdd("
+                act_when <= '{$q['to']}'
+            ");
+        }
         
     }