[Fmsystem-commits] [12632] class.boproject.inc.php

[Saul]

Revision: 12632
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12632
Author:   psaul
Date:     2015-01-19 23:51:16 +0000 (Mon, 19 Jan 2015)
Log Message:
-----------
class.boproject.inc.php

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.boproject.inc.php

Modified: branches/dev-syncromind/property/inc/class.boproject.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.boproject.inc.php        
2015-01-19 23:50:37 UTC (rev 12631)
+++ branches/dev-syncromind/property/inc/class.boproject.inc.php        
2015-01-19 23:51:16 UTC (rev 12632)
@@ -464,6 +464,8 @@
 
                function read($data = array())
                {
+            
+            
                        if(isset($this->allrows) && $this->allrows)
                        {
                                $data['allrows'] = true;
@@ -471,13 +473,17 @@
 
                        $start_date     = 
$this->bocommon->date_to_timestamp($data['start_date']);
                        $end_date       = 
$this->bocommon->date_to_timestamp($data['end_date']);
-
-                       $project = $this->so->read(array('start' => 
$this->start,'query' => $this->query,'sort' => $this->sort,'order' => 
$this->order,
-                               'filter' => $this->filter,'cat_id' => 
$this->cat_id,'status_id' => $this->status_id,'wo_hour_cat_id' => 
$this->wo_hour_cat_id,
-                               
'start_date'=>$start_date,'end_date'=>$end_date,'allrows'=>isset($data['allrows'])
 ? $data['allrows'] : '','dry_run' => $data['dry_run'],
-                               'district_id' => $this->district_id, 'criteria' 
=> $this->get_criteria($this->criteria_id),
-                               'project_type_id'       => 
$this->project_type_id, 'filter_year' => $this->filter_year));
-
+            $criteria   = $this->get_criteria($data['criteria']);
+//                     $project = $this->so->read(array('start' => 
$this->start,'query' => $this->query,'sort' => $this->sort,'order' => 
$this->order,
+//                             'filter' => $this->filter,'cat_id' => 
$this->cat_id,'status_id' => $this->status_id,'wo_hour_cat_id' => 
$this->wo_hour_cat_id,
+//                             
'start_date'=>$start_date,'end_date'=>$end_date,'allrows'=>isset($data['allrows'])
 ? $data['allrows'] : '','dry_run' => $data['dry_run'],
+//                             'district_id' => $this->district_id, 'criteria' 
=> $this->get_criteria($this->criteria_id),
+//                             'project_type_id'       => 
$this->project_type_id, 'filter_year' => $this->filter_year));
+            array_unshift($data['criteria'], $criteria);
+            array_unshift($data['start_date'],$start_date);
+            array_unshift($data['end_date'],$end_date);
+            
+            $project = $this->so->read($data);
                        $this->total_records = $this->so->total_records;
 
                        $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];