[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.44,1.45 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.44,1.45 class.bopricebook.inc.php,1.6,1.7 class.boreport.inc.php,1.2,1.3 class.socommon.inc.php,1.19,1.20 class.sopricebook.inc.php,1.8,1.9 class.uidocument.inc.php,1.6,1.7 class.uiowner.inc.php,1.1,1.2 class.uipricebook.inc.php,1.12,1.13 class.uiproject.inc.php,1.18,1.19 class.uiwo_hour.inc.php,1.21,1.22 class.uiworkorder.inc.php,1.18,1.19 |
|
Date: |
Mon, 19 May 2003 07:04:38 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv5791/inc
Modified Files:
class.bocommon.inc.php class.bopricebook.inc.php
class.boreport.inc.php class.socommon.inc.php
class.sopricebook.inc.php class.uidocument.inc.php
class.uiowner.inc.php class.uipricebook.inc.php
class.uiproject.inc.php class.uiwo_hour.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.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** class.bocommon.inc.php 12 May 2003 21:45:32 -0000 1.44
--- class.bocommon.inc.php 19 May 2003 11:04:36 -0000 1.45
***************
*** 229,232 ****
--- 229,233 ----
{
$location
= array();
+ $location['location_code'] =
get_var('location_code',array('POST','GET'));
$location['equipment_id'] =
get_var('equipment_id',array('POST','GET'));
$location['property_id'] =
get_var('property_id',array('POST','GET'));
***************
*** 241,244 ****
--- 242,246 ----
$location['tenant_name'] =
get_var('tenant_name',array('POST','GET'));
$location['tenant_phone'] =
get_var('tenant_phone',array('POST','GET'));
+ //_debug_array($location);
return $location;
Index: class.bopricebook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.bopricebook.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.bopricebook.inc.php 15 May 2003 09:08:02 -0000 1.6
--- class.bopricebook.inc.php 19 May 2003 11:04:36 -0000 1.7
***************
*** 51,54 ****
--- 51,60 ----
$this->bocommon =
CreateObject($this->currentapp.'.bocommon');
+ if ($session)
+ {
+ $this->read_sessiondata();
+ $this->use_session = True;
+ }
+
$start = get_var('start',array('POST','GET'));
$query = get_var('query',array('POST','GET'));
***************
*** 94,97 ****
--- 100,126 ----
}
+ function save_sessiondata($data)
+ {
+ if ($this->use_session)
+ {
+
$GLOBALS['phpgw']->session->appsession('session_data','pricebook',$data);
+ }
+ }
+
+ function read_sessiondata()
+ {
+ $data =
$GLOBALS['phpgw']->session->appsession('session_data','pricebook');
+
+ //_debug_array($data);
+
+ $this->start = $data['start'];
+ $this->query = $data['query'];
+ $this->filter = $data['filter'];
+ $this->sort = $data['sort'];
+ $this->order = $data['order'];
+ $this->cat_id = $data['cat_id'];
+ }
+
+
function select_status_list($format='',$selected='')
{
***************
*** 466,472 ****
! function check_activity_num($num='')
{
! return $this->so->check_activity_num($num);
}
--- 495,501 ----
! function check_activity_num($num='',$agreement_id='')
{
! return
$this->so->check_activity_num($num,$agreement_id);
}
Index: class.boreport.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.boreport.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.boreport.inc.php 14 May 2003 13:18:15 -0000 1.2
--- class.boreport.inc.php 19 May 2003 11:04:36 -0000 1.3
***************
*** 289,293 ****
}
! _debug_array($receipt);
return $receipt;
}
--- 289,293 ----
}
! //_debug_array($receipt);
return $receipt;
}
Index: class.socommon.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.socommon.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** class.socommon.inc.php 12 May 2003 21:45:32 -0000 1.19
--- class.socommon.inc.php 19 May 2003 11:04:36 -0000 1.20
***************
*** 65,68 ****
--- 65,70 ----
{
+ $location['location_code'] = $location_code;
+
$location_key = split("-", $location_code);
$sql = array(
Index: class.sopricebook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.sopricebook.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.sopricebook.inc.php 15 May 2003 09:08:02 -0000 1.8
--- class.sopricebook.inc.php 19 May 2003 11:04:36 -0000 1.9
***************
*** 144,150 ****
}
! function check_activity_num($num='')
{
! $this->db->query("SELECT count(*) FROM fm_activities
where num='$num'");
$this->db->next_record();
--- 144,150 ----
}
! function check_activity_num($num='',$agreement_id='')
{
! $this->db->query("SELECT count(*) FROM fm_activities
where num='$num' and agreement_id ='$agreement_id'");
$this->db->next_record();
***************
*** 642,645 ****
--- 642,646 ----
$receipt['message'][] = array('msg'=>lang('Activity has
been saved'));
+ $receipt['activity_id']= $values['activity_id'];
return $receipt;
}
***************
*** 661,664 ****
--- 662,666 ----
. "' WHERE id= '" . $values['activity_id'] .
"'",__LINE__,__FILE__);
+ $receipt['activity_id']= $values['activity_id'];
$receipt['message'][] = array('msg'=>lang('Activity has
been edited'));
return $receipt;
Index: class.uidocument.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidocument.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.uidocument.inc.php 14 May 2003 13:18:15 -0000 1.6
--- class.uidocument.inc.php 19 May 2003 11:04:36 -0000 1.7
***************
*** 242,248 ****
--- 242,252 ----
$GLOBALS['phpgw']->xslttpl->add_file(array('document',
'menu',
+
'receipt',
'nextmatchs',
'search_field'));
+ $receipt =
$GLOBALS['phpgw']->session->appsession('session_data','document_receipt');
+
$GLOBALS['phpgw']->session->appsession('session_data','document_receipt','');
+
$location_code =
get_var('location_code',array('POST','GET'));
$equipment_id =
get_var('equipment_id',array('POST','GET'));
***************
*** 266,271 ****
'apartment_id' =>
$location['apartment_id']));
!
! //_debug_array($location_data);
$links = $this->bocommon->menu();
--- 270,274 ----
'apartment_id' =>
$location['apartment_id']));
! //_debug_array($receipt);
$links = $this->bocommon->menu();
***************
*** 288,292 ****
'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.view&document_id='
. $document['document_id'] . '&from=list_doc'),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.edit&document_id='
. $document['document_id'] . '&from=list_doc'),
! 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.delete&document_id='
. $document['document_id']),
'lang_view_file_statustext' =>
lang('view the document'),
'lang_view_statustext' =>
lang('view information about the document'),
--- 291,295 ----
'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.view&document_id='
. $document['document_id'] . '&from=list_doc'),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.edit&document_id='
. $document['document_id'] . '&from=list_doc'),
! 'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.delete&document_id='
. $document['document_id'] . '&location_code=' . $location_code .
'&equipment_id=' . $equipment_id),
'lang_view_file_statustext' =>
lang('view the document'),
'lang_view_statustext' =>
lang('view information about the document'),
***************
*** 316,320 ****
'lang_document_name' => lang('Document
name'),
'lang_category' =>
lang('Category'),
! 'lang_owner' =>
lang('owner'),
'lang_title' =>
lang('Title'),
'lang_view' => lang('view'),
--- 319,323 ----
'lang_document_name' => lang('Document
name'),
'lang_category' =>
lang('Category'),
! 'lang_user' =>
lang('user'),
'lang_title' =>
lang('Title'),
'lang_view' => lang('view'),
***************
*** 346,349 ****
--- 349,354 ----
$data = array
(
+ 'error'
=> $receipt['error'],
+ 'message'
=> $receipt['message'],
'location_data'
=> $location_data,
'link_history'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.list_doc&cat_id='
. $this->cat_id),
***************
*** 405,409 ****
}
! function view_file($file_array='')
{
$GLOBALS['phpgw_info']['flags']['noframework'] = True;
--- 410,414 ----
}
! function view_file()
{
$GLOBALS['phpgw_info']['flags']['noframework'] = True;
***************
*** 446,450 ****
echo $document;
! flush();
}
}
--- 451,455 ----
echo $document;
! // flush();
}
}
***************
*** 492,495 ****
--- 497,505 ----
$values['document_name']=$_FILES['document_file']['name'];
+ if(!$values['document_name'] &&
!$values['document_name_orig'])
+ {
+
$receipt['error'][]=array('msg'=>lang('Please select a file to upload !'));
+ }
+
if(!$values['cat_id'])
{
***************
*** 533,542 ****
//echo $_FILES['document_file']['tmp_name'] .'<br>';
//echo $to_file .'<br>';
! if(!$this->bo->vfs->cp (array (
! 'from' =>
$_FILES['document_file']['tmp_name'],
! 'to' => $to_file,
! 'relatives' => array
(RELATIVE_NONE|VFS_REAL, RELATIVE_ALL))))
{
!
$receipt['error'][]=array('msg'=>lang('Failed to upload file !'));
}
--- 543,555 ----
//echo $_FILES['document_file']['tmp_name'] .'<br>';
//echo $to_file .'<br>';
! if($values['document_name'])
{
! if(!$this->bo->vfs->cp (array (
! 'from' =>
$_FILES['document_file']['tmp_name'],
! 'to' => $to_file,
! 'relatives' =>
array (RELATIVE_NONE|VFS_REAL, RELATIVE_ALL))))
! {
!
$receipt['error'][]=array('msg'=>lang('Failed to upload file !'));
! }
}
***************
*** 544,548 ****
{
$receipt =
$this->bo->save($values);
!
$document_id=$receipt['document_id'];
}
}
--- 557,563 ----
{
$receipt =
$this->bo->save($values);
! //
$document_id=$receipt['document_id'];
!
$GLOBALS['phpgw']->session->appsession('session_data','document_receipt',$receipt);
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction='.$this->currentapp.'.uidocument.list_doc&location_code='
.$values['location_code'] . '&equipment_id=' . $values['equipment_id'] );
}
}
***************
*** 602,606 ****
(
'menuaction' =>
$this->currentapp.'.uidocument.edit',
! 'document_id' => $document_id
);
--- 617,623 ----
(
'menuaction' =>
$this->currentapp.'.uidocument.edit',
! 'document_id' => $document_id,
! 'from' => $from,
! 'location_code' => $values['location_code']
);
***************
*** 689,692 ****
--- 706,710 ----
'lang_status_statustext' =>
lang('What is the current status of this document ?'),
+ 'value_location_code' =>
$values['location_code'],
'branch_list'
=> $this->bo->select_branch_list($values['branch_id']),
***************
*** 704,707 ****
--- 722,727 ----
function delete()
{
+ $location_code =
get_var('location_code',array('POST','GET'));
+ $equipment_id =
get_var('equipment_id',array('POST','GET'));
$document_id =
get_var('document_id',array('POST','GET'));
$confirm = get_var('confirm',array('POST'));
***************
*** 709,713 ****
$link_data = array
(
! 'menuaction' =>
$this->currentapp.'.uidocument.index'
);
--- 729,735 ----
$link_data = array
(
! 'menuaction' =>
$this->currentapp.'.uidocument.list_doc',
! 'location_code' => $location_code,
! 'equipment_id' => $equipment_id
);
***************
*** 723,727 ****
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
! 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.delete&document_id='
. $document_id),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
--- 745,749 ----
(
'done_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
! 'delete_action' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidocument.delete&document_id='
. $document_id . '&location_code=' . $location_code . '&equipment_id=' .
$equipment_id),
'lang_confirm_msg' => lang('do you
really want to delete this entry'),
'lang_yes' =>
lang('yes'),
Index: class.uiowner.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiowner.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.uiowner.inc.php 17 May 2003 17:49:03 -0000 1.1
--- class.uiowner.inc.php 19 May 2003 11:04:36 -0000 1.2
***************
*** 30,34 ****
$GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
- $this->cats =
CreateObject('phpgwapi.categories');
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
--- 30,33 ----
Index: class.uipricebook.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uipricebook.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uipricebook.inc.php 3 May 2003 06:02:17 -0000 1.12
--- class.uipricebook.inc.php 19 May 2003 11:04:36 -0000 1.13
***************
*** 70,74 ****
'cat_id' => $this->cat_id
);
! $this->bocommon->save_sessiondata($data);
}
--- 70,74 ----
'cat_id' => $this->cat_id
);
! $this->bo->save_sessiondata($data);
}
***************
*** 983,987 ****
if($values['num'] && !$activity_id)
{
!
if($this->bo->check_activity_num($values['num']))
{
$receipt['error'][]=array('msg'=>lang('This activity code is already
registered!') . '[ '.$values['num'] .' ]');
--- 983,987 ----
if($values['num'] && !$activity_id)
{
!
if($this->bo->check_activity_num($values['num'],$values['cat_id']))
{
$receipt['error'][]=array('msg'=>lang('This activity code is already
registered!') . '[ '.$values['num'] .' ]');
***************
*** 1003,1006 ****
--- 1003,1008 ----
{
$receipt =
$this->bo->save_activity($values,$action);
+ $activity_id= $receipt['activity_id'];
+ $values['activity_id']= $activity_id;
}
Index: class.uiproject.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiproject.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.uiproject.inc.php 13 May 2003 11:03:06 -0000 1.18
--- class.uiproject.inc.php 19 May 2003 11:04:36 -0000 1.19
***************
*** 314,325 ****
$action='edit';
}
- else
- {
-
$values['project_id']=$this->bo->increment_project_id();
- $id = $values['project_id'];
- }
if(!$receipt['error'])
{
if($values['copy_project'])
{
--- 314,326 ----
$action='edit';
}
if(!$receipt['error'])
{
+ if(!$id)
+ {
+
$values['project_id']=$this->bo->increment_project_id();
+ $id = $values['project_id'];
+ }
+
if($values['copy_project'])
{
Index: class.uiwo_hour.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiwo_hour.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** class.uiwo_hour.inc.php 8 May 2003 13:56:29 -0000 1.21
--- class.uiwo_hour.inc.php 19 May 2003 11:04:36 -0000 1.22
***************
*** 353,358 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
!
'menu',
!
'headonly'));
$show_cost =
get_var('show_cost',array('POST','GET'));
--- 353,357 ----
$GLOBALS['phpgw']->xslttpl->add_file(array('wo_hour',
!
'menu'));
$show_cost =
get_var('show_cost',array('POST','GET'));
Index: class.uiworkorder.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uiworkorder.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.uiworkorder.inc.php 3 May 2003 06:02:17 -0000 1.18
--- class.uiworkorder.inc.php 19 May 2003 11:04:36 -0000 1.19
***************
*** 290,301 ****
$action='edit';
}
- else
- {
-
$values['workorder_id']=$this->bo->increment_workorder_id();
- $id = $values['workorder_id'];
- }
if(!$receipt['error'])
{
if($values['copy_workorder'])
{
--- 290,301 ----
$action='edit';
}
if(!$receipt['error'])
{
+ if(!$id)
+ {
+
$values['workorder_id']=$this->bo->increment_workorder_id();
+ $id =
$values['workorder_id'];
+ }
if($values['copy_workorder'])
{
***************
*** 396,402 ****
$location_data=$this->bocommon->initiate_ui_location(array(
'location_type' => 'view',
! 'equipment' => true,
! 'tenant' => true,
! 'address' => true,
'equipment_id' =>
$project['equipment_id'],
'property_id' =>
$project['property_id'],
--- 396,402 ----
$location_data=$this->bocommon->initiate_ui_location(array(
'location_type' => 'view',
! 'equipment' =>
$project['equipment_id'],
! 'tenant' =>
$project['tenant_id'],
! 'address' =>
$project['street_name'],
'equipment_id' =>
$project['equipment_id'],
'property_id' =>
$project['property_id'],
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.44,1.45 class.bopricebook.inc.php,1.6,1.7 class.boreport.inc.php,1.2,1.3 class.socommon.inc.php,1.19,1.20 class.sopricebook.inc.php,1.8,1.9 class.uidocument.inc.php,1.6,1.7 class.uiowner.inc.php,1.1,1.2 class.uipricebook.inc.php,1.12,1.13 class.uiproject.inc.php,1.18,1.19 class.uiwo_hour.inc.php,1.21,1.22 class.uiworkorder.inc.php,1.18,1.19,
Sigurd Nes <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: property/templates/default app_delete.xsl,1.1,1.2 document.xsl,1.2,1.3 wo_hour.xsl,1.11,1.12
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.sessions.inc.php,1.105,1.106
- Previous by thread:
[Phpgroupware-cvs] CVS: property/templates/default app_delete.xsl,1.1,1.2 document.xsl,1.2,1.3 wo_hour.xsl,1.11,1.12
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/inc class.sessions.inc.php,1.105,1.106
- Index(es):