X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_watch.php;h=438884c006a0b4de316f77d62ba59a869882c53b;hp=4fa3d644d3e4a73c41c19a4a651ae67821174a98;hb=fc0afbc16b364ea50aa668cbe6cb451e4a74046d;hpb=fc1d0500a21670687b3f81f7e63b627166c5d00f

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index 4fa3d644..438884c0 100644
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -1,3 +1,4 @@
+
 <?php
 /**
  * Table Definition for core_watch
@@ -47,12 +48,75 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
     ###END_AUTOCODE
     /** make sure there is a watch for this user.. */
     
+    
+    function applyFilters($q,$au, $roo)
+    {
+        if (!empty($q['_list_actions'])) {
+            $this->listActions($roo,$q);
+        }
+        //die("apply filters");
+        if (!empty($q['_split_event_name'])) {
+            $this->selectAdd("
+                
+                substr( event, substring_index(event, '.')) as event_left,
+                substr( event, 0, substring_index(event, '.')) as event_right        
+                             
+            ");
+            
+            
+            
+        }
+        
+    }
+    
+    function toRooSingleArray($au,$q)
+    {
+        $ret = $this->toArray();
+        if (empty($q['_split_event_name'])) {
+            return $ret;
+        }
+        $bits = explode('.', $this->event);
+        $ret['event_left'] = $bits[0];
+        $ret['event_right'] = $bits[1];
+        // check core enu.
+        if (!empty($ret['event_right'])) {
+            $ce = DB_DataObject::factory('core_enum')->lookup($q['_split_event_name'], $ret['event_right']);
+            $ret['event_right_display_name'] = $ce;
+        }
+        
+        
+        
+        
+    }
+    
+    function listActions($roo, $q) {
+        
+        //print_r($q);
+        $d = DB_DataObject::Factory($q['on_table']);
+        $ret = array();
+        
+        foreach(get_class_methods($d) as $m) {
+            //var_dump($m);
+            if (!preg_match('/^notify/', $m)) {
+                continue;
+            }
+            $ret[] = array(
+                'display_name' => preg_replace('/^notify/', '' , $m),
+                'name' => $q['on_table'] .':'. $m
+            );
+        }
+        $roo->jdata($ret);
+    }
+    
     /**
      *
      * Create a watch...
      *
      */
     
+    
+    
+    
     function ensureNotify(  $ontable, $onid, $person_id, $whereAdd)
     {
         //DB_DAtaObject::debugLevel(1);
@@ -134,7 +198,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
     // static really...
     /**
      *
-     * This get's called by roo->jok()
+     * This get's called by roo->addEvent()
      *
      * And searches for matching '$watch->event' == $event->action
      *  along with id/table etc..
@@ -150,7 +214,8 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
     
     function notifyEvent($event)
     {
-        //DB_DataObject::DebugLevel(1);
+        //print_r($event);
+       //DB_DataObject::DebugLevel(1);
         // see if there are any watches on events..
         // notify everyone flagged except the person doing it...
         // this is very basic logic... -
@@ -172,7 +237,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
  
         $watches = $w->fetchAll();
         
-       //print_R($watches);exit;
+        //print_R($watches); //exit;
         
         $nn = DB_DataObject::Factory('core_notify');
         $nn->ontable    = $event->on_table;
@@ -190,15 +255,16 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
                 // in which case we set the  set $nn->evtype = medium..
                 // in that case - just let the called method generate the notify..
                 
-                
+                //print_R($dom);
                 $do = DB_DataObject::factory($dom[0]);
                 if (!method_exists($do,$dom[1])) {
                     continue;
                 }
-                echo "calling {$watch->medium}\n";
+                //echo "calling {$watch->medium}\n";
                 // the triggered method, can either do something
                 // or modify the notify event..
                 if ($do->{$dom[1]}($event, $n) !== false) {
+                    //echo "method did not return false?";
                     continue;
                 }
                 
@@ -219,11 +285,9 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
                 // we have a item in the queue for that waiting to be sent..
                 continue;
             }
-            
-            $n->act_start( date("Y-m-d H:i:s") );
+            //echo "inserting notify?";
+            $n->act_start( empty($n->act_start) ? date("Y-m-d H:i:s") : $n->act_start );
             $n->insert();
-            
-            
         }