X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FEvents.php;h=f803fa67e1e212fd46c8721cccf83bcbe8fe2224;hb=4cb93dc15a755a4602cedabe6c1210770d828cf2;hp=90f598cf8ca81f61479fb2c5be1b5b70d754b8ba;hpb=76e28e95b3362986192970918a9c161b4def40fd;p=Pman.Core

diff --git a/DataObjects/Events.php b/DataObjects/Events.php
index 90f598cf..f803fa67 100644
--- a/DataObjects/Events.php
+++ b/DataObjects/Events.php
@@ -7,7 +7,7 @@
  *
  * 
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Events extends DB_DataObject 
 {
@@ -25,7 +25,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     public $person_id;                       // int(11)  
     public $remarks;                         // blob(65535)  blob
     public $person_table;                    // string(64)
-    
+
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
     
@@ -37,14 +37,18 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
     {
         $tn = $this->tableName();
         // if not empty on_table
+        
         if(!empty($q['person_table'])){
             $jt = DB_DataObject::factory($q['person_table']);
+
             
-            if(!array_key_exists("{$jt->tableName()}_id", $this->table())){ // coz we have triiger on mysql...
+            
+            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->selectAdd();
                 $this->selectAs();
 
@@ -86,6 +90,15 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             $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.evet_id=Events.id)";
+            $this->selectAdd("(select count(*)+1 from Events where Events.dup_id = evet.evet_id) as cnt ");        	   
+        	   $this->selectAs($et,'evet_%s','evet');
+        	   $this->having('Events.dup_id = 0 ');
+            
+        }
         /*
         if (!empty($q['query']['grouped']) && $q['query']['grouped'] == 'gr') {
             // grouped..
@@ -100,7 +113,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..
-            $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...
@@ -115,9 +129,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
             // empty ontable queries.. these are valid..
             $this->whereAdd("$tn.on_table = ''");
         }
-        
-        
-        
+      
         if (isset($q['query']['person_sum'])) {
             //DB_DataObject::debugLevel(1);
             $this->_extra_cols = array('qty' );
@@ -164,7 +176,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
                     LEFT JOIN {$jtn} as join_on_id_{$jtn} ON {$tn}.on_id = join_on_id_{$jtn}.{$jk}
                         AND on_table = '{$jtn}'
                 ";
-                $keys = array_keys($x->table());
+                $keys = array_keys($x->tableColumns());
                 if (isset($q['_join_cols'])) {
                     $jcs = explode(',',$q['_join_cols'] );
                     //DB_DataObject::DebugLevel(1);
@@ -312,7 +324,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         } else {
             $col = $au->tableName() == "Person" ? 'person_id' : $au->tableName() . '_id';
             // does $col exist?
-            $cols = $this->table();
+            $cols = $this->tableColumns();
             $col = isset($cols[$col]) ? $col : 'person_id'; // for BC.... - revert to using person_id
             $this->{$col} = $au->pid();
             //$this->person_id = $au ? (!empty($au->id) ? $au->id : $au->pid()) : -1;
@@ -354,7 +366,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         }
          
         $ret = 0;
-        foreach(array_keys($new->table()) as $k) {
+        foreach(array_keys($new->tableColumns()) as $k) {
             // should we JSON serialize this?
             $n = empty($new->$k) ? '' : $new->$k;
             $o = empty($old->$k) || empty($old->$k) ? '' : $old->$k;
@@ -494,7 +506,11 @@ class Pman_Core_DataObjects_Events extends DB_DataObject
         //print_r($this);
         $file = $logdir.  date('/Y/m/d/'). $this->id . ".json";
         if (!file_exists(dirname($file))) {
-            mkdir(dirname($file),0700,true); // this might fail if it does not have correct permissions..
+            
+            @mkdir(dirname($file),0700,true); // this might fail if it does not have correct permissions..
+            if (!file_exists(dirname($file))) {
+                die("could not create $file - permissons are not correct"); // fatal, otherwise we loop!?
+            }
             
         }