[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property/inc class.boproject.inc.php class.sopr...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property/inc class.boproject.inc.php class.sopr... |
|
Date: |
Thu, 28 Sep 2006 12:07:43 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/09/28 12:07:43
Modified files:
inc : class.boproject.inc.php class.soproject.inc.php
class.uiproject.inc.php
Log message:
E_NOTICES
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.boproject.inc.php?cvsroot=phpgroupware&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.soproject.inc.php?cvsroot=phpgroupware&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiproject.inc.php?cvsroot=phpgroupware&r1=1.36&r2=1.37
Patches:
Index: class.boproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.boproject.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- class.boproject.inc.php 9 Jul 2006 17:47:38 -0000 1.17
+++ class.boproject.inc.php 28 Sep 2006 12:07:43 -0000 1.18
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.boproject.inc.php,v 1.17 2006/07/09 17:47:38
sigurdne Exp $
+ * @version $Id: class.boproject.inc.php,v 1.18 2006/09/28 12:07:43
sigurdne Exp $
*/
/**
@@ -162,13 +162,14 @@
$j++;
}
- for ($i=0;$i<count($branch_list);$i++)
+ /* for ($i=0;$i<count($branch_list);$i++)
{
if ($branch_list[$i]['selected'] != 'selected')
{
unset($branch_list[$i]['selected']);
}
}
+ */
return $branch_list;
}
Index: class.soproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- class.soproject.inc.php 26 Sep 2006 18:29:27 -0000 1.31
+++ class.soproject.inc.php 28 Sep 2006 12:07:43 -0000 1.32
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.soproject.inc.php,v 1.31 2006/09/26 18:29:27
sigurdne Exp $
+ * @version $Id: class.soproject.inc.php,v 1.32 2006/09/28 12:07:43
sigurdne Exp $
*/
/**
@@ -81,6 +81,7 @@
{
$this->db->query("SELECT id, descr FROM fm_key_loc
ORDER BY descr ");
+ $key_location_entries = '';
$i = 0;
while ($this->db->next_record())
{
@@ -434,13 +435,12 @@
function branch_p_list($project_id = '')
{
-
+ $selected = array();
$this->db2->query("SELECT branch_id from
fm_projectbranch WHERE project_id=" . (int)$project_id ,__LINE__,__FILE__);
while ($this->db2->next_record())
{
$selected[] = array('branch_id' =>
$this->db2->f('branch_id'));
}
-
return $selected;
}
Index: class.uiproject.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- class.uiproject.inc.php 27 Sep 2006 18:21:52 -0000 1.36
+++ class.uiproject.inc.php 28 Sep 2006 12:07:43 -0000 1.37
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage project
- * @version $Id: class.uiproject.inc.php,v 1.36 2006/09/27 18:21:52
sigurdne Exp $
+ * @version $Id: class.uiproject.inc.php,v 1.37 2006/09/28 12:07:43
sigurdne Exp $
*/
/**
@@ -587,6 +587,10 @@
'type'=> $origin
);
}
+ else
+ {
+ $values['origin'] = '';
+ }
$values['start_date'] =
get_var('start_date',array('POST'));
$values['end_date'] =
get_var('end_date',array('POST'));
@@ -765,6 +769,7 @@
}
}
+ $record_history = '';
if(isset($bypass_error) || ((!isset($receipt['error'])
|| $add_request) && !$bypass) && $id)
{
$values = $this->bo->read_single($id);
@@ -854,22 +859,22 @@
'project_id' =>
(isset($values['project_id'])?$values['project_id']:'')
);
-
$supervisor_id=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['approval_from'];
- $need_approval =
$config->config_data['workorder_approval'];
+ $supervisor_id=
(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['approval_from'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['approval_from']:'');
+ $need_approval =
(isset($config->config_data['workorder_approval'])?$config->config_data['workorder_approval']:'');
-
$project_status=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['project_status'];
-
$project_category=$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['project_category'];
- if(!$values['status'])
+
$project_status=(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['project_status'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['project_status']:'');
+
$project_category=(isset($GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['project_category'])?$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['project_category']:'');
+ if(!isset($values['status']))
{
$values['status']=$project_status;
}
- if(!$values['cat_id'])
+ if(!isset($values['cat_id']))
{
$values['cat_id']=$project_category;
}
- if(!$values['coordinator'])
+ if(!isset($values['coordinator']))
{
$values['coordinator']=$this->account;
}
@@ -885,12 +890,16 @@
$values['start_date'] =
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
- if($receipt)
+ if(isset($receipt) && is_array($receipt))
{
$msgbox_data =
$this->bocommon->msgbox_data($receipt);
}
+ else
+ {
+ $msgbox_data ='';
+ }
- if($values['reserve'])
+ if(isset($values['reserve']))
{
$reserve_remainder=$values['reserve']-$values['deviation'];
$remainder_percent=
number_format(($reserve_remainder/$values['reserve'])*100, 2, ',', '');
@@ -935,9 +944,9 @@
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'value_origin'
=> $values['origin'],
- 'value_origin_type'
=> $origin,
- 'value_origin_id'
=> $origin_id,
- 'selected_request'
=> $selected_request,
+ 'value_origin_type'
=> (isset($origin)?$origin:''),
+ 'value_origin_id'
=> (isset($origin_id)?$origin_id:''),
+ 'selected_request'
=> (isset($selected_request)?$selected_request:''),
'lang_select_request'
=> lang('Select request'),
'lang_select_request_statustext'
=> lang('Add request for this project'),
@@ -978,25 +987,24 @@
'lang_charge_tenant'
=> lang('Charge tenant'),
'lang_charge_tenant_statustext'
=> lang('Choose charge tenant if the tenant i to pay for this project'),
- 'charge_tenant'
=> $values['charge_tenant'],
+ 'charge_tenant'
=> (isset($values['charge_tenant'])?$values['charge_tenant']:''),
'lang_power_meter'
=> lang('Power meter'),
'lang_power_meter_statustext'
=> lang('Enter the power meter'),
- 'value_power_meter'
=> $values['power_meter'],
+ 'value_power_meter'
=> (isset($values['power_meter'])?$values['power_meter']:''),
'lang_budget'
=> lang('Budget'),
- 'value_budget'
=> $values['budget'],
+ 'value_budget'
=> (isset($values['budget'])?$values['budget']:''),
'lang_budget_statustext'
=> lang('Enter the budget'),
'lang_reserve'
=> lang('reserve'),
- 'value_reserve'
=> $values['reserve'],
+ 'value_reserve'
=> (isset($values['reserve'])?$values['reserve']:''),
'lang_reserve_statustext'
=> lang('Enter the reserve'),
'lang_reserve_remainder'
=> lang('reserve remainder'),
- 'value_reserve_remainder'
=> $reserve_remainder,
- 'value_reserve_remainder_percent'
=> $remainder_percent,
+ 'value_reserve_remainder'
=> (isset($reserve_remainder)?$reserve_remainder:''),
+ 'value_reserve_remainder_percent'
=> (isset($remainder_percent)?$remainder_percent:''),
- 'vendor_data'
=> $vendor_data,
'location_data'
=> $location_data,
'location_type'
=> 'form',
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
@@ -1008,34 +1016,34 @@
'lang_name'
=> lang('Name'),
'lang_project_id'
=> lang('Project ID'),
- 'value_project_id'
=> $values['project_id'],
- 'value_name'
=> $values['name'],
+ 'value_project_id'
=> (isset($values['project_id'])?$values['project_id']:''),
+ 'value_name'
=> (isset($values['name'])?$values['name']:''),
'lang_name_statustext'
=> lang('Enter Project Name'),
'lang_other_branch'
=> lang('Other branch'),
'lang_other_branch_statustext'
=> lang('Enter other branch if not found in the list'),
- 'value_other_branch'
=> $values['other_branch'],
+ 'value_other_branch'
=> (isset($values['other_branch'])?$values['other_branch']:''),
'lang_descr_statustext'
=> lang('Enter a description of the project'),
'lang_descr'
=> lang('Description'),
- 'value_descr'
=> $values['descr'],
+ 'value_descr'
=> (isset($values['descr'])?$values['descr']:''),
'lang_remark_statustext'
=> lang('Enter a remark to add to the history of the project'),
'lang_remark'
=> lang('remark'),
- 'value_remark'
=> $values['remark'],
+ 'value_remark'
=> (isset($values['remark'])?$values['remark']:''),
'lang_done_statustext'
=> lang('Back to the list'),
'lang_save_statustext'
=> lang('Save the project'),
'lang_no_cat'
=> lang('Select category'),
'lang_cat_statustext'
=> lang('Select the category the project belongs to. To do not use a category
select NO CATEGORY'),
'select_name'
=> 'values[cat_id]',
- 'value_cat_id'
=> $values['cat_id'],
+ 'value_cat_id'
=> (isset($values['cat_id'])?$values['cat_id']:''),
'cat_list'
=> $this->bocommon->select_category_list(array('format'=>'select','selected' =>
$values['cat_id'],'type' =>'project','order'=>'descr')),
'lang_workorder_id'
=> lang('Workorder ID'),
- 'sum_workorder_budget'
=> $values['sum_workorder_budget'],
- 'sum_workorder_calculation'
=> $values['sum_workorder_calculation'],
- 'workorder_budget'
=> $values['workorder_budget'],
- 'sum_workorder_actual_cost'
=> $values['sum_workorder_actual_cost'],
+ 'sum_workorder_budget'
=> (isset($values['sum_workorder_budget'])?$values['sum_workorder_budget']:''),
+ 'sum_workorder_calculation'
=>
(isset($values['sum_workorder_calculation'])?$values['sum_workorder_calculation']:''),
+ 'workorder_budget'
=> (isset($values['workorder_budget'])?$values['workorder_budget']:''),
+ 'sum_workorder_actual_cost'
=>
(isset($values['sum_workorder_actual_cost'])?$values['sum_workorder_actual_cost']:''),
'lang_actual_cost'
=> lang('Actual cost'),
'lang_coordinator'
=> lang('Coordinator'),
'lang_sum'
=> lang('Sum'),
@@ -1052,29 +1060,29 @@
'lang_confirm_status'
=> lang('Confirm status'),
'lang_confirm_statustext'
=> lang('Confirm status to the history'),
- 'branch_list'
=> $this->bo->select_branch_p_list($values['project_id']),
+ 'branch_list'
=>
$this->bo->select_branch_p_list((isset($values['project_id'])?$values['project_id']:'')),
'lang_branch'
=> lang('branch'),
'lang_branch_statustext'
=> lang('Select the branches for this project'),
- 'key_responsible_list'
=> $this->bo->select_branch_list($values['key_responsible']),
+ 'key_responsible_list'
=>
$this->bo->select_branch_list((isset($values['key_responsible'])?$values['key_responsible']:'')),
'lang_no_key_responsible'
=> lang('Select key responsible'),
'lang_key_responsible'
=> lang('key responsible'),
'lang_key_responsible_statustext'
=> lang('Select the key responsible for this project'),
- 'key_fetch_list'
=> $this->bo->select_key_location_list($values['key_fetch']),
+ 'key_fetch_list'
=>
$this->bo->select_key_location_list((isset($values['key_fetch'])?$values['key_fetch']:'')),
'lang_no_key_fetch'
=> lang('Where to fetch the key'),
'lang_key_fetch'
=> lang('key fetch location'),
'lang_key_fetch_statustext'
=> lang('Select where to fetch the key'),
- 'key_deliver_list'
=> $this->bo->select_key_location_list($values['key_deliver']),
+ 'key_deliver_list'
=>
$this->bo->select_key_location_list((isset($values['key_deliver'])?$values['key_deliver']:'')),
'lang_no_key_deliver'
=> lang('Where to deliver the key'),
'lang_key_deliver'
=> lang('key deliver location'),
'lang_key_deliver_statustext'
=> lang('Select where to deliver the key'),
- 'need_approval'
=> $need_approval,
+ 'need_approval'
=> (isset($need_approval)?$need_approval:''),
'lang_ask_approval'
=> lang('Ask for approval'),
'lang_ask_approval_statustext'
=> lang('Check this to send a mail to your supervisor for approval'),
- 'value_approval_mail_address'
=> $supervisor_email,
+ 'value_approval_mail_address'
=> (isset($supervisor_email)?$supervisor_email:''),
'currency'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['currency']
);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property/inc class.boproject.inc.php class.sopr...,
Sigurd Nes <=