[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8965] Merge 8963:8964 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [8965] Merge 8963:8964 from trunk |
|
Date: |
Tue, 06 Mar 2012 11:14:39 +0000 |
Revision: 8965
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8965
Author: sigurdne
Date: 2012-03-06 11:14:39 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
Merge 8963:8964 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.bobudget.inc.php
branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
branches/Version-1_0-branch/property/inc/class.uibudget.inc.php
branches/Version-1_0-branch/property/js/yahoo/budget.index.js
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968,6970-6971,6973-6974,6976-6978,6980,6982-7017,7019-7025,7027-7035,7037-7039,7041-7045,7047-7055,7057,7059-7065,7067-7069,7071,7073,7075-7076,7078,7080-7081,7083,7085,7087,7089-7097,7099-7102,7104-7105,7107-7111,7113-7120,7122-7124,7126-7129,7131,7133-7141,7143,7145-7146,7148-7150,7152-7153,7155-7158,7160-7164,7166-7167,7169-7170,7172,7174,7176,7178,7180-7181,7183,7185,7187-7188,7190,7192-7196,7198-7199,7201-7203,7205,7207,7209-7210,7212,7214,7216-7217,7219-7222,7224-7226,7228-7229,7231,7233-7234,7236-7238,7240-7241,7243-7244,7246,7248,7250,7252-7256,7258-7259,7261-7264,7266-7273,7275-7279,7281-7332,7334-7338,7340-7348,7350,7352-7353,7355-7361,7363-7366,7368-7370,7372,7374,7376,7378,7380-7386,7388-7400,7402,7404-7433,7435-7439,7441-7446,7448-7458,7460-7469,7471-7483,7485-7487,7489-7490,7492,7494,7496-7497,7499,7501-7502,7504,7506-7507,7509-7511,7513-7517,7519-7521,7523,7525,7527-7529,7531,7533,7535-7538,7540-7542,7544-7549,7551-7552,7554-7561,7563,7565,7567-7573,7575-7578,7580-7584,7586-7591,7593-7624,7627-7636,7638-7656,7658-7718,7720-7732,7734,7736,7738-7750,7754-7759,7761-7767,7769-7780,7782,7784-7809,7811-7812,7814-7835,7837-7847,7849-7887,7889-7895,7897,7899,7901,7903-7905,7907-7921,7923-7925,7927-7933,7935,7937-7952,7954-7968,7970-7974,7976,7978-7979,7981-7982,7984-7988,7990-7992,7994-8041,8043-8066,8068-8087,8089,8091-8108,8110-8124,8126-8129,8131,8133-8150,8152-8154,8156-8162,8164-8167,8169-8170,8172-8179,8181,8183-8196,8198-8207,8209-8211,8213-8214,8216-8217,8219-8220,8222,8224-8225,8227-8247,8249,8251,8253-8282,8284-8352,8354-8368,8370-8396,8398-8430,8432,8434-8440,8442-8445,8447-8453,8455-8456,8458,8460,8462-8464,8466-8473,8475-8479,8481,8483-8501,8503-8523,8525,8527-8531,8533,8535-8536,8538-8550,8552-8554,8556-8557,8559-8579,8581-8587,8589,8591-8592,8594-8595,8597-8601,8603-8610,8612-8613,8615,8617,8619-8645,8647-8650,8652-8661,8663-8666,8668-8669,8671-8683,8685-8691,8693-8730,8732-8737,8739,8741-8767,8769,8771-8772,8774,8776-8797,8799-8812,8814-8819,8821,8823-8833,8835-8837,8839,8841,8843-8849,8852-8858,8860-8867,8869-8870,8872,8874-8877,8879,8881,8883-8888,8890,8892-8901,8903-8911,8913-8917,8920-8923,8925-8933,8935-8938,8940-8943,8945,8947-8948,8950,8952-8953,8955-8962,8964
Modified: branches/Version-1_0-branch/property/inc/class.bobudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bobudget.inc.php
2012-03-06 11:13:41 UTC (rev 8964)
+++ branches/Version-1_0-branch/property/inc/class.bobudget.inc.php
2012-03-06 11:14:39 UTC (rev 8965)
@@ -145,8 +145,8 @@
'district_id' => $this->district_id,'year' =>
$this->year,'grouping' => $this->grouping,'revision' => $this->revision,
'cat_id' => $this->cat_id, '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;
foreach ($budget as & $entry)
{
// $entry['entry_date'] =
$GLOBALS['phpgw']->common->show_date($entry['entry_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
Modified: branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
2012-03-06 11:13:41 UTC (rev 8964)
+++ branches/Version-1_0-branch/property/inc/class.sobudget.inc.php
2012-03-06 11:14:39 UTC (rev 8965)
@@ -152,11 +152,26 @@
}
- $sql = "SELECT fm_budget.*, fm_budget.category as
cat_id, ecodimb, descr,fm_b_account.category as grouping FROM fm_budget
$this->join fm_b_account ON fm_budget.b_account_id = fm_b_account.id
$filtermethod $querymethod";
+ $sql = "SELECT fm_budget.*, fm_budget.category as
cat_id, ecodimb, descr,fm_b_account.category as grouping FROM fm_budget
{$this->join} fm_b_account ON fm_budget.b_account_id = fm_b_account.id
$filtermethod $querymethod";
- $this->db->query($sql,__LINE__,__FILE__);
- $this->total_records = $this->db->num_rows();
+
if($GLOBALS['phpgw_info']['server']['db_type']=='postgres')
+ {
+ $sql_count = 'SELECT count(id) as cnt,
sum(budget_cost) AS sum_budget_cost FROM (SELECT DISTINCT fm_budget.id,
budget_cost '. substr($sql,strripos($sql,'FROM')) .') AS t';
+ $this->db->query($sql_count,__LINE__,__FILE__);
+ $this->db->next_record();
+ $this->total_records =
$this->db->f('cnt');
+ $this->sum_budget_cost =
$this->db->f('sum_budget_cost');
+ }
+ else
+ {
+ $sql_count = 'SELECT count(fm_budget.id) as
cnt, sum(budget_cost) AS sum_budget_cost ' . substr($sql,strripos($sql,'FROM'));
+ $this->db->query($sql_count,__LINE__,__FILE__);
+ $this->db->next_record();
+ $this->total_records =
$this->db->f('cnt');
+ $this->sum_budget_cost =
$this->db->f('sum_budget_cost');
+ }
+
if(!$allrows)
{
$this->db->limit_query($sql .
$ordermethod,$start,__LINE__,__FILE__);
@@ -182,7 +197,7 @@
'entry_date' =>
$this->db->f('entry_date'),
'ecodimb'
=> $this->db->f('ecodimb'),
'cat_id'
=> $this->db->f('cat_id'),
- // 'user'
=>
$GLOBALS['phpgw']->accounts->id2name($this->db->f('user_id'))
+ // 'user'
=> $GLOBALS['phpgw']->accounts->id2name($this->db->f('user_id'))
);
}
return $budget;
Modified: branches/Version-1_0-branch/property/inc/class.uibudget.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uibudget.inc.php
2012-03-06 11:13:41 UTC (rev 8964)
+++ branches/Version-1_0-branch/property/inc/class.uibudget.inc.php
2012-03-06 11:14:39 UTC (rev 8965)
@@ -459,7 +459,8 @@
'startIndex' =>
$datatable['pagination']['records_start'],
'sort' =>
$datatable['sorting']['order'],
'dir' =>
$datatable['sorting']['sort'],
- 'records' =>
array()
+ 'records' =>
array(),
+ 'sum_budget' =>
$this->bo->sum_budget_cost
);
// values for datatable
Modified: branches/Version-1_0-branch/property/js/yahoo/budget.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/budget.index.js
2012-03-06 11:13:41 UTC (rev 8964)
+++ branches/Version-1_0-branch/property/js/yahoo/budget.index.js
2012-03-06 11:14:39 UTC (rev 8965)
@@ -95,10 +95,8 @@
this.addFooterDatatable = function()
{
-
//call getSumPerPage(name of column) in property.js
- tmp_sum = getSumPerPage('budget_cost',0);
-
+ tmp_sum =
YAHOO.util.Number.format(values_ds.sum_budget, {decimalPlaces:0,
decimalSeparator:",", thousandsSeparator:" "});
//Create ROW
newTR = document.createElement('tr');
td_empty(9);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8965] Merge 8963:8964 from trunk,
Sigurd Nes <=