[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11546] property: list obligation
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [11546] property: list obligation |
|
Date: |
Thu, 19 Dec 2013 18:47:01 +0000 |
Revision: 11546
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11546
Author: sigurdne
Date: 2013-12-19 18:47:00 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
property: list obligation
Modified Paths:
--------------
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.sobudget.inc.php
===================================================================
--- trunk/property/inc/class.sobudget.inc.php 2013-12-19 15:31:02 UTC (rev
11545)
+++ trunk/property/inc/class.sobudget.inc.php 2013-12-19 18:47:00 UTC (rev
11546)
@@ -525,7 +525,7 @@
$sort = isset($data['sort']) ?
$data['sort'] : 'DESC';
$order = isset($data['order']) ?
$data['order'] : '';
$allrows = isset($data['allrows']) ?
$data['allrows'] : '';
- $district_id = isset($data['district_id']) ?
$data['district_id'] : '';
+ $filter_district_id = isset($data['district_id'])
&& $data['district_id'] ? (int)$data['district_id'] : 0;
$year = isset($data['year']) ?
(int)$data['year'] : '';
$grouping = isset($data['grouping']) ?
$data['grouping'] : '';
$revision = isset($data['revision']) ?
$data['revision'] : 1;
@@ -580,9 +580,9 @@
$where = 'AND';
}
- if ($district_id > 0)
+ if ($filter_district_id > 0)
{
- $filtermethod .= " {$where} district_id=" .
(int)$district_id;
+ $filtermethod .= " {$where} district_id=" .
(int)$filter_district_id;
$where = 'AND';
}
@@ -673,6 +673,7 @@
{
$_id = $this->db->f('id');
+ $district_id = $filter_district_id ?
(int)$this->db->f('district_id') : 0;
$projects[$this->db->f('project_id')] = 0;
@@ -682,7 +683,7 @@
(
'actual_cost' => 0,
'mva'
=> (int)$this->db->f('mva'),
- 'district_id' =>
(int)$this->db->f('district_id'),
+ 'district_id' =>
$district_id,
'ecodimb'
=> (int)$this->db->f('ecodimb'),
'b_account'
=> $this->db->f('b_account'),
);
@@ -764,9 +765,9 @@
$where = 'AND';
}
- if ($district_id > 0)
+ if ($filter_district_id > 0)
{
- $filtermethod .= " $where district_id=" .
(int)$district_id;
+ $filtermethod .= " $where district_id=" .
(int)$filter_district_id;
$where = 'AND';
}
@@ -805,10 +806,11 @@
$_hits = $this->db->f('hits');
$sum_hits += $_hits;
-
$obligations[$this->db->f($b_account_field)][(int)$this->db->f('district_id')][(int)$this->db->f('ecodimb')]
+= $_budget;
-
$hits[$this->db->f($b_account_field)][(int)$this->db->f('district_id')][(int)$this->db->f('ecodimb')]
+= $_hits;
+ $district_id = $filter_district_id ?
(int)$this->db->f('district_id') : 0;
+
$obligations[$this->db->f($b_account_field)][$district_id][(int)$this->db->f('ecodimb')]
+= $_budget;
+
$hits[$this->db->f($b_account_field)][$district_id][(int)$this->db->f('ecodimb')]
+= $_hits;
$accout_info[$this->db->f($b_account_field)] =
true;
- $district[$this->db->f('district_id')] = true;
+ $district[$district_id] = true;
$ecodimb[(int)$this->db->f('ecodimb')] = true;
}
@@ -829,9 +831,11 @@
$_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;
+ $district_id = $filter_district_id ?
(int)$this->db->f('district_id') : 0;
+
+
$actual_cost[$this->db->f($b_account_field)][$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;
+ $district[$district_id] = true;
$ecodimb[(int)$this->db->f('ecodimb')] = true;
}
//_debug_array($actual_cost);die();
@@ -866,9 +870,9 @@
$where = 'AND';
}
- if ($district_id > 0)
+ if ($filter_district_id > 0)
{
- $filtermethod .= " $where
district_id='$district_id' ";
+ $filtermethod .= " $where
district_id='$filter_district_id' ";
$where = 'AND';
}
@@ -905,17 +909,16 @@
while ($this->db->next_record())
{
$_budget_cost =
round($this->db->f('budget_cost'));
+ $district_id = $filter_district_id ?
(int)$this->db->f('district_id') : 0;
$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;
+
$budget_cost[$this->db->f('b_account_field')][$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;
+ $district[$district_id] = true;
$ecodimb[(int)$this->db->f('ecodimb')] = true;
}
//_debug_array($budget_cost);die();
-
-
// start service agreements
$filtermethod = " fm_s_agreement_budget.year = $year";
@@ -954,7 +957,7 @@
//_debug_array($sql);die();
$this->db->query($sql . $ordermethod,__LINE__,__FILE__);
- $_dummy_district = 1;
+ $_dummy_district = $filter_district_id ?
$filter_district_id : 0;
while ($this->db->next_record())
{
$_budget = round($this->db->f('budget'));
Modified: trunk/property/inc/class.uibudget.inc.php
===================================================================
--- trunk/property/inc/class.uibudget.inc.php 2013-12-19 15:31:02 UTC (rev
11545)
+++ trunk/property/inc/class.uibudget.inc.php 2013-12-19 18:47:00 UTC (rev
11546)
@@ -117,7 +117,7 @@
$revision_list =
$this->bo->get_revision_filter_list($this->revision); // reset year
$this->year = $this->bo->year;
- $this->revision = $this->bo->revision;
+ $this->revision = $this->bo->revision;
$GLOBALS['phpgw_info']['flags']['menu_selection'] .=
'::budget';
$datatable = array();
@@ -159,7 +159,7 @@
array_unshift
($values_combo_box[0],$default_value);
$values_combo_box[1] =
$this->bo->get_revision_filter_list($this->revision);
- $default_value = array
('id'=>'','name'=>lang('no revision'));
+ $default_value = array
('id'=>'','name'=>lang('no revision'));
if (count($values_combo_box[1]))
{
array_unshift
($values_combo_box[1],$default_value);
@@ -198,7 +198,7 @@
'selected' => $_cat['selected']
? 1 : 0
);
}
-
+
array_unshift ($values_combo_box[4],array
('id'=>'', 'name'=>lang('no category')));
$values_combo_box[5] =
$this->bocommon->select_category_list(array('type'=>'dimb'));
@@ -273,7 +273,7 @@
'tab_index' => 5
),
array
- (
+ (
'id' =>
'sel_dimb_id',
'name'
=> 'dimb_id',
'value'
=> lang('dimb'),
@@ -381,7 +381,7 @@
'visible'=>true,
'name'=>'category', 'label'=>lang('category'),
'className'=>'rightClasss', 'sortable'=>false,
'sort_field'=>'','formatter'=>''),
array(
'visible'=>true,
'name'=>'budget_cost', 'label'=>lang('budget_cost'),
'className'=>'rightClasss', 'sortable'=>true,
'sort_field'=>'budget_cost','formatter'=>'myFormatDate'),
- );
+ );
$content = array();
$j = 0;
@@ -501,7 +501,7 @@
}
//Depended select: REVISION
$opt_cb_depend =
$this->bo->get_revision_filter_list($this->revision);
- $default_value = array ('id'=>'','name'=>lang('no
revision'));
+ $default_value = array ('id'=>'','name'=>lang('no
revision'));
if (count($opt_cb_depend))
{
array_unshift ($opt_cb_depend,$default_value);
@@ -527,7 +527,7 @@
}
$json['hidden']['dependent'][] = array ('id' =>
$this->grouping,
'value' =>
$this->bocommon->select2String($opt_cb_depend)
- );
+ );
// right in datatable
if(isset($datatable['rowactions']['action']) &&
is_array($datatable['rowactions']['action']))
@@ -586,7 +586,7 @@
$revision_list =
$this->bo->get_revision_filter_list($this->revision,$basis=true); // reset year
$this->year = $this->bo->year;
- $this->revision = $this->bo->revision;
+ $this->revision = $this->bo->revision;
$GLOBALS['phpgw_info']['flags']['menu_selection'] .=
'::basis';
$datatable = array();
@@ -628,7 +628,7 @@
array_unshift
($values_combo_box[0],$default_value);
$values_combo_box[1] =
$this->bo->get_revision_filter_list($this->revision,$basis=true);
- $default_value = array
('id'=>'','name'=>lang('no revision'));
+ $default_value = array
('id'=>'','name'=>lang('no revision'));
if (count($values_combo_box[1]))
{
array_unshift
($values_combo_box[1],$default_value);
@@ -809,7 +809,7 @@
'visible'=>true,
'name'=>'category', 'label'=>lang('category'),
'className'=>'rightClasss', 'sortable'=>false,
'sort_field'=>'','formatter'=>''),
array(
'visible'=>true,
'name'=>'budget_cost', 'label'=>lang('budget_cost'),
'className'=>'rightClasss', 'sortable'=>true,
'sort_field'=>'budget_cost','formatter'=>myFormatDate),
- );
+ );
$content = array();
$j = 0;
@@ -928,7 +928,7 @@
}
//Depended select: REVISION
$opt_cb_depend =
$this->bo->get_revision_filter_list($this->revision,$basis=true);
- $default_value = array ('id'=>'','name'=>lang('no
revision'));
+ $default_value = array ('id'=>'','name'=>lang('no
revision'));
if (count($opt_cb_depend))
{
array_unshift ($opt_cb_depend,$default_value);
@@ -954,7 +954,7 @@
}
$json['hidden']['dependent'][] = array ('id' =>
$this->grouping,
'value' =>
$this->bocommon->select2String($opt_cb_depend)
- );
+ );
// right in datatable
if(isset($datatable['rowactions']['action']) &&
is_array($datatable['rowactions']['action']))
@@ -1067,7 +1067,7 @@
'selected' => $_cat['selected']
? 1 : 0
);
}
-
+
array_unshift ($values_combo_box[2],array
('id'=>'', 'name'=>lang('no category')));
//_debug_array($values_combo_box[2]);
@@ -1144,7 +1144,7 @@
'type'
=> 'button',
'style'
=> 'filter',
'tab_index' => 3
- ),
+ ),*/
array
( //boton
GROUPING
'id'
=> 'btn_grouping',
@@ -1155,15 +1155,6 @@
'tab_index' => 4
),
array
- ( //boton
GROUPING
- 'id'
=> 'btn_dimb_id',
- 'name'
=> 'dimb_id',
- 'value'
=> lang('dimb'),
- 'type'
=> 'button',
- 'style'
=> 'filter',
-
'tab_index' => 5
- ),*/
- array
( //boton
USER
//
'id' => 'btn_user_id',
'id' =>
'sel_cat_id',
@@ -1175,6 +1166,7 @@
'onchange'=> 'onChangeSelect("cat_id");',
'tab_index' => 3
),
+/*
array
( //boton
USER
//
'id' => 'btn_user_id',
@@ -1187,6 +1179,7 @@
'onchange'=> 'onChangeSelect("grouping");',
'tab_index' => 4
),
+*/
array
( //boton
USER
//
'id' => 'btn_user_id',
@@ -1261,17 +1254,12 @@
( //div values
combo_box_1
'id' =>
'values_combo_box_1',
'value'
=> $this->bocommon->select2String($values_combo_box[1])
- )/*,
- array
- ( //div values
combo_box_2
- 'id' =>
'values_combo_box_2',
- 'value'
=> $this->bocommon->select2String($values_combo_box[2],'cat_id','name')
),
array
( //div values
combo_box_3
- 'id' =>
'values_combo_box_3',
+ 'id' =>
'values_combo_box_2',
'value'
=> $this->bocommon->select2String($values_combo_box[3])
- ),
+ ),/*
array
( //div values
combo_box_4
'id' =>
'values_combo_box_4',
@@ -1291,9 +1279,9 @@
'col_name'=>'grouping',
'visible'=>false, 'label'=>'',
'className'=>'', 'sortable'=>false,
'sort_field'=>'', 'formatter'=>''),
array(
'col_name'=>'b_account',
'visible'=>true, 'label'=>lang('grouping'),
'className'=>'centerClasss', 'sortable'=>true,
'sort_field'=>'b_account', 'formatter'=>'myformatLinkPGW'),
+// array(
+// 'col_name'=>'district_id',
'visible'=>true,
'label'=>lang('district_id'),'className'=>'centerClasss',
'sortable'=>false, 'sort_field'=>'',
'formatter'=>''),
array(
- 'col_name'=>'district_id',
'visible'=>true,
'label'=>lang('district_id'),'className'=>'centerClasss',
'sortable'=>false, 'sort_field'=>'',
'formatter'=>''),
- array(
'col_name'=>'ecodimb',
'visible'=>true, 'label'=>lang('dimb'), 'className'=>'centerClasss',
'sortable'=>false, 'sort_field'=>'',
'formatter'=>''),
array(
'col_name'=>'hits_ex',
'visible'=>false, 'label'=>'',
'className'=>'rightClasss', 'sortable'=>false,
'sort_field'=>'', 'formatter'=>''),
@@ -1319,7 +1307,7 @@
'col_name'=>'diff_ex',
'visible'=>false, 'label'=>'',
'className'=>'rightClasss', 'sortable'=>false, 'sort_field'=>'',
'formatter'=>''),
array(
'col_name'=>'diff',
'visible'=>true, 'label'=>lang('difference'),'className'=>'rightClasss',
'sortable'=>false, 'sort_field'=>'',
'formatter'=>'')
- );
+ );
//FIXME
@@ -1334,7 +1322,7 @@
}
//_debug_array($location_list);
-
+
$entry = $content = array();
$j = 0;
//cramirez: add this code because "mktime" functions
fire an error
@@ -1349,16 +1337,15 @@
$details = $this->details ? false : true;
$start_date =
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,1,1,$this->year),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
- $end_date =
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,12,31,$this->year),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $end_date =
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,12,31,$this->year),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
- $sum_obligation = $sum_hits = $sum_budget_cost
= $sum_actual_cost = 0;
+ $sum_obligation = $sum_hits = $sum_budget_cost
= $sum_actual_cost = 0;
foreach($location_list as $entry)
{
- //_debug_array($entry);
$content[] = array
(
'grouping'
=> $entry['grouping'],
- 'b_account'
=> $entry['b_account'],
+ 'b_account'
=> $entry['b_account'],
'district_id'
=> $entry['district_id'],
'ecodimb'
=> $entry['ecodimb'],
'hits_ex'
=> $entry['hits'],
@@ -1373,15 +1360,9 @@
'link_actual_cost'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiinvoice.consume', 'district_id'=> $entry['district_id'],
'b_account_class'=> $entry['grouping'], 'b_account' =>$entry['b_account'],
'start_date'=> $start_date, 'end_date'=> $end_date, 'ecodimb' =>
$entry['ecodimb'], 'submit_search'=>true)),
'diff_ex'
=> $entry['budget_cost'] - $entry['actual_cost'] - $entry['obligation'],
'diff'
=> number_format($entry['budget_cost'] - $entry['actual_cost'] -
$entry['obligation'], 0, ',', ' ')
- );
-
- //
$sum_obligation += $entry['obligation'];
- //
$sum_hits += $entry['hits'];
- //
$sum_budget_cost += $entry['budget_cost'];
- //
$sum_actual_cost += $entry['actual_cost'];
+ );
}
- // $sum_diff =
$sum_budget_cost - $sum_actual_cost - $sum_obligation;
}
$j=0;
@@ -2017,7 +1998,7 @@
lang('grouping'),
lang('district_id'),
lang('dimb'),
- lang('category'),
+ lang('category'),
lang('budget')
);
break;
@@ -2032,7 +2013,7 @@
'grouping',
'district_id',
'ecodimb',
- 'category',
+ 'category',
'budget_cost'
);
$descr = array
@@ -2044,20 +2025,20 @@
lang('grouping'),
lang('district_id'),
lang('dimb'),
- lang('category'),
+ lang('category'),
lang('budget')
);
break;
case 'obligations':
$gross_list=
$this->bo->read_obligations();
- $sum_obligation = $sum_hits =
$sum_budget_cost = $sum_actual_cost = 0;
+ $sum_obligation = $sum_hits =
$sum_budget_cost = $sum_actual_cost = 0;
$list = array();
foreach($gross_list as $entry)
{
$list[] = array
(
'grouping'
=> $entry['grouping'],
- 'b_account'
=> $entry['b_account'],
+ 'b_account'
=> $entry['b_account'],
'district_id'
=> $entry['district_id'],
'ecodimb'
=> $entry['ecodimb'],
'hits'
=> $entry['hits'],
@@ -2065,7 +2046,7 @@
'obligation'
=> $entry['obligation'],
'actual_cost'
=> $entry['actual_cost'],
'diff'
=> ($entry['budget_cost'] - $entry['actual_cost'] -
$entry['obligation']),
- );
+ );
}
$names = array
(
Modified: trunk/property/js/yahoo/budget.obligations.js
===================================================================
--- trunk/property/js/yahoo/budget.obligations.js 2013-12-19 15:31:02 UTC
(rev 11545)
+++ trunk/property/js/yahoo/budget.obligations.js 2013-12-19 18:47:00 UTC
(rev 11546)
@@ -3,12 +3,11 @@
//--------------------------------------------------------
//define SelectButton
- var oMenuButton_0, oMenuButton_1;//, oMenuButton_2,
oMenuButton_3, oMenuButton_4;
+ var oMenuButton_0, oMenuButton_1, oMenuButton_2;//,
oMenuButton_3, oMenuButton_4;
var selectsButtons = [
{order:0, var_URL:'year', name:'btn_year',
style:'',dependiente:[]},
- {order:1, var_URL:'district_id',name:'btn_district_id',
style:'',dependiente:[]}
-// {order:2, var_URL:'cat_id', name:'btn_cat_id',
style:'',dependiente:[]},
-// {order:3, var_URL:'grouping', name:'btn_grouping',
style:'',dependiente:[]},
+ {order:1, var_URL:'district_id',name:'btn_district_id',
style:'',dependiente:[]},
+ {order:2, var_URL:'grouping', name:'btn_grouping',
style:'',dependiente:[]}
// {order:4, var_URL:'dimb_id', name:'btn_dimb_id',
style:'',dependiente:[]}
]
@@ -59,15 +58,15 @@
if(details)
{
//look for "grouping" column
- // oMenuButton_3.set("label", ("<em>" + param +
"</em>"));
- // oMenuButton_3.set("value", param);
+ oMenuButton_2.set("label", ("<em>" + param +
"</em>"));
+ oMenuButton_2.set("value", param);
path_values.grouping = param;
}
else
{
//reset GROUPING filter
- // oMenuButton_3.set("label", ("<em>" +
array_options[3][0][1] + "</em>"));
- // path_values.grouping = array_options[3][0][0];
+ oMenuButton_2.set("label", ("<em>" +
array_options[2][0][1] + "</em>"));
+ path_values.grouping = array_options[2][0][0];
path_values.b_account = param;
}
@@ -88,6 +87,7 @@
var myformatLinkPGW = function(elCell, oRecord, oColumn, oData)
{
var details;
+ var district_id = 0;
if(oRecord._oData.grouping != "")
{
details = 1;
@@ -98,8 +98,13 @@
details = 0;
text = oRecord._oData.b_account;
}
-
- elCell.innerHTML = "<a
onclick=\"javascript:filter_grouping("+path_values.year+","+oRecord._oData.district_id+","+
text +","+details+");\" href=\"#\">" + text + "</a>";
+
+ if (typeof (oRecord._oData.district_id) != 'undefined')
+ {
+ district_id = oRecord._oData.district_id;
+ }
+
+ elCell.innerHTML = "<a
onclick=\"javascript:filter_grouping("+path_values.year+","+district_id+","+
text +","+details+");\" href=\"#\">" + text + "</a>";
}
/********************************************************************************/
var myFormatLink_Count = function(elCell, oRecord, oColumn,
oData)
@@ -164,7 +169,7 @@
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_empty(4);
td_sum(tmp_sum_hits);
td_empty(1);
td_sum(tmp_sum_budget);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11546] property: list obligation,
Sigurd Nes <=