X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_notify_recur.php;h=8f1a787d479224a229863594d22a9ef4119adf26;hp=7e3a98b6de297c243798a97750d4050a48313f3a;hb=b481fb8b33d63f025453eadb23c558d11e8a6212;hpb=dfa0414559e0a08903276c1e0dbac392733e9a6c

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index 7e3a98b6..8f1a787d 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,7 +48,19 @@ 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)));
@@ -52,6 +68,13 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         
     }
     
+    function method()
+    {
+        $e = DB_DataObject::Factory('core_enum');
+        $e->get($this->method_id);
+        return $e;
+    }
+    
     function notifytimes($advance)
     {
         
@@ -63,6 +86,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         if (strtotime($start) > strtotime($end)) {
             return array(); // no data..
         }
+        
         $ret = array();
         $hours = empty($this->freq_hour) ? array() : array_unique(json_decode($this->freq_hour));
         $days = empty($this->freq_day) ? array() : json_decode($this->freq_day);
@@ -93,7 +117,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         foreach($usedays as $d){
             foreach($hours as $h){
                 $date = new DateTime($d. ' ' . $h, new DateTimeZone($this->tz));
-                $date->setTimezone(new DateTimeZone(ini_get('date.timezone')));
+                $date->setTimezone(new DateTimeZone(date_default_timezone_get()));
                 $ret[] = $date->format('Y-m-d H:i:s');
             }
         }
@@ -104,6 +128,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
     {
         //DB_DataObject::debugLevel(1);
         $w = DB_DataObject::factory($this->tableName());
+        $w->id = 117;
         $w->find();
         
         while($w->fetch()){
@@ -118,6 +143,8 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         
 
         $notifytimes = $this->notifyTimes(2);
+        print_R($notifytimes);exit;
+        
         $newSearch = DB_DataObject::factory('core_notify');
         $newSearch->whereAdd( 'act_start > NOW()');
         $newSearch->recur_id = $this->id;
@@ -125,18 +152,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 not get deleted..
-                unset($old[$time]);
-                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(
@@ -146,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();
         }
@@ -155,6 +191,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
                 $del->get($id);
                 $del->delete();
         }
+        //echo("UPDATED");
 
     }
     
@@ -176,4 +213,45 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         // should delete old events that have not occurred...
         $n->delete(DB_DATAOBJECT_WHEREADD_ONLY);
     }
+    
+    function toRooSingleArray($authUser, $request)
+    {
+        $ret = $this->toArray();
+        
+        if(!empty($ret['keyword_filters'])){
+            $keywords = array_unique(array_filter(explode(',', $ret['keyword_filters'])));
+            
+            $clipping_keywords = DB_DataObject::factory('clipping_keywords');
+            $clipping_keywords->whereAddIn('id', $keywords, 'int');
+            
+            $li = array();
+            
+            foreach ($clipping_keywords->fetchAll('id', 'keyword') as $k => $v){
+                $li[] = array(
+                    'id' => $k,
+                    'keyword' => $v
+                );
+            }
+            
+            $ret['keywords'] = json_encode($li);
+        }
+        
+        return $ret;
+    }
+    
+    function toRooArray($request)
+    {
+        $ret = $this->toArray();
+        
+        if(!empty($ret['keyword_filters'])){
+            $keywords = array_unique(array_filter(explode(',', $ret['keyword_filters'])));
+            
+            $clipping_keywords = DB_DataObject::factory('clipping_keywords');
+            $clipping_keywords->whereAddIn('id', $keywords, 'int');
+            
+            $ret['keywords'] = implode(',', $clipping_keywords->fetchAll('keyword'));
+        }
+        
+        return $ret;
+    }
 }