X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify_recur.php;h=56396eb9f9d1f4179a1835bc99b06cf7fe7fd872;hb=8060d5eba0d9bfbaa10e65fde566284fe20aada5;hp=18f16c52ee13e7324928cf0d2163480d55d15f06;hpb=eae738ee66c8f0ee4abe99dc692131c58cb893a1;p=Pman.Core

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index 18f16c52..56396eb9 100644
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -48,19 +48,32 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         *
     /* the code above is auto generated do not remove the tag below */
     
-    
+    function applyFilters($q, $au, $roo)
+    {
+        
+        if (isset($q['query']['person_id_name']) ) {
+            $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'");
+             
+        }
+         
+        
+         
+        
+        
+    }
     function notifytimesRange($advance) {
         
         $start = date('Y-m-d H:i:s', max(strtotime("NOW"), strtotime($this->dtstart)));
         $end  = date('Y-m-d H:i:s', min(strtotime("NOW + $advance DAYS"), strtotime($this->dtend)));
         
+        return array($start, $end);
     }
     
     function method()
     {
         $e = DB_DataObject::Factory('core_enum');
         $e->get($this->method_id);
-        
+        return $e;
     }
     
     function notifytimes($advance)
@@ -97,13 +110,14 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
                 $usedays[] = date("Y-m-d", $ut);
             }
         }
-                
+               
         //print_r($this);
         
         
         foreach($usedays as $d){
             foreach($hours as $h){
                 $date = new DateTime($d. ' ' . $h, new DateTimeZone($this->tz));
+                print_r($date);exit;
                 $date->setTimezone(new DateTimeZone(ini_get('date.timezone')));
                 $ret[] = $date->format('Y-m-d H:i:s');
             }
@@ -129,7 +143,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         
 
         $notifytimes = $this->notifyTimes(2);
-        ////print_R($notifytimes);
+        //print_R($notifytimes);
         
         $newSearch = DB_DataObject::factory('core_notify');
         $newSearch->whereAdd( 'act_start > NOW()');
@@ -143,6 +157,13 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
            
             if (isset($old[$time])) {
                 // we already have it...
+                
+                $oo = DB_DataObject::Factory('core_notify');
+                $oo->get($old[$time]);
+                $oc = clone($oo);
+                $oo->evtype = $this->method()->name;
+                $oo->update($oc);
+                
                 unset($old[$time]);
                 continue;
             }
@@ -161,7 +182,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
                 "person_id" => $this->person_id,
                 "onid" => $this->onid,
                 "ontable" => $this->ontable,
-                'evtype' => $this->method,
+                'evtype' => $this->method()->name,
             ));
             $add->insert();
         }
@@ -192,4 +213,5 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         // should delete old events that have not occurred...
         $n->delete(DB_DATAOBJECT_WHEREADD_ONLY);
     }
+    
 }