X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify_recur.php;h=428b30cb79a305857c4bed5900988c3860d75dca;hb=0782c2267d4722a857baab803c0e7c2c9cefc2a3;hp=64971db57d39cc9e2bcad6852e7959b6ce834bd6;hpb=b00fe7af26aadf7494a7b1fc323eca38f6af5b46;p=Pman.Core

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index 64971db5..428b30cb 100644
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -12,6 +12,7 @@ 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
@@ -28,9 +29,8 @@ 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   
     ###END_AUTOCODE
     
     
@@ -47,8 +47,8 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
     
     function notifytimesRange($advance) {
         
-        $start = date('Y-m-d H:i:s', max(strtotime("NOW - 24 HOURS"), strtotime($this->dtstart)));
-        $end  = date('Y-m-d H:i:s', min(strtotime("NOW  + $advance DAYS"), strtotime($this->dtend)));
+        $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)));
         
     }
     
@@ -64,43 +64,121 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
             return array(); // no data..
         }
         $ret = array();
-        $hours = array_unique(json_decode($this->freq_hour));
-        $days = json_decode($this->freq_day);
-        foreach($days as $d){
-            foreach($hours as $h){
-                $ret[] = date('Y-m-d', strtotime($d)) . ' ' . $h;
+        $hours = empty($this->freq_hour) ? array() : array_unique(json_decode($this->freq_hour));
+        $days = empty($this->freq_day) ? array() : json_decode($this->freq_day);
+        
+        //days to use are = MON FRI SUN
+        
+        //ARE there events on these day in advance days in the future?
+        //TODAY = 25th of may (FRI)
+        //TODAY+1  = 26th  (SAT)
+        //TODAY +2 = 27th = SUN (2== advance)
+        //foreeach day in the future upto >>> advance <<< days?
+            
+         // - does an event occur on this day?
+        //    -YES - then we will generate an event for it.
+         //   -NO nothing happens..
+        $usedays = array();
+        for (  $i =0; $i < $advance +1; $i++) {
+            $ut = strtotime("NOW + $i DAYS");
+            $day = strtoupper(date("D", $ut));
+            if (in_array($day, $days)) {
+                $usedays[] = date("Y-m-d", $ut);
             }
         }
-        return $this->applyTimezoneToList($ret);
-    }
-    function applyTimezoneToList($ar)
-    {
-        $ret = array();
-        foreach($ar as $a) {
-            $date = new DateTime($a);
-            $date->setTimezone(new DateTimeZone($this->tz));
-            $ret[] = $date->format('Y-m-d H:i');
+                
+        //print_r($this);
+        
+        
+        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')));
+                $ret[] = $date->format('Y-m-d H:i:s');
+            }
         }
         return $ret;
     }
     
-    function generateNotifications(){
-        
+    function generateNotifications()
+    {
         //DB_DataObject::debugLevel(1);
         $w = DB_DataObject::factory($this->tableName());
         $w->find();
         
         while($w->fetch()){
-            $notifytimes = $w->notifyTimes(2);
-            var_dump($notifytimes);
+            $w->generateNotificationsSingle();
+        
         }
-        foreach($notifytimes as $newTimes){
-            $newSearch = DB_DataObject::factory('core_notify');
-            
-            $newSearch->whereAdd("act_start == $newTimes");
-            $newSearch->delete(DB_DATAOBJECT_WHEREADD_ONLY);
- 
+    }
+    
+    
+    function generateNotificationsSingle()
+    {
+        
+
+        $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 (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(
+                "recur_id" => $this->id,
+                "act_start" => $time,
+                "act_when" => $time,
+                "person_id" => $this->person_id,
+                "onid" => $this->onid,
+                "ontable" => $this->ontable,
+                'evtype' => $this->method,
+            ));
+            $add->insert();
+        }
+        foreach($old as $date => $id ) {
+                $del = DB_DataObject::factory('core_notify');
+                $del->get($id);
+                $del->delete();
         }
+        //echo("UPDATED");
+
     }
     
+    function onUpdate($old, $request,$roo)
+    {
+        $this->generateNotificationsSingle();
+        
+    }
+    function onInsert($request,$roo)
+    {
+        $this->generateNotificationsSingle();
+        
+    }
+    function beforeDelete($dependants_array, $roo)
+    {
+        $n = DB_DataObject::Factory("core_notify");
+        $n->recur_id = $this->id;
+        $n->whereAdd('act_start > NOW() OR act_when > NOW()');
+        // should delete old events that have not occurred...
+        $n->delete(DB_DATAOBJECT_WHEREADD_ONLY);
+    }
 }