DataObjects/Core_notify_recur.php

[Pman.Core] / DataObjects / Core_notify_recur.php

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index 39fb063..af802e1 100644 (file)
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -48,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)));
@@ -143,6 +155,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;
             }
@@ -192,4 +211,43 @@ 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');
+            
+            $ret['keywords'] = array();
+            
+            foreach ($clipping_keywords->fetchAll('id', 'keyword') as $k => $v){
+                $ret['keywords'][] = array(
+                    'id' => $k,
+                    'keyword' => $v
+                );
+            }
+        }
+        
+        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;
+    }
 }