X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify_recur.php;h=d8274cc61e0b493ede1fcbd57a361f17e9e6ee8b;hb=f1da5ba7765fb48f2c907423d3293e8fe64ffb6e;hp=34cc2f6e8056f2f3dfd99415d482a7862e7a7226;hpb=14343d91799a38445dbbc6ff5fc8a1301716e3bd;p=Pman.Core

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index 34cc2f6e..d8274cc6 100644
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -12,7 +12,6 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
     public $__table = 'core_notify_recur';    // table name
     public $id;                              // int(11)  not_null primary_key auto_increment
     public $person_id;                       // int(11)  not_null
-    public $recur_id;                       //INT(11) not_null
     
     public $dtstart;                         // datetime(19)  not_null binary
     public $dtend;                           // datetime(19)  not_null binary
@@ -29,9 +28,14 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
     public $onid;                            // int(11)  not_null
     public $ontable;                         // string(128)  not_null
     public $last_event_id;                   // int(11)  
-    public $method;                         // string(128)  not_null
+    public $method;                         // depricated.
+    public $method_id;                         // string(128)  not_null
+    
+    public $recur_id;                       //INT(11) not_null
+
     
     ###END_AUTOCODE
+    //NOTE recur_id and method are depricated.
     
     
     /*
@@ -44,12 +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)
@@ -86,8 +110,8 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
                 $usedays[] = date("Y-m-d", $ut);
             }
         }
-                
-        //print_r($usedays);
+               
+        //print_r($this);
         
         
         foreach($usedays as $d){
@@ -118,6 +142,8 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         
 
         $notifytimes = $this->notifyTimes(2);
+        //print_R($notifytimes);
+        
         $newSearch = DB_DataObject::factory('core_notify');
         $newSearch->whereAdd( 'act_start > NOW()');
         $newSearch->recur_id = $this->id;
@@ -125,17 +151,27 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         // returns array('2012-12-xx'=>12, 'date' => id....)
 
         
+        
         foreach($notifytimes as $time){
-            if (strtotime($time) < time()) {
-                // will get deleted..
-                continue;
-            }
+           
             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;
             }
-
+            if (strtotime($time) < time()) {
+                // will not get deleted..
+                //echo "SKIP BEFORE NOW";
+                unset($old[$time]);
+               continue;
+            }
             // do not have a notify event... creat it..
             $add = DB_DataObject::factory('core_notify');
             $add->setFrom(array(
@@ -144,7 +180,8 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
                 "act_when" => $time,
                 "person_id" => $this->person_id,
                 "onid" => $this->onid,
-                "ontable" => $this->ontable
+                "ontable" => $this->ontable,
+                'evtype' => $this->method()->name,
             ));
             $add->insert();
         }
@@ -153,6 +190,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
                 $del->get($id);
                 $del->delete();
         }
+        //echo("UPDATED");
 
     }
     
@@ -174,4 +212,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);
     }
+    
 }