[Phpgroupware-cvs] CVS: property/inc header.inc.php,1.9,1.10 class.fm_wrkorder.inc.php,1.4,1.5

[Sigurd Nes <address@hidden>]

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

Modified Files:
        header.inc.php class.fm_wrkorder.inc.php 
Log Message:
no message

Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/header.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** header.inc.php      9 Sep 2002 17:45:17 -0000       1.9
--- header.inc.php      16 Sep 2002 16:05:43 -0000      1.10
***************
*** 188,197 ****
                
$t->set_var('sub_workorder_request',$phpgw->link('/property/list_request.php','sub=p_workorder'));
                
$t->set_var('sub_workorder_archive',$phpgw->link('/property/list_workorder.php','sub=p_workorder&status=Avsluttet'));
! //            
$t->set_var('sub_workorder_archive',$phpgw->link('/property/workorder_archive.php','sub=p_workorder'));
                $t->set_var('sublang_workorder_list',lang('Workorder'));
                $t->set_var('sublang_workorder_request',lang('Request'));
                $t->set_var('sublang_workorder_archive',lang('Archive'));
                $t->set_var('tr_color2',$phpgw_info['theme']['row_off']);
                $admin_info = lang('Workorder');
        }
        else
--- 188,199 ----
                
$t->set_var('sub_workorder_request',$phpgw->link('/property/list_request.php','sub=p_workorder'));
                
$t->set_var('sub_workorder_archive',$phpgw->link('/property/list_workorder.php','sub=p_workorder&status=Avsluttet'));
!               
$t->set_var('sub_workorder_template',$phpgw->link('/property/list_wo_template.php','sub=p_workorder'));
                $t->set_var('sublang_workorder_list',lang('Workorder'));
                $t->set_var('sublang_workorder_request',lang('Request'));
                $t->set_var('sublang_workorder_archive',lang('Archive'));
+               $t->set_var('sublang_workorder_template',lang('Workorder 
template'));
                $t->set_var('tr_color2',$phpgw_info['theme']['row_off']);
                $admin_info = lang('Workorder');
+ 
        }
        else
***************
*** 203,206 ****
--- 205,209 ----
          $t->set_var('sublang_workorder_request','');
          $t->set_var('sublang_workorder_archive','');
+         $t->set_var('sublang_workorder_template','');
        }
  

Index: class.fm_wrkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.fm_wrkorder.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.fm_wrkorder.inc.php   6 Sep 2002 20:33:35 -0000       1.4
--- class.fm_wrkorder.inc.php   16 Sep 2002 16:05:43 -0000      1.5
***************
*** 434,438 ****
  
  */
!                       $sql = "SELECT h.quantity as quantity,h.activity_id as 
activity_id, h.activity_num as activity_num, h.record as record, h.grouping_id 
as grouping_id,h.grouping_descr as grouping_descr, h.id as 
id,h.hours_descr,a.descr,h.ns3420_id as ns3420_id,h.unit as unit,h.status,"
                                . 
"h.start_date,h.end_date,h.minutes,h.employee,address.org_name as vendor, 
cost,h.remark as remark, h.building_part as building_part FROM (fm_wo_hours AS 
h"
                                . "$join fm_wo_activities AS a ON 
h.activity_id=a.id)$join phpgw_addressbook as address ON h.vendor_id = 
address.id WHERE h.wrkorder_id='$wrkorder_id' "
--- 434,438 ----
  
  */
!                       $sql = "SELECT h.tolerance,h.quantity as 
quantity,h.activity_id as activity_id, h.activity_num as activity_num, h.record 
as record, h.grouping_id as grouping_id,h.grouping_descr as grouping_descr, 
h.id as id,h.hours_descr,a.descr,h.ns3420_id as ns3420_id,h.unit as 
unit,h.status,"
                                . 
"h.start_date,h.end_date,h.minutes,h.employee,address.org_name as vendor, 
cost,h.remark as remark, h.building_part as building_part FROM (fm_wo_hours AS 
h"
                                . "$join fm_wo_activities AS a ON 
h.activity_id=a.id)$join phpgw_addressbook as address ON h.vendor_id = 
address.id WHERE h.wrkorder_id='$wrkorder_id' "
***************
*** 467,470 ****
--- 467,471 ----
                                $hours[$i]['building_part']                     
= $this->db->f('building_part');
                                $hours[$i]['activity_num']                      
= $this->db->f('activity_num');
+                               $hours[$i]['tolerance']                 = 
$this->db->f('tolerance');
                                $i++;
                        }
