[Phpgroupware-cvs] CVS: property list_request.php,1.3,1.4

[Sigurd Nes <address@hidden>]

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

Modified Files:
        list_request.php 
Log Message:
no message

Index: list_request.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/list_request.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** list_request.php    6 Sep 2002 20:33:35 -0000       1.3
--- list_request.php    9 Sep 2002 17:45:18 -0000       1.4
***************
*** 51,54 ****
--- 51,59 ----
        
$t->set_var('searchurl',$GLOBALS['phpgw']->link('/property/list_request.php'));
  
+       
$t->set_var('link_priority_key',$GLOBALS['phpgw']->link('/property/request_priority_key.php','bilagsnr='
 . $bilag_nr . '&period=' . $period));
+       $t->set_var('lang_priority_key',lang('Priority key'));
+       $t->set_var('lang_priority_help',lang('To alter the priority key'));
+ 
+ 
        if (! $start)
        {
***************
*** 108,113 ****
        $db2 = $GLOBALS['phpgw']->db;
  
!       $sql = "select 
id,descr,type_descr,objekt_id,bygg_id,fm_request.request_type_id,status,date,account_lid"
!               . " FROM fm_request "
                . " $join  phpgw_accounts ON fm_request.owner = 
phpgw_accounts.account_id "
                . " $join  fm_request_type ON fm_request.request_type_id = 
fm_request_type.request_type_id "
--- 113,118 ----
        $db2 = $GLOBALS['phpgw']->db;
  
!       $sql = "select 
id,descr,type_descr,objekt_id,bygg_id,fm_request.request_type_id,status,date,account_lid,score,"
!               . " property_name, building_name, street FROM fm_request "
                . " $join  phpgw_accounts ON fm_request.owner = 
phpgw_accounts.account_id "
                . " $join  fm_request_type ON fm_request.request_type_id = 
fm_request_type.request_type_id "
***************
*** 153,168 ****
        $t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
        $t->set_var('currency',$currency);
        
$t->set_var('sort_request_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'id',$order,'/property/list_request.php',lang('request
 ID')));
-       
$t->set_var('sort_descr',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'descr',$order,'/property/list_request.php',lang('Description')));
        
$t->set_var('sort_type_descr',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'type_descr',$order,'/property/list_request.php',lang('Type
 description')));
        
$t->set_var('sort_reg_dateout',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'date',$order,'/property/list_request.php',lang('Date
 registered')));
        
$t->set_var('sort_objekt_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'objekt_id',$order,'/property/list_request.php',lang('Property')));
-       
$t->set_var('sort_bygg_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'bygg_id',$order,'/property/list_request.php',lang('Building')));
        
$t->set_var('sort_status',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'status',$order,'/property/list_request.php',lang('Status')));
        
$t->set_var('sort_account_lid',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'account_lid',$order,'/property/list_request.php',lang('User')));
        $t->set_var('lang_edit',lang('Edit'));
        $t->set_var('lang_attribute',lang('Attribute'));
        $t->set_var('lang_delete',lang('Delete'));
        $t->set_var('lang_event',lang('Event'));
  
  // ---------------------------- end header declaration 
-------------------------------------
--- 158,175 ----
        $t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
        $t->set_var('currency',$currency);
+       
$t->set_var('sort_score',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'score',$order,'/property/list_request.php',lang('Score')));
        
$t->set_var('sort_request_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'id',$order,'/property/list_request.php',lang('request
 ID')));
        
$t->set_var('sort_type_descr',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'type_descr',$order,'/property/list_request.php',lang('Type
 description')));
        
$t->set_var('sort_reg_dateout',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'date',$order,'/property/list_request.php',lang('Date
 registered')));
        
$t->set_var('sort_objekt_id',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'objekt_id',$order,'/property/list_request.php',lang('Property')));
        
$t->set_var('sort_status',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'status',$order,'/property/list_request.php',lang('Status')));
        
$t->set_var('sort_account_lid',$GLOBALS['phpgw']->nextmatchs->show_sort_order($sort,'account_lid',$order,'/property/list_request.php',lang('User')));
+       $t->set_var('lang_descr',lang('Description'));
+       $t->set_var('lang_bygg_id',lang('Building'));
        $t->set_var('lang_edit',lang('Edit'));
        $t->set_var('lang_attribute',lang('Attribute'));
        $t->set_var('lang_delete',lang('Delete'));
        $t->set_var('lang_event',lang('Event'));
+       $t->set_var('lang_address',lang('lang_address'));
  
  // ---------------------------- end header declaration 
-------------------------------------
***************
*** 175,181 ****
--- 182,206 ----
                if (! $request_id)  $request_id  = ' ';
  
+ 
+ 
+               $address = 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('property_name'));
+ 
+               if(!$address)
+               {
+                       $address = 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('building_name'));
+               }
+               if(!$address)
+               {
+                       $address = 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('street'));
+               }
+ 
+               if (! $address)  $address  = ' ';
+ 
                $descr = 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('descr'));
                if (! $descr)  $descr  = ' ';
  
+               $score = 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('score'));
+               if (! $score)  $score  = ' ';
+ 
                $type_descr = 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('type_descr'));
                if (! $type_descr)  $type_descr  = ' ';
***************
*** 217,220 ****
--- 242,247 ----
  
                $t->set_var(array('request_id'  => $request_id,
+                                       'score'         => $score,
+                                       'address'       => $address,
                                        'descr'         => $descr,
                                        'objekt_id'     => $objekt_id,