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

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index 71b79a79..18f16c52 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.
     
     
     /*
@@ -52,6 +56,13 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         
     }
     
+    function method()
+    {
+        $e = DB_DataObject::Factory('core_enum');
+        $e->get($this->method_id);
+        
+    }
+    
     function notifytimes($advance)
     {
         
@@ -81,13 +92,13 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         $usedays = array();
         for (  $i =0; $i < $advance +1; $i++) {
             $ut = strtotime("NOW + $i DAYS");
-            $day = date("???", $ut);
+            $day = strtoupper(date("D", $ut));
             if (in_array($day, $days)) {
                 $usedays[] = date("Y-m-d", $ut);
             }
         }
                 
-        
+        //print_r($this);
         
         
         foreach($usedays as $d){
@@ -118,23 +129,29 @@ 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;
         $old = $newSearch->fetchAll('act_start', 'id');
         // returns array('2012-12-xx'=>12, 'date' => id....)
 
-
+        
+        
         foreach($notifytimes as $time){
-            if (strtotime($time) < time()) {
-                continue;
-            }
+           
             if (isset($old[$time])) {
                 // we already have it...
                 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(
@@ -143,7 +160,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,
             ));
             $add->insert();
         }
@@ -152,6 +170,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
                 $del->get($id);
                 $del->delete();
         }
+        //echo("UPDATED");
 
     }