[Fmsystem-commits] [10997] property: listing locations

[Sigurd Nes]

Revision: 10997
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10997
Author:   sigurdne
Date:     2013-03-18 11:56:29 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
property: listing locations

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

Modified: trunk/property/inc/class.bocommon.inc.php
===================================================================
--- trunk/property/inc/class.bocommon.inc.php   2013-03-17 19:41:05 UTC (rev 
10996)
+++ trunk/property/inc/class.bocommon.inc.php   2013-03-18 11:56:29 UTC (rev 
10997)
@@ -1184,7 +1184,7 @@
                                        $on = 'ON';
                                        for ($k=($_level-1); $k>0; $k--)
                                        {
-                                               $joinmethod .= " $on 
(fm_location{$_level}.loc{$k} = fm_location" . ($_level-1) . ".loc{$k})";
+                                               $joinmethod .= " $on 
(fm_location{$_level}.loc{$k} = fm_location" . ($_level-1) . ".loc{$k} AND  
fm_location{$_level}.loc{$_level} = $entity_table.loc{$_level})";
                                                $on = 'AND';
                                                if($k==1)
                                                {
@@ -1193,18 +1193,30 @@
                                        }
                                }
                                $_level ++;
+                       }
 
-                               $uicols['input_type'][]         = 'text';
-                               $uicols['name'][]                       = 'loc' 
. $location_types[$i]['id'];
-                               $uicols['descr'][]                      = 
$location_types[$i]['name'];
-                               $uicols['statustext'][]         = 
$location_types[$i]['descr'];
-                               $uicols['exchange'][]           = false;
-                               $uicols['align'][]                      = '';
-                               $uicols['datatype'][]           = '';
-                               $uicols['formatter'][]          = '';
-                               $uicols['classname'][]          = '';
-                               $uicols['sortable'][]           = $i === 0;
+                       unset($_level);
+
+                       foreach ($list_location_level as $_key => $_level)
+                       {
+                               if($_level)
+                               {
+                                       $i = $_level -1;
+                                       $uicols['input_type'][]         = 
'text';
+                                       $uicols['name'][]                       
= 'loc' . $location_types[$i]['id'];
+                                       $uicols['descr'][]                      
= $location_types[$i]['name'];
+                                       $uicols['statustext'][]         = 
$location_types[$i]['descr'];
+                                       $uicols['exchange'][]           = false;
+                                       $uicols['align'][]                      
= '';
+                                       $uicols['datatype'][]           = '';
+                                       $uicols['formatter'][]          = '';
+                                       $uicols['classname'][]          = '';
+                                       $uicols['sortable'][]           = 
$_level === 1;
+                               }
                        }
+
+
+//_debug_array($uicols);die();
 //_debug_array($joinmethod);die();
                        unset($soadmin_location);
 
@@ -1215,6 +1227,7 @@
 
                        for ($i=1;$i<($type_id+1);$i++)
                        {
+                               $cols.= ",loc{$i}_name";
                                $cols_return[]                          = 
"loc{$i}_name";
                                $cols_extra[]                           = 
"loc{$i}_name";
                                $cols_return_lookup[]           = 
"loc{$i}_name";

Modified: trunk/property/inc/class.soproject.inc.php
===================================================================
--- trunk/property/inc/class.soproject.inc.php  2013-03-17 19:41:05 UTC (rev 
10996)
+++ trunk/property/inc/class.soproject.inc.php  2013-03-18 11:56:29 UTC (rev 
10997)
@@ -673,7 +673,7 @@
                                }
 
                                $project_list = array();
-
+//_debug_array($cols_return);
                                $count_cols_return=count($cols_return);
 
                                while ($this->db->next_record())
@@ -687,7 +687,7 @@
                                {
                                        $this->db->query("{$sql} WHERE 
fm_project.id = '{$project['project_id']}' {$group_method}");
                                        $this->db->next_record();
-
+//_debug_array("{$sql} WHERE fm_project.id = '{$project['project_id']}' 
{$group_method}");
                                        for ($i=0;$i<$count_cols_return;$i++)
                                        {
                                                $project[$cols_return[$i]] = 
$this->db->f($cols_return[$i]);
@@ -709,7 +709,7 @@
                                        $project['billable_hours']      = 0;
 
                                }
-
+//_debug_array($project_list);
                                unset($project);
 
                                $_datatype = array();