X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_notify_recur.php;h=ceca27cb28f11d8144010a2e3a0beb3c719e9ea4;hp=747c4236bf2e4e563c0361ccbcfc72cb097a48c2;hb=HEAD;hpb=00f4f5ab349a5c5a27a775a76882e965d49e2d0a diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php index 747c4236..ceca27cb 100644 --- a/DataObjects/Core_notify_recur.php +++ b/DataObjects/Core_notify_recur.php @@ -2,7 +2,7 @@ /** * Table Definition for core_notify_recur */ -require_once 'DB/DataObject.php'; +class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php'; class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject { @@ -28,10 +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 - 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 = min( new DateTime("NOW + $advance DAYS"), new DateTime($this->dtend ) )->format('Y-m-d H:i:s'); + + return array($start, $end); + } + function method() + { + $e = DB_DataObject::Factory('core_enum'); + $e->get($this->method_id); + return $e; } function notifytimes($advance) @@ -59,125 +83,145 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject // it starts 24 hours ago.. or when dtstart list($start, $end) = $this->notifytimesRange($advance); + //var_dump(array($start, $end)); + //print_r($this); 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); + //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); + } + } + + //print_r($this); - switch($this->freq) { - case 'HOURLY': - - - - // happens every day based on freq_hour. - $hours = explode(',', $this->freq_hour); - for ($day = date('Y-m-d', strtotime($start)); - strtotime($day) < strtotime($end); - $day = date('Y-m-d', strtotime("$day + 1 DAY"))) - { - foreach($hours as $h) { - $hh = strpos($h,":") > 0 ? $h : "$H:00"; - $ret[] = $day . ' ' . $hh; - } - } - return $this->applyTimezoneToList($ret); - - case 'DAILY': - $hours = explode(',', $this->freq_hour); - if (!$hours) { - $hours = array(date('H:i', strtotime($this->dtstart))); - } - - $days = explode(','. $this->freq_day); - - for ($day = date('Y-m-d', strtotime($start)); - strtotime($day) < strtotime($end); - $day = date('Y-m-d', strtotime("$day + 1 DAY"))) - { - // skip days not accounted for.. - if (!in_array(date('N', strtotime($day)), $days)) { - continue; - } - - foreach($hours as $h) { - $hh = strpos($h,":") > 0 ? $h : "$H:00"; - $ret[] = $day . ' ' . $hh; - } + + foreach($usedays as $d){ + foreach($hours as $h){ + $date = new DateTime($d. ' ' . $h, new DateTimeZone($this->tz)); + $tz= ini_get('date.timezone'); + if(!empty($tz)){ + $date->setTimezone(new DateTimeZone($tz)); } - return $this->applyTimezoneToList($ret); - - - case 'MONTHLY': // ignored.. - case 'YEARLY': // ignored.. - break; - + $ret[] = $date->format('Y-m-d H:i:s'); + } } - + return $ret; } - function applyTimezoneToList($ar) + + function generateNotifications() { - $ret = array(); + //DB_DataObject::debugLevel(1); + $w = DB_DataObject::factory($this->tableName()); + $w->find(); - $tz = explode($this->tz, ":"); - if ($tz < 0) { - - } - $append = ($tz[0] < 0) ? " - " : " + "; + while($w->fetch()){ + $w->generateNotificationsSingle(); - $append .= abs($tz[0]) . " HOURS"; - if (!empty($tz[1])) { - $append .= $tz[1] . " MINUTES"; } + } + + + function generateNotificationsSingle() + { + + $notifytimes = $this->notifyTimes(2); + //echo "{$this->person()->email}\n"; + //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($ar as $a) { - $ret[] = date('Y-m-d H:i', strtotime($a . $append)); + foreach($notifytimes as $time){ + + 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()) { // should not happen, just in case... + 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()->name, + )); + $add->insert(); } - return $ret; - - + foreach($old as $date => $id ) { + $del = DB_DataObject::factory('core_notify'); + $del->get($id); + $del->delete(); + } + //echo("UPDATED"); + } - function generateNotifications(){ - //$this->notifytimes(2); - //DB_DataObject::debugLevel(1); - $w = DB_DataObject::factory($this->tableName()); - //$this->notifytimes(2); - $w->find(); - //$test = $w->fetchAll(); - - //$test = $this->notifytimes(2); + function person() + { + $p = DB_DAtaObject::factory('core_person'); + $p->get($this->person_id); + return $p; + } + + function onUpdate($old, $request,$roo) + { + $this->generateNotificationsSingle(); - $test = array(); - while($w->fetch()){ - $this->id = $w->id; - $this->person_id = $w->person_id; - $this->dtstart = $w->dtstart; - $this->dtend = $w->dtend; - $this->tz = $w->tz; - $this->updated_dt = $w->updated_dt; - $this->last_applied_dt = $w->last_applied_dt; - $this->freq = $w->freq; - $this->freq_day = $w->freq_day; - $this->freq_hour = $w->freq_hour; - $this->onid = $w->onid; - $this->ontable = $w->ontable; - $this->last_event_id = $w->last_event_id; - $this->method = $w->method; - //$this->dtstart = $w->dtstart; - //$this->dtend = $w->dtend; - //$this = clone($w); - $w->notifytimes(2); - error_log($this->dtstart); - } -// foreach($test as $item){ -// error_log($item); -// } + } + 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); + } }