***************
*** 475,479 ****
                {
  
!                       $this->db->query("SELECT 
activity_num,record,fm_wo_hours.billperae,quantity,grouping_id,grouping_descr,fm_wo_hours.unit
 as unit, descr, hours_descr, num, fm_wo_hours.remark, ns3420_id,building_part, 
fm_wo_hours.cost from fm_wo_hours left join fm_wo_activities on 
fm_wo_activities.id=fm_wo_hours.activity_id WHERE wrkorder_id='$wrkorder_id' 
order by grouping_id, record asc",__LINE__,__FILE__);
  
                        $i = 0;
--- 476,480 ----
                {
  
!                       $this->db->query("SELECT 
tolerance,activity_num,record,fm_wo_hours.billperae,quantity,grouping_id,grouping_descr,fm_wo_hours.unit
 as unit, descr, hours_descr, num, fm_wo_hours.remark, ns3420_id,building_part, 
fm_wo_hours.cost from fm_wo_hours left join fm_wo_activities on 
fm_wo_activities.id=fm_wo_hours.activity_id WHERE wrkorder_id='$wrkorder_id' 
order by grouping_id, record asc",__LINE__,__FILE__);
  
                        $i = 0;
***************
*** 497,500 ****
--- 498,502 ----
                                $hours_detail[$i]['ns3420_id']          = 
$this->db->f('ns3420_id');
                                $hours_detail[$i]['building_part']      = 
$this->db->f('building_part');
+                               $hours_detail[$i]['tolerance']  = 
$this->db->f('tolerance');
                                $i++;
                        }
***************
*** 874,881 ****
  
  
!               function select_chapter_list($wrkorder_id = '')
                {
  
!                       $this->db2->query("SELECT chapter_id from 
fm_wo_wrkorders WHERE id='$wrkorder_id' ");
                        $this->db2->next_record();
  
--- 876,883 ----
  
  
!               function select_chapter_list($table='',$id = '')
                {
  
!                       $this->db2->query("SELECT chapter_id from $table WHERE 
id='$id' ");
                        $this->db2->next_record();
  
***************
*** 908,924 ****
  
  
!               function select_grouping_list($wrkorder_id = '',$grouping_id='')
                {
  
                        if (!$grouping_id)
                        {
!                       $this->db2->query("SELECT max(id) as id from 
fm_wo_hours WHERE wrkorder_id='$wrkorder_id' ");
!                       $this->db2->next_record();
!                       $hours_id = $this->db2->f('id');
  
!                       $this->db2->query("SELECT grouping_id from fm_wo_hours 
WHERE id='$hours_id'");
!                       $this->db2->next_record();
  
!                       $selected = $this->db2->f('grouping_id');
                        }
                        else
--- 910,935 ----
  
  
!               function select_grouping_list($table='',$parent_id 
='',$grouping_id='',$record_id)
                {
  
+                       if ($table=='fm_wo_hours')
+                       {
+                               $id_name='wrkorder_id';
+                       }
+                       else
+                       {
+                               $id_name='wo_template_type_id';
+                       }
+ 
                        if (!$grouping_id)
                        {
!                               $this->db2->query("SELECT max(id) as id from 
$table WHERE $id_name='$parent_id' ");
!                               $this->db2->next_record();
!                               $grouping_parent_id = $this->db2->f('id');
  
!                               $this->db2->query("SELECT grouping_id from 
$table WHERE id='$grouping_parent_id'");
!                               $this->db2->next_record();
  
!                               $selected = $this->db2->f('grouping_id');
                        }
                        else
***************
*** 926,946 ****
                                $selected = $grouping_id;
                        }
  
  
!                       $this->db->query("SELECT grouping_id,grouping_descr 
FROM fm_wo_hours WHERE  wrkorder_id= '$wrkorder_id'  group by 
grouping_id,grouping_descr ");
                        while ($this->db->next_record())
                        {
!                               $grouping_list .= '<option value="' . 
$this->db->f('grouping_id') . '"';
!                               for ($i=0;$i<count($selected);$i++)
                                {
!                                       if($selected == 
$this->db->f('grouping_id'))
                                        {
!                                               $grouping_list .= ' selected';
                                        }
!                               }
!                               $grouping_list .= 
'>'.$GLOBALS['phpgw']->strip_html($this->db->f('grouping_id')).' - '. 
$GLOBALS['phpgw']->strip_html($this->db->f('grouping_descr'));
  
  
!                               $grouping_list .= '</option>' . "\n";
                        }
                        return $grouping_list;
--- 937,961 ----
                                $selected = $grouping_id;
                        }
+ //            echo 'selected: '.$selected .'<BR>';
  
  
!                       $this->db->query("SELECT grouping_id,grouping_descr 
FROM $table WHERE  $id_name= '$parent_id'  group by grouping_id,grouping_descr 
");
                        while ($this->db->next_record())
                        {
!                               if($this->db->f('grouping_id'))
                                {
!                                       $grouping_list .= '<option value="' . 
$this->db->f('grouping_id') . '"';
!                                       for ($i=0;$i<count($selected);$i++)
                                        {
!                                               if($selected == 
$this->db->f('grouping_id'))
!                                               {
!                                                       $grouping_list .= ' 
selected';
!                                               }
                                        }
!                                       $grouping_list .= 
'>'.$GLOBALS['phpgw']->strip_html($this->db->f('grouping_id')).' - '. 
$GLOBALS['phpgw']->strip_html($this->db->f('grouping_descr'));
  
  
!                                       $grouping_list .= '</option>' . "\n";
!                               }
                        }
                        return $grouping_list;
***************
*** 951,954 ****
--- 966,987 ----
  
  //----------------------------work hour grouping  ----------------------
+ //----------------------- dim_d
+               function select_dim_d_list($dim_d='')
+               {
+ 
+                       $GLOBALS['phpgw']->db->query("SELECT dim_d,descr FROM 
fm_wo_dim_d order by dim_d asc");
+                       while ($GLOBALS['phpgw']->db->next_record())
+                       {
+                               $dim_d_list .= '<option value="' . 
$GLOBALS['phpgw']->db->f('dim_d') . '"';
+                               if 
($GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('dim_d')) == $dim_d)
+                               $dim_d_list .= ' selected';
+                               $dim_d_list .= '>'
+                                       . $GLOBALS['phpgw']->db->f('dim_d')
+                                       . ' ['. 
$GLOBALS['phpgw']->strip_html($GLOBALS['phpgw']->db->f('descr')). '] ' . 
'</option>';
+                       }
+                       return $dim_d_list;
+               }
+ 
+       //----------------------- end dim_d
  
  //----------------------------Standard work derscription (NS3420)  
----------------------