[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.38,1.39 cl
|
From: |
Sigurd Nes <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.38,1.39 class.uidrawing.inc.php,1.10,1.11 class.uilookup.inc.php,1.15,1.16 class.uirequest.inc.php,1.7,1.8 |
|
Date: |
Sat, 26 Apr 2003 04:14:16 -0400 |
Update of /cvsroot/phpgroupware/property/inc
In directory subversions:/tmp/cvs-serv22260/inc
Modified Files:
class.bocommon.inc.php class.uidrawing.inc.php
class.uilookup.inc.php class.uirequest.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.38
retrieving revision 1.39
diff -C2 -r1.38 -r1.39
*** class.bocommon.inc.php 25 Apr 2003 09:46:13 -0000 1.38
--- class.bocommon.inc.php 26 Apr 2003 08:14:13 -0000 1.39
***************
*** 347,351 ****
//_debug_array($data);
!
$GLOBALS['phpgw']->xslttpl->add_file(array('vendor_form'));
$vendor['value_vendor_id']
= $data['vendor_id'];
--- 347,358 ----
//_debug_array($data);
! if($data['type']=='view')
! {
!
$GLOBALS['phpgw']->xslttpl->add_file(array('vendor_view'));
! }
! else
! {
!
$GLOBALS['phpgw']->xslttpl->add_file(array('vendor_form'));
! }
$vendor['value_vendor_id']
= $data['vendor_id'];
Index: class.uidrawing.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uidrawing.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.uidrawing.inc.php 25 Apr 2003 11:36:53 -0000 1.10
--- class.uidrawing.inc.php 26 Apr 2003 08:14:13 -0000 1.11
***************
*** 23,26 ****
--- 23,27 ----
(
'index' => True,
+ 'view' => True,
'view_file' => True,
'edit' => True,
***************
*** 34,39 ****
$this->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
$this->account =
$GLOBALS['phpgw_info']['user']['account_id'];
- // $GLOBALS['phpgw_info']['flags']['headonly'] = True;
- //$GLOBALS['phpgw_info']['flags']['noheader'] = True;
$this->grants =
$GLOBALS['phpgw']->acl->get_grants($this->currentapp);
$this->grants[$this->account] = PHPGW_ACL_READ +
PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE;
--- 35,38 ----
***************
*** 103,112 ****
'floor'
=> $drawing['floor'],
'address'
=> $drawing['address'],
! 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.view_file&drawing_id='
. $drawing['drawing_id']),
! // 'link_view'
=> $drawing_path . SEP .$drawing['drawing_name'],
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.edit&drawing_id='
. $drawing['drawing_id']),
'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.delete&drawing_id='
. $drawing['drawing_id']),
! 'lang_view_statustext' =>
lang('view the drawing'),
! 'lang_edit_statustext' =>
lang('edit the drawing'),
'lang_delete_statustext' =>
lang('delete this drawing'),
'text_view'
=> lang('view'),
--- 102,112 ----
'floor'
=> $drawing['floor'],
'address'
=> $drawing['address'],
! 'link_view_file'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.view_file&drawing_id='
. $drawing['drawing_id']),
! 'link_view'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.view&drawing_id='
. $drawing['drawing_id']),
'link_edit'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.edit&drawing_id='
. $drawing['drawing_id']),
'link_delete'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.delete&drawing_id='
. $drawing['drawing_id']),
! 'lang_view_file_statustext' =>
lang('view the drawing'),
! 'lang_view_statustext' =>
lang('view information about the drawing'),
! 'lang_edit_statustext' =>
lang('edit information about the drawing'),
'lang_delete_statustext' =>
lang('delete this drawing'),
'text_view'
=> lang('view'),
***************
*** 567,579 ****
function view()
{
! $id = get_var('id',array('POST','GET'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('project'));
! $this->config->read_repository();
! $values = $this->bo->read_single($id);
! $record_history = $this->bo->read_record_history($id);
$table_header_history[] = array
--- 567,603 ----
function view()
{
! $drawing_id =
get_var('drawing_id',array('POST','GET'));
! $values =
get_var('values',array('POST'));
! $GLOBALS['phpgw']->xslttpl->add_file(array('drawing'));
! $this->create_home_dir();
!
! if($values)
! {
! $values = $values +
$this->bocommon->get_location();
! }
! else
! {
! $location_code =
get_var('location_code',array('POST','GET'));
! $values['equipment_id'] =
get_var('equipment_id',array('POST','GET'));
! $values['descr'] =
get_var('descr',array('POST','GET'));
!
! if($location_code)
! {
!
$location_data=$this->bocommon->read_location_data($location_code);
!
! $values=$values + $location_data;
! }
! }
! $values['drawing_date'] =
get_var('drawing_date',array('POST'));
! $values['vendor_id'] =
get_var('vendor_id',array('POST'));
! //_debug_array($values);
!
! $values = $this->bo->read_single($drawing_id);
! $function_msg = lang('view drawing');
! $record_history =
$this->bo->read_record_history($drawing_id);
$table_header_history[] = array
***************
*** 585,596 ****
);
- $table_header_workorder_budget[] = array
- (
- 'lang_workorder_id' => lang('Workorder'),
- 'lang_sum' => lang('Sum')
- );
-
- $function_msg = lang('View Project');
-
if ($values['cat_id'])
{
--- 609,612 ----
***************
*** 602,606 ****
'location_type' => 'view',
'equipment' => true,
! 'tenant' => true,
'address' => true,
'equipment_id' =>
$values['equipment_id'],
--- 618,622 ----
'location_type' => 'view',
'equipment' => true,
! 'entrance' => true,
'address' => true,
'equipment_id' =>
$values['equipment_id'],
***************
*** 612,625 ****
'street_name' =>
$values['street_name'],
'street_number' =>
$values['street_number'],
- 'tenant_id' =>
$values['tenant_id'],
- 'tenant_name' =>
$values['tenant_name'],
- 'tenant_phone' =>
$values['tenant_phone'],
'apartment_id' =>
$values['apartment_id']));
$data = array
(
! 'table_header_workorder_budget' =>
$table_header_workorder_budget,
! 'lang_no_workorders' =>
lang('No workorder bugdet'),
! 'workorder_link'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiworkorder.view'),
'record_history'
=> $record_history,
'table_header_history' =>
$table_header_history,
--- 628,659 ----
'street_name' =>
$values['street_name'],
'street_number' =>
$values['street_number'],
'apartment_id' =>
$values['apartment_id']));
+
+
+
$vendor_data=$this->bocommon->initiate_ui_vendorlookup(array(
+ 'type' =>
'view',
+ 'vendor_id' =>
$values['vendor_id'],
+ 'vendor_name' =>
$values['vendor_name']));
+
+
+ $link_data = array
+ (
+ 'menuaction' =>
$this->currentapp.'.uidrawing.edit',
+ 'drawing_id' => $drawing_id
+ );
+
+ $dateformat =
strtolower($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $sep = '/';
+ $dlarr[strpos($dateformat,'y')] = 'yyyy';
+ $dlarr[strpos($dateformat,'m')] = 'MM';
+ $dlarr[strpos($dateformat,'d')] = 'DD';
+ ksort($dlarr);
+
+ $dateformat= (implode($sep,$dlarr));
+
$data = array
(
! 'vendor_data'
=> $vendor_data,
'record_history'
=> $record_history,
'table_header_history' =>
$table_header_history,
***************
*** 627,674 ****
'lang_no_history'
=> lang('No history'),
! 'lang_start_date'
=> lang('Project start date'),
! 'value_start_date'
=> $values['start_date'],
!
! 'lang_end_date'
=> lang('Project end date'),
! 'value_end_date'
=> $values['end_date'],
!
! 'lang_charge_tenant' =>
lang('Charge tenant'),
! 'charge_tenant'
=> $values['charge_tenant'],
!
! 'lang_power_meter'
=> lang('Power meter'),
! 'value_power_meter'
=> $values['power_meter'],
! 'lang_budget'
=> lang('Budget'),
! 'value_budget'
=> $values['budget'],
'vendor_data'
=> $vendor_data,
'location_data'
=> $location_data,
! 'location_type'
=> 'view',
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.index'),
'lang_year'
=> lang('Year'),
'lang_category'
=> lang('category'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
- 'lang_name'
=> lang('Name'),
! 'lang_project_id'
=> lang('Project ID'),
! 'value_project_id'
=> $values['project_id'],
! 'value_name'
=> $values['name'],
! 'lang_other_branch'
=> lang('Other branch'),
! 'value_other_branch'
=> $values['other_branch'],
'lang_descr'
=> lang('Description'),
'value_descr'
=> $values['descr'],
'lang_done_statustext' =>
lang('Back to the list'),
'select_name'
=> 'values[cat_id]',
! 'cat_list'
=> $this->bo->select_category_project_list('select',$values['cat_id']),
!
! 'lang_workorder_id'
=> lang('Workorder ID'),
! 'sum_workorder_budget' =>
$values['sum_workorder_budget'],
! 'workorder_budget'
=> $values['workorder_budget'],
'lang_coordinator'
=> lang('Coordinator'),
! 'lang_sum'
=> lang('Sum'),
'select_user_name'
=> 'values[coordinator]',
'lang_no_user'
=> lang('Select coordinator'),
--- 661,720 ----
'lang_no_history'
=> lang('No history'),
! 'calendar_gif'
=> './'.$this->currentapp.'/templates/default/images/calendar.gif',
! 'calendar_source'
=> './'.$this->currentapp.'/inc/calendar.js',
! 'dateformat'
=> $dateformat,
! 'lang_popup_calendar' =>
lang('Popup Calendar'),
! 'link_calendar_drawing_date' =>
'setDateField(document.form.drawing_date);top.newWin=window.open('."'.".'/'.$this->currentapp.'/inc/calendar.html'."'".','."'".'cal'."'".','."'dependent=yes,width=210,height=230,screenX=200,screenY=300,titlebar=yes'".')',
! 'lang_drawing_date_statustext' => lang('Select
date the drawing was created'),
! 'lang_drawing_date'
=> lang('Drawing date'),
! 'value_drawing_date' =>
$values['drawing_date'],
'vendor_data'
=> $vendor_data,
'location_data'
=> $location_data,
! 'location_type'
=> 'form',
! 'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
! 'done_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.index'),
'lang_year'
=> lang('Year'),
'lang_category'
=> lang('category'),
'lang_save'
=> lang('save'),
'lang_done'
=> lang('done'),
! 'lang_update_file'
=> lang('Update file'),
!
! 'lang_drawing_id'
=> lang('Drawing ID'),
! 'value_drawing_id'
=> $drawing_id,
!
! 'lang_drawing_name'
=> lang('Drawing name'),
! 'value_drawing_name' =>
$values['drawing_name'],
! 'lang_drawing_name_statustext'
=> lang('Enter drawing Name'),
! 'lang_floor_id'
=> lang('Floor ID'),
! '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'),
+ 'value_version'
=> $values['version'],
+ 'lang_version_statustext' =>
lang('Enter drawing version'),
+
+ 'error'
=> $receipt['error'],
+ 'message'
=> $receipt['message'],
+ 'lang_descr_statustext' =>
lang('Enter a description of the drawing'),
'lang_descr'
=> lang('Description'),
'value_descr'
=> $values['descr'],
'lang_done_statustext' =>
lang('Back to the list'),
+ 'lang_save_statustext' =>
lang('Save the drawing'),
+ 'lang_no_cat'
=> lang('Select category'),
+ 'lang_cat_statustext' =>
lang('Select the category the drawing belongs to. To do not use a category
select NO CATEGORY'),
'select_name'
=> 'values[cat_id]',
! 'value_cat_id'
=> $values['cat_id'],
! 'cat_list'
=> $this->bo->select_category_list('select',$values['cat_id']),
'lang_coordinator'
=> lang('Coordinator'),
! 'lang_user_statustext' =>
lang('Select the coordinator the drawing belongs to. To do not use a category
select NO USER'),
'select_user_name'
=> 'values[coordinator]',
'lang_no_user'
=> lang('Select coordinator'),
***************
*** 676,698 ****
'status_list'
=> $this->bo->select_status_list('select',$values['status']),
'lang_no_status'
=> lang('Select status'),
'lang_status'
=> lang('Status'),
- 'branch_list'
=> $this->bo->select_branch_p_list($values['project_id']),
- 'lang_branch'
=> lang('branch'),
-
- 'key_responsible_list'
=> $this->bo->select_branch_list($values['key_responsible']),
- 'lang_key_responsible'
=> lang('key responsible'),
-
- 'key_fetch_list'
=> $this->bo->select_key_location_list($values['key_fetch']),
- 'lang_key_fetch'
=> lang('key fetch location'),
! 'key_deliver_list'
=> $this->bo->select_key_location_list($values['key_deliver']),
! 'lang_key_deliver'
=> lang('key deliver location'),
! 'edit_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uiproject.edit&id='
. $id),
! 'lang_edit_statustext'
=> lang('Edit this entry project'),
! 'lang_edit'
=> lang('Edit'),
! 'currency'
=>
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency']
);
--- 722,739 ----
'status_list'
=> $this->bo->select_status_list('select',$values['status']),
+ 'select_status_name' =>
'values[status]',
'lang_no_status'
=> lang('Select status'),
'lang_status'
=> lang('Status'),
+ 'lang_status_statustext' =>
lang('What is the current status of this drawing ?'),
! 'branch_list'
=> $this->bo->select_branch_list($values['branch_id']),
! 'lang_no_branch'
=> lang('No branch'),
! 'lang_branch'
=> lang('branch'),
! 'lang_branch_statustext' =>
lang('Select the branch for this drawing'),
! 'edit_action'
=>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->currentapp.'.uidrawing.edit&drawing_id='
. $drawing_id),
! 'lang_edit_statustext'
=> lang('Edit this entry'),
! 'lang_edit'
=> lang('Edit')
);
***************
*** 702,705 ****
--- 743,749 ----
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
}
+
+
+
}
?>
Index: class.uilookup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uilookup.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.uilookup.inc.php 25 Apr 2003 11:36:53 -0000 1.15
--- class.uilookup.inc.php 26 Apr 2003 08:14:13 -0000 1.16
***************
*** 33,36 ****
--- 33,37 ----
function uilookup()
{
+ $GLOBALS['phpgw_info']['flags']['headonly']=true;
$GLOBALS['phpgw_info']['flags']['xslt_app'] = True;
$this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
***************
*** 75,79 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('lookup',
'nextmatchs',
-
'headonly',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 76,79 ----
***************
*** 188,192 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('lookup',
'nextmatchs',
-
'headonly',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 188,191 ----
***************
*** 287,291 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('lookup',
'nextmatchs',
-
'headonly',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 286,289 ----
***************
*** 383,387 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('lookup',
'nextmatchs',
-
'headonly',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 381,384 ----
***************
*** 478,482 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('lookup',
'nextmatchs',
-
'headonly',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 475,478 ----
***************
*** 634,637 ****
--- 630,634 ----
'lang_searchbutton_statustext' => lang('Submit
the search string'),
'query'
=> $this->query,
+ 'lang_search'
=> lang('search'),
'lang_select'
=> lang('Select'),
'table_header_'.$list =>
$table_header,
***************
*** 652,656 ****
$GLOBALS['phpgw']->xslttpl->add_file(array('lookup',
'nextmatchs',
-
'headonly',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'filter_select',
$GLOBALS['phpgw']->common->get_tpl_dir('phpgwapi','default') . SEP .
'search_field'));
--- 649,652 ----
Index: class.uirequest.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/property/inc/class.uirequest.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** class.uirequest.inc.php 25 Apr 2003 11:36:53 -0000 1.7
--- class.uirequest.inc.php 26 Apr 2003 08:14:13 -0000 1.8
***************
*** 257,264 ****
function priority_key()
{
!
! $GLOBALS['phpgw']->xslttpl->add_file(array('request',
!
'headonly'));
!
$values = get_var('values',array('POST','GET'));
--- 257,262 ----
function priority_key()
{
! $GLOBALS['phpgw']->xslttpl->add_file(array('request'));
! $GLOBALS['phpgw_info']['flags']['headonly']=true;
$values = get_var('values',array('POST','GET'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: property/inc class.bocommon.inc.php,1.38,1.39 class.uidrawing.inc.php,1.10,1.11 class.uilookup.inc.php,1.15,1.16 class.uirequest.inc.php,1.7,1.8,
Sigurd Nes <address@hidden> <=