[Phpgroupware-cvs] CVS: property/inc class.soproject.inc.php,1.13,1.14 class.sorequest.inc.php,1.8,1.9 class.uiproject.inc.php,1.22,1.23 class.uirequest.inc.php,1.16,1.17

[Sigurd Nes <address@hidden>]

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

Modified Files:
        class.soproject.inc.php class.sorequest.inc.php 
        class.uiproject.inc.php class.uirequest.inc.php 
Log Message:
no message

Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.soproject.inc.php     26 May 2003 12:15:20 -0000      1.13
--- class.soproject.inc.php     26 May 2003 18:18:17 -0000      1.14
***************
*** 530,533 ****
--- 530,539 ----
                        }
  
+                       if($project['delete_request'])
+                       {
+                               $receipt = 
$this->delete_request_from_project($project['delete_request'],$project['project_id']);
+ 
+                       }
+ 
                        
$this->update_request_status($project['project_id'],$project['status'],$project['cat_id'],$project['coordinator']);
  
***************
*** 536,539 ****
--- 542,558 ----
  
                }
+ 
+ 
+               function delete_request_from_project($request_id,$project_id)
+               {
+                       for ($i=0;$i<count($request_id);$i++)
+                       {
+                               $this->db2->query("update fm_request set 
project_id = NULL where id='". $request_id[$i] . "'",__LINE__,__FILE__);
+                               $this->db->query("DELETE FROM fm_project_origin 
WHERE origin_id='" . $request_id[$i] . "' AND 
origin='request'",__LINE__,__FILE__);
+                               $receipt['message'][] = 
array('msg'=>lang('Request %1 has been deleted from project 
%2',$request_id[$i],$project_id));
+                       }
+                       return $receipt;
+               }
+ 
  
                function 
update_request_status($project_id='',$status='',$category=0,$coordinator=0)

Index: class.sorequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sorequest.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.sorequest.inc.php     26 May 2003 12:15:20 -0000      1.8
--- class.sorequest.inc.php     26 May 2003 18:18:17 -0000      1.9
***************
*** 316,319 ****
--- 316,328 ----
                        }
  
+                       $sql = "SELECT * FROM fm_project_origin WHERE 
origin_id='$request_id' and origin ='request'";
+ 
+                       $this->db->query($sql,__LINE__,__FILE__);
+ 
+                       while ($this->db->next_record())
+                       {
+                               $request['project_id'][]['id']  = 
$this->db->f('project_id');
+                       }
+ 
  
  //_debug_array($request);

Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.uiproject.inc.php     26 May 2003 12:15:20 -0000      1.22
--- class.uiproject.inc.php     26 May 2003 18:18:17 -0000      1.23
***************
*** 474,480 ****
--- 474,482 ----
                                'value_ticket_id'                               
=> $values['ticket_id'],
  
+                               'lang_request'                                  
=> lang('request'),
                                'lang_select_request'                   => 
lang('Select request'),
                                'lang_select_request_statustext'        => 
lang('Add request for this project'),
                                'lang_request_statustext'               => 
lang('Link to the request for this project'),
+                               'lang_delete_request_statustext'=> lang('Check 
to delete this request from this project'),
                                'link_select_request'                   => 
$GLOBALS['phpgw']->link('/index.php',$link_request_data),
                                'value_request_id'                              
=> $values['request_id'],
***************
*** 676,681 ****
                        
$location_data=$this->bocommon->initiate_ui_location(array(
                                                'location_type' => 'view',
!                                               'equipment'             => true,
!                                               'tenant'                => true,
                                                'address'               => true,
                                                'equipment_id'  => 
$values['equipment_id'],
--- 678,683 ----
                        
$location_data=$this->bocommon->initiate_ui_location(array(
                                                'location_type' => 'view',
!                                               'equipment'             => 
$values['equipment_id'],
!                                               'tenant'                => 
$values['tenant_id'],
                                                'address'               => true,
                                                'equipment_id'  => 
$values['equipment_id'],
***************
*** 707,710 ****
--- 709,717 ----
                                'link_origin'                                   
=> $GLOBALS['phpgw']->link('/index.php',$origin_data),
                                'value_origin_id'                               
=> $values['origin_id'],
+ 
+                               'lang_request'                                  
=> lang('request'),
+                               'lang_request_statustext'               => 
lang('Link to the request for this project'),
+                               'value_request_id'                              
=> $values['request_id'],
+                               'link_request'                                  
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.view'),
  
                                'table_header_workorder_budget' => 
$table_header_workorder_budget,

Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.uirequest.inc.php     26 May 2003 12:15:20 -0000      1.16
--- class.uirequest.inc.php     26 May 2003 18:18:17 -0000      1.17
***************
*** 184,187 ****
--- 184,188 ----
                        $table_add[] = array
                        (
+                               'lang_add'                              => 
lang('add'),
                                'lang_add_statustext'   => lang('add a 
request'),
                                'add_action'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uirequest.edit')
***************
*** 212,216 ****
                                'lang_select'                                   
        => lang('select'),
  
!                               'lang_add'                                      
                => lang('add'),
                                'lang_add_to_project_statustext'        => 
lang('add selected request to project'),
                                'add_to_project_action'                         
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
 . $project_id),
--- 213,217 ----
                                'lang_select'                                   
        => lang('select'),
  
!                               'lang_update_project'                           
=> lang('Update project'),
                                'lang_add_to_project_statustext'        => 
lang('add selected request to project'),
                                'add_to_project_action'                         
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
 . $project_id),
***************
*** 569,572 ****
--- 570,582 ----
                        );
  
+                       if($values['project_id'])
+                       {
+                               $project_lookup_data = array
+                               (
+                                       'menuaction'    => 
$this->currentapp.'.uiproject.view'
+                               );
+                       }
+ 
+ //_debug_array($values);
  
                        $msgbox_data = $this->bocommon->msgbox_data($receipt);
***************
*** 581,584 ****
--- 591,600 ----
                                'value_origin_id'                               
=> $values['origin_id'],
  
+                               'lang_project'                                  
=> lang('Project'),
+                               'lang_project_statustext'               => 
lang('Link to the project originatet from this request'),
+                               'link_project'                                  
=> $GLOBALS['phpgw']->link('/index.php',$project_lookup_data),
+                               'value_project_id'                              
=> $values['project_id'],
+ 
+ 
                                'generate_project_action'                       
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit'),
                                'lang_generate_project'                         
=> lang('Generate project'),
***************
*** 834,837 ****
--- 850,861 ----
                        }
  
+                       if($values['project_id'])
+                       {
+                               $project_lookup_data = array
+                               (
+                                       'menuaction'    => 
$this->currentapp.'.uiproject.view'
+                               );
+                       }
+ 
                        $data = array
                        (
***************
*** 840,843 ****
--- 864,872 ----
                                'link_origin'                                   
=> $GLOBALS['phpgw']->link('/index.php',$origin_data),
                                'value_origin_id'                               
=> $values['origin_id'],
+ 
+                               'lang_project'                                  
=> lang('Project'),
+                               'lang_project_statustext'               => 
lang('Link to the project originatet from this request'),
+                               'link_project'                                  
=> $GLOBALS['phpgw']->link('/index.php',$project_lookup_data),
+                               'value_project_id'                              
=> $values['project_id'],
  
                                'lang_importance'                               
=> lang('Importance'),