[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8473] property: budget: total sums
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8473] property: budget: total sums |
|
Date: |
Mon, 02 Jan 2012 15:15:55 +0000 |
Revision: 8473
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8473
Author: sigurdne
Date: 2012-01-02 15:15:55 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
property: budget: total sums
Modified Paths:
--------------
trunk/property/inc/class.bobudget.inc.php
trunk/property/inc/class.sobudget.inc.php
trunk/property/inc/class.uibudget.inc.php
trunk/property/js/yahoo/budget.obligations.js
Modified: trunk/property/inc/class.bobudget.inc.php
===================================================================
--- trunk/property/inc/class.bobudget.inc.php 2012-01-02 14:28:44 UTC (rev
8472)
+++ trunk/property/inc/class.bobudget.inc.php 2012-01-02 15:15:55 UTC (rev
8473)
@@ -46,6 +46,11 @@
var $revision;
var $allrows;
var $details;
+ var $sum_budget_cost = 0;
+ var $sum_obligation_cost = 0;
+ var $sum_actual_cost = 0;
+ var $sum_hits = 0;
+ var $total_records = 0;
var $public_functions = array
(
@@ -177,7 +182,12 @@
'year' => $this->year, 'grouping' =>
$this->grouping, 'revision' => $this->revision,
'details' => $this->details,'dimb_id' =>
$this->dimb_id));
- $this->total_records = $this->so->total_records;
+ $this->total_records =
$this->so->total_records;
+ $this->sum_budget_cost =
$this->so->sum_budget_cost;
+ $this->sum_obligation_cost =
$this->so->sum_obligation_cost;
+ $this->sum_actual_cost =
$this->so->sum_actual_cost;
+ $this->sum_hits =
$this->so->sum_hits;
+
return $obligations;
}
Modified: trunk/property/inc/class.sobudget.inc.php
===================================================================
--- trunk/property/inc/class.sobudget.inc.php 2012-01-02 14:28:44 UTC (rev
8472)
+++ trunk/property/inc/class.sobudget.inc.php 2012-01-02 15:15:55 UTC (rev
8473)
@@ -34,7 +34,11 @@
class property_sobudget
{
- var $sum_actual_cost = 0;
+ var $sum_budget_cost = 0;
+ var $sum_obligation_cost = 0;
+ var $sum_actual_cost = 0;
+ var $sum_hits = 0;
+
function __construct()
{
$this->cats =
CreateObject('phpgwapi.categories', -1, 'property', '.project');
@@ -527,7 +531,7 @@
$start_date = mktime(1, 1, 1, 1, 1, $year);
$end_date = mktime (23, 59, 59, 12, 31, $year);
// $filtermethod .= " AND fm_workorder.start_date >=
$start_date AND fm_workorder.start_date <= $end_date";
- $filtermethod .= " AND fm_workorder_status.closed IS
NULL AND fm_workorder.start_date <= $end_date";
+ $filtermethod .= " AND fm_workorder_status.closed IS
NULL AND fm_workorder.start_date >= $start_date AND fm_workorder.start_date <=
$end_date";
$where = 'AND';
@@ -582,12 +586,18 @@
//_debug_array($sql);die();
$this->db->query($sql . $ordermethod,__LINE__,__FILE__);
+ $sum_obligation_cost = 0;
$obligations = array();
-
+ $sum_hits = 0;
while ($this->db->next_record())
{
-
$obligations[$this->db->f($b_account_field)][$this->db->f('district_id')][(int)$this->db->f('ecodimb')]
= round($this->db->f('combined_cost'));
-
$hits[$this->db->f($b_account_field)][$this->db->f('district_id')][(int)$this->db->f('ecodimb')]
= $this->db->f('hits');
+ $_combined_cost =
round($this->db->f('combined_cost'));
+ $sum_obligation_cost += $_combined_cost;
+ $_hits = $this->db->f('hits');
+ $sum_hits += $_hits;
+
+
$obligations[$this->db->f($b_account_field)][$this->db->f('district_id')][(int)$this->db->f('ecodimb')]
+= $_combined_cost;
+
$hits[$this->db->f($b_account_field)][$this->db->f('district_id')][(int)$this->db->f('ecodimb')]
+= $_hits;
$accout_info[$this->db->f($b_account_field)] =
true;
$district[$this->db->f('district_id')] = true;
$ecodimb[(int)$this->db->f('ecodimb')] = true;
@@ -641,8 +651,13 @@
while ($this->db->next_record())
{
-
$obligations[$this->db->f($b_account_field)][$this->db->f('district_id')][(int)$this->db->f('ecodimb')]
+= round($this->db->f('budget'));
-
$hits[$this->db->f($b_account_field)][$this->db->f('district_id')][(int)$this->db->f('ecodimb')]
+= $this->db->f('hits');
+ $_budget = round($this->db->f('budget'));
+ $sum_obligation_cost += $_budget;
+ $_hits = $this->db->f('hits');
+ $sum_hits += $_hits;
+
+
$obligations[$this->db->f($b_account_field)][$this->db->f('district_id')][(int)$this->db->f('ecodimb')]
+= $_budget;
+
$hits[$this->db->f($b_account_field)][$this->db->f('district_id')][(int)$this->db->f('ecodimb')]
+= $_hits;
$accout_info[$this->db->f($b_account_field)] =
true;
$district[$this->db->f('district_id')] = true;
$ecodimb[(int)$this->db->f('ecodimb')] = true;
@@ -660,10 +675,14 @@
$sql = str_replace('budget', 'actual_cost', $sql);
$this->db->query($sql . $ordermethod,__LINE__,__FILE__);
+ $sum_actual_cost = 0;
$actual_cost = array();
while ($this->db->next_record())
{
-
$actual_cost[$this->db->f($b_account_field)][$this->db->f('district_id')][(int)$this->db->f('ecodimb')]
= round($this->db->f('actual_cost'));
+ $_actual_cost =
round($this->db->f('actual_cost'));
+ $sum_actual_cost +=
round($this->db->f('actual_cost'));
+
+
$actual_cost[$this->db->f($b_account_field)][$this->db->f('district_id')][(int)$this->db->f('ecodimb')]
+= $_actual_cost;
$accout_info[$this->db->f($b_account_field)] =
true;
$district[$this->db->f('district_id')] = true;
$ecodimb[(int)$this->db->f('ecodimb')] = true;
@@ -719,10 +738,13 @@
//_debug_array($sql);
$this->db->query($sql,__LINE__,__FILE__);
+ $sum_budget_cost = 0;
$budget_cost = array();
while ($this->db->next_record())
{
-
$budget_cost[$this->db->f('b_account_field')][$this->db->f('district_id')][(int)$this->db->f('ecodimb')]
= round($this->db->f('budget_cost'));
+ $_budget_cost =
round($this->db->f('budget_cost'));
+ $sum_budget_cost += $_budget_cost;
+
$budget_cost[$this->db->f('b_account_field')][$this->db->f('district_id')][(int)$this->db->f('ecodimb')]
+= $_budget_cost;
$accout_info[$this->db->f('b_account_field')] =
true;
$district[$this->db->f('district_id')] = true;
$ecodimb[(int)$this->db->f('ecodimb')] = true;
@@ -771,7 +793,6 @@
$this->db->query($sql,__LINE__,__FILE__);
- $sum_actual_cost = 0;
while ($this->db->next_record())
{
$_actual_cost =
round($this->db->f('actual_cost'));
@@ -782,7 +803,11 @@
$ecodimb[(int)$this->db->f('dimb')] = true;
}
- $this->sum_actual_cost = $sum_actual_cost;
+ $this->sum_budget_cost = $sum_budget_cost;
+ $this->sum_obligation_cost = $sum_obligation_cost;
+ $this->sum_actual_cost = $sum_actual_cost;
+ $this->sum_hits = $sum_hits;
+
//_debug_array($actual_cost);die();
$result = array();
Modified: trunk/property/inc/class.uibudget.inc.php
===================================================================
--- trunk/property/inc/class.uibudget.inc.php 2012-01-02 14:28:44 UTC (rev
8472)
+++ trunk/property/inc/class.uibudget.inc.php 2012-01-02 15:15:55 UTC (rev
8473)
@@ -46,13 +46,13 @@
(
'index' => true,
'basis' => true,
- 'obligations' => true,
+ 'obligations' => true,
'view' => true,
'edit' => true,
- 'edit_basis' => true,
- 'download' => true,
+ 'edit_basis' => true,
+ 'download' => true,
'delete' => true,
- 'delete_basis' => true
+ 'delete_basis' => true
);
function property_uibudget()
{
@@ -1321,7 +1321,12 @@
'startIndex' =>
$datatable['pagination']['records_start'],
'sort' =>
$datatable['sorting']['order'],
'dir' =>
$datatable['sorting']['sort'],
- 'records' =>
array()
+ 'records' =>
array(),
+ 'sum_budget' =>
$this->bo->sum_budget_cost,
+ 'sum_obligation' =>
$this->bo->sum_obligation_cost,
+ 'sum_actual' =>
$this->bo->sum_actual_cost,
+ 'sum_diff' =>
$this->bo->sum_budget_cost - $this->bo->sum_actual_cost -
$this->bo->sum_obligation_cost,
+ 'sum_hits' =>
$this->bo->sum_hits
);
// values for datatable
Modified: trunk/property/js/yahoo/budget.obligations.js
===================================================================
--- trunk/property/js/yahoo/budget.obligations.js 2012-01-02 14:28:44 UTC
(rev 8472)
+++ trunk/property/js/yahoo/budget.obligations.js 2012-01-02 15:15:55 UTC
(rev 8473)
@@ -133,21 +133,26 @@
this.addFooterDatatable = function()
{
-
//Create ROW
newTR = document.createElement('tr');
+
+ tmp_sum_budget =
YAHOO.util.Number.format(values_ds.sum_budget, {decimalPlaces:0,
decimalSeparator:",", thousandsSeparator:" "});
+ tmp_sum_obligation =
YAHOO.util.Number.format(values_ds.sum_obligation, {decimalPlaces:0,
decimalSeparator:",", thousandsSeparator:" "});
+ tmp_sum_actual =
YAHOO.util.Number.format(values_ds.sum_actual, {decimalPlaces:0,
decimalSeparator:",", thousandsSeparator:" "});
+ tmp_sum_diff =
YAHOO.util.Number.format(values_ds.sum_diff, {decimalPlaces:0,
decimalSeparator:",", thousandsSeparator:" "});
+ tmp_sum_hits =
YAHOO.util.Number.format(values_ds.sum_hits, {decimalPlaces:0,
decimalSeparator:",", thousandsSeparator:" "});
td_empty(5);
- td_sum(getSumPerPage("hits_ex",0));
+ td_sum(tmp_sum_hits);
td_empty(1);
- td_sum(getSumPerPage("budget_cost_ex",0));
+ td_sum(tmp_sum_budget);
td_empty(1);
- td_sum(getSumPerPage("obligation_ex",0));
+ td_sum(tmp_sum_obligation);
td_empty(2);
- td_sum(getSumPerPage("actual_cost_ex",0));
+ td_sum(tmp_sum_actual);
td_empty(2);
- td_sum(getSumPerPage("diff_ex",0));
-
+ td_sum(tmp_sum_diff);
+
//Add to Table
myfoot = tableYUI.createTFoot();
myfoot.setAttribute("id","myfoot");
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8473] property: budget: total sums,
Sigurd Nes <=