DataObjects/Core_notify.php

[Pman.Core] / DataObjects / Core_notify.php

diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php
index 211c5ec..4f0d684 100644 (file)
--- a/DataObjects/Core_notify.php
+++ b/DataObjects/Core_notify.php
@@ -41,6 +41,7 @@ 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;
     
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -82,7 +83,13 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
             $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 act_start($set = false)
     {
@@ -105,11 +112,34 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
         return false;
         
     }
+    
+    function triggerEvent()
+    {
+
+        $c = DB_DataObject::factory('Events');
+        
+        if ($c->get($this->trigger_event_id)) {
+            return $c;
+        }
+        return false;
+        
+    }
+    
     function delivered()
     {
         return !empty($this->msgid);
     }
     
+    function whereAddDeliveryStatus($delivered = false)
+    {
+        $tn = $this->tableName();
+        if ($delivered) {
+            $this->whereAdd("$tn.msgid IS NOT NULL AND $tn.msgid != ''");
+        } else {
+            $this->whereAdd("$tn.msgid IS NULL OR $tn.msgid = ''");    
+        }
+    }
+    
     function status() // used by commandline reporting at present..
     {
         switch($this->event_id) {
@@ -129,17 +159,17 @@ 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'))) {
+        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($hi);
+            //echo '<PRE>';print_R($ji);
             // get cols
-            foreach($ji['cols'] as $cname=>$fname) {
-                //$this->selectAdd($fname . ' as ontable_id_' . $cname );
+            foreach($ji['join_names'] as $cname=>$fname) {
+                 $this->selectAdd($fname . ' as ontable_id_' . $cname );
             }
             
             //$this->selectAdd($d->_query['data_select']); -- this will cause the same dataIndex...
@@ -167,6 +197,11 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject
                 case 'PENDING';
                     $this->whereAdd('event_id = 0 OR (event_id  > 0 AND act_when > NOW() )');
                     break;
+                
+                case 'OPENED';
+                    $this->whereAdd('is_open > 0');
+                    break;
+                
                 case 'ALL':
                 default:
                     break;