[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.19,1.20 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.19,1.20 class.boproperty.inc.php,1.4,1.5 class.soproperty.inc.php,1.8,1.9 class.uiproperty.inc.php,1.11,1.12 hook_admin.inc.php,1.17,1.18 |
|
Date: |
Thu, 27 Feb 2003 14:40:05 -0500 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv14395/inc
Modified Files:
class.bocommon.inc.php class.boproperty.inc.php
class.soproperty.inc.php class.uiproperty.inc.php
hook_admin.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.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.bocommon.inc.php 27 Feb 2003 09:53:36 -0000 1.19
--- class.bocommon.inc.php 27 Feb 2003 19:40:01 -0000 1.20
***************
*** 456,460 ****
$menu = array
(
! 'link_property' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiproperty.index&sub=property'),
'lang_property' =>
lang('Property'),
'link_equipment' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiequipment.index'),
--- 456,460 ----
$menu = array
(
! 'link_property' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiproperty.index'),
'lang_property' =>
lang('Property'),
'link_equipment' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiequipment.index'),
***************
*** 468,480 ****
'link_events' =>
$GLOBALS['phpgw']->link('/calendar/index.php'),
'lang_events' => lang('Events'),
! 'link_helpdesk' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uitts.index&sub=ticket'),
'lang_helpdesk' =>
lang('Helpdesk'),
'link_workorder' =>
$GLOBALS['phpgw']->link('/property/list_workorder.php','sub=workorder'),
'lang_workorder' =>
lang('Workorder'),
! 'link_invoice' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index&sub=invoice'),
'lang_invoice' => lang('Invoice'),
! 'link_activities' =>
$GLOBALS['phpgw']->link('/property/list_vendors_activities.php','sub=activity'),
'lang_activities' =>
lang('Activities'),
! 'link_documentation'=>
$GLOBALS['phpgw']->link('/property/list_documentation.php','sub=documentation'),
'lang_documentation'=> lang('Documentation')
);
--- 468,480 ----
'link_events' =>
$GLOBALS['phpgw']->link('/calendar/index.php'),
'lang_events' => lang('Events'),
! 'link_helpdesk' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uitts.index'),
'lang_helpdesk' =>
lang('Helpdesk'),
'link_workorder' =>
$GLOBALS['phpgw']->link('/property/list_workorder.php','sub=workorder'),
'lang_workorder' =>
lang('Workorder'),
! 'link_invoice' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index'),
'lang_invoice' => lang('Invoice'),
! 'link_activities' =>
$GLOBALS['phpgw']->link('/property/list_vendors_activities.php'),
'lang_activities' =>
lang('Activities'),
! 'link_documentation'=>
$GLOBALS['phpgw']->link('/property/list_documentation.php'),
'lang_documentation'=> lang('Documentation')
);
***************
*** 505,519 ****
if ($sub == property)
{
!
$menu['sublink_property']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiproperty.index&sub=property');
$menu['sublang_property']=lang('Property');
!
$menu['sublink_building']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uibuilding.index&sub=property');
$menu['sublang_building']=lang('Building');
!
$menu['sublink_entrance']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uientrance.index&sub=property');
$menu['sublang_entrance']=lang('Entrance');
!
$menu['sublink_apartment']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiapartment.index&sub=property');
$menu['sublang_apartment']=lang('Apartment');
!
$menu['sublink_drawing']=$GLOBALS['phpgw']->link('/property/list_drawing.php','sub=property');
$menu['sublang_drawing']=lang('Drawing');
!
$menu['sublink_gabnr']=$GLOBALS['phpgw']->link('/property/list_gabnr.php','sub=property');
$menu['sublang_gabnr']=lang('gabnr');
--- 505,519 ----
if ($sub == property)
{
!
$menu['sublink_property']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiproperty.index');
$menu['sublang_property']=lang('Property');
!
$menu['sublink_building']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uibuilding.index');
$menu['sublang_building']=lang('Building');
!
$menu['sublink_entrance']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uientrance.index');
$menu['sublang_entrance']=lang('Entrance');
!
$menu['sublink_apartment']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiapartment.index');
$menu['sublang_apartment']=lang('Apartment');
!
$menu['sublink_drawing']=$GLOBALS['phpgw']->link('/property/list_drawing.php');
$menu['sublang_drawing']=lang('Drawing');
!
$menu['sublink_gabnr']=$GLOBALS['phpgw']->link('/property/list_gabnr.php');
$menu['sublang_gabnr']=lang('gabnr');
***************
*** 538,545 ****
if ($sub == invoice)
{
!
$menu['sub_invoice_list']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index&sub=invoice');
!
$menu['sub_invoice_paid']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index&sub=invoice&paid=true');
! //
$menu['sub_invoice_powermeter']=$GLOBALS['phpgw']->link('/property/list_power_meter.php','sub=invoice');
!
$menu['sub_invoice_consume']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.consume&sub=invoice');
$menu['sublang_invoice_list']=lang('Invoice');
$menu['sublang_invoice_paid']=lang('Paid');
--- 538,545 ----
if ($sub == invoice)
{
!
$menu['sub_invoice_list']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index');
!
$menu['sub_invoice_paid']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.index&paid=true');
! //
$menu['sub_invoice_powermeter']=$GLOBALS['phpgw']->link('/property/list_power_meter.php');
!
$menu['sub_invoice_consume']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvoice.consume');
$menu['sublang_invoice_list']=lang('Invoice');
$menu['sublang_invoice_paid']=lang('Paid');
***************
*** 548,556 ****
if ($this->admin_invoice)
{
!
$menu['sub_invoice_investment_value']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvestment.index&sub=invoice');
$menu['sublang_invoice_investment_value']=lang('Investment value');
!
$menu['sub_invoice_import']=$GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.import&sub=invoice');
$menu['sublang_invoice_import']=lang('Import invoice');
!
$menu['sub_invoice_export']=$GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.export&sub=invoice');
$menu['sublang_invoice_export']=lang('Export invoice');
}
--- 548,556 ----
if ($this->admin_invoice)
{
!
$menu['sub_invoice_investment_value']=$GLOBALS['phpgw']->link('/index.php','menuaction='.$currentapp.'.uiinvestment.index');
$menu['sublang_invoice_investment_value']=lang('Investment value');
!
$menu['sub_invoice_import']=$GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.import');
$menu['sublang_invoice_import']=lang('Import invoice');
!
$menu['sub_invoice_export']=$GLOBALS['phpgw']->link('/index.php','menuaction=property.uiXport.export');
$menu['sublang_invoice_export']=lang('Export invoice');
}
***************
*** 581,587 ****
if ($sub == activity && $admin_activity)
{
!
$menu['sub_activities_list']=$GLOBALS['phpgw']->link('/property/list_activity.php','sub=activity');
!
$menu['sub_vendor_activities']=$GLOBALS['phpgw']->link('/property/list_vendors_activities.php','sub=activity');
!
$menu['sub_list_agreement']=$GLOBALS['phpgw']->link('/property/list_agreement.php','sub=activity');
$menu['sublang_activities_list']=lang('Activities');
$menu['sublang_vendor_activities']=lang('Vendors');
--- 581,587 ----
if ($sub == activity && $admin_activity)
{
!
$menu['sub_activities_list']=$GLOBALS['phpgw']->link('/property/list_activity.php');
!
$menu['sub_vendor_activities']=$GLOBALS['phpgw']->link('/property/list_vendors_activities.php');
!
$menu['sub_list_agreement']=$GLOBALS['phpgw']->link('/property/list_agreement.php');
$menu['sublang_activities_list']=lang('Activities');
$menu['sublang_vendor_activities']=lang('Vendors');
Index: class.boproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boproperty.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.boproperty.inc.php 27 Feb 2003 09:53:36 -0000 1.4
--- class.boproperty.inc.php 27 Feb 2003 19:40:01 -0000 1.5
***************
*** 159,163 ****
function update_cat()
{
! $this->so->update_cat();
}
}
--- 159,163 ----
function update_cat()
{
! return $this->so->update_cat();
}
}
Index: class.soproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproperty.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.soproperty.inc.php 27 Feb 2003 09:53:36 -0000 1.8
--- class.soproperty.inc.php 27 Feb 2003 19:40:01 -0000 1.9
***************
*** 218,230 ****
}
for ($i=0; $i<count($update); $i++)
{
! $this->db->query("UPDATE fm_entrance set
! cat_id='99' "
. " WHERE property_id= '" .
$update[$i]['property_id'] ."'"
. " AND building_id= '" .
$update[$i]['building_id'] ."'"
! . " AND entrance_id= '" .
$update[$i]['entrance_id'] ."'",__LINE__,__FILE__);
}
unset($outdated);
unset($update);
--- 218,246 ----
}
+ $j=0;
for ($i=0; $i<count($update); $i++)
{
!
! $sql = "SELECT cat_id FROM fm_entrance "
. " WHERE property_id= '" .
$update[$i]['property_id'] ."'"
. " AND building_id= '" .
$update[$i]['building_id'] ."'"
! . " AND entrance_id= '" .
$update[$i]['entrance_id'] ."'";
!
! $this->db->query($sql,__LINE__,__FILE__);
! $this->db->next_record();
!
! if(!$this->db->f('cat_id')=='99')
! {
! $j++;
! $this->db->query("UPDATE fm_entrance set
! cat_id='99' "
! . " WHERE property_id= '" .
$update[$i]['property_id'] ."'"
! . " AND building_id= '" .
$update[$i]['building_id'] ."'"
! . " AND entrance_id= '" .
$update[$i]['entrance_id'] ."'",__LINE__,__FILE__);
! }
}
+ $receipt['message'][]=array('msg'=>lang('%1 Entrances
has been updated to not active of %2 already not active',$j,count($update)));
+
unset($outdated);
unset($update);
***************
*** 253,264 ****
}
for ($i=0; $i<count($update); $i++)
{
! $this->db->query("UPDATE fm_building set
! cat_id='99' "
. " WHERE property_id= '" .
$update[$i]['property_id'] ."'"
! . " AND building_id= '" .
$update[$i]['building_id'] ."'",__LINE__,__FILE__);
}
unset($outdated);
unset($update);
--- 269,294 ----
}
+ $j=0;
for ($i=0; $i<count($update); $i++)
{
! $sql = "SELECT cat_id FROM fm_building "
. " WHERE property_id= '" .
$update[$i]['property_id'] ."'"
! . " AND building_id= '" .
$update[$i]['building_id'] ."'";
!
! $this->db->query($sql,__LINE__,__FILE__);
! $this->db->next_record();
!
! if(!$this->db->f('cat_id')=='99')
! {
! $j++;
! $this->db->query("UPDATE fm_building set
! cat_id='99' "
! . " WHERE property_id= '" .
$update[$i]['property_id'] ."'"
! . " AND building_id= '" .
$update[$i]['building_id'] ."'",__LINE__,__FILE__);
! }
}
+ $receipt['message'][]=array('msg'=>lang('%1 Buildings
has been updated to not active of %2 already not active',$j,count($update)));
+
unset($outdated);
unset($update);
***************
*** 286,299 ****
}
for ($i=0; $i<count($update); $i++)
{
! $this->db->query("UPDATE fm_property set
! cat_id='99' "
! . " WHERE property_id= '" .
$update[$i]['property_id'] ."'",__LINE__,__FILE__);
}
unset($outdated);
unset($update);
}
--- 316,343 ----
}
+ $j=0;
for ($i=0; $i<count($update); $i++)
{
! $sql = "SELECT cat_id FROM fm_property "
! . " WHERE property_id= '" .
$update[$i]['property_id'] ."'";
!
! $this->db->query($sql,__LINE__,__FILE__);
! $this->db->next_record();
!
! if(!$this->db->f('cat_id')=='99')
! {
! $j++;
! $this->db->query("UPDATE fm_property set
! cat_id='99' "
! . " WHERE property_id= '" .
$update[$i]['property_id'] ."'",__LINE__,__FILE__);
! }
}
+ $receipt['message'][]=array('msg'=>lang('%1 Properties
has been updated to not active of %2 already not active',$j,count($update)));
+
unset($outdated);
unset($update);
+ return $receipt;
}
Index: class.uiproperty.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproperty.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.uiproperty.inc.php 27 Feb 2003 09:53:38 -0000 1.11
--- class.uiproperty.inc.php 27 Feb 2003 19:40:01 -0000 1.12
***************
*** 77,82 ****
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
! $sub = get_var('sub',array('POST','GET'));
! $links = $this->bocommon->menu($sub);
$property_list = $this->bo->read();
--- 77,81 ----
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
! $links = $this->bocommon->menu();
$property_list = $this->bo->read();
***************
*** 419,424 ****
if (get_var('confirm',array('POST')))
{
! $this->bo->update_cat();
! Header('Location: ' .
$GLOBALS['phpgw']->link('/admin/index.php'));
}
--- 418,429 ----
if (get_var('confirm',array('POST')))
{
! $receipt= $this->bo->update_cat();
! $lang_confirm_msg = lang('Do you really want to
update the categories again');
! $lang_yes = lang('again');
! }
! else
! {
! $lang_confirm_msg = lang('Do you really
want to update the categories');
! $lang_yes = lang('yes');
}
***************
*** 429,438 ****
(
'appname' =>
lang('property'),
! 'function_msg' => lang('Update
the categories for locations'),
'done_action' =>
$GLOBALS['phpgw']->link('/admin/index.php'),
'update_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.update_cat'),
! 'lang_confirm_msg' => lang('do you
really want to update the categories'),
! 'lang_yes' =>
lang('yes'),
! 'lang_yes_statustext' => lang('Update the
categories'),
'lang_no_statustext' => lang('Back to
Admin'),
'lang_no' =>
lang('no')
--- 434,444 ----
(
'appname' =>
lang('property'),
! 'function_msg' => lang('Update
the not active category for locations'),
'done_action' =>
$GLOBALS['phpgw']->link('/admin/index.php'),
'update_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproperty.update_cat'),
! 'message' =>
$receipt['message'],
! 'lang_confirm_msg' =>
$lang_confirm_msg,
! 'lang_yes' =>
$lang_yes,
! 'lang_yes_statustext' => lang('Update the
category to not active based on if there is only nonactive apartments'),
'lang_no_statustext' => lang('Back to
Admin'),
'lang_no' =>
lang('no')
Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_admin.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** hook_admin.inc.php 27 Feb 2003 09:53:39 -0000 1.17
--- hook_admin.inc.php 27 Feb 2003 19:40:01 -0000 1.18
***************
*** 25,29 ****
'Equipment type'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=equipment'),
'Location type'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=location'),
! 'Update Location categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiproperty.update_cat'),
'Property Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=property'),
'Building Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=building'),
--- 25,29 ----
'Equipment type'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=equipment'),
'Location type'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_entity.index&type=location'),
! 'Update the not active category for
locations'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiproperty.update_cat'),
'Property Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=property'),
'Building Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uistandard_2.index&type=building'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.19,1.20 class.boproperty.inc.php,1.4,1.5 class.soproperty.inc.php,1.8,1.9 class.uiproperty.inc.php,1.11,1.12 hook_admin.inc.php,1.17,1.18,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default property.xsl,1.6,1.7
- Next by Date:
[Phpgroupware-cvs] CVS: addressbook/setup phpgw_br.lang,1.3,1.3.2.1 phpgw_cs.lang,1.2,1.2.2.1 phpgw_da.lang,1.2.2.1,1.2.2.2 phpgw_de.lang,1.7.2.3,1.7.2.4 phpgw_en.lang,1.14.2.6,1.14.2.7 phpgw_es.lang,1.3,1.3.2.1 phpgw_fi.lang,1.1.2.1,1.1.2.2 phpgw_fr.lang,1.4.2.6,1.4.2.7 phpgw_hu.lang,1.2,1.2.2.1 phpgw_it.lang,1.4.2.3,1.4.2.4 phpgw_ja.lang,1.7,1.7.2.1 phpgw_ko.lang,1.3,1.3.2.1 phpgw_nl.lang,1.2,1.2.2.1 phpgw_no.lang,1.2,1.2.2.1 phpgw_pl.lang,1.1.2.2,1.1.2.3 phpgw_pt.lang,1.1.2.1,1.1.2.2 phpgw_sv.lang,1.3,1.3.2.1
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default property.xsl,1.6,1.7
- Next by thread:
[Phpgroupware-cvs] CVS: addressbook/setup phpgw_br.lang,1.3,1.3.2.1 phpgw_cs.lang,1.2,1.2.2.1 phpgw_da.lang,1.2.2.1,1.2.2.2 phpgw_de.lang,1.7.2.3,1.7.2.4 phpgw_en.lang,1.14.2.6,1.14.2.7 phpgw_es.lang,1.3,1.3.2.1 phpgw_fi.lang,1.1.2.1,1.1.2.2 phpgw_fr.lang,1.4.2.6,1.4.2.7 phpgw_hu.lang,1.2,1.2.2.1 phpgw_it.lang,1.4.2.3,1.4.2.4 phpgw_ja.lang,1.7,1.7.2.1 phpgw_ko.lang,1.3,1.3.2.1 phpgw_nl.lang,1.2,1.2.2.1 phpgw_no.lang,1.2,1.2.2.1 phpgw_pl.lang,1.1.2.2,1.1.2.3 phpgw_pt.lang,1.1.2.1,1.1.2.2 phpgw_sv.lang,1.3,1.3.2.1
- Index(es):