[Phpgroupware-cvs] CVS: property/inc class.bolocation.inc.php, 1.24, 1.25 class.botts.inc.php, 1.16, 1.17 class.solocation.inc.php, 1.30, 1.31 class.soproject.inc.php, 1.31, 1.32 class.sorequest.inc.php, 1.19, 1.20 class.uilocation.inc.php, 1.26, 1.27 class.uiproject.inc.php, 1.39, 1.40 class.uireport.inc.php, 1.13, 1.14 class.uiworkorder.inc.php, 1.33, 1.34

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv14746/inc

Modified Files:
        class.bolocation.inc.php class.botts.inc.php 
        class.solocation.inc.php class.soproject.inc.php 
        class.sorequest.inc.php class.uilocation.inc.php 
        class.uiproject.inc.php class.uireport.inc.php 
        class.uiworkorder.inc.php 
Log Message:
no message

Index: class.bolocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** class.bolocation.inc.php    23 Aug 2003 17:43:06 -0000      1.24
--- class.bolocation.inc.php    29 Aug 2003 16:17:55 -0000      1.25
***************
*** 519,522 ****
--- 519,524 ----
                        $this->total_records = $this->so->total_records;
                        $this->uicols = $this->so->uicols;
+ 
+                       $this->end_time = $this->so->end_time;
                        return $location;
                }

Index: class.botts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.botts.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.botts.inc.php 9 Jul 2003 11:12:16 -0000       1.16
--- class.botts.inc.php 29 Aug 2003 16:17:55 -0000      1.17
***************
*** 671,679 ****
                        if ($mail_method=='smtp'):
                        {
!                               $rc = $this->send->msg('email', $to, $subject, 
stripslashes($body), '', $cc, 
$bcc,$current_user_address,$current_user_name,'txt');
                        }
                        elseif ($mail_method=='sendmail'):
                        {
!                               $rc=    @mail($to,$subject,stripslashes($body), 
$headers);
                        }
                        else:
--- 671,679 ----
                        if ($mail_method=='smtp'):
                        {
!                               $rc = $this->send->msg('email', $to, 
$ticket['subject'], stripslashes($body), '', $cc, 
$bcc,$current_user_address,$current_user_name,'txt');
                        }
                        elseif ($mail_method=='sendmail'):
                        {
!                               $rc=    
@mail($to,$ticket['subject'],stripslashes($body), $headers);
                        }
                        else:

Index: class.solocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** class.solocation.inc.php    27 Aug 2003 16:35:12 -0000      1.30
--- class.solocation.inc.php    29 Aug 2003 16:17:55 -0000      1.31
***************
*** 117,120 ****
--- 117,121 ----
                //      $sql = $GLOBALS['phpgw']->session->appsession('sql_'. 
$type_id . '_' . $lookup_tenant ,$this->currentapp);
  
+ 
                        if(!$sql)
                        {
***************
*** 362,370 ****
--- 363,375 ----
  
                        $this->db2->query($sql,__LINE__,__FILE__);
+ 
                        $this->total_records = $this->db2->num_rows();
+ 
                        $this->db->limit_query($sql . 
$ordermethod,$start,__LINE__,__FILE__);
  
                        $j=0;
                        $cols_return_count      = count($cols_return);
+                       $location_count = $type_id-1;
+ 
                        while ($this->db->next_record())
                        {
***************
*** 376,380 ****
                                $location_code= $this->db->f('location_code');
                                $location = split('-',$location_code);
!                               for ($m=0;$m<count($location);$m++)
                                {
                                        $location_list[$j]['loc' . ($m+1)] = 
$location[$m];
--- 381,385 ----
                                $location_code= $this->db->f('location_code');
                                $location = split('-',$location_code);
!                               for ($m=0;$m<$location_count;$m++)
                                {
                                        $location_list[$j]['loc' . ($m+1)] = 
$location[$m];
***************
*** 385,388 ****
--- 390,396 ----
                        }
  
+                       $end_time = explode(' ',microtime());
+                       $this->end_time = $end_time;
+ 
  //_debug_array($location_list);
                        return $location_list;
***************
*** 480,484 ****
                                if (($config[$i]['location_type'] <= $type_id) 
&& ($config[$i]['f_key'] ==1))
                                {
!                                       $joinmethod .= " $this->join  " . 
$config[$i]['reference_table'] . " ON ( fm_location" . 
$config[$i]['location_type'] . "." . $config[$i]['column_name'] . "=" . 
$config[$i]['reference_table'] . ".".$config[$i]['reference_id']."))";
  
                                        $paranthesis .='(';
--- 488,502 ----
                                if (($config[$i]['location_type'] <= $type_id) 
&& ($config[$i]['f_key'] ==1))
                                {
! 
!                                       
if($config[$i]['column_name']=='tenant_id')
!                                       {
!                                               $join=$this->left_join;
!                                       }
!                                       else
!                                       {
!                                               $join =$this->join;
!                                       }
! 
!                                       $joinmethod .= " $join  " . 
$config[$i]['reference_table'] . " ON ( fm_location" . 
$config[$i]['location_type'] . "." . $config[$i]['column_name'] . "=" . 
$config[$i]['reference_table'] . ".".$config[$i]['reference_id']."))";
  
                                        $paranthesis .='(';

Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** class.soproject.inc.php     27 Aug 2003 16:35:12 -0000      1.31
--- class.soproject.inc.php     29 Aug 2003 16:17:55 -0000      1.32
***************
*** 450,454 ****
                                $project['other_branch'],
                                $project['key_responsible'],
-                               $project['tenant_id'],
                                $project['charge_tenant'],
                                $this->account);
--- 450,453 ----
***************
*** 459,463 ****
  
                        $this->db->query("INSERT INTO fm_project 
(id,name,access,category,entry_date,start_date,end_date,coordinator,status,"
!                               . 
"descr,budget,location_code,address,key_deliver,key_fetch,other_branch,key_responsible,tenant_id,charge_tenant,user_id
 $cols) "
                                . "VALUES ($values $vals )",__LINE__,__FILE__);
  
--- 458,462 ----
  
                        $this->db->query("INSERT INTO fm_project 
(id,name,access,category,entry_date,start_date,end_date,coordinator,status,"
!                               . 
"descr,budget,location_code,address,key_deliver,key_fetch,other_branch,key_responsible,charge_tenant,user_id
 $cols) "
                                . "VALUES ($values $vals )",__LINE__,__FILE__);
  

Index: class.sorequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sorequest.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.sorequest.inc.php     27 Aug 2003 16:35:12 -0000      1.19
--- class.sorequest.inc.php     29 Aug 2003 16:17:55 -0000      1.20
***************
*** 487,491 ****
                                $request['equipment_id'],
                                $address,
-                               $request['tenant_id'],
                                time(),
                                $request['budget'],
--- 487,490 ----
***************
*** 518,522 ****
  
                        $this->db->query("insert into fm_request 
(id,title,owner,category,descr,location_code,equipment_id,"
!                               . 
"address,tenant_id,entry_date,budget,status,branch_id,coordinator,"
                                . 
"d_safety,d_aesthetics,d_indoor_climate,d_consequential_damage,d_user_gratification,d_residential_environment,"
                                . 
"c_safety,c_aesthetics,c_indoor_climate,c_consequential_damage,c_user_gratification,c_residential_environment,"
--- 517,521 ----
  
                        $this->db->query("insert into fm_request 
(id,title,owner,category,descr,location_code,equipment_id,"
!                               . 
"address,entry_date,budget,status,branch_id,coordinator,"
                                . 
"d_safety,d_aesthetics,d_indoor_climate,d_consequential_damage,d_user_gratification,d_residential_environment,"
                                . 
"c_safety,c_aesthetics,c_indoor_climate,c_consequential_damage,c_user_gratification,c_residential_environment,"
***************
*** 604,608 ****
                                'title'                                 => 
$request['title'],
                                'budget'                                => 
(int)$request['budget'],
-                               'tenant_id'                             => 
$request['tenant_id'],
                                'location_code'                 => 
$request['location_code'],
                                'floor'                                 => 
$request['floor'],
--- 603,606 ----

Index: class.uilocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilocation.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** class.uilocation.inc.php    23 Aug 2003 17:43:49 -0000      1.26
--- class.uilocation.inc.php    29 Aug 2003 16:17:55 -0000      1.27
***************
*** 75,78 ****
--- 75,81 ----
                function index()
                {
+                       $start_time = explode(' ',microtime());
+                       $start_time = $start_time[1]+$start_time[0];
+ 
                        if(!$this->acl_read)
                        {
***************
*** 100,104 ****
--- 103,109 ----
                        $links = $this->bocommon->menu();
  
+ 
                        $location_list = 
$this->bo->read($type_id,$lookup_tenant);
+                       $end_time = $this->bo->end_time;
  
                        $uicols = $this->bo->uicols;
***************
*** 346,349 ****
--- 351,358 ----
                        
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list' => $data));
                        $this->save_sessiondata();
+ 
+                       $end_time = $end_time[1]+$end_time[0];
+                       $process = ($end_time-$start_time);
+                       echo "tidsforbruk: $process";
                }
  

Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** class.uiproject.inc.php     8 Aug 2003 17:07:58 -0000       1.39
--- class.uiproject.inc.php     29 Aug 2003 16:17:55 -0000      1.40
***************
*** 499,502 ****
--- 499,508 ----
                                                endif;
                                        }
+ 
+                                       if($rcpt)
+                                       {
+                                               
$receipt['message'][]=array('msg'=>lang('%1 is 
notified',$values['mail_address']));
+                                       }
+ 
                                }
  

Index: class.uireport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uireport.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.uireport.inc.php      18 Jul 2003 09:34:54 -0000      1.13
--- class.uireport.inc.php      29 Aug 2003 16:17:55 -0000      1.14
***************
*** 525,529 ****
                                $attributes_header[]    = array
                                (
!                                       'lang_name'             => lang('Name'),
                                        'lang_descr'    => lang('Description'),
                                        'lang_datatype' => lang('Datatype'),
--- 525,529 ----
                                $attributes_header[]    = array
                                (
!                                       'lang_name'             => lang('Record 
Name'),
                                        'lang_descr'    => lang('Description'),
                                        'lang_datatype' => lang('Datatype'),
***************
*** 725,729 ****
                                $attributes_values              = 
$this->bocommon->read_attibutes(array('form'=>false,'type'=>'report','type_id'=>$values['cat_id'],'id'=>$id));
                                $attributes_header[]    = array(
!                                       'lang_name'             => lang('Name'),
                                        'lang_descr'    => lang('Description'),
                                        'lang_datatype' => lang('Datatype'),
--- 725,729 ----
                                $attributes_values              = 
$this->bocommon->read_attibutes(array('form'=>false,'type'=>'report','type_id'=>$values['cat_id'],'id'=>$id));
                                $attributes_header[]    = array(
!                                       'lang_name'             => lang('Record 
Name'),
                                        'lang_descr'    => lang('Description'),
                                        'lang_datatype' => lang('Datatype'),
***************
*** 740,745 ****
--- 740,754 ----
                        }
  
+                       $this->config->read_repository();
+                       $link_to_files = 
$this->config->config_data['files_url'];
+ 
                        $data = array
                        (
+                               'link_view_file'                                
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uireport.view_file&loc1='
 . $values['location_data']['loc1'] . '&report_id=' . $id),
+                               'link_to_files'                                 
=> $link_to_files,
+                               'files'                                         
        => $values['files'],
+                               'lang_files'                                    
=> lang('files'),
+                               'lang_filename'                                 
=> lang('Filename'),
+                               'lang_view_file_statustext'             => 
lang('Klick to view file'),
                                'lang_attributes'                       => 
lang('Attributes'),
                                'attributes_header'                     => 
$attributes_header,

Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -r1.33 -r1.34
*** class.uiworkorder.inc.php   26 Aug 2003 19:16:30 -0000      1.33
--- class.uiworkorder.inc.php   29 Aug 2003 16:17:55 -0000      1.34
***************
*** 473,476 ****
--- 473,480 ----
                                        
$values['key_deliver']=$project['key_deliver'];
                                }
+                               if( $project['charge_tenant'] && 
!$values['workorder_id'])
+                               {
+                                       
$values['charge_tenant']=$project['charge_tenant'];
+                               }
  
  //_debug_array($values);