[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.35,1.36 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.35,1.36 class.bodrawing.inc.php,1.1,1.2 class.sodrawing.inc.php,1.1,1.2 class.soproject.inc.php,1.8,1.9 class.uidrawing.inc.php,1.1,1.2 |
|
Date: |
Mon, 21 Apr 2003 05:23:38 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv23319/inc
Modified Files:
class.bocommon.inc.php class.bodrawing.inc.php
class.sodrawing.inc.php class.soproject.inc.php
class.uidrawing.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.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** class.bocommon.inc.php 20 Apr 2003 22:24:30 -0000 1.35
--- class.bocommon.inc.php 21 Apr 2003 09:23:35 -0000 1.36
***************
*** 52,55 ****
--- 52,56 ----
$this->accounts =
CreateObject('phpgwapi.accounts');
$this->acl2 =
CreateObject($this->currentapp.'.acl2');
+ $this->contacts =
CreateObject('phpgwapi.contacts');
$this->part_of_town_id =
get_var('part_of_town_id',array('POST','GET'));
***************
*** 313,318 ****
--- 314,327 ----
$GLOBALS['phpgw']->xslttpl->add_file(array('vendor_form'));
+
$vendor['value_vendor_id']
= $data['vendor_id'];
$vendor['value_vendor_name'] =
$data['vendor_name'];
+
+ if($data['vendor_id'] && !$data['vendor_name'])
+ {
+ $vendor_data
=
$this->contacts->read_single_entry($data['vendor_id'],array('org_name'=>'org_name','email'=>'email'));
+ $vendor['value_vendor_name'] =
$vendor_data[0]['org_name'];
+ }
+
$vendor['vendor_link']
=
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uilookup.addressbook');
$vendor['lang_vendor']
= lang('Vendor');
Index: class.bodrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bodrawing.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.bodrawing.inc.php 20 Apr 2003 22:24:30 -0000 1.1
--- class.bodrawing.inc.php 21 Apr 2003 09:23:35 -0000 1.2
***************
*** 298,306 ****
function save($values)
{
if ($values['drawing_id'])
{
if ($values['drawing_id'] != 0)
{
! $receipt = $this->so->edit($values);
}
}
--- 298,313 ----
function save($values)
{
+
+ $drawing_date =
$this->bocommon->date_array($values['drawing_date']);
+ $values['drawing_date'] = mktime
(2,0,0,$drawing_date['month'],$drawing_date['day'],$drawing_date['year']);
+
+
$values['location_code']=$this->bocommon->location_code($values['property_id'],$values['building_id'],$values['entrance_id'],$values['apartment_id']);
+
+ _debug_array($values);
if ($values['drawing_id'])
{
if ($values['drawing_id'] != 0)
{
! // $receipt = $this->so->edit($values);
}
}
Index: class.sodrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sodrawing.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.sodrawing.inc.php 20 Apr 2003 22:24:30 -0000 1.1
--- class.sodrawing.inc.php 21 Apr 2003 09:23:35 -0000 1.2
***************
*** 192,199 ****
$drawing['equipment_id'] =
$this->db->f('equipment_id');
$drawing['location_code'] =
$this->db->f('location_code');
! $drawing['key_fetch'] =
$this->db->f('key_fetch');
! $drawing['key_deliver'] =
$this->db->f('key_deliver');
! $drawing['other_branch'] =
$this->db->f('other_branch');
! $drawing['key_responsible'] =
$this->db->f('key_responsible');
$drawing['charge_tenant'] =
$this->db->f('charge_tenant');
$drawing['descr']
= $this->db->f('descr');
--- 192,199 ----
$drawing['equipment_id'] =
$this->db->f('equipment_id');
$drawing['location_code'] =
$this->db->f('location_code');
! $drawing['branch_id'] =
$this->db->f('branch_id');
! $drawing['version']
= $this->db->f('version');
! $drawing['vendor_id'] =
$this->db->f('vendor_id');
! $drawing['floor_id'] =
$this->db->f('floor_id');
$drawing['charge_tenant'] =
$this->db->f('charge_tenant');
$drawing['descr']
= $this->db->f('descr');
***************
*** 231,259 ****
$drawing['title'] =
$this->db->db_addslashes($drawing['title']);
//_debug_array($drawing);
! $this->db->query("INSERT INTO fm_drawing
(id,name,equipment_id,access,category,entry_date,start_date,end_date,coordinator,status,"
! .
"descr,title,budget,location_code,floor,address,key_deliver,key_fetch,other_branch,key_responsible,tenant_id,charge_tenant,owner)
"
. "VALUES ('"
! . $drawing['drawing_id']. "','"
! . $drawing['name']. "','"
. $drawing['equipment_id']. "','"
. "public','"
. $drawing['cat_id']. "','"
. time() . "','"
! . $drawing['start_date']. "','"
! . $drawing['end_date']. "','"
. $drawing['coordinator']. "','"
. $drawing['status']. "','"
. $drawing['descr']. "','"
- . $drawing['title']. "','"
- . $drawing['budget']. "','"
. $drawing['location_code']. "','"
! . $drawing['floor'] . "','"
! . $drawing['address'] . "','"
! . $drawing['key_deliver']. "','"
! . $drawing['key_fetch']. "','"
! . $drawing['other_branch']. "','"
! . $drawing['key_responsible']. "','"
! . $drawing['tenant_id']. "','"
! . $drawing['charge_tenant'] . "','"
. $this->account. "')",__LINE__,__FILE__);
--- 231,253 ----
$drawing['title'] =
$this->db->db_addslashes($drawing['title']);
//_debug_array($drawing);
! $this->db->query("INSERT INTO fm_drawing
(drawing_name,title,equipment_id,access,category,entry_date,drawing_date,version,coordinator,status,"
! .
"descr,location_code,floor_id,address,branch_id,vendor_id,owner) "
. "VALUES ('"
! . $drawing['drawing_name']. "','"
! . $drawing['title']. "','"
. $drawing['equipment_id']. "','"
. "public','"
. $drawing['cat_id']. "','"
. time() . "','"
! . $drawing['drawing_date']. "','"
! . $drawing['version']. "','"
. $drawing['coordinator']. "','"
. $drawing['status']. "','"
. $drawing['descr']. "','"
. $drawing['location_code']. "','"
! . $drawing['floor_id'] . "','"
! . $address . "','"
! . $drawing['branch_id']. "','"
! . $drawing['vendor_id']. "','"
. $this->account. "')",__LINE__,__FILE__);
***************
*** 305,326 ****
$this->db->query("UPDATE fm_drawing set
! name ='" . $drawing['name']
. "',
status ='" .
$drawing['status'] . "',
category ='" .
$drawing['cat_id'] . "',
! start_date ='" .
$drawing['start_date'] . "',
end_date ='" .
$drawing['end_date'] . "',
coordinator ='" .
$drawing['coordinator'] . "',
descr ='" . $drawing['descr']
. "',
! title ='" .
$drawing['title'] . "',
! budget ='" .
(int)$drawing['budget'] . "',
! key_deliver ='" .
$drawing['key_deliver'] . "',
! key_fetch ='" .
$drawing['key_fetch'] . "',
! other_branch ='" . $drawing['other_branch']
. "',
! key_responsible ='" .
$drawing['key_responsible'] . "',
! tenant_id ='" .
$drawing['tenant_id'] . "',
! charge_tenant ='" . $drawing['charge_tenant']
. "',
location_code ='" . $drawing['location_code']
. "',
! floor ='" . $drawing['floor']
. "',
equipment_id ='" . $drawing['equipment_id']
. "',
address ='" . $address
. "' WHERE id= '" . $drawing['drawing_id']
."'",__LINE__,__FILE__);
--- 299,316 ----
$this->db->query("UPDATE fm_drawing set
! drawing_name ='" . $drawing['drawing_name']
. "',
! title ='" .
$drawing['title'] . "',
! branch_id ='" .
$drawing['branch_id'] . "',
status ='" .
$drawing['status'] . "',
category ='" .
$drawing['cat_id'] . "',
! drawing_date ='" . $drawing['drawing_date']
. "',
end_date ='" .
$drawing['end_date'] . "',
coordinator ='" .
$drawing['coordinator'] . "',
descr ='" . $drawing['descr']
. "',
! version ='" .
$drawing['version'] . "',
location_code ='" . $drawing['location_code']
. "',
! floor_id ='" .
$drawing['floor_id'] . "',
equipment_id ='" . $drawing['equipment_id']
. "',
+ vendor_id ='" .
$drawing['vendor_id'] . "',
address ='" . $address
. "' WHERE id= '" . $drawing['drawing_id']
."'",__LINE__,__FILE__);
Index: class.soproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.soproject.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.soproject.inc.php 12 Apr 2003 17:55:03 -0000 1.8
--- class.soproject.inc.php 21 Apr 2003 09:23:35 -0000 1.9
***************
*** 353,357 ****
. $project['location_code']. "','"
. $project['floor'] . "','"
! . $project['address'] . "','"
. $project['key_deliver']. "','"
. $project['key_fetch']. "','"
--- 353,357 ----
. $project['location_code']. "','"
. $project['floor'] . "','"
! . $address . "','"
. $project['key_deliver']. "','"
. $project['key_fetch']. "','"
Index: class.uidrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidrawing.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.uidrawing.inc.php 20 Apr 2003 22:24:30 -0000 1.1
--- class.uidrawing.inc.php 21 Apr 2003 09:23:35 -0000 1.2
***************
*** 301,305 ****
}
! $values['create_date'] =
get_var('create_date',array('POST'));
//_debug_array($values);
--- 301,306 ----
}
! $values['drawing_date'] =
get_var('drawing_date',array('POST'));
! $values['vendor_id'] =
get_var('vendor_id',array('POST'));
//_debug_array($values);
***************
*** 381,385 ****
(
'menuaction' =>
$this->currentapp.'.uidrawing.edit',
! 'id' => $id
);
--- 382,386 ----
(
'menuaction' =>
$this->currentapp.'.uidrawing.edit',
! 'drawing_id' => $drawing_id
);
***************
*** 424,428 ****
'lang_drawing_id'
=> lang('Drawing ID'),
! 'value_drawing_id'
=> $values['drawing_id'],
'lang_drawing_name'
=> lang('Drawing name'),
--- 425,429 ----
'lang_drawing_id'
=> lang('Drawing ID'),
! 'value_drawing_id'
=> $drawing_id,
'lang_drawing_name'
=> lang('Drawing name'),
***************
*** 433,436 ****
--- 434,441 ----
'value_floor_id'
=> $values['floor_id'],
'lang_floor_statustext' =>
lang('Enter the floor ID'),
+
+ 'lang_title'
=> lang('title'),
+ 'value_title'
=> $values['title'],
+ 'lang_title_statustext' =>
lang('Enter drawing title'),
'lang_version'
=> lang('Version'),
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.35,1.36 class.bodrawing.inc.php,1.1,1.2 class.sodrawing.inc.php,1.1,1.2 class.soproject.inc.php,1.8,1.9 class.uidrawing.inc.php,1.1,1.2,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default drawing.xsl,1.1,1.2
- Next by Date:
[Phpgroupware-cvs] CVS: calendar/inc class.uialarm.inc.php,1.5,1.6 class.uicalendar.inc.php,1.98,1.99 class.uiholiday.inc.php,1.5,1.6 class.uiicalendar.inc.php,1.5,1.6
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default drawing.xsl,1.1,1.2
- Next by thread:
[Phpgroupware-cvs] CVS: calendar/inc class.uialarm.inc.php,1.5,1.6 class.uicalendar.inc.php,1.98,1.99 class.uiholiday.inc.php,1.5,1.6 class.uiicalendar.inc.php,1.5,1.6
- Index(es):