[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9066] propery: listing
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [9066] propery: listing |
|
Date: |
Thu, 29 Mar 2012 08:42:27 +0000 |
Revision: 9066
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9066
Author: sigurdne
Date: 2012-03-29 08:42:26 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
propery: listing
Modified Paths:
--------------
trunk/property/inc/class.boproject.inc.php
trunk/property/inc/class.boworkorder.inc.php
trunk/property/inc/class.soproject.inc.php
trunk/property/inc/class.uiproject.inc.php
trunk/property/inc/class.uiworkorder.inc.php
Modified: trunk/property/inc/class.boproject.inc.php
===================================================================
--- trunk/property/inc/class.boproject.inc.php 2012-03-29 07:35:07 UTC (rev
9065)
+++ trunk/property/inc/class.boproject.inc.php 2012-03-29 08:42:26 UTC (rev
9066)
@@ -824,9 +824,14 @@
return $this->so->bulk_update_status($start_date,
$end_date, $status_filter, $status_new, $execute, $type,
$user_id,$ids,$paid,$closed_orders);
}
- public function get_user_list()
+ public function get_user_list($selected = 0)
{
- return $this->so->get_user_list();
+ $ser_list = $this->so->get_user_list();
+ foreach($ser_list as &$user)
+ {
+ $user['selected'] = $user['id'] == $selected ?
true : false;
+ }
+ return $ser_list;
}
public function get_budget($project_id)
Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php 2012-03-29 07:35:07 UTC
(rev 9065)
+++ trunk/property/inc/class.boworkorder.inc.php 2012-03-29 08:42:26 UTC
(rev 9066)
@@ -782,8 +782,13 @@
$this->so->delete($workorder_id);
}
- public function get_user_list()
+ public function get_user_list($selected = 0)
{
- return $this->so->get_user_list();
+ $ser_list = $this->so->get_user_list();
+ foreach($ser_list as &$user)
+ {
+ $user['selected'] = $user['id'] == $selected ?
true : false;
+ }
+ return $ser_list;
}
}
Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php 2012-03-29 07:35:07 UTC (rev
9065)
+++ trunk/property/inc/class.soproject.inc.php 2012-03-29 08:42:26 UTC (rev
9066)
@@ -377,11 +377,6 @@
$this->uicols = $uicols;
- if($dry_run)
- {
- return array();
- }
-
$order_field = '';
if ($order)
{
@@ -610,150 +605,157 @@
$sql_end = str_replace('SELECT DISTINCT
fm_project.id',"SELECT DISTINCT fm_project.id {$order_field}", $sql_minimized)
. " GROUP BY fm_project.id {$ordermethod}";
$project_list = array();
- if(!$allrows)
+
+ if(!$dry_run)
{
-
$this->db->limit_query($sql_end,$start,__LINE__,__FILE__);
- }
- else
- {
- if($this->total_records > 200)
+ if(!$allrows)
{
- $_fetch_single = true;
+
$this->db->limit_query($sql_end,$start,__LINE__,__FILE__);
}
else
{
- $_fetch_single = false;
+ if($this->total_records > 200)
+ {
+ $_fetch_single = true;
+ }
+ else
+ {
+ $_fetch_single = false;
+ }
+
$this->db->query($sql_end,__LINE__,__FILE__, false, $_fetch_single );
+ unset($_fetch_single);
}
- $this->db->query($sql_end,__LINE__,__FILE__,
false, $_fetch_single );
- unset($_fetch_single);
- }
- $project_list = array();
+ $project_list = array();
- $count_cols_return=count($cols_return);
+ $count_cols_return=count($cols_return);
- while ($this->db->next_record())
- {
- $project_list[] = array('project_id' =>
$this->db->f('id'));
- }
-
- foreach($project_list as &$project)
- {
- $this->db->query("{$sql} WHERE fm_project.id =
'{$project['project_id']}' {$group_method}");
- $this->db->next_record();
-
- for ($i=0;$i<$count_cols_return;$i++)
+ while ($this->db->next_record())
{
- $project[$cols_return[$i]] =
$this->db->f($cols_return[$i]);
+ $project_list[] = array('project_id' =>
$this->db->f('id'));
}
- $project['grants'] =
(int)$this->grants[$this->db->f('user_id')];
- $location_code= $this->db->f('location_code');
- $location = explode('-',$location_code);
- $count_location =count($location);
-
- for ($m=0;$m<$count_location;$m++)
+ foreach($project_list as &$project)
{
- $project['loc' . ($m+1)] =
$location[$m];
- $project['query_location']['loc' .
($m+1)]=implode("-", array_slice($location, 0, ($m+1)));
- }
+ $this->db->query("{$sql} WHERE
fm_project.id = '{$project['project_id']}' {$group_method}");
+ $this->db->next_record();
- $project['combined_cost'] = 0;
- $project['actual_cost'] = 0;
- $project['billable_hours'] = 0;
+ for ($i=0;$i<$count_cols_return;$i++)
+ {
+ $project[$cols_return[$i]] =
$this->db->f($cols_return[$i]);
+ }
+ $project['grants'] =
(int)$this->grants[$this->db->f('user_id')];
- $sql_workder = 'SELECT contract_sum,
calculation, budget,'
- . ' (fm_workorder.act_mtrl_cost +
fm_workorder.act_vendor_cost) as actual_cost,'
- . ' billable_hours,closed'
- . " FROM fm_workorder {$this->join}
fm_workorder_status ON fm_workorder.status = fm_workorder_status.id"
- . " WHERE project_id =
'{$project['project_id']}'";
+ $location_code=
$this->db->f('location_code');
+ $location = explode('-',$location_code);
+ $count_location =count($location);
- $this->db->query($sql_workder);
- while ($this->db->next_record())
- {
- $closed = false;
- if($this->db->f('closed'))
+ for ($m=0;$m<$count_location;$m++)
{
- $_sum = 0;
- $closed = true;
+ $project['loc' . ($m+1)] =
$location[$m];
+
$project['query_location']['loc' . ($m+1)]=implode("-", array_slice($location,
0, ($m+1)));
}
- else if($this->db->f('contract_sum') >
0)
+
+ $project['combined_cost'] = 0;
+ $project['actual_cost'] = 0;
+ $project['billable_hours'] = 0;
+
+ $sql_workder = 'SELECT contract_sum,
calculation, budget,'
+ . ' (fm_workorder.act_mtrl_cost +
fm_workorder.act_vendor_cost) as actual_cost,'
+ . ' billable_hours,closed'
+ . " FROM fm_workorder {$this->join}
fm_workorder_status ON fm_workorder.status = fm_workorder_status.id"
+ . " WHERE project_id =
'{$project['project_id']}'";
+
+ $this->db->query($sql_workder);
+ while ($this->db->next_record())
{
- $_sum =
$this->db->f('contract_sum');
+ $closed = false;
+ if($this->db->f('closed'))
+ {
+ $_sum = 0;
+ $closed = true;
+ }
+ else
if($this->db->f('contract_sum') > 0)
+ {
+ $_sum =
$this->db->f('contract_sum');
+ }
+ else
if($this->db->f('calculation') > 0)
+ {
+ $_sum =
$this->db->f('calculation');
+ }
+ else if($this->db->f('budget')
> 0)
+ {
+ $_sum =
$this->db->f('budget');
+ }
+ else
+ {
+ $_sum = 0;
+ }
+
+ $_actual_cost =
(int)$this->db->f('actual_cost');
+
+ if($closed)
+ {
+ $__actual_cost = 0;
+ }
+ else
+ {
+ $__actual_cost =
$_actual_cost;
+ }
+
+ $project['combined_cost']
+= ($_sum - $__actual_cost);
+ $project['actual_cost']
+= $_actual_cost;
+ $project['billable_hours']
+= (int)$this->db->f('billable_hours');
}
- else if($this->db->f('calculation') > 0)
- {
- $_sum =
$this->db->f('calculation');
- }
- else if($this->db->f('budget') > 0)
- {
- $_sum = $this->db->f('budget');
- }
- else
- {
- $_sum = 0;
- }
- $_actual_cost =
(int)$this->db->f('actual_cost');
+ $sql_workder = 'SELECT godkjentbelop
AS actual_cost'
+ . " FROM fm_ecobilag {$this->join}
fm_workorder ON fm_ecobilag.pmwrkord_code = fm_workorder.id"
+ . " WHERE fm_workorder.project_id =
'{$project['project_id']}'";
- if($closed)
+ $this->db->query($sql_workder);
+ while ($this->db->next_record())
{
- $__actual_cost = 0;
+ $_actual_cost =
(int)$this->db->f('actual_cost');
+ $project['combined_cost']
+= ($_sum - $_actual_cost);
+ $project['actual_cost']
+= $_actual_cost;
}
- else
+
+ if($project['combined_cost'] < 0)
{
- $__actual_cost = $_actual_cost;
+ $project['combined_cost'] = 0;
}
-
- $project['combined_cost'] +=
($_sum - $__actual_cost);
- $project['actual_cost'] +=
$_actual_cost;
- $project['billable_hours'] +=
(int)$this->db->f('billable_hours');
}
+ unset($project);
- $sql_workder = 'SELECT godkjentbelop AS
actual_cost'
- . " FROM fm_ecobilag {$this->join} fm_workorder
ON fm_ecobilag.pmwrkord_code = fm_workorder.id"
- . " WHERE fm_workorder.project_id =
'{$project['project_id']}'";
-
- $this->db->query($sql_workder);
- while ($this->db->next_record())
+ $_datatype = array();
+ foreach($this->uicols['name'] as $key => $_name)
{
- $_actual_cost =
(int)$this->db->f('actual_cost');
- $project['combined_cost'] +=
($_sum - $_actual_cost);
- $project['actual_cost'] +=
$_actual_cost;
+ $_datatype[$_name] =
$this->uicols['datatype'][$key];
}
- if($project['combined_cost'] < 0)
+ $dataset = array();
+ $j=0;
+
+ foreach($project_list as $project)
{
- $project['combined_cost'] = 0;
+ foreach ($project as $field => $value)
+ {
+ $dataset[$j][$field] = array
+ (
+ 'value' =>
$value,
+ 'datatype' =>
isset($_datatype[$field]) && $_datatype[$field] ? $_datatype[$field] : false,
+ 'attrib_id' =>
isset($_attrib[$field]) && $_attrib[$field] ? $_attrib[$field] : false
+ );
+ }
+ $j++;
}
- }
- $_datatype = array();
- foreach($this->uicols['name'] as $key => $_name)
- {
- $_datatype[$_name] =
$this->uicols['datatype'][$key];
- }
+ $values =
$this->custom->translate_value($dataset, $location_id);
- $dataset = array();
- $j=0;
-
- foreach($project_list as $project)
- {
- foreach ($project as $field => $value)
- {
- $dataset[$j][$field] = array
- (
- 'value' => $value,
- 'datatype' =>
isset($_datatype[$field]) && $_datatype[$field] ? $_datatype[$field] : false,
- 'attrib_id' =>
isset($_attrib[$field]) && $_attrib[$field] ? $_attrib[$field] : false
- );
- }
- $j++;
+ return $values;
}
- $values = $this->custom->translate_value($dataset,
$location_id);
-
- return $values;
+ return array();
}
function get_meter_table()
@@ -1393,7 +1395,7 @@
'modified_date' =>
$this->db->f('modified_date')
);
}
-
+
foreach($budget as $entry)
{
$sql = "SELECT * FROM fm_project_budget
WHERE project_id = {$new_project_id} AND year = {$entry['year']}";
Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php 2012-03-29 07:35:07 UTC (rev
9065)
+++ trunk/property/inc/class.uiproject.inc.php 2012-03-29 08:42:26 UTC (rev
9066)
@@ -267,7 +267,7 @@
$default_value = array
('id'=>'','name'=>lang('no criteria'));
array_unshift
($values_combo_box[4],$default_value);
- $values_combo_box[5] =
$this->bo->get_user_list();
+ $values_combo_box[5] =
$this->bo->get_user_list($this->filter);
array_unshift
($values_combo_box[5],array('id'=>$GLOBALS['phpgw_info']['user']['account_id'],'name'=>lang('mine
projects')));
$default_value = array
('id'=>'','name'=>lang('no user'));
array_unshift
($values_combo_box[5],$default_value);
Modified: trunk/property/inc/class.uiworkorder.inc.php
===================================================================
--- trunk/property/inc/class.uiworkorder.inc.php 2012-03-29 07:35:07 UTC
(rev 9065)
+++ trunk/property/inc/class.uiworkorder.inc.php 2012-03-29 08:42:26 UTC
(rev 9066)
@@ -274,7 +274,7 @@
$default_value = array
('id'=>'','name'=>lang('no criteria'));
array_unshift
($values_combo_box[4],$default_value);
- $values_combo_box[5] =
$this->bo->get_user_list();
+ $values_combo_box[5] =
$this->bo->get_user_list($this->filter);
array_unshift
($values_combo_box[5],array('id'=>$GLOBALS['phpgw_info']['user']['account_id'],'name'=>lang('mine
orders')));
$default_value = array
('id'=>'','name'=>lang('no user'));
array_unshift
($values_combo_box[5],$default_value);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9066] propery: listing,
Sigurd Nes <=