[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: property/inc class.bolocation.inc.php,1.20,1.21
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bolocation.inc.php,1.20,1.21 class.botenant.inc.php,1.2,1.3 class.socategory.inc.php,1.6,1.7 class.solocation.inc.php,1.17,1.18 class.sotenant.inc.php,1.4,1.5 class.uitenant.inc.php,1.3,1.4 hook_admin.inc.php,1.38,1.39 |
|
Date: |
Tue, 01 Jul 2003 07:19:29 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv7181/inc
Modified Files:
class.bolocation.inc.php class.botenant.inc.php
class.socategory.inc.php class.solocation.inc.php
class.sotenant.inc.php class.uitenant.inc.php
hook_admin.inc.php
Log Message:
no message
Index: class.bolocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bolocation.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** class.bolocation.inc.php 28 Jun 2003 16:11:47 -0000 1.20
--- class.bolocation.inc.php 1 Jul 2003 11:19:24 -0000 1.21
***************
*** 550,558 ****
}
- function read_category_name($cat_id)
- {
- return $this->so->read_category_name($cat_id);
- }
-
function check_location($location_code='',$type_id='')
{
--- 550,553 ----
Index: class.botenant.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.botenant.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.botenant.inc.php 29 May 2003 07:42:24 -0000 1.2
--- class.botenant.inc.php 1 Jul 2003 11:19:24 -0000 1.3
***************
*** 202,211 ****
$categories= $this->so->select_category_list();
! $categories[0]['id'] = 1;
$categories[0]['name'] = lang('male');
$categories[1]['id'] = 2;
$categories[1]['name'] = lang('female');
!
while (is_array($categories) && list(,$category) =
each($categories))
{
--- 202,213 ----
$categories= $this->so->select_category_list();
! /* $categories[0]['id'] = 1;
$categories[0]['name'] = lang('male');
$categories[1]['id'] = 2;
$categories[1]['name'] = lang('female');
+ $categories[2]['id'] = 3;
+ $categories[2]['name'] = lang('organization');
! */
while (is_array($categories) && list(,$category) =
each($categories))
{
Index: class.socategory.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socategory.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.socategory.inc.php 30 Jun 2003 10:49:14 -0000 1.6
--- class.socategory.inc.php 1 Jul 2003 11:19:24 -0000 1.7
***************
*** 129,132 ****
--- 129,136 ----
$table='fm_owner_category';
break;
+ case 'tenant':
+ $table='fm_tenant_category';
+ break;
+
}
Index: class.solocation.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.solocation.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** class.solocation.inc.php 30 Jun 2003 19:18:34 -0000 1.17
--- class.solocation.inc.php 1 Jul 2003 11:19:24 -0000 1.18
***************
*** 25,36 ****
}
- function read_category_name($cat_id)
- {
- $this->db->query("SELECT descr FROM
fm_apartment_category where id='$cat_id'");
- $this->db->next_record();
- return $this->db->f('descr');
- }
-
-
function get_owner_type_list()
{
--- 25,28 ----
Index: class.sotenant.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sotenant.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.sotenant.inc.php 30 Jun 2003 10:49:14 -0000 1.4
--- class.sotenant.inc.php 1 Jul 2003 11:19:24 -0000 1.5
***************
*** 21,29 ****
$this->join = $this->socommon->join;
}
function select_category_list()
{
! $this->db->query("SELECT id,descr FROM fm_tenant_sex
ORDER BY descr ");
$i = 0;
--- 21,30 ----
$this->join = $this->socommon->join;
+ $this->left_join = $this->socommon->left_join;
}
function select_category_list()
{
! $this->db->query("SELECT id,descr FROM
fm_tenant_category ORDER BY descr ");
$i = 0;
***************
*** 70,74 ****
if ($cat_id > 0)
{
! $filtermethod .= " $where sex_id='$cat_id' ";
$where = 'AND';
--- 71,75 ----
if ($cat_id > 0)
{
! $filtermethod .= " $where category='$cat_id' ";
$where = 'AND';
***************
*** 80,87 ****
$query = ereg_replace('"','',$query);
! $querymethod = " $where name LIKE '%$query%'";
}
! $sql = "SELECT * FROM fm_tenant $filtermethod
$querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
--- 81,88 ----
$query = ereg_replace('"','',$query);
! $querymethod = " $where ( last_name LIKE
'%$query%' OR first_name LIKE '%$query%' OR contact_phone LIKE '%$query%')";
}
! $sql = "SELECT fm_tenant.*, fm_tenant_category.descr
as category FROM fm_tenant $this->left_join fm_tenant_category on
fm_tenant.category=fm_tenant_category.id $filtermethod $querymethod";
$this->db2->query($sql,__LINE__,__FILE__);
***************
*** 117,121 ****
{
$tenant['id'] =
(int)$this->db->f('tenant_id');
! $tenant['name'] =
stripslashes($this->db->f('name'));
$tenant['entry_date'] =
$this->db->f('entry_date');
$tenant['cat_id'] =
(int)$this->db->f('category');
--- 118,124 ----
{
$tenant['id'] =
(int)$this->db->f('tenant_id');
! $tenant['last_name'] =
stripslashes($this->db->f('last_name'));
! $tenant['first_name'] =
stripslashes($this->db->f('first_name'));
! $tenant['contact_phone'] =
$this->db->f('contact_phone');
$tenant['entry_date'] =
$this->db->f('entry_date');
$tenant['cat_id'] =
(int)$this->db->f('category');
***************
*** 127,135 ****
function add($tenant)
{
! $tenant['name'] =
$this->db->db_addslashes($tenant['name']);
! $this->db->query("INSERT INTO fm_tenant
(entry_date,name,sex_id) "
! . "VALUES ('" . time() . "','" . $tenant['name']
! . "','" . $tenant['cat_id'] .
"')",__LINE__,__FILE__);
$receipt['tenant_id']=
$this->db->get_last_insert_id('fm_tenant','tenant_id');
--- 130,138 ----
function add($tenant)
{
! $tenant['last_name'] =
$this->db->db_addslashes($tenant['last_name']);
! $tenant['first_name'] =
$this->db->db_addslashes($tenant['first_name']);
! $this->db->query("INSERT INTO fm_tenant
(entry_date,last_name,first_name,contact_phone,category) "
! . "VALUES ('" . time() . "','" .
$tenant['last_name'] . "','" . $tenant['first_name'] . "','" .
$tenant['contact_phone'] . "','" . $tenant['cat_id'] . "')",__LINE__,__FILE__);
$receipt['tenant_id']=
$this->db->get_last_insert_id('fm_tenant','tenant_id');
***************
*** 140,146 ****
function edit($tenant)
{
! $tenant['name'] =
$this->db->db_addslashes($tenant['name']);
! $this->db->query("UPDATE fm_tenant set name='" .
$tenant['name'] . "', entry_date='" . time() . "', sex_id='"
. $tenant['cat_id'] .
"' WHERE tenant_id=" . intval($tenant['tenant_id']),__LINE__,__FILE__);
--- 143,150 ----
function edit($tenant)
{
! $tenant['last_name'] =
$this->db->db_addslashes($tenant['last_name']);
! $tenant['first_name'] =
$this->db->db_addslashes($tenant['first_name']);
! $this->db->query("UPDATE fm_tenant set last_name='" .
$tenant['last_name'] . "', first_name='" . $tenant['first_name'] . "',
contact_phone='" . $tenant['contact_phone'] . "', entry_date='" . time() . "',
category='"
. $tenant['cat_id'] .
"' WHERE tenant_id=" . intval($tenant['tenant_id']),__LINE__,__FILE__);
Index: class.uitenant.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uitenant.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.uitenant.inc.php 30 Jun 2003 10:49:14 -0000 1.3
--- class.uitenant.inc.php 1 Jul 2003 11:19:24 -0000 1.4
***************
*** 178,182 ****
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'links'
=> $links,
! 'allow_allrows'
=> true,
'allrows'
=> $this->allrows,
'start_record'
=> $this->start,
--- 178,182 ----
'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
'links'
=> $links,
! 'allow_allrows'
=> false,
'allrows'
=> $this->allrows,
'start_record'
=> $this->start,
***************
*** 224,228 ****
}
! if(!$values['name'])
{
$receipt['error'][]=array('msg'=>lang('Please enter a name !'));
--- 224,228 ----
}
! if(!$values['last_name'])
{
$receipt['error'][]=array('msg'=>lang('Please enter a name !'));
***************
*** 271,282 ****
'lang_tenant_id'
=> lang('Owner ID'),
'value_tenant_id'
=> $tenant_id,
! 'lang_name'
=> lang('name'),
'lang_category'
=> lang('category'),
'lang_save'
=> lang('save'),
'lang_cancel'
=> lang('cancel'),
'lang_apply'
=> lang('apply'),
! 'value_name'
=> $tenant['name'],
'value_cat'
=> $tenant['cat'],
! 'lang_name_statustext' => lang('Enter
the name of the tenant'),
'lang_apply_statustext' =>
lang('Apply the values'),
'lang_cancel_statustext' =>
lang('Leave the tenant untouched and return back to the list'),
--- 271,288 ----
'lang_tenant_id'
=> lang('Owner ID'),
'value_tenant_id'
=> $tenant_id,
! 'lang_first_name'
=> lang('first name'),
! 'lang_last_name'
=> lang('last name'),
! 'lang_contact_phone' =>
lang('contact phone'),
'lang_category'
=> lang('category'),
'lang_save'
=> lang('save'),
'lang_cancel'
=> lang('cancel'),
'lang_apply'
=> lang('apply'),
! 'value_first_name'
=> $tenant['first_name'],
! 'value_last_name'
=> $tenant['last_name'],
! 'value_contact_phone' =>
$tenant['contact_phone'],
'value_cat'
=> $tenant['cat'],
! 'lang_first_name_statustext' => lang('Enter
the first name of the tenant'),
! 'lang_last_name_statustext' =>
lang('Enter the last name of the tenant'),
! 'lang_contact_phone_statustext' => lang('Enter
the contact phone for the tenant'),
'lang_apply_statustext' =>
lang('Apply the values'),
'lang_cancel_statustext' =>
lang('Leave the tenant untouched and return back to the list'),
***************
*** 346,357 ****
$data = array
(
! 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant.index'),
! 'lang_name' => lang('name'),
! 'lang_category' => lang('category'),
! 'lang_time_created' => lang('time created'),
! 'lang_done' => lang('done'),
! 'value_name' => $tenant['name'],
! 'value_cat' =>
$this->bo->read_category_name($tenant['cat_id']),
! 'value_date' =>
$GLOBALS['phpgw']->common->show_date($tenant['entry_date'])
);
--- 352,367 ----
$data = array
(
! 'done_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uitenant.index'),
! 'lang_first_name'
=> lang('first name'),
! 'lang_last_name'
=> lang('last name'),
! 'lang_contact_phone' =>
lang('contact phone'),
! 'lang_category' =>
lang('category'),
! 'lang_time_created' =>
lang('time created'),
! 'lang_done'
=> lang('done'),
! 'value_first_name' =>
$tenant['first_name'],
! 'value_last_name' =>
$tenant['last_name'],
! 'value_contact_phone' =>
$tenant['contact_phone'],
! 'cat_list'
=> $this->bo->select_category_list('',$tenant['cat_id']),
! 'value_date' =>
$GLOBALS['phpgw']->common->show_date($tenant['entry_date'])
);
Index: hook_admin.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/hook_admin.inc.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** hook_admin.inc.php 30 Jun 2003 10:49:14 -0000 1.38
--- hook_admin.inc.php 1 Jul 2003 11:19:24 -0000 1.39
***************
*** 22,25 ****
--- 22,26 ----
'Workorder Categories' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=wo'),
'Ticket Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=ticket'),
+ 'Tenant Categories'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uicategory.index&type=tenant'),
'Tenant'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uitenant.index'),
'Owner'=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$appname.'.uiowner.index'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bolocation.inc.php,1.20,1.21 class.botenant.inc.php,1.2,1.3 class.socategory.inc.php,1.6,1.7 class.solocation.inc.php,1.17,1.18 class.sotenant.inc.php,1.4,1.5 class.uitenant.inc.php,1.3,1.4 hook_admin.inc.php,1.38,1.39,
Sigurd Nes <address@hidden> <=