projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #8131 - chinese translations
[Pman.Core]
/
DataObjects
/
Core_notify_recur.php
diff --git
a/DataObjects/Core_notify_recur.php
b/DataObjects/Core_notify_recur.php
index
39fb063
..
ceca27c
100644
(file)
--- a/
DataObjects/Core_notify_recur.php
+++ b/
DataObjects/Core_notify_recur.php
@@
-2,7
+2,7
@@
/**
* Table Definition for core_notify_recur
*/
/**
* 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
{
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
{
@@
-48,12
+48,25
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
*
/* the code above is auto generated do not remove the tag below */
*
/* 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)));
function notifytimesRange($advance) {
$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))
);
+ $end =
min( new DateTime("NOW + $advance DAYS"), new DateTime($this->dtend ) )->format('Y-m-d H:i:s'
);
+ return array($start, $end);
}
function method()
}
function method()
@@
-70,6
+83,8
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
// it starts 24 hours ago.. or when dtstart
list($start, $end) = $this->notifytimesRange($advance);
// 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..
if (strtotime($start) > strtotime($end)) {
return array(); // no data..
@@
-97,14
+112,18
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
$usedays[] = date("Y-m-d", $ut);
}
}
$usedays[] = date("Y-m-d", $ut);
}
}
-
+
//print_r($this);
foreach($usedays as $d){
foreach($hours as $h){
$date = new DateTime($d. ' ' . $h, new DateTimeZone($this->tz));
//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')));
+ $tz= ini_get('date.timezone');
+ if(!empty($tz)){
+ $date->setTimezone(new DateTimeZone($tz));
+ }
+
$ret[] = $date->format('Y-m-d H:i:s');
}
}
$ret[] = $date->format('Y-m-d H:i:s');
}
}
@@
-129,7
+148,8
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
$notifytimes = $this->notifyTimes(2);
$notifytimes = $this->notifyTimes(2);
- ////print_R($notifytimes);
+ //echo "{$this->person()->email}\n";
+ //print_R($notifytimes);
$newSearch = DB_DataObject::factory('core_notify');
$newSearch->whereAdd( 'act_start > NOW()');
$newSearch = DB_DataObject::factory('core_notify');
$newSearch->whereAdd( 'act_start > NOW()');
@@
-138,20
+158,24
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
// returns array('2012-12-xx'=>12, 'date' => id....)
// returns array('2012-12-xx'=>12, 'date' => id....)
-
foreach($notifytimes as $time){
if (isset($old[$time])) {
// we already have it...
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;
}
unset($old[$time]);
continue;
}
- if (strtotime($time) < time()) {
- // will not get deleted..
- //echo "SKIP BEFORE NOW";
- unset($old[$time]);
+
+ if (strtotime($time) < time()) { // should not happen, just in case...
continue;
}
continue;
}
+
// do not have a notify event... creat it..
$add = DB_DataObject::factory('core_notify');
$add->setFrom(array(
// do not have a notify event... creat it..
$add = DB_DataObject::factory('core_notify');
$add->setFrom(array(
@@
-174,6
+198,13
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
}
}
+ function person()
+ {
+ $p = DB_DAtaObject::factory('core_person');
+ $p->get($this->person_id);
+ return $p;
+ }
+
function onUpdate($old, $request,$roo)
{
$this->generateNotificationsSingle();
function onUpdate($old, $request,$roo)
{
$this->generateNotificationsSingle();
@@
-192,4
+223,5
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
// should delete old events that have not occurred...
$n->delete(DB_DATAOBJECT_WHEREADD_ONLY);
}
// should delete old events that have not occurred...
$n->delete(DB_DATAOBJECT_WHEREADD_ONLY);
}
+
}
}