[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9747] property: calculation
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9747] property: calculation |
|
Date: |
Thu, 05 Jul 2012 08:53:50 +0000 |
Revision: 9747
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9747
Author: sigurdne
Date: 2012-07-05 08:53:50 +0000 (Thu, 05 Jul 2012)
Log Message:
-----------
property: calculation
Modified Paths:
--------------
trunk/property/inc/class.boproject.inc.php
trunk/property/inc/class.boworkorder.inc.php
trunk/property/inc/class.soworkorder.inc.php
trunk/property/inc/class.uiproject.inc.php
trunk/property/js/yahoo/project.edit.js
Modified: trunk/property/inc/class.boproject.inc.php
===================================================================
--- trunk/property/inc/class.boproject.inc.php 2012-07-05 07:43:30 UTC (rev
9746)
+++ trunk/property/inc/class.boproject.inc.php 2012-07-05 08:53:50 UTC (rev
9747)
@@ -507,27 +507,37 @@
}
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
- $values['start_date'] =
$GLOBALS['phpgw']->common->show_date($values['start_date'],$dateformat);
- $values['end_date'] =
isset($values['end_date']) && $values['end_date'] ?
$GLOBALS['phpgw']->common->show_date($values['end_date'],$dateformat) : '';
- $workorder_data =
$this->so->project_workorder_data($project_id);
+ $values['start_date'] =
$GLOBALS['phpgw']->common->show_date($values['start_date'],$dateformat);
+ $values['end_date'] =
isset($values['end_date']) && $values['end_date'] ?
$GLOBALS['phpgw']->common->show_date($values['end_date'],$dateformat) : '';
+ $workorder_data =
$this->so->project_workorder_data($project_id);
- $sum_workorder_budget = 0;
$sum_deviation = 0;
- $sum_workorder_calculation = 0;
- $sum_workorder_actual_cost = 0;
for ($i=0;$i<count($workorder_data);$i++)
{
- $sum_workorder_budget+=
$workorder_data[$i]['budget'];
$sum_deviation+=
$workorder_data[$i]['deviation'];
- $sum_workorder_calculation+=
$workorder_data[$i]['calculation'];
- $sum_workorder_actual_cost+=
$workorder_data[$i]['actual_cost'];
+ $_cost = (float)number_format(0, 2, ',', '');
+ if(abs($workorder_data[$i]['contract_sum']) > 0)
+ {
+ $_cost =
(float)number_format($workorder_data[$i]['contract_sum'] *
(1+(((int)$workorder_data[$i]['addition_percentage'])/100)), 2, ',', '');
+ }
+ else if(abs($workorder_data[$i]['calculation'])
> 0)
+ {
+ $_cost =
(float)number_format($workorder_data[$i]['calculation'] * $tax, 2, ',', '');
+ }
+ else if(abs($workorder_data[$i]['budget']) > 0)
+ {
+ $_cost =
(float)number_format($workorder_data[$i]['budget'] * $tax, 2, ',', '');
+ }
+
+ $values['workorder_budget'][$i]['cost'] =
$_cost;
+
$values['workorder_budget'][$i]['title']=htmlspecialchars_decode($workorder_data[$i]['title']);
$values['workorder_budget'][$i]['workorder_id']=$workorder_data[$i]['workorder_id'];
-
$values['workorder_budget'][$i]['contract_sum']=(float)number_format($workorder_data[$i]['contract_sum']
* (1+(((int)$workorder_data[$i]['addition_percentage'])/100)), 2, ',', '');
- $values['workorder_budget'][$i]['budget']=
$workorder_data[$i]['budget'];
-
$values['workorder_budget'][$i]['calculation']=(float)number_format($workorder_data[$i]['calculation']*$tax,
2, ',', '');
+ //
$values['workorder_budget'][$i]['contract_sum']=(float)number_format($workorder_data[$i]['contract_sum']
* (1+(((int)$workorder_data[$i]['addition_percentage'])/100)), 2, ',', '');
+ // $values['workorder_budget'][$i]['budget']=
$workorder_data[$i]['budget'];
+ //
$values['workorder_budget'][$i]['calculation']=(float)number_format($workorder_data[$i]['calculation']*$tax,
2, ',', '');
$values['workorder_budget'][$i]['charge_tenant'] =
$workorder_data[$i]['charge_tenant'];
$values['workorder_budget'][$i]['status'] =
$workorder_data[$i]['status'];
$values['workorder_budget'][$i]['actual_cost']
= (float)number_format($workorder_data[$i]['actual_cost'] ?
$workorder_data[$i]['actual_cost'] : 0, 2, ',', '');
@@ -552,10 +562,7 @@
}
if($workorder_data)
{
- $values['sum_workorder_budget']=
number_format($sum_workorder_budget, 2, ',', '');
$values['deviation']= $sum_deviation;
- $values['sum_workorder_calculation']=
number_format($sum_workorder_calculation*$tax, 2, ',', '');
- $values['sum_workorder_actual_cost']=
number_format($sum_workorder_actual_cost, 2, ',', '');
}
if($values['location_code'])
Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php 2012-07-05 07:43:30 UTC
(rev 9746)
+++ trunk/property/inc/class.boworkorder.inc.php 2012-07-05 08:53:50 UTC
(rev 9747)
@@ -229,6 +229,13 @@
'sortable' => true
);
+ $columns['approved'] = array
+ (
+ 'id' => 'approved',
+ 'name' => lang('approved'),
+ 'sortable' => true
+ );
+
return $columns;
}
Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php 2012-07-05 07:43:30 UTC
(rev 9746)
+++ trunk/property/inc/class.soworkorder.inc.php 2012-07-05 08:53:50 UTC
(rev 9747)
@@ -215,6 +215,9 @@
$cols_return[] =
'ecodimb';
$cols.= ",fm_workorder.contract_sum";
$cols_return[] =
'contract_sum';
+ $cols.= ",fm_workorder.approved";
+ $cols_return[] =
'approved';
+
/*
$uicols['input_type'][] = 'text';
$uicols['name'][] =
'entry_date';
@@ -461,6 +464,9 @@
case 'budget':
$order_field = ",
fm_workorder.budget";
break;
+ case 'approved':
+ $order_field = ",
fm_workorder.approved";
+ break;
default:
$order_field = ", {$order}";
}
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2012-07-05 07:43:30 UTC (rev
9746)
+++ trunk/property/inc/class.uiproject.inc.php 2012-07-05 08:53:50 UTC (rev
9747)
@@ -1664,14 +1664,8 @@
}
$value_remainder = $values['sum'];
- if(isset($values['sum_workorder_actual_cost']))
- {
- $value_remainder = $values['sum'] -
$values['sum_workorder_actual_cost'];
- }
- $values['sum'] = number_format($values['sum'], 0, ',',
' ');
- $value_remainder = number_format($value_remainder, 0,
',', ' ');
-// $values['planned_cost'] =
number_format($values['planned_cost'], 0, ',', ' ');
+
$GLOBALS['phpgw']->jqcal->add_listener('values_start_date');
$GLOBALS['phpgw']->jqcal->add_listener('values_end_date');
@@ -1690,8 +1684,15 @@
foreach($content_budget as & $b_entry)
{
$b_entry['delete_year'] = "<input
type='checkbox' name='values[delete_b_year][]' value='{$b_entry['year']}'
title='{$lang_delete}'>";
+ $value_remainder -=
$b_entry['sum_orders'];
+ $value_remainder -=
$b_entry['actual_cost'];
}
}
+
+ $values['sum'] = number_format($values['sum'], 0, ',',
' ');
+ $value_remainder = number_format($value_remainder, 0,
',', ' ');
+
+
//_debug_array($content_budget);die();
$datavalues[0] = array
(
@@ -1733,9 +1734,10 @@
'values' =>
json_encode(array( array('key' =>
'workorder_id','label'=>lang('Workorder'),'sortable'=>true,'resizeable'=>true,'formatter'=>'YAHOO.widget.DataTable.formatLink'),
array('key' =>
'title','label'=>lang('title'),'sortable'=>true,'resizeable'=>true),
array('key' =>
'b_account_id','label'=>lang('Budget
account'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterRight'),
-
array('key' =>
'budget','label'=>lang('Budget'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount0'),
-
array('key' =>
'calculation','label'=>lang('Calculation'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterRight'),
-
array('key' =>
'contract_sum','label'=>lang('contract
sum'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount2'),
+
array('key' =>
'cost','label'=>lang('cost'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount2'),
+
// array('key' =>
'budget','label'=>lang('Budget'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount0'),
+
// array('key' =>
'calculation','label'=>lang('Calculation'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterRight'),
+
// array('key' =>
'contract_sum','label'=>lang('contract
sum'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount2'),
array('key' => 'addition_percentage','label'=>
'%','sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterRight'),
array('key' =>
'actual_cost','label'=>lang('actual
cost'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount2'),
// array('key' =>
'charge_tenant','label'=>lang('charge
tenant'),'sortable'=>true,'resizeable'=>true),
Modified: trunk/property/js/yahoo/project.edit.js
===================================================================
--- trunk/property/js/yahoo/project.edit.js 2012-07-05 07:43:30 UTC (rev
9746)
+++ trunk/property/js/yahoo/project.edit.js 2012-07-05 08:53:50 UTC (rev
9747)
@@ -126,9 +126,12 @@
this.addFooterDatatable1 = function(paginator,datatable)
{
//call getTotalSum(name of column) in property.js
+ tmp_sum0 = getTotalSum('cost',2,paginator,datatable);
+/*
tmp_sum1 = getTotalSum('budget',0,paginator,datatable);
tmp_sum2 = getTotalSum('calculation',2,paginator,datatable);
tmp_sum3 = getTotalSum('contract_sum',2,paginator,datatable);
+*/
tmp_sum4 = getTotalSum('actual_cost',2,paginator,datatable);
if(typeof(tableYUI1)=='undefined')
@@ -146,9 +149,10 @@
td_sum('Sum');
td_empty(2);
- td_sum(tmp_sum1);
- td_sum(tmp_sum2);
- td_sum(tmp_sum3);
+ td_sum(tmp_sum0);
+// td_sum(tmp_sum1);
+// td_sum(tmp_sum2);
+// td_sum(tmp_sum3);
td_empty(1);
td_sum(tmp_sum4);
td_empty(5);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9747] property: calculation,
Sigurd Nes <=