[Phpgroupware-cvs] projects/inc/class.uiconfig.inc.php, 1.25

[nomail]

Update of /projects/inc
Modified Files:
        Branch: 
          class.uiconfig.inc.php

date: 2004/04/29 15:53:38;  author: ceb;  state: Exp;  lines: +56 -14

Log Message:
update
=====================================================================
Index: projects/inc/class.uiconfig.inc.php
diff -u projects/inc/class.uiconfig.inc.php:1.24 
projects/inc/class.uiconfig.inc.php:1.25
--- projects/inc/class.uiconfig.inc.php:1.24    Wed Apr 28 13:34:47 2004
+++ projects/inc/class.uiconfig.inc.php Thu Apr 29 15:53:38 2004
@@ -157,6 +157,10 @@
                        
$GLOBALS['phpgw']->template->set_var('lang_period',lang('period'));
                        
$GLOBALS['phpgw']->template->set_var('lang_sdate',lang('start date'));
                        
$GLOBALS['phpgw']->template->set_var('lang_edate',lang('end date'));
+
+                       
$GLOBALS['phpgw']->template->set_var('lang_per_hour',lang('per hour'));
+                       
$GLOBALS['phpgw']->template->set_var('lang_per_day',lang('per day'));
+                       
$GLOBALS['phpgw']->template->set_var('lang_employee',lang('employee'));
                }
 
                function display_app_header()
@@ -230,7 +234,6 @@
                function list_employees()
                {
                        $id                     = $_GET['id'];
-                       $account_id     = $_GET['account_id'];
                        $values         = $_POST['values'];
                        $sdate          = get_var('sdate',array('GET','POST'));
                        $edate          = get_var('edate',array('GET','POST'));
@@ -241,11 +244,6 @@
                                'action'                => 'accounting'
                        );
 
-                       if($account_id)
-                       {
-                               list($values) = 
$this->boconfig->read_accounting_factors(array('account_id' => 
$account_id,'limit' => False));
-                       }
-
                        if ($values['save'])
                        {
                                //_debug_array($values);
@@ -309,8 +307,6 @@
                                $GLOBALS['phpgw']->template->set_var(array
                                (
                                        'emp_name'                              
=> $emps[$i]['account_name'],
-                                       'edit_url'                              
=> 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.list_employees&account_id='
-                                                                               
                                                        . 
$emps[$i]['account_id']),
                                        'factor'                                
=> $emps[$i]['accounting'],
                                        'd_factor'                              
=> $emps[$i]['d_accounting'],
                                        'delete_emp'                    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=projects.uiconfig.list_employees&id='
@@ -341,11 +337,8 @@
                                $end_val        = $end_array['raw'];
                        }
 
-                       $start  = 
$start_val?$start_val:mktime(12,0,0,date('m'),date('d'),date('Y'));
-                       $end    = 
$end_val?$end_val:mktime(12,0,0,date('m'),date('d')+30,date('Y'));
-
-                       
$GLOBALS['phpgw']->template->set_var('sdate_select',$jscal->input('sdate[str]',$start));
-                       
$GLOBALS['phpgw']->template->set_var('edate_select',$jscal->input('edate[str]',$end));
+                       
$GLOBALS['phpgw']->template->set_var('sdate_select',$jscal->input('sdate[str]',$start_val));
+                       
$GLOBALS['phpgw']->template->set_var('edate_select',$jscal->input('edate[str]',$end_val));
 
                        $this->save_sessiondata('accounting');
                        
$GLOBALS['phpgw']->template->pfp('out','emp_list_t',True);
@@ -353,7 +346,56 @@
 
                function edit_employee_factor()
                {
+                       $id = get_var('id',array('GET','POST'));
+
+                       if ($values['save'])
+                       {
+                               //_debug_array($values);
+                               $error = 
$this->boconfig->check_pa_values($values,'accounting');
+                               if(is_array($error))
+                               {
+                                       
$GLOBALS['phpgw']->template->set_var('message',$GLOBALS['phpgw']->common->error_list($error));
+                               }
+                               else
+                               {
+                                       
$this->boconfig->save_accounting_factor($values);
+                                       
$GLOBALS['phpgw']->template->set_var('message',lang('factor has been saved'));
+                               }
+                       }
+
+                       $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('projects') . ': ' . lang('accounting');
+                       $jscal = CreateObject('phpgwapi.jscalendar');
+
+                       $this->display_app_header();
+
+                       $GLOBALS['phpgw']->template->set_file(array('emp_form' 
=> 'form_emp_factor.tpl'));
+
+                       if($id)
+                       {
+                               $values = 
$this->boconfig->read_single_afactor($id);
+                       }
+
+                       
$GLOBALS['phpgw']->template->set_var('accounting',$values['accounting']);
+                       
$GLOBALS['phpgw']->template->set_var('d_accounting',$values['d_accounting']);
+                       
$GLOBALS['phpgw']->template->set_var('lang_save_factor',lang('save factor'));
+                       
$GLOBALS['phpgw']->template->set_var('emp_select',$this->employee_format($values['account_id']));
+
+                       if(is_array($sdate))
+                       {
+                               $start_array    = 
$jscal->input2date($sdate['str']);
+                               $start_val              = $start_array['raw'];
+                       }
+
+                       if(is_array($edate))
+                       {
+                               $end_array      = 
$jscal->input2date($edate['str']);
+                               $end_val        = $end_array['raw'];
+                       }
+
+                       
$GLOBALS['phpgw']->template->set_var('sdate_select',$jscal->input('sdate[str]',$start_val));
+                       
$GLOBALS['phpgw']->template->set_var('edate_select',$jscal->input('edate[str]',$end_val));
 
+                       $GLOBALS['phpgw']->template->pfp('out','emp_form',True);
                }
 
                function delete_pa()