From ad4991d896747dc07c9ee40ea341a2635067d539 Mon Sep 17 00:00:00 2001 From: KH Lau Date: Tue, 24 Oct 2017 10:42:30 +0800 Subject: [PATCH] DataObjects/Events.php --- DataObjects/Events.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/DataObjects/Events.php b/DataObjects/Events.php index ca02b023..1de9633e 100644 --- a/DataObjects/Events.php +++ b/DataObjects/Events.php @@ -41,9 +41,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject if(!empty($q['person_table'])){ $jt = DB_DataObject::factory($q['person_table']); - $et = DB_DataObject::factory($tn); - $this->selectAdd("(select count(*) from Events where Events.dup_id = evet.id) as cnt "); - $this->selectAs($et,'%s','evet'); + if(!array_key_exists("{$jt->tableName()}_id", $this->tableColumns())){ // coz we have triiger on mysql... @@ -91,6 +89,16 @@ class Pman_Core_DataObjects_Events extends DB_DataObject if (!empty($q['query']['to'])) { $dt = date('Y-m-d' , strtotime($q['query']['to'])); $this->whereAdd(" {$tn}.event_when <= '$dt' "); + } + + if(!empty($q['dup_check'])){ + $et = DB_DataObject::factory($tn); + $this->_join = "LEFT JOIN {$et->tableName()} AS evet ON (evet.id=Events.id)"; + $this->selectAdd("(select count(*) from Events where Events.dup_id = evet.id) as cnt "); + $this->selectAs($et,'evet_%s','evet'); + + + } /* if (!empty($q['query']['grouped']) && $q['query']['grouped'] == 'gr') { -- 2.39.2