projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
commit
[Pman.Core]
/
DataObjects
/
Core_notify_recur.php
diff --git
a/DataObjects/Core_notify_recur.php
b/DataObjects/Core_notify_recur.php
index
8a46f9e
..
bd68312
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 */
*
/* 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)));
@@
-56,6
+68,13
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
}
}
+ function method()
+ {
+ $e = DB_DataObject::Factory('core_enum');
+ $e->get($this->method_id);
+ return $e;
+ }
+
function notifytimes($advance)
{
function notifytimes($advance)
{
@@
-136,6
+155,13
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
if (isset($old[$time])) {
// we already have it...
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;
}
@@
-154,7
+180,7
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
"person_id" => $this->person_id,
"onid" => $this->onid,
"ontable" => $this->ontable,
"person_id" => $this->person_id,
"onid" => $this->onid,
"ontable" => $this->ontable,
- 'evtype' => $this->method,
+ 'evtype' => $this->method
()->name
,
));
$add->insert();
}
));
$add->insert();
}
@@
-185,4
+211,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);
}
+
}
}