projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Events.php
[Pman.Core]
/
DataObjects
/
Events.php
diff --git
a/DataObjects/Events.php
b/DataObjects/Events.php
index
563f2c0
..
72f2e2b
100644
(file)
--- a/
DataObjects/Events.php
+++ b/
DataObjects/Events.php
@@
-25,7
+25,6
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
public $person_id; // int(11)
public $remarks; // blob(65535) blob
public $person_table; // string(64)
public $person_id; // int(11)
public $remarks; // blob(65535) blob
public $person_table; // string(64)
- public $coba_investor_id; // int(11)
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
@@
-38,14
+37,21
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
{
$tn = $this->tableName();
// if not empty on_table
{
$tn = $this->tableName();
// if not empty on_table
+
if(!empty($q['person_table'])){
$jt = DB_DataObject::factory($q['person_table']);
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');
+ //$tn='evet';
if(!array_key_exists("{$jt->tableName()}_id", $this->tableColumns())){ // coz we have triiger on mysql...
$keys = $jt->keys();
if(!array_key_exists("{$jt->tableName()}_id", $this->tableColumns())){ // coz we have triiger on mysql...
$keys = $jt->keys();
- $this->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.{$keys[0]}=Events.person_id)";
+ $this->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.{$keys[0]}={$tn}.person_id)";
+ //$this->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.{$keys[0]}=Events.person_id)";
$this->selectAdd();
$this->selectAs();
$this->selectAdd();
$this->selectAs();
@@
-101,7
+107,8
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
if (!$au->hasPerm("Admin.Admin_Tab", 'S')) {
//DB_DataObject::DebugLevel(1);
// they can only view their changes..
if (!$au->hasPerm("Admin.Admin_Tab", 'S')) {
//DB_DataObject::DebugLevel(1);
// they can only view their changes..
- $this->person_id = $au->id;
+ $this->whereAdd("($tn.person_id = {$au->id} OR $tn.person_id = 0)");
+// $this->person_id = $au->id;
}
// _join = tablename,tablename...
}
// _join = tablename,tablename...
@@
-114,14
+121,9
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
if (isset($q['on_table']) && !strlen($q['on_table'])) {
// empty ontable queries.. these are valid..
if (isset($q['on_table']) && !strlen($q['on_table'])) {
// empty ontable queries.. these are valid..
- $this->whereAdd("
$tn
.on_table = ''");
+ $this->whereAdd("
{$tn}
.on_table = ''");
}
}
-
- if (!empty($q['query']['to'])) {
- $dt = date('Y-m-d' , strtotime($q['query']['to']));
- $this->whereAdd(" {$tn}.event_when <= '$dt' ");
- }
-
+
if (isset($q['query']['person_sum'])) {
//DB_DataObject::debugLevel(1);
$this->_extra_cols = array('qty' );
if (isset($q['query']['person_sum'])) {
//DB_DataObject::debugLevel(1);
$this->_extra_cols = array('qty' );
@@
-249,12
+251,12
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
if(!empty($q['query']['action'])) {
$act = $this->escape($q['query']['action']);
if(!empty($q['query']['action'])) {
$act = $this->escape($q['query']['action']);
- $this->whereAdd("
Events
.action LIKE '%{$act}%'");
+ $this->whereAdd("
{$tn}
.action LIKE '%{$act}%'");
}
if(!empty($q['query']['on_table'])) {
$tnb = $this->escape($q['query']['on_table']);
}
if(!empty($q['query']['on_table'])) {
$tnb = $this->escape($q['query']['on_table']);
- $this->whereAdd("
Events
.on_table LIKE '%{$tnb}%'");
+ $this->whereAdd("
{$tn}
.on_table LIKE '%{$tnb}%'");
}
}
}
}