[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php, 1.73, 1.74
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php, 1.73, 1.74 class.boproject.inc.php, 1.13, 1.14 class.soequipment.inc.php, 1.24, 1.25 class.soproject.inc.php, 1.35, 1.36 class.soworkorder.inc.php, 1.22, 1.23 class.uiproject.inc.php, 1.42, 1.43 class.uiworkorder.inc.php, 1.36, 1.37 |
|
Date: |
Tue, 09 Sep 2003 11:24:54 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv26841/inc
Modified Files:
class.bocommon.inc.php class.boproject.inc.php
class.soequipment.inc.php class.soproject.inc.php
class.soworkorder.inc.php class.uiproject.inc.php
class.uiworkorder.inc.php
Log Message:
no message
Index: class.bocommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bocommon.inc.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -r1.73 -r1.74
*** class.bocommon.inc.php 7 Sep 2003 19:49:51 -0000 1.73
--- class.bocommon.inc.php 9 Sep 2003 15:24:44 -0000 1.74
***************
*** 138,142 ****
}
! function get_user_list($format='',$selected='')
{
switch($format)
--- 138,142 ----
}
! function
get_user_list($format='',$selected='',$extra='',$default='')
{
switch($format)
***************
*** 150,154 ****
--- 150,175 ----
}
+ if(!$selected && $default)
+ {
+ $selected = $default;
+ }
+
+ if (is_array($extra))
+ {
+ foreach($extra as $extra_user)
+ {
+ $users_extra[]=array
+ (
+ 'account_id' => $extra_user,
+ 'account_firstname' =>
lang($extra_user)
+ );
+ }
+ }
+
$users = $this->accounts->get_list('accounts', $start,
$sort, $order, $query);
+ if (is_array($users_extra) && is_array($users))
+ {
+ $users = $users_extra + $users;
+ }
if (isSet($users) AND is_array($users))
***************
*** 165,169 ****
(
'user_id' =>
$user['account_id'],
! 'name' =>
$user['account_lastname'].', '.$user['account_firstname'],
'selected' => $sel_user
);
--- 186,190 ----
(
'user_id' =>
$user['account_id'],
! 'name' =>
$user['account_lastname'].' '.$user['account_firstname'],
'selected' => $sel_user
);
Index: class.boproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boproject.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** class.boproject.inc.php 8 Aug 2003 17:07:58 -0000 1.13
--- class.boproject.inc.php 9 Sep 2003 15:24:47 -0000 1.14
***************
*** 329,333 ****
$project['workorder_budget'][$i]['vendor_name']
= $vendor[0]['org_name'];
}
! if($sum_workorder_budget)
{
$project['sum_workorder_budget']=
number_format($sum_workorder_budget, 2, ',', ' ');
--- 329,333 ----
$project['workorder_budget'][$i]['vendor_name']
= $vendor[0]['org_name'];
}
! if($workorder_data)
{
$project['sum_workorder_budget']=
number_format($sum_workorder_budget, 2, ',', ' ');
Index: class.soequipment.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soequipment.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** class.soequipment.inc.php 27 Aug 2003 16:35:12 -0000 1.24
--- class.soequipment.inc.php 9 Sep 2003 15:24:47 -0000 1.25
***************
*** 76,80 ****
}
! $sql = $this->socommon->fm_cache('sql_equipment_' .
$lookup . '_' . $filter);
if(!$sql)
--- 76,80 ----
}
! $sql = $this->socommon->fm_cache('sql_equipment_' .
$lookup . '_' . !!$filter);
if(!$sql)
***************
*** 121,129 ****
'uicols'=>$uicols,'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,'query'=>$query,'lookup'=>$lookup));
! $this->socommon->fm_cache('sql_equipment_' .
$lookup . '_' . $filter,$sql);
! $this->socommon->fm_cache('uicols_equipment_' .
$lookup,$this->bocommon->uicols);
!
$this->socommon->fm_cache('cols_return_equipment_' .
$lookup,$this->bocommon->cols_return);
!
$this->socommon->fm_cache('cols_return_lookup_equipment_' .
$lookup,$this->bocommon->cols_return_lookup);
!
$this->socommon->fm_cache('cols_extra_equipment_' .
$lookup,$this->bocommon->cols_extra);
$uicols
= $this->bocommon->uicols;
--- 121,129 ----
'uicols'=>$uicols,'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,'query'=>$query,'lookup'=>$lookup));
! $this->socommon->fm_cache('sql_equipment_' .
$lookup . '_' . !!$filter,$sql);
! $this->socommon->fm_cache('uicols_equipment_' .
$lookup . '_' . !!$filter,$this->bocommon->uicols);
!
$this->socommon->fm_cache('cols_return_equipment_' . $lookup . '_' .
!!$filter,$this->bocommon->cols_return);
!
$this->socommon->fm_cache('cols_return_lookup_equipment_' . $lookup . '_' .
!!$filter,$this->bocommon->cols_return_lookup);
!
$this->socommon->fm_cache('cols_extra_equipment_' . $lookup . '_' .
!!$filter,$this->bocommon->cols_extra);
$uicols
= $this->bocommon->uicols;
***************
*** 135,142 ****
else
{
! $uicols
= $this->socommon->fm_cache('uicols_equipment_' . $lookup);
! $cols_return
= $this->socommon->fm_cache('cols_return_equipment_' . $lookup);
! $this->cols_return_lookup =
$this->socommon->fm_cache('cols_return_lookup_equipment_' . $lookup);
! $this->cols_extra
= $this->socommon->fm_cache('cols_extra_equipment_' . $lookup);
}
--- 135,142 ----
else
{
! $uicols
= $this->socommon->fm_cache('uicols_equipment_' . $lookup . '_' .
!!$filter);
! $cols_return
= $this->socommon->fm_cache('cols_return_equipment_' . $lookup . '_' .
!!$filter);
! $this->cols_return_lookup =
$this->socommon->fm_cache('cols_return_lookup_equipment_' . $lookup . '_' .
!!$filter);
! $this->cols_extra
= $this->socommon->fm_cache('cols_extra_equipment_' . $lookup . '_' .
!!$filter);
}
***************
*** 151,165 ****
$where = 'WHERE';
! if ($cat_id > 0)
{
! $filtermethod .= " $where fm_equipment.
equipment_type_id='$cat_id' ";
$where = 'AND';
}
! if($filter)
{
! $filtermethod .= " $where
fm_equipment_attrib.attrib_id='$filter' ";
$where = 'AND';
}
if ($district_id > 0)
--- 151,177 ----
$where = 'WHERE';
!
! if($filter)
{
! $filtermethod .= " $where
fm_equipment_attrib.attrib_id=$filter ";
$where = 'AND';
+
+ $uicols['input_type'][] = 'text';
+ $uicols['name'][] =
'attribute';
+ $uicols['descr'][] =
lang('attribute');
+ $uicols['statustext'][] =
lang('attribute');
}
! $this->uicols = $uicols;
!
! if ($cat_id > 0)
{
! $filtermethod .= " $where fm_equipment.
equipment_type_id=$cat_id ";
$where = 'AND';
}
+ else
+ {
+ return;
+ }
if ($district_id > 0)
***************
*** 180,194 ****
//echo $sql;
-
- if($filter)
- {
- $uicols['input_type'][] = 'text';
- $uicols['name'][] =
'attribute';
- $uicols['descr'][] =
lang('attribute');
- $uicols['statustext'][] =
lang('attribute');
- }
-
- $this->uicols = $uicols;
-
$this->db2->query($sql,__LINE__,__FILE__);
--- 192,195 ----
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** class.soproject.inc.php 7 Sep 2003 19:49:51 -0000 1.35
--- class.soproject.inc.php 9 Sep 2003 15:24:48 -0000 1.36
***************
*** 186,190 ****
else
{
! $ordermethod = ' order by fm_project.id ASC';
}
--- 186,190 ----
else
{
! $ordermethod = ' order by fm_project.id DESC';
}
***************
*** 211,215 ****
if ($cat_id > 0)
{
! $filtermethod .= " $where
fm_project.category='$cat_id' ";
$where= 'AND';
}
--- 211,215 ----
if ($cat_id > 0)
{
! $filtermethod .= " $where
fm_project.category=$cat_id ";
$where= 'AND';
}
***************
*** 221,229 ****
}
! if ($filter)
{
! $filtermethod .= " $where
fm_project.coordinator='$filter' ";
$where= 'AND';
}
if($query)
--- 221,234 ----
}
! if (!$filter):
{
! return;
! }
! elseif($filter!='all'):
! {
! $filtermethod .= " $where
fm_project.coordinator=$filter ";
$where= 'AND';
}
+ endif;
if($query)
***************
*** 243,249 ****
$j=0;
while ($this->db->next_record())
{
! for ($i=0;$i<count($cols_return);$i++)
{
$project_list[$j][$cols_return[$i]] =
$this->db->f($cols_return[$i]);
--- 248,255 ----
$j=0;
+ $k=count($cols_return);
while ($this->db->next_record())
{
! for ($i=0;$i<$k;$i++)
{
$project_list[$j][$cols_return[$i]] =
$this->db->f($cols_return[$i]);
***************
*** 254,258 ****
$location_code= $this->db->f('location_code');
$location = split('-',$location_code);
! for ($m=0;$m<count($location);$m++)
{
$project_list[$j]['loc' . ($m+1)] =
$location[$m];
--- 260,265 ----
$location_code= $this->db->f('location_code');
$location = split('-',$location_code);
! $n=count($location);
! for ($m=0;$m<$n;$m++)
{
$project_list[$j]['loc' . ($m+1)] =
$location[$m];
Index: class.soworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soworkorder.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.soworkorder.inc.php 4 Sep 2003 17:27:27 -0000 1.22
--- class.soworkorder.inc.php 9 Sep 2003 15:24:49 -0000 1.23
***************
*** 220,224 ****
else
{
! $ordermethod = ' order by fm_workorder.id ASC';
}
--- 220,224 ----
else
{
! $ordermethod = ' order by fm_workorder.id DESC';
}
***************
*** 241,245 ****
if ($cat_id > 0)
{
! $filtermethod .= " $where
fm_project.category='$cat_id' ";
$where= 'AND';
}
--- 241,245 ----
if ($cat_id > 0)
{
! $filtermethod .= " $where
fm_project.category=$cat_id ";
$where= 'AND';
}
***************
*** 251,259 ****
}
! if ($filter)
{
! $filtermethod .= " $where
fm_workorder.user_id='$filter' ";
$where= 'AND';
}
if($query)
--- 251,264 ----
}
! if (!$filter):
{
! return;
! }
! elseif($filter!='all'):
! {
! $filtermethod .= " $where
fm_workorder.user_id=$filter ";
$where= 'AND';
}
+ endif;
if($query)
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** class.uiproject.inc.php 8 Sep 2003 17:36:37 -0000 1.42
--- class.uiproject.inc.php 9 Sep 2003 15:24:49 -0000 1.43
***************
*** 86,171 ****
'search_field'));
-
$lookup = get_var('lookup',array('POST','GET'));
$links = $this->bocommon->menu();
$project_list = $this->bo->read();
-
- //_debug_array($project_list);
-
$uicols = $this->bo->uicols;
! //_debug_array($uicols);
$j=0;
! while (is_array($project_list) && list(,$project_entry)
= each($project_list))
{
! for ($k=0;$k<count($uicols['name']);$k++)
{
! if($uicols['input_type'][$k]!='hidden')
{
!
!
if($project_entry['query_location'][$uicols['name'][$k]])
{
!
$content[$j]['row'][$k]['statustext'] = lang('search');
!
$content[$j]['row'][$k]['text'] =
$project_entry[$uicols['name'][$k]];
!
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index&query='
. $project_entry['query_location'][$uicols['name'][$k]] . '&lookup=' .
$lookup);
}
! else
{
!
$content[$j]['row'][$k]['value'] =
$project_entry[$uicols['name'][$k]];
!
$content[$j]['row'][$k]['name'] = $uicols['name'][$k];
}
-
}
! if($lookup &&
$k==(count($uicols['name'])-2))
{
!
$content[$j]['row'][$k]['lookup_action'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&project_id='
. $project_entry['project_id']);
! }
! }
! if(!$lookup)
! {
! if ($this->acl_read &&
$this->bocommon->check_perms($project_entry['grants'],PHPGW_ACL_READ))
! {
!
$content[$j]['row'][$k]['statustext'] = lang('view the
project');
! $content[$j]['row'][$k]['text']
= lang('view');
! $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.view&id='
. $project_entry['project_id']);
! $k++;
! }
! else
! {
!
$content[$j]['row'][$k++]['link']='dummy';
! }
! if ($this->acl_edit &&
$this->bocommon->check_perms($project_entry['grants'],PHPGW_ACL_EDIT))
! {
!
$content[$j]['row'][$k]['statustext'] = lang('edit the
project');
! $content[$j]['row'][$k]['text']
= lang('edit');
! $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
. $project_entry['project_id']);
! $k++;
! }
! else
! {
!
$content[$j]['row'][$k++]['link']='dummy';
}
! if ($this->acl_delete &&
$this->bocommon->check_perms($project_entry['grants'],PHPGW_ACL_DELETE))
! {
!
$content[$j]['row'][$k]['statustext'] = lang('delete the
project');
! $content[$j]['row'][$k]['text']
= lang('delete');
! $content[$j]['row'][$k]['link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.delete&id='
. $project_entry['project_id']);
! $k++;
! }
! else
! {
!
$content[$j]['row'][$k++]['link']='dummy';
! }
}
-
- $j++;
}
! for ($i=0;$i<count($uicols['descr']);$i++)
{
if($uicols['input_type'][$i]!='hidden')
--- 86,171 ----
'search_field'));
$lookup = get_var('lookup',array('POST','GET'));
$links = $this->bocommon->menu();
$project_list = $this->bo->read();
$uicols = $this->bo->uicols;
! $count_uicols_name=count($uicols['name']);
$j=0;
! if (isSet($project_list) AND is_array($project_list))
{
! foreach($project_list as $project_entry)
!
{
! for ($k=0;$k<$count_uicols_name;$k++)
{
!
if($uicols['input_type'][$k]!='hidden')
{
!
!
if($project_entry['query_location'][$uicols['name'][$k]])
! {
!
$content[$j]['row'][$k]['statustext'] = lang('search');
!
$content[$j]['row'][$k]['text'] =
$project_entry[$uicols['name'][$k]];
!
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index&query='
. $project_entry['query_location'][$uicols['name'][$k]] . '&lookup=' .
$lookup);
! }
! else
! {
!
$content[$j]['row'][$k]['value'] =
$project_entry[$uicols['name'][$k]];
!
$content[$j]['row'][$k]['name'] = $uicols['name'][$k];
! }
}
!
! if($lookup &&
$k==($count_uicols_name-2))
{
!
$content[$j]['row'][$k]['lookup_action'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&project_id='
. $project_entry['project_id']);
}
}
! if(!$lookup)
{
! if ($this->acl_read &&
$this->bocommon->check_perms($project_entry['grants'],PHPGW_ACL_READ))
! {
!
$content[$j]['row'][$k]['statustext'] = lang('view the
project');
!
$content[$j]['row'][$k]['text'] = lang('view');
!
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.view&id='
. $project_entry['project_id']);
! $k++;
! }
! else
! {
!
$content[$j]['row'][$k++]['link']='dummy';
! }
! if ($this->acl_edit &&
$this->bocommon->check_perms($project_entry['grants'],PHPGW_ACL_EDIT))
! {
!
$content[$j]['row'][$k]['statustext'] = lang('edit the
project');
!
$content[$j]['row'][$k]['text'] = lang('edit');
!
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
. $project_entry['project_id']);
! $k++;
! }
! else
! {
!
$content[$j]['row'][$k++]['link']='dummy';
! }
! if ($this->acl_delete &&
$this->bocommon->check_perms($project_entry['grants'],PHPGW_ACL_DELETE))
! {
!
$content[$j]['row'][$k]['statustext'] = lang('delete the
project');
!
$content[$j]['row'][$k]['text'] =
lang('delete');
!
$content[$j]['row'][$k]['link'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.delete&id='
. $project_entry['project_id']);
! $k++;
! }
! else
! {
!
$content[$j]['row'][$k++]['link']='dummy';
! }
}
! $j++;
}
}
! $count_uicols_descr=count($uicols['descr']);
! for ($i=0;$i<$count_uicols_descr;$i++)
{
if($uicols['input_type'][$i]!='hidden')
***************
*** 311,315 ****
'select_user_name'
=> 'filter',
'lang_no_user'
=> lang('No user'),
! 'user_list'
=> $this->bocommon->get_user_list('filter',$this->filter),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
--- 311,315 ----
'select_user_name'
=> 'filter',
'lang_no_user'
=> lang('No user'),
! 'user_list'
=>
$this->bocommon->get_user_list('filter',$this->filter,array('all'),$default=''),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** class.uiworkorder.inc.php 8 Sep 2003 17:36:37 -0000 1.36
--- class.uiworkorder.inc.php 9 Sep 2003 15:24:50 -0000 1.37
***************
*** 92,95 ****
--- 92,96 ----
$uicols = $this->bo->uicols;
+ $count_uicols_name=count($uicols['name']);
$j=0;
***************
*** 97,104 ****
{
foreach($workorder_list as $workorder_entry)
-
- //while (is_array($workorder_list) &&
list(,$workorder_entry) = each($workorder_list))
{
! for
($k=0;$k<count($uicols['name']);$k++)
{
if($uicols['input_type'][$k]!='hidden')
--- 98,103 ----
{
foreach($workorder_list as $workorder_entry)
{
! for ($k=0;$k<$count_uicols_name;$k++)
{
if($uicols['input_type'][$k]!='hidden')
***************
*** 116,120 ****
}
}
! if($lookup &&
$k==(count($uicols['name'])-2))
$content[$j]['row'][$k]['lookup_action'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&workorder_id='
. $workorder_entry['workorder_id']);
}
--- 115,119 ----
}
}
! if($lookup &&
$k==($count_uicols_name - 2))
$content[$j]['row'][$k]['lookup_action'] =
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.edit&workorder_id='
. $workorder_entry['workorder_id']);
}
***************
*** 168,172 ****
}
! for ($i=0;$i<count($uicols['descr']);$i++)
{
if($uicols['input_type'][$i]!='hidden')
--- 167,172 ----
}
! $count_uicols_descr=count($uicols['descr']);
! for ($i=0;$i<$count_uicols_descr;$i++)
{
if($uicols['input_type'][$i]!='hidden')
***************
*** 327,331 ****
'select_user_name'
=> 'filter',
'lang_no_user'
=> lang('No user'),
! 'user_list'
=> $this->bocommon->get_user_list('filter',$this->filter),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
--- 327,331 ----
'select_user_name'
=> 'filter',
'lang_no_user'
=> lang('No user'),
! 'user_list'
=>
$this->bocommon->get_user_list('filter',$this->filter,array('all'),$default=''),
'lang_searchfield_statustext' => lang('Enter
the search string. To show all entries, empty this field and press the SUBMIT
button again'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php, 1.73, 1.74 class.boproject.inc.php, 1.13, 1.14 class.soequipment.inc.php, 1.24, 1.25 class.soproject.inc.php, 1.35, 1.36 class.soworkorder.inc.php, 1.22, 1.23 class.uiproject.inc.php, 1.42, 1.43 class.uiworkorder.inc.php, 1.36, 1.37,
Sigurd Nes <address@hidden> <=