[Fmsystem-commits] [10636] property: tuning for speed

[Sigurd Nes]

Revision: 10636
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10636
Author:   sigurdne
Date:     2013-01-02 12:40:46 +0000 (Wed, 02 Jan 2013)
Log Message:
-----------
property: tuning for speed

Modified Paths:
--------------
    trunk/property/inc/class.soproject.inc.php
    trunk/property/inc/class.uiproject.inc.php
    trunk/property/inc/hook_settings.inc.php

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2013-01-02 09:21:36 UTC (rev 
10635)
+++ trunk/property/inc/class.soproject.inc.php  2013-01-02 12:40:46 UTC (rev 
10636)
@@ -680,12 +680,20 @@
                                                $sql_workder_date_filter = "AND 
fm_workorder.start_date >= $start_date AND fm_workorder.start_date <= $end_date 
";
                                        }
 
+/*
                                        $sql_workder  = 'SELECT 
fm_workorder.id, budget, combined_cost, billable_hours, closed, 
sum(fm_orders_paid_or_pending_view.amount) AS actual_cost'//, contract_sum, 
addition, calculation, budget'
                                        . " FROM fm_workorder"
                                        . " {$this->join} fm_workorder_status 
ON fm_workorder.status  = fm_workorder_status.id"
                                        . " {$this->left_join} 
fm_orders_paid_or_pending_view ON fm_workorder.id = 
fm_orders_paid_or_pending_view.order_id"
                                        . " WHERE project_id = 
'{$project['project_id']}' {$sql_workder_date_filter}"
                                        . " GROUP BY fm_workorder.id, budget, 
combined_cost, billable_hours, closed";
+
+*/
+                                       $sql_workder  = 'SELECT 
fm_workorder.id, budget, combined_cost, billable_hours, closed, actual_cost, 
pending_cost'//, contract_sum, addition, calculation, budget'
+                                       . " FROM fm_workorder"
+                                       . " {$this->join} fm_workorder_status 
ON fm_workorder.status  = fm_workorder_status.id"
+                                       . " {$this->left_join} 
fm_orders_pending_cost_view ON fm_workorder.id = 
fm_orders_pending_cost_view.order_id"
+                                       . " WHERE project_id = 
'{$project['project_id']}' {$sql_workder_date_filter}";
 //_debug_array($sql_workder);
 
                                        
$this->db->query($sql_workder,__LINE__,__FILE__);
@@ -696,7 +704,7 @@
                                        while ($this->db->next_record())
                                        {
                                                $_combined_cost = 
$this->db->f('combined_cost');
-                                               $_actual_cost =  
$this->db->f('actual_cost');
+                                               $_actual_cost =  
$this->db->f('actual_cost') + (float)$this->db->f('pending_cost');
                                                if(!$this->db->f('closed'))
                                                {
 //$test[] = $this->db->f('id');

Modified: trunk/property/inc/class.uiproject.inc.php
===================================================================
--- trunk/property/inc/class.uiproject.inc.php  2013-01-02 09:21:36 UTC (rev 
10635)
+++ trunk/property/inc/class.uiproject.inc.php  2013-01-02 12:40:46 UTC (rev 
10636)
@@ -1987,9 +1987,11 @@
                                );
                        }
 
+                       $project_type_id = isset($values['project_type_id']) && 
$values['project_type_id'] ? $values['project_type_id'] : 
$GLOBALS['phpgw_info']['user']['preferences']['property']['default_project_type'];
+                       
                        $data = array
                                (
-                                       'project_types'                         
                => array('options' => 
$this->bo->get_project_types($values['project_type_id'])),
+                                       'project_types'                         
                => array('options' => 
$this->bo->get_project_types($project_type_id)),
                                        'project_type_id'                       
                => $values['project_type_id'],
                                        'inherit_location'                      
                => $id ? $values['inherit_location'] : 1,
                                        'mode'                                  
                        => $mode,

Modified: trunk/property/inc/hook_settings.inc.php
===================================================================
--- trunk/property/inc/hook_settings.inc.php    2013-01-02 09:21:36 UTC (rev 
10635)
+++ trunk/property/inc/hook_settings.inc.php    2013-01-02 12:40:46 UTC (rev 
10636)
@@ -236,6 +236,17 @@
        unset($soworkorder);
        unset($socommon);
 
+
+       $default_project_type =array
+       (
+               '1'     => lang('operation'),
+               '2' => lang('investment'),
+               '3' => lang('buffer')
+       );
+
+       create_select_box('Default project 
type','default_project_type',$default_project_type,'Select your default project 
type');
+
+
        create_select_box('Default project 
status','project_status',$_status_project,'The default status for your 
projects');
        create_select_box('Default workorder 
status','workorder_status',$_status_workorder,'The default status for your 
workorders');
        create_select_box('Default project 
categories','project_category',$_categories_project,'The default category for 
your projects and workorders');