X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=dfde126517a70bbdc81a8c4bae91c9d87a1b9a58;hb=f8f197045932ffb305b3ab370365e8725f58bc59;hp=71e9ef518bed4fa89e66739eee238daf58552f8e;hpb=6f7dd2d3bf70fb89441de1ab8c37b8a745f3e17f;p=Pman.Core diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php index 71e9ef51..dfde1265 100644 --- a/DataObjects/Core_notify.php +++ b/DataObjects/Core_notify.php @@ -41,7 +41,10 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject public $trigger_person_id; // int(11) public $trigger_event_id; // int(11) public $evtype; // event type (or method to call)fall - + public $act_start; + public $person_table; + + /* the code above is auto generated do not remove the tag below */ ###END_AUTOCODE @@ -51,8 +54,12 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject $this->person_id = is_object($set) ? $set->id : $set; return; } - $c = DB_DataObject::Factory('Person'); - $c->get($this->person_id); + + $person_table = empty($this->person_table) ? 'Person' : $this->person_table; + $col = $person_table == "Person" ? 'person_id' : $person_table . '_id'; + + $c = DB_DataObject::Factory($person_table); + $c->get($this->{$col}); return $c; } @@ -64,17 +71,37 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject return $set; } $c = DB_DataObject::factory($this->ontable); + if ($this->onid == 0) { return $c; // empty dataobject. } $c->autoJoin(); + if ($c->get($this->onid)) { return $c; } return false; } + function beforeDelete($dependants_array, $roo) { + if ($this->delivered()) { + $roo->jerr("you can not delete a record of a successfull delivery"); + } + } + function beforeInsert($request,$roo) + { + if (empty($request['act_when']) && !empty($request['act_start'])) { + $this->act_start($request['act_start']); + } + + } + function beforeUpdate($old, $request,$roo) + { + if (empty($request['act_when']) && !empty($request['act_start'])) { + $this->act_start($request['act_start']); + } + } function act_start($set = false) @@ -98,16 +125,39 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject return false; } + + function triggerEvent() + { + + $c = DB_DataObject::factory('Events'); + + if ($c->get($this->trigger_event_id)) { + return $c; + } + return false; + + } + function delivered() { - return !empty($msgid); + return !empty($this->msgid); + } + + function whereAddDeliveryStatus($delivered = false) + { + $tn = $this->tableName(); + if ($delivered) { + $this->whereAdd("$tn.msgid IS NOT NULL AND $tn.msgid != ''"); + } else { + $this->whereAdd("$tn.msgid IS NULL OR $tn.msgid = ''"); + } } function status() // used by commandline reporting at present.. { switch($this->event_id) { case -1: - return 'DELIVERED'; + return 'DELIVERED'; //not valid.. case 0: return 'PENDING'; default: @@ -122,13 +172,19 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject function applyFilters($q, $au, $roo) { - if (isset($q['ontable']) && !in_array($q['ontable'], array('Person', 'Events' . 'core_watch'))) { + if (isset($q['ontable']) && !in_array($q['ontable'], array('Person', 'Events', 'core_watch'))) { // this will only work on tables not joined to ours. //DB_DAtaObject::DebugLevel(1); // then we can build a join.. $d = DB_DataObject::Factory($q['ontable']); - $d->autoJoin(); + $ji = $d->autoJoin(); + //echo '
';print_R($ji); + // get cols + foreach($ji['join_names'] as $cname=>$fname) { + $this->selectAdd($fname . ' as ontable_id_' . $cname ); + } + //$this->selectAdd($d->_query['data_select']); -- this will cause the same dataIndex... $this->_join .= " LEFT JOIN {$d->tableName()} ON {$this->tableName()}.onid = {$d->tableName()}.id @@ -136,15 +192,62 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject "; $this->selectAs($d, 'core_notify_%s'); } - if (isset($q['query']['person_id_name']) ) { + if (!empty($q['query']['person_id_name']) ) { $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'"); + } + if (!empty($q['query']['status'])) { + switch ($q['query']['status']) { + + case 'SUCCESS'; + $this->whereAdd("msgid != ''"); + break; + case 'FAILED'; + + $this->whereAdd("msgid = '' AND event_id > 0 AND act_when < NOW()"); + + break; + case 'PENDING'; + $this->whereAdd('event_id = 0 OR (event_id > 0 AND act_when > NOW() )'); + break; + + case 'OPENED'; + $this->whereAdd('is_open > 0'); + break; + + case 'ALL': + default: + break; + } } + if(!empty($q['_evtype_align'])){ + $this->selectAdd(" + (SELECT + display_name + FROM + core_enum + WHERE + etype = 'Core.NotifyType' + AND + name = core_notify.evtype + AND + active = 1 + ) AS evtype_align + "); + } + if(!empty($q['from'])){ + $this->whereAdd(" + act_when >= '{$q['from']}' + "); + } - - + if(!empty($q['to'])){ + $this->whereAdd(" + act_when <= '{$q['to']}' + "); + } }