X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_watch.php;h=d84775ff0178580c66d754de8a49ee32a0c99954;hb=06417ad74cdf4fd96acd06c393bd699f0574fff4;hp=8b249e9f1d654020c69d452c456fee0ac571c737;hpb=016528d0970c82cf4ae0f770389537cfbab01a4f;p=Pman.Core

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index 8b249e9f..d84775ff 100644
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -74,67 +74,132 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         $nw->insert();
          
     }
-    
-    function notify($ontable , $onid, $whereAdd)
+    /**
+     * Generate a notify event based on watches (matching whereAdd)
+     *
+     * Usage: $core_watch->notify('mtrack_repos', 1, false, date()
+     *
+     * This can match any 'event' type - eg. it can be blank etc...
+     *   Generally used by non-event driven notifications, like our
+     *   Daily commit message.
+     *
+     *  @param string $ontable - the database table that has been updated/changed etc.
+     *  @param int    $onid    - the id of the row changed
+     *  @param string  $whereAdd (optiona) - a DB whereAdd() condition to filter the search for watches
+     *  @param datetime    $when   (default now)  - date/time to create the notification for (Eg. end of day..)
+     * 
+     */
+    function notify($ontable , $onid, $whereAdd = false, $when=false)
     {
-        $w = DB_DataObject::factory('core_watch');
-        $w->whereAdd($whereAdd);
-        $w->selectAdd();
-        $w->selectAdd('distinct(person_id) as person_id');
-        $people = $w->fetchAll('person_id');
+        $w = DB_DataObject::factory('core_watch');   
+        if ($whereAdd !== false) { 
+            $w->whereAdd($whereAdd  );
+        }
+        $w->active =1;
         
-        $nn = DB_DataObject::Factory('core_notify');
-        $nn->ontable = $ontable;
-        $nn->onid = $onid;
-        foreach($people as $p) {
-            if (!$p) { // no people??? bugs in watch table
+        $w->whereAdd('onid = 0 OR onid='. ((int) $onid));
+       
+        
+        $w->ontable = $ontable;
+        //$w->selectAdd();
+        //$w->selectAdd('distinct(person_id) as person_id');
+        
+        foreach($w->fetchAll() as $w) { 
+            if (!$w->person_id) { // no people??? bugs in watch table
                 continue;
             }
-            $n = clone($nn);
-            $n->person_id = $p;
-            $nf = clone($n);
-            $nf->whereAdd('sent < act_when');
+         
+         
+         
+            $nn = DB_DataObject::Factory('core_notify');
+            $nn->ontable = $ontable;
+            $nn->onid = $onid;
+            $nn->evtype = $w->medium;
+            $nn->person_id = $w->person_id;
+            
+            $nf = clone($nn);
+            $nf->whereAdd("sent < '2000-01-01'");
             if ($nf->count()) {
                 // we have a item in the queue for that waiting to be sent..
                 continue;
             }
-            $n->act_start( date("Y-m-d H:i:s") );
-            $n->insert();
-            
-            
+            $nn->act_start( date("Y-m-d H:i:s", $when !== false ? strtotime($when) : time()) );
+            $nn->insert();
         }
-         
+          
     }
     // static really...
+    /**
+     *
+     * This get's called by roo->jok()
+     *
+     * And searches for matching '$watch->event' == $event->action
+     *  along with id/table etc..
+     *
+     * it's basic usage is to fill in core_notify after an event has happend.
+     *
+     * We can also use it to notify other modules if something has happend.
+     *  = eg. mtrack_ticket * watch will notify mtrack_jira::
+     *
+     * @param Pman_Core_DataObject_Events $event - the Pman event dataobject that was created
+     * 
+     */
+    
     function notifyEvent($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... -
+        //    if more intelligence is needed...
+        //    then it 'rules' will have to be added by the watched object....
+        //    anyway leave that for another day..
+        if (empty($event->action)) {
+            return;
+        }
         $w = DB_DataObject::factory('core_watch');
         $w->ontable = $event->on_table;
         $w->whereAdd('onid = 0 OR onid='. ((int) $event->on_id));
+       
         $w->event  = $event->action;
-        $w->whereAdd('person_id != '. (int) $event->person_id)));
-
+        $w->active = 1;
         
+        
+        $w->whereAdd('person_id != '. (int) $event->person_id);
+ 
         $watches = $w->fetchAll();
         
+        //print_R($watches);exit;
+        
         $nn = DB_DataObject::Factory('core_notify');
         $nn->ontable    = $event->on_table;
         $nn->onid       = $event->on_id;
         
         foreach($watches as $watch) {
             if (!$watch->person_id) { // no people??? bugs in watch table
+                $dom = explode(':',$watch->medium);
+                if (count($dom) != 2) {
+                    continue;
+                }
+                $do = DB_DataObject::factory($dom[0]);
+                if (!method_exists($do,$dom[1])) {
+                    continue;
+                }
+                $do->{$dom[1]}($event);
+                
                 continue;
             }
             
             $n = clone($nn);
-            $n->person_id = $p;
+            $n->trigger_person_id = $event->person_id;
+            $n->trigger_event_id = $event->id;
+            $n->person_id = $watch->person_id;
             $n->watch_id =  $watch->id;
             
             // does this watch already have a flag...
             $nf = clone($n);
-            $nf->whereAdd('sent < act_when');
+            $nf->whereAdd("sent ><'2000-01-01'");
+            //$nf->whereAdd('sent < act_when');
             if ($nf->count()) {
                 // we have a item in the queue for that waiting to be sent..
                 continue;