php8

[web.mtrack] / MTrackWeb / Timeline.php

diff --git a/MTrackWeb/Timeline.php b/MTrackWeb/Timeline.php
index 39b7e71..80b5ebc 100644 (file)
--- a/MTrackWeb/Timeline.php
+++ b/MTrackWeb/Timeline.php
@@ -42,7 +42,9 @@ class MTrackWeb_Timeline extends MTrackWeb
         $start = empty($_REQUEST['from_date']) ? date('Y-m-01') : 
             date('Y-m-01', strtotime($_REQUEST['from_date']));
 
-
+        $start_day = empty($_REQUEST['from_date']) ? date('Y-m-d') : 
+            date('Y-m-d', strtotime($_REQUEST['from_date']));
+            
         $e->whereAdd("
             ( ontable='mtrack_ticket' AND
                 onid IN (SELECT id FROM mtrack_ticket where project_id = $pid)
@@ -58,7 +60,7 @@ class MTrackWeb_Timeline extends MTrackWeb
             $isSummary = true;
             $e->whereAdd("changedate >= '$start 00:00:00' AND changedate < '$start 00:00:00' + INTERVAL 1 MONTH");
             $e->selectAdd();
-            $e->joinAdd(DB_DataObject::factory('Person'), 'LEFT');
+            $e->joinAdd(DB_DataObject::factory('core_person'), 'LEFT');
             $e->selectAdd("
                      DATE_FORMAT(changedate, '%Y-%m-%d')  as changeday,
                      CONCAT(DATE_FORMAT(changedate, '%Y-%m-%d-') ,Person.id)  as id,
@@ -75,10 +77,11 @@ class MTrackWeb_Timeline extends MTrackWeb
             $this->jdata($ret);
             
             
-        } else {
-            $e->whereAdd("changedate >= '$start 00:00:00' AND changedate < '$start 00:00:00' + INTERVAL 3 DAY");
-        }
-        
+        }  
+        $e->whereAdd("changedate >= '$start_day 00:00:00' AND
+                      changedate < '$start_day 00:00:00' + INTERVAL 1 DAY");
+         
+        //DB_DataObject::debugLevel(1);
         
        
         
@@ -121,14 +124,14 @@ class MTrackWeb_Timeline extends MTrackWeb
             $this->events[] = $add;
              
         }
-        
-        $extra = array(
+        $total = count($this->events);
+        $extra = !$total ? array() :  array(
                  'metaData'  => $this->meta($e, $this->events)
         );
              
          
 
-        $this->jdata($this->events, count($this->events), $extra);
+        $this->jdata($this->events, $total, $extra);
     
          
          
@@ -157,14 +160,14 @@ class MTrackWeb_Timeline extends MTrackWeb
         
         $rdata = unserialize(file_get_contents($reader));
         
-        echo '<PRE>';print_r($rdata);exit;
+        //echo '<PRE>';print_r($rdata);exit;
         
         $meta = array();
         foreach($cols as $c ) {
             $cc = $x->tableName().'.'.$c;
             if (      !isset($rdata[$cc]) 
-                ||    !is_array($rdata[$cc]]
-            )) {
+                ||    !is_array($rdata[$cc])
+            ) {
                 
                 $meta[] = $c;
                 continue;