[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12951]
From: |
Nelson Guerra |
Subject: |
[Fmsystem-commits] [12951] |
Date: |
Mon, 06 Apr 2015 22:52:11 +0000 |
Revision: 12951
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12951
Author: nelson224
Date: 2015-04-06 22:52:10 +0000 (Mon, 06 Apr 2015)
Log Message:
-----------
Modified Paths:
--------------
branches/dev-syncromind/property/inc/class.bobudget.inc.php
Modified: branches/dev-syncromind/property/inc/class.bobudget.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.bobudget.inc.php 2015-04-06
22:51:58 UTC (rev 12950)
+++ branches/dev-syncromind/property/inc/class.bobudget.inc.php 2015-04-06
22:52:10 UTC (rev 12951)
@@ -152,13 +152,33 @@
}
- function read()
+ function read($data= array())
{
- $budget = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
+ /*$budget = $this->so->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
'filter' => $this->filter,'cat_id' =>
$this->cat_id,'allrows'=>$this->allrows,
'district_id' => $this->district_id,'year' =>
$this->year,'grouping' => $this->grouping,'revision' => $this->revision,
- 'cat_id' => $this->cat_id, 'dimb_id' =>
$this->dimb_id, 'org_unit_id' => $this->org_unit_id));
+ 'cat_id' => $this->cat_id, 'dimb_id' =>
$this->dimb_id, 'org_unit_id' => $this->org_unit_id));*/
+ $budget = $this->so->read(array
+ (
+ 'start' =>
$data['start'],
+ 'query' =>
$data['query'],
+ 'sort' =>
$data['sort'],
+ 'order' =>
$data['order'],
+ 'results' =>
$data['results'],
+ 'filter' =>
$this->filter,
+ 'cat_id' =>
$this->cat_id,
+ 'allrows' =>
isset($data['allrows'])?$data['allrows']:'',
+ 'district_id' => $this->district_id,
+ 'year' => $this->year,
+ 'grouping' =>
$this->grouping,
+ 'revision' =>
$this->revision,
+ 'cat_id' =>
$this->cat_id,
+ 'dimb_id' =>
$this->dimb_id,
+ 'org_unit_id' => $this->org_unit_id
+ )
+ );
+
$this->total_records =
$this->so->total_records;
$this->sum_budget_cost =
$this->so->sum_budget_cost;
foreach ($budget as & $entry)
@@ -171,12 +191,29 @@
return $budget;
}
- function read_basis()
+ function read_basis($data= array())
{
- $budget = $this->so->read_basis(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
+ /*$budget = $this->so->read_basis(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
'filter' => $this->filter,'cat_id' =>
$this->cat_id,'allrows'=>$this->allrows,
- 'district_id' => $this->district_id,'year' =>
$this->year,'grouping' => $this->grouping,'revision' => $this->revision,));
+ 'district_id' => $this->district_id,'year' =>
$this->year,'grouping' => $this->grouping,'revision' => $this->revision,));*/
+ $budget = $this->so->read_basis(array
+ (
+ 'start' => $data['start'],
+ 'query' => $data['query'],
+ 'sort' => $data['sort'],
+ 'order' => $data['order'],
+ 'results' => $data['results'],
+ 'filter' => $this->filter,
+ 'cat_id' => $this->cat_id,
+ 'allrows' =>
isset($data['allrows'])?$data['allrows']:'',
+ 'district_id' => $this->district_id,
+ 'year' => $this->year,
+ 'grouping' => $this->grouping,
+ 'revision' => $this->revision
+ )
+ );
+
$this->total_records = $this->so->total_records;
for ($i=0; $i<count($budget); $i++)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12951],
Nelson Guerra <=