[Fmsystem-commits] [9647] property: allrows at project/order

[Sigurd Nes]

Revision: 9647
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9647
Author:   sigurdne
Date:     2012-06-22 11:22:35 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
property: allrows at project/order

Modified Paths:
--------------
    trunk/property/inc/class.boentity.inc.php
    trunk/property/inc/class.boproject.inc.php
    trunk/property/inc/class.boworkorder.inc.php
    trunk/property/inc/class.soworkorder.inc.php

Modified: trunk/property/inc/class.boentity.inc.php
===================================================================
--- trunk/property/inc/class.boentity.inc.php   2012-06-22 10:20:13 UTC (rev 
9646)
+++ trunk/property/inc/class.boentity.inc.php   2012-06-22 11:22:35 UTC (rev 
9647)
@@ -305,7 +305,7 @@
 
                function read($data= array())
                {
-                       if(isset($this->allrows))
+                       if(isset($this->allrows) && $this->allrows)
                        {
                                $data['allrows'] = true;
                        }

Modified: trunk/property/inc/class.boproject.inc.php
===================================================================
--- trunk/property/inc/class.boproject.inc.php  2012-06-22 10:20:13 UTC (rev 
9646)
+++ trunk/property/inc/class.boproject.inc.php  2012-06-22 11:22:35 UTC (rev 
9647)
@@ -41,6 +41,7 @@
                var $sort;
                var $order;
                var $cat_id;
+               var $allrows;
 
                var $public_functions = array
                        (
@@ -77,6 +78,7 @@
                        $wo_hour_cat_id                 = 
phpgw::get_var('wo_hour_cat_id', 'int');
                        $district_id                    = 
phpgw::get_var('district_id', 'int');
                        $criteria_id                    = 
phpgw::get_var('criteria_id', 'int');
+                       $this->allrows                  = 
phpgw::get_var('allrows', 'bool');
 
                        $this->start                    = $start ? $start : 0;
 
@@ -401,6 +403,11 @@
 
                function read($data = array())
                {
+                       if(isset($this->allrows) && $this->allrows)
+                       {
+                               $data['allrows'] = true;
+                       }
+
                        $start_date     = 
$this->bocommon->date_to_timestamp($data['start_date']);
                        $end_date       = 
$this->bocommon->date_to_timestamp($data['end_date']);
 

Modified: trunk/property/inc/class.boworkorder.inc.php
===================================================================
--- trunk/property/inc/class.boworkorder.inc.php        2012-06-22 10:20:13 UTC 
(rev 9646)
+++ trunk/property/inc/class.boworkorder.inc.php        2012-06-22 11:22:35 UTC 
(rev 9647)
@@ -41,6 +41,7 @@
                var $order;
                var $cat_id;
                var $order_sent_adress; // in case we want to resend the order 
as an reminder
+               var $allrows;
 
                var $public_functions = array
                        (
@@ -80,6 +81,7 @@
                        $b_account                      = 
phpgw::get_var('b_account');
                        $district_id            = phpgw::get_var('district_id', 
'int');
                        $criteria_id            = phpgw::get_var('criteria_id', 
'int');
+                       $this->allrows                  = 
phpgw::get_var('allrows', 'bool');
 
                        $this->start            = $start ? $start : 0;
                        $this->criteria_id      = isset($criteria_id) && 
$criteria_id ? $criteria_id : '';
@@ -448,6 +450,10 @@
                        $start_date     = 
$this->bocommon->date_to_timestamp($data['start_date']);
                        $end_date       = 
$this->bocommon->date_to_timestamp($data['end_date']);
 
+                       if(isset($this->allrows) && $this->allrows)
+                       {
+                               $data['allrows'] = true;
+                       }
 
                        $workorder = $this->so->read(array('start' => 
$this->start,'query' => $this->query,'sort' => $this->sort,'order' => 
$this->order,
                                'filter' => $this->filter,'cat_id' => 
$this->cat_id,'status_id' => $this->status_id,

Modified: trunk/property/inc/class.soworkorder.inc.php
===================================================================
--- trunk/property/inc/class.soworkorder.inc.php        2012-06-22 10:20:13 UTC 
(rev 9646)
+++ trunk/property/inc/class.soworkorder.inc.php        2012-06-22 11:22:35 UTC 
(rev 9647)
@@ -405,10 +405,6 @@
 //                             $this->cols_extra       = 
$this->bocommon->fm_cache('cols_extra_workorder'.!!$search_vendor . '_' . 
!!$wo_hour_cat_id . '_' . !!$b_group);
                        }
 
-                       if($dry_run)
-                       {
-                               return array();
-                       }
 
                        $location_table = 'fm_project';
                        
if(isset($GLOBALS['phpgw']->config->config_data['location_at_workorder']) && 
$GLOBALS['phpgw']->config->config_data['location_at_workorder'])
@@ -662,6 +658,11 @@
 
                        $workorder_list = array();
 
+                       if($dry_run)
+                       {
+                               return $workorder_list;
+                       }
+
                        $sql_end =   str_replace('SELECT DISTINCT 
fm_workorder.id',"SELECT DISTINCT fm_workorder.id {$order_field}", 
$sql_minimized) . $ordermethod;
 //     _debug_array($sql_end);die();