[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12645] class.boproject.inc.php
From: |
Saul |
Subject: |
[Fmsystem-commits] [12645] class.boproject.inc.php |
Date: |
Tue, 20 Jan 2015 23:19:11 +0000 |
Revision: 12645
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12645
Author: psaul
Date: 2015-01-20 23:19:10 +0000 (Tue, 20 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-20 23:18:37 UTC (rev 12644)
+++ branches/dev-syncromind/property/inc/class.boproject.inc.php
2015-01-20 23:19:10 UTC (rev 12645)
@@ -464,25 +464,29 @@
function read($data = array())
{
-
-
if(isset($this->allrows) && $this->allrows)
- {
+ {
$data['allrows'] = true;
}
$start_date =
$this->bocommon->date_to_timestamp($data['start_date']);
$end_date =
$this->bocommon->date_to_timestamp($data['end_date']);
- $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);
+ $criteria = $this->get_criteria($this->criteria_id);
+// echo '<pre>'; print_r($criteria); echo '</pre>';
+// echo '<pre>'; print_r($data); echo '</pre>';
+// exit('ssss1');
+
+ $data['start_date'] = $start_date;
+ $data['end_date']= $end_date;
+ $data['criteria'] = $criteria;
+
$project = $this->so->read($data);
$this->total_records = $this->so->total_records;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12645] class.boproject.inc.php,
Saul <=