|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [6705] Property: formatting: intend |
| Date: | Sun, 26 Dec 2010 23:10:56 +0000 |
Revision: 6705
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6705
Author: sigurdne
Date: 2010-12-26 23:10:55 +0000 (Sun, 26 Dec 2010)
Log Message:
-----------
Property: formatting: intend
Modified Paths:
--------------
trunk/property/inc/class.uiXport.inc.php
trunk/property/inc/class.uiresponsible.inc.php
trunk/property/inc/class.uis_agreement.inc.php
trunk/property/inc/class.uitemplate.inc.php
trunk/property/inc/class.uitenant_claim.inc.php
trunk/property/inc/class.uitts.inc.php
trunk/property/inc/class.uiwo_hour.inc.php
trunk/property/inc/class.uiworkorder.inc.php
trunk/property/templates/base/abook_form.xsl
trunk/property/templates/base/abook_view.xsl
trunk/property/templates/base/admin.xsl
trunk/property/templates/base/admin_entity.xsl
trunk/property/templates/base/admin_location.xsl
trunk/property/templates/base/agreement.xsl
trunk/property/templates/base/alarm.xsl
trunk/property/templates/base/alarm_form.xsl
trunk/property/templates/base/alarm_view.xsl
trunk/property/templates/base/app_data.xsl
trunk/property/templates/base/app_delete.xsl
trunk/property/templates/base/async.xsl
trunk/property/templates/base/attrib_history.xsl
trunk/property/templates/base/attributes_view.xsl
trunk/property/templates/base/b_account_form.xsl
trunk/property/templates/base/b_account_view.xsl
trunk/property/templates/base/branch_select.xsl
trunk/property/templates/base/budget.xsl
trunk/property/templates/base/building_part_select.xsl
trunk/property/templates/base/calendar_info.xsl
trunk/property/templates/base/cat_filter.xsl
trunk/property/templates/base/cat_select.xsl
trunk/property/templates/base/cat_sub_select.xsl
trunk/property/templates/base/chapter_filter.xsl
trunk/property/templates/base/chapter_select.xsl
trunk/property/templates/base/choice.xsl
trunk/property/templates/base/columns.xsl
trunk/property/templates/base/config.tpl
trunk/property/templates/base/confirm_custom.xsl
trunk/property/templates/base/custom.xsl
trunk/property/templates/base/date_search.xsl
trunk/property/templates/base/dim_d_select.xsl
trunk/property/templates/base/document.xsl
trunk/property/templates/base/ecodimb_view.xsl
trunk/property/templates/base/entity.xsl
trunk/property/templates/base/event.xsl
trunk/property/templates/base/event_form.xsl
trunk/property/templates/base/event_schedule.xsl
trunk/property/templates/base/event_schedule_week.xsl
trunk/property/templates/base/files.xsl
trunk/property/templates/base/fileuploader.xsl
trunk/property/templates/base/filter_district.xsl
trunk/property/templates/base/filter_filter.xsl
trunk/property/templates/base/filter_location.xsl
trunk/property/templates/base/filter_member_of.xsl
trunk/property/templates/base/filter_part_of_town.xsl
trunk/property/templates/base/filter_permission.xsl
trunk/property/templates/base/filter_select.xsl
trunk/property/templates/base/filter_submodule.xsl
trunk/property/templates/base/filter_vendor.xsl
trunk/property/templates/base/gab.xsl
trunk/property/templates/base/generic.xsl
trunk/property/templates/base/group_filter.xsl
trunk/property/templates/base/group_select.xsl
trunk/property/templates/base/grouping_select.xsl
trunk/property/templates/base/help_data.xsl
trunk/property/templates/base/hour_data_view.xsl
trunk/property/templates/base/ifc.xsl
trunk/property/templates/base/import.xsl
trunk/property/templates/base/investment.xsl
trunk/property/templates/base/invoice.xsl
trunk/property/templates/base/jasper.xsl
trunk/property/templates/base/location.xsl
trunk/property/templates/base/location_form.xsl
trunk/property/templates/base/location_view.xsl
trunk/property/templates/base/lookup.xsl
trunk/property/templates/base/menu.xsl
trunk/property/templates/base/migrate.xsl
trunk/property/templates/base/nextmatchs.xsl
trunk/property/templates/base/no_access.xsl
trunk/property/templates/base/owner_filter.xsl
trunk/property/templates/base/owner_select.xsl
trunk/property/templates/base/pricebook.xsl
trunk/property/templates/base/project.xsl
trunk/property/templates/base/project_group_form.xsl
trunk/property/templates/base/project_group_view.xsl
trunk/property/templates/base/request.xsl
trunk/property/templates/base/responsible.xsl
trunk/property/templates/base/s_agreement.xsl
trunk/property/templates/base/search_field.xsl
trunk/property/templates/base/search_field_grouped.xsl
trunk/property/templates/base/select_district.xsl
trunk/property/templates/base/select_location.xsl
trunk/property/templates/base/select_multi_user.xsl
trunk/property/templates/base/select_part_of_town.xsl
trunk/property/templates/base/select_permission.xsl
trunk/property/templates/base/select_submodule.xsl
trunk/property/templates/base/select_vendor.xsl
trunk/property/templates/base/status_filter.xsl
trunk/property/templates/base/status_select.xsl
trunk/property/templates/base/table_header.xsl
trunk/property/templates/base/template.xsl
trunk/property/templates/base/tenant_claim.xsl
trunk/property/templates/base/tenant_form.xsl
trunk/property/templates/base/tenant_view.xsl
trunk/property/templates/base/tolerance_select.xsl
trunk/property/templates/base/tts.xsl
trunk/property/templates/base/unit_select.xsl
trunk/property/templates/base/user_id_filter.xsl
trunk/property/templates/base/user_id_select.xsl
trunk/property/templates/base/user_lid_filter.xsl
trunk/property/templates/base/user_lid_select.xsl
trunk/property/templates/base/values.xsl
trunk/property/templates/base/vendor_form.xsl
trunk/property/templates/base/vendor_view.xsl
trunk/property/templates/base/wo_hour.xsl
trunk/property/templates/base/wo_hour_cat_filter.xsl
trunk/property/templates/base/wo_hour_cat_select.xsl
trunk/property/templates/base/workorder.xsl
Modified: trunk/property/inc/class.uiXport.inc.php
===================================================================
--- trunk/property/inc/class.uiXport.inc.php 2010-12-25 23:13:55 UTC (rev
6704)
+++ trunk/property/inc/class.uiXport.inc.php 2010-12-26 23:10:55 UTC (rev
6705)
@@ -37,11 +37,11 @@
class property_uiXport
{
var $public_functions = array
- (
- 'import' => true,
- 'export' => true,
- 'rollback' => true
- );
+ (
+ 'import' => true,
+ 'export' => true,
+ 'rollback' => true
+ );
var $start;
var $query;
@@ -55,7 +55,6 @@
$GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
$GLOBALS['phpgw_info']['flags']['menu_selection'] =
'property::invoice';
- // $this->currentapp =
$GLOBALS['phpgw_info']['flags']['currentapp'];
$this->bo =
CreateObject('property.boXport',true);
$this->invoice =
CreateObject('property.boinvoice');
$this->bocommon =
CreateObject('property.bocommon');
@@ -92,16 +91,16 @@
$art = phpgw::get_var('art',
'int');
$type =
phpgw::get_var('type');
$dim_b =
phpgw::get_var('dim_b', 'int');
- $invoice_num =
phpgw::get_var('invoice_num');
+ $invoice_num = phpgw::get_var('invoice_num');
$kid_nr =
phpgw::get_var('kid_nr');
$vendor_id =
phpgw::get_var('vendor_id', 'int');
- $vendor_name =
phpgw::get_var('vendor_name');
+ $vendor_name = phpgw::get_var('vendor_name');
$janitor =
phpgw::get_var('janitor');
$supervisor =
phpgw::get_var('supervisor');
- $budget_responsible =
phpgw::get_var('budget_responsible');
- $invoice_date =
urldecode(phpgw::get_var('invoice_date'));
+ $budget_responsible =
phpgw::get_var('budget_responsible');
+ $invoice_date =
urldecode(phpgw::get_var('invoice_date'));
$num_days =
phpgw::get_var('num_days', 'int');
- $payment_date =
urldecode(phpgw::get_var('payment_date'));
+ $payment_date =
urldecode(phpgw::get_var('payment_date'));
$cancel =
phpgw::get_var('cancel', 'bool');
$convert =
phpgw::get_var('convert', 'bool');
$conv_type =
phpgw::get_var('conv_type');
@@ -178,47 +177,48 @@
if($invoice_date)
{
$sdateparts =
phpgwapi_datetime::date_array($invoice_date);
- $sday = $sdateparts['day'];
- $smonth = $sdateparts['month'];
- $syear = $sdateparts['year'];
- unset($sdateparts);
+ $sday = $sdateparts['day'];
+ $smonth = $sdateparts['month'];
+ $syear = $sdateparts['year'];
+ unset($sdateparts);
$edateparts =
phpgwapi_datetime::date_array($payment_date);
- $eday = $edateparts['day'];
- $emonth = $edateparts['month'];
- $eyear = $edateparts['year'];
- unset($edateparts);
+ $eday = $edateparts['day'];
+ $emonth = $edateparts['month'];
+ $eyear = $edateparts['year'];
+ unset($edateparts);
}
$old = $tsvfile;
$tsvfile =
$GLOBALS['phpgw_info']['server']['temp_dir'].'/invoice_import_'.basename($tsvfile);
rename($old,$tsvfile);
- $invoice_common=array(
- 'bilagsnr'
=> $this->invoice->next_bilagsnr(),
- 'art'
=> $art,
- 'type'
=> $type,
- 'dim_b'
=> $dim_b,
- 'invoice_num'
=> $invoice_num,
- 'kid_nr'
=> $kid_nr,
- 'vendor_id'
=> $vendor_id,
- 'vendor_name'
=> $vendor_name,
- 'janitor'
=> $janitor,
- 'supervisor'
=> $supervisor,
-
'budget_responsible' => $budget_responsible,
- 'num_days'
=> $num_days,
- 'sday'
=> $sday,
- 'smonth'
=> $smonth,
- 'syear'
=> $syear,
- 'eday'
=> $eday,
- 'emonth'
=> $emonth,
- 'eyear'
=> $eyear,
- 'tsvfile'
=> $tsvfile,
- 'conv_type'
=> $conv_type,
- 'invoice_date'
=> $invoice_date,
- 'payment_date'
=> $payment_date,
- 'auto_tax'
=> $auto_tax
- );
+ $invoice_common=array
+ (
+ 'bilagsnr'
=> $this->invoice->next_bilagsnr(),
+ 'art'
=> $art,
+ 'type'
=> $type,
+ 'dim_b'
=> $dim_b,
+ 'invoice_num'
=> $invoice_num,
+ 'kid_nr'
=> $kid_nr,
+ 'vendor_id'
=> $vendor_id,
+ 'vendor_name'
=> $vendor_name,
+ 'janitor'
=> $janitor,
+ 'supervisor'
=> $supervisor,
+ 'budget_responsible'
=> $budget_responsible,
+ 'num_days'
=> $num_days,
+ 'sday'
=> $sday,
+ 'smonth'
=> $smonth,
+ 'syear'
=> $syear,
+ 'eday'
=> $eday,
+ 'emonth'
=> $emonth,
+ 'eyear'
=> $eyear,
+ 'tsvfile'
=> $tsvfile,
+ 'conv_type'
=> $conv_type,
+ 'invoice_date'
=> $invoice_date,
+ 'payment_date'
=> $payment_date,
+ 'auto_tax'
=> $auto_tax
+ );
$buffer =
$this->bo->import($invoice_common,$download);
@@ -243,7 +243,7 @@
unset($payment_date);
unset($conv_type);
unset($auto_tax);
-//
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uiXport.import'));
+ //
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uiXport.import'));
}
else
{
@@ -258,10 +258,10 @@
set_time_limit(0);
$link_data = array
- (
- 'menuaction' => 'property.uiXport.import',
- 'sub' => $sub
- );
+ (
+ 'menuaction' =>
'property.uiXport.import',
+ 'sub' => $sub
+ );
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -271,107 +271,107 @@
$jscal->add_listener('payment_date');
$data = array
- (
- 'menu'
=> $this->bocommon->get_menu(),
- 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
+ (
+ 'menu'
=> $this->bocommon->get_menu(),
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
- 'lang_datetitle'
=> lang('Select date'),
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
+ 'lang_datetitle'
=> lang('Select date'),
- 'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'cancel_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiinvoice.index', 'sub'=> $sub)),
- 'lang_cancel'
=> lang('Cancel'),
- 'lang_cancel_statustext'
=> lang('cancel the import'),
- 'action_url'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 'property'
.'.uiXport.import')),
- 'tsvfilename'
=> '',
+ 'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
+ 'cancel_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiinvoice.index', 'sub'=> $sub)),
+ 'lang_cancel'
=> lang('Cancel'),
+ 'lang_cancel_statustext'
=> lang('cancel the import'),
+ 'action_url'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property' .'.uiXport.import')),
+ 'tsvfilename'
=> '',
- 'lang_debug'
=> lang('Debug output in browser'),
- 'lang_debug_statustext'
=> lang('Check this to have the output to screen before import (recommended)'),
- 'value_debug'
=> $download,
+ 'lang_debug'
=> lang('Debug output in browser'),
+ 'lang_debug_statustext'
=> lang('Check this to have the output to screen before import
(recommended)'),
+ 'value_debug'
=> $download,
- 'lang_import'
=> lang('Import'),
- 'lang_import_statustext'
=> lang('click this button to start the import'),
+ 'lang_import'
=> lang('Import'),
+ 'lang_import_statustext'
=> lang('click this button to start the import'),
- 'lang_invoice_date'
=> lang('invoice date'),
- 'lang_payment_date'
=> lang('Payment date'),
- 'lang_no_of_days'
=> lang('Days'),
- 'lang_invoice_number'
=> lang('Invoice Number'),
- 'lang_invoice_num_statustext'
=> lang('Enter Invoice Number'),
+ 'lang_invoice_date'
=> lang('invoice date'),
+ 'lang_payment_date'
=> lang('Payment date'),
+ 'lang_no_of_days'
=> lang('Days'),
+ 'lang_invoice_number'
=> lang('Invoice Number'),
+ 'lang_invoice_num_statustext'
=> lang('Enter Invoice Number'),
- 'lang_select'
=> lang('Select per button !'),
- 'lang_kidnr'
=> lang('KID nr'),
- 'lang_kid_nr_statustext'
=> lang('Enter Kid nr'),
+ 'lang_select'
=> lang('Select per button !'),
+ 'lang_kidnr'
=> lang('KID nr'),
+ 'lang_kid_nr_statustext'
=> lang('Enter Kid nr'),
- 'lang_vendor'
=> lang('Vendor'),
- 'addressbook_link'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uilookup.vendor')),
+ 'lang_vendor'
=> lang('Vendor'),
+ 'addressbook_link'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uilookup.vendor')),
- 'lang_invoice_date_statustext'
=> lang('Enter the invoice date'),
- 'lang_num_days_statustext'
=> lang('Enter the payment date or the payment delay'),
- 'lang_payment_date_statustext'
=> lang('Enter the payment date or the payment delay'),
- 'lang_file_statustext'
=> lang('Select the file to import from'),
- 'lang_vendor_statustext'
=> lang('Select the vendor by clicking the button'),
- 'lang_vendor_name_statustext'
=> lang('Select the vendor by clicking the button'),
- 'lang_select_vendor_statustext'
=> lang('Select the vendor by clicking this button'),
+ 'lang_invoice_date_statustext'
=> lang('Enter the invoice date'),
+ 'lang_num_days_statustext'
=> lang('Enter the payment date or the payment delay'),
+ 'lang_payment_date_statustext'
=> lang('Enter the payment date or the payment delay'),
+ 'lang_file_statustext'
=> lang('Select the file to import from'),
+ 'lang_vendor_statustext'
=> lang('Select the vendor by clicking the button'),
+ 'lang_vendor_name_statustext'
=> lang('Select the vendor by clicking the button'),
+ 'lang_select_vendor_statustext'
=> lang('Select the vendor by clicking this button'),
- 'value_invoice_date'
=> $invoice_date,
- 'value_payment_date'
=> $payment_date,
- 'value_belop'
=> $belop,
- 'value_vendor_id'
=> $vendor_id,
- 'value_vendor_name'
=> $vendor_name,
- 'value_kid_nr'
=> $kid_nr,
- 'value_dim_b'
=> $dim_b,
- 'value_invoice_num'
=> $invoice_num,
- 'value_merknad'
=> $merknad,
- 'value_num_days'
=> $num_days,
-// 'value_tsvfile'
=> $tsvfile,
+ 'value_invoice_date'
=> $invoice_date,
+ 'value_payment_date'
=> $payment_date,
+ 'value_belop'
=> $belop,
+ 'value_vendor_id'
=> $vendor_id,
+ 'value_vendor_name'
=> $vendor_name,
+ 'value_kid_nr'
=> $kid_nr,
+ 'value_dim_b'
=> $dim_b,
+ 'value_invoice_num'
=> $invoice_num,
+ 'value_merknad'
=> $merknad,
+ 'value_num_days'
=> $num_days,
+ // 'value_tsvfile'
=> $tsvfile,
- 'lang_file'
=> lang('File'),
- 'lang_conv'
=> lang('Conversion'),
- 'conv_list'
=> $this->bo->select_import_conv($conv_type),
- 'select_conv'
=> 'conv_type',
- 'lang_select_conversion'
=> lang('Select the type of conversion:'),
- 'lang_conv_statustext'
=> lang('You have to select the Conversion for this import'),
+ 'lang_file'
=> lang('File'),
+ 'lang_conv'
=> lang('Conversion'),
+ 'conv_list'
=> $this->bo->select_import_conv($conv_type),
+ 'select_conv'
=> 'conv_type',
+ 'lang_select_conversion'
=> lang('Select the type of conversion:'),
+ 'lang_conv_statustext'
=> lang('You have to select the Conversion for this import'),
- 'lang_auto_tax'
=> lang('Auto TAX'),
- 'lang_auto_tax_statustext'
=> lang('Set tax during import'),
+ 'lang_auto_tax'
=> lang('Auto TAX'),
+ 'lang_auto_tax_statustext'
=> lang('Set tax during import'),
- 'lang_art'
=> lang('Art'),
- 'art_list'
=> $this->invoice->get_lisfm_ecoart($art),
- 'select_art'
=> 'art',
- 'lang_select_art'
=> lang('Select Invoice Type'),
- 'lang_art_statustext'
=> lang('You have to select type of invoice'),
+ 'lang_art'
=> lang('Art'),
+ 'art_list'
=> $this->invoice->get_lisfm_ecoart($art),
+ 'select_art'
=> 'art',
+ 'lang_select_art'
=> lang('Select Invoice Type'),
+ 'lang_art_statustext'
=> lang('You have to select type of invoice'),
- 'lang_type'
=> lang('Type invoice II'),
- 'type_list'
=> $this->invoice->get_type_list($type),
- 'select_type'
=> 'type',
- 'lang_no_type'
=> lang('No type'),
- 'lang_type_statustext'
=> lang('Select the type invoice. To do not use type - select NO TYPE'),
+ 'lang_type'
=> lang('Type invoice II'),
+ 'type_list'
=> $this->invoice->get_type_list($type),
+ 'select_type'
=> 'type',
+ 'lang_no_type'
=> lang('No type'),
+ 'lang_type_statustext'
=> lang('Select the type invoice. To do not use type - select NO
TYPE'),
- 'lang_dimb'
=> lang('Dim B'),
- 'dimb_list'
=> $this->invoice->select_dimb_list($dim_b),
- 'select_dimb'
=> 'dim_b',
- 'lang_no_dimb'
=> lang('No Dim B'),
- 'lang_dimb_statustext'
=> lang('Select the Dim B for this invoice. To do not use Dim B - select NO
DIM B'),
+ 'lang_dimb'
=> lang('Dim B'),
+ 'dimb_list'
=> $this->invoice->select_dimb_list($dim_b),
+ 'select_dimb'
=> 'dim_b',
+ 'lang_no_dimb'
=> lang('No Dim B'),
+ 'lang_dimb_statustext'
=> lang('Select the Dim B for this invoice. To do not use Dim B -
select NO DIM B'),
- 'lang_janitor'
=> lang('Janitor'),
- 'janitor_list'
=> $this->bocommon->get_user_list_right(32,$janitor,'.invoice'),
- 'select_janitor'
=> 'janitor',
- 'lang_no_janitor'
=> lang('No janitor'),
- 'lang_janitor_statustext'
=> lang('Select the janitor responsible for this invoice. To do not use janitor
- select NO JANITOR'),
+ 'lang_janitor'
=> lang('Janitor'),
+ 'janitor_list'
=> $this->bocommon->get_user_list_right(32,$janitor,'.invoice'),
+ 'select_janitor'
=> 'janitor',
+ 'lang_no_janitor'
=> lang('No janitor'),
+ 'lang_janitor_statustext'
=> lang('Select the janitor responsible for this invoice. To do not use
janitor - select NO JANITOR'),
- 'lang_supervisor'
=> lang('Supervisor'),
- 'supervisor_list'
=> $this->bocommon->get_user_list_right(64,$supervisor,'.invoice'),
- 'select_supervisor'
=> 'supervisor',
- 'lang_no_supervisor'
=> lang('No supervisor'),
- 'lang_supervisor_statustext'
=> lang('Select the supervisor responsible for this invoice. To do not use
supervisor - select NO SUPERVISOR'),
+ 'lang_supervisor'
=> lang('Supervisor'),
+ 'supervisor_list'
=>
$this->bocommon->get_user_list_right(64,$supervisor,'.invoice'),
+ 'select_supervisor'
=> 'supervisor',
+ 'lang_no_supervisor'
=> lang('No supervisor'),
+ 'lang_supervisor_statustext'
=> lang('Select the supervisor responsible for this invoice. To do not use
supervisor - select NO SUPERVISOR'),
- 'lang_budget_responsible'
=> lang('B - responsible'),
- 'budget_responsible_list'
=> $this->bocommon->get_user_list_right(128,$budget_responsible,'.invoice'),
- 'select_budget_responsible'
=> 'budget_responsible',
- 'lang_select_budget_responsible'
=> lang('Select B-Responsible'),
- 'lang_budget_responsible_statustext'
=> lang('You have to select a budget responsible for this invoice in order to
make the import')
- );
+ 'lang_budget_responsible'
=> lang('B - responsible'),
+ 'budget_responsible_list'
=>
$this->bocommon->get_user_list_right(128,$budget_responsible,'.invoice'),
+ 'select_budget_responsible'
=> 'budget_responsible',
+ 'lang_select_budget_responsible'
=> lang('Select B-Responsible'),
+ 'lang_budget_responsible_statustext'=>
lang('You have to select a budget responsible for this invoice in order to make
the import')
+ );
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice'));
@@ -380,7 +380,7 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('import' => $data));
- // $GLOBALS['phpgw']->xslttpl->pp();
+ // $GLOBALS['phpgw']->xslttpl->pp();
}
function debug_import($buffer='',$invoice_common='')
@@ -418,40 +418,40 @@
foreach ($import as $text => $key)
{
$table_header[] = array
- (
- 'header' => $text,
- 'width' => '5%',
- 'align' => 'center'
- );
+ (
+ 'header' => $text,
+ 'width' => '5%',
+ 'align' => 'center'
+ );
}
$link_data_add = array
- (
- 'menuaction' => 'property.uiXport.import',
- 'convert' => 'true'
- );
+ (
+ 'menuaction' =>
'property.uiXport.import',
+ 'convert' => 'true'
+ );
$link_data_cancel = array
- (
- 'menuaction' => 'property.uiXport.import',
- 'cancel' => true
+ (
+ 'menuaction' =>
'property.uiXport.import',
+ 'cancel' => true
- );
+ );
$link_data_add = $link_data_add +
$invoice_common;
$link_data_cancel = $link_data_cancel +
$invoice_common;
$table_add[] = array
- (
- 'lang_add'
=> lang('Import'),
- 'lang_add_statustext' => lang('Import
this invoice'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data_add),
- 'lang_cancel' =>
lang('cancel'),
- 'lang_cancel_statustext' => lang('Do not
import this invoice'),
- 'cancel_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data_cancel)
+ (
+ 'lang_add'
=> lang('Import'),
+ 'lang_add_statustext' =>
lang('Import this invoice'),
+ 'add_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data_add),
+ 'lang_cancel'
=> lang('cancel'),
+ 'lang_cancel_statustext' =>
lang('Do not import this invoice'),
+ 'cancel_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data_cancel)
- );
+ );
$vendor = $this->contacts->read_single(array('id' =>
$invoice_common['vendor_id']), array('attributes'=>array(array('column_name' =>
'org_name'))));
@@ -465,30 +465,30 @@
}
$data = array
- (
- 'artid'
=> $invoice_common['art'],
- 'lang_type'
=> lang('Type'),
- 'lang_bilagsnr'
=> lang('bilagsnr'),
- 'bilagsnr'
=> $invoice_common['bilagsnr'],
- 'lang_vendor'
=> lang('Vendor'),
- 'vendor_name'
=> $vendor_name,
- 'spvend_code'
=> $invoice_common['vendor_id'],
- 'lang_fakturadato'
=> lang('invoice date'),
- 'fakturadato'
=> $invoice_common['invoice_date'],
- 'lang_forfallsdato'
=> lang('Payment date'),
- 'forfallsdato'
=> $table[0]['forfallsdato'],
- 'lang_janitor'
=> lang('Janitor'),
- 'oppsynsmannid'
=> $invoice_common['janitor'],
- 'lang_supervisor'
=> lang('Supervisor'),
- 'saksbehandlerid'
=> $invoice_common['supervisor'],
- 'lang_budget_responsible' =>
lang('Budget Responsible'),
- 'budsjettansvarligid' =>
$invoice_common['budget_responsible'],
- 'lang_sum'
=> lang('Sum'),
- 'sum'
=> number_format($sum, 2, ',', ''),
- 'table_header'
=> $table_header,
- 'values'
=> $content,
- 'table_add'
=> $table_add
- );
+ (
+ 'artid'
=> $invoice_common['art'],
+ 'lang_type'
=> lang('Type'),
+ 'lang_bilagsnr'
=> lang('bilagsnr'),
+ 'bilagsnr'
=> $invoice_common['bilagsnr'],
+ 'lang_vendor'
=> lang('Vendor'),
+ 'vendor_name'
=> $vendor_name,
+ 'spvend_code'
=> $invoice_common['vendor_id'],
+ 'lang_fakturadato'
=> lang('invoice date'),
+ 'fakturadato'
=> $invoice_common['invoice_date'],
+ 'lang_forfallsdato'
=> lang('Payment date'),
+ 'forfallsdato'
=> $table[0]['forfallsdato'],
+ 'lang_janitor'
=> lang('Janitor'),
+ 'oppsynsmannid'
=> $invoice_common['janitor'],
+ 'lang_supervisor'
=> lang('Supervisor'),
+ 'saksbehandlerid'
=> $invoice_common['supervisor'],
+ 'lang_budget_responsible'
=> lang('Budget Responsible'),
+ 'budsjettansvarligid'
=> $invoice_common['budget_responsible'],
+ 'lang_sum'
=> lang('Sum'),
+ 'sum'
=> number_format($sum, 2, ',', ''),
+ 'table_header'
=> $table_header,
+ 'values'
=> $content,
+ 'table_add'
=> $table_add
+ );
unset($content);
@@ -499,7 +499,7 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('debug' => $data));
- // $GLOBALS['phpgw']->xslttpl->pp();
+ // $GLOBALS['phpgw']->xslttpl->pp();
}
function export()
@@ -511,7 +511,7 @@
$GLOBALS['phpgw_info']['flags']['menu_selection'] .=
'::export';
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice',
-
'search_field'));
+ 'search_field'));
$values = phpgw::get_var('values');
$date = phpgw::get_var('date');
@@ -519,12 +519,12 @@
if($values['submit'])
{
- if (!$values['conv_type'] && !$values['file'] ):
+ if (!$values['conv_type'] && !$values['file'] )
{
$receipt['error'][] = array('msg'=>
lang('No conversion type could be located.') . ' - ' . lang('Please choose a
conversion type from the list'));
}
- elseif($values['conv_type'] &&
!$values['file']):
+ else if($values['conv_type'] &&
!$values['file'])
{
$receipt =
$this->bo->export(array('conv_type'=>$values['conv_type'],'download'=>$values['download'],'force_period_year'=>$values['force_period_year']));
if(!$values['download'])
@@ -537,46 +537,45 @@
echo ' <a
href="'.$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiXport.export')) . '">' . lang('Back') . '</a>';
}
}
- endif;
}
else
{
$date =
$GLOBALS['phpgw']->common->show_date(mktime(0,0,0,date("m"),date("d"),date("Y")),$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
-//_debug_array($receipt);
+ //_debug_array($receipt);
$link_data = array
- (
- 'menuaction' =>
'property.uiXport.export'
- );
+ (
+ 'menuaction' =>
'property.uiXport.export'
+ );
$msgbox_data = $this->bocommon->msgbox_data($receipt);
$data = array
- (
- 'menu'
=> $this->bocommon->get_menu(),
- 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'lang_export_statustext' => lang('click
this button to start the export'),
- 'lang_select_conv' =>
lang('Select conversion'),
- 'conv_list'
=> $this->bo->select_export_conv($values['conv_type']),
- 'select_conv' =>
'values[conv_type]',
- 'lang_conv_statustext' => lang('Select
conversion'),
+ (
+ 'menu'
=> $this->bocommon->get_menu(),
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
+ 'lang_export_statustext' =>
lang('click this button to start the export'),
+ 'lang_select_conv'
=> lang('Select conversion'),
+ 'conv_list'
=> $this->bo->select_export_conv($values['conv_type']),
+ 'select_conv'
=> 'values[conv_type]',
+ 'lang_conv_statustext' =>
lang('Select conversion'),
- 'lang_rollback_file' => lang('Roll
back'),
- 'link_rollback_file' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiXport.rollback')),
+ 'lang_rollback_file' =>
lang('Roll back'),
+ 'link_rollback_file' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiXport.rollback')),
- 'lang_export_to_file' => lang('Export
to file'),
- 'value_debug' =>
$values['debug'],
- 'lang_debug_statustext' =>
lang('Uncheck to debug the result'),
+ 'lang_export_to_file' =>
lang('Export to file'),
+ 'value_debug'
=> $values['debug'],
+ 'lang_debug_statustext' =>
lang('Uncheck to debug the result'),
- 'lang_submit' =>
lang('Submit'),
- 'lang_cancel' =>
lang('Cancel'),
+ 'lang_submit'
=> lang('Submit'),
+ 'lang_cancel'
=> lang('Cancel'),
- 'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'lang_save'
=> lang('save')
- );
+ 'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
+ 'lang_save'
=> lang('save')
+ );
-//_debug_array($data);
+ //_debug_array($data);
$appname = lang('Invoice');
$function_msg = lang('Export invoice');
@@ -593,11 +592,11 @@
}
$GLOBALS['phpgw']->xslttpl->add_file(array('invoice',
-
'search_field'));
+ 'search_field'));
$values = phpgw::get_var('values');
$date = phpgw::get_var('date');
-//_debug_array($values);
+ //_debug_array($values);
if($values['submit'])
{
@@ -623,54 +622,52 @@
$link_data = array('menuaction' =>
'property.uiXport.rollback');
-//_debug_array($receipt);
+ //_debug_array($receipt);
$jscal = CreateObject('phpgwapi.jscalendar');
$jscal->add_listener('date');
$msgbox_data = $this->bocommon->msgbox_data($receipt);
$data = array
- (
- 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
+ (
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
- 'lang_datetitle' =>
lang('Select date'),
- 'calendar_setup' =>
"Calendar.setup({inputField : 'date',ifFormat : '" . $jsDateFormat .
"',button : 'date-trigger'});",
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
+ 'lang_datetitle'
=> lang('Select date'),
+ 'calendar_setup'
=> "Calendar.setup({inputField : 'date',ifFormat : '" . $jsDateFormat .
"',button : 'date-trigger'});",
- 'lang_select_conv' =>
lang('Select conversion'),
- 'conv_list' =>
$this->bo->select_export_conv($values['conv_type']),
- 'select_conv' =>
'values[conv_type]',
- 'lang_conv_statustext' =>
lang('Select conversion'),
+ 'lang_select_conv'
=> lang('Select conversion'),
+ 'conv_list'
=> $this->bo->select_export_conv($values['conv_type']),
+ 'select_conv'
=> 'values[conv_type]',
+ 'lang_conv_statustext' =>
lang('Select conversion'),
- 'lang_select_file' =>
lang('Select file to roll back'),
- 'lang_no_file' =>
lang('No file selected'),
- 'lang_file_statustext' =>
lang('Select file to roll back'),
- 'select_file' =>
'values[file]',
+ 'lang_select_file'
=> lang('Select file to roll back'),
+ 'lang_no_file'
=> lang('No file selected'),
+ 'lang_file_statustext' =>
lang('Select file to roll back'),
+ 'select_file'
=> 'values[file]',
- 'rollback_file_list' =>
$this->bo->select_rollback_file($values['file']),
- 'lang_export_to_file' =>
lang('Export to file'),
- 'value_debug' =>
$values['debug'],
+ 'rollback_file_list' =>
$this->bo->select_rollback_file($values['file']),
+ 'lang_export_to_file' =>
lang('Export to file'),
+ 'value_debug'
=> $values['debug'],
- 'value_date' =>
$date,
- 'lang_date' =>
lang('Export date'),
- 'lang_date_statustext' =>
lang('Select date for the file to roll back'),
+ 'value_date'
=> $date,
+ 'lang_date'
=> lang('Export date'),
+ 'lang_date_statustext' =>
lang('Select date for the file to roll back'),
- 'lang_submit' =>
lang('Submit'),
- 'lang_cancel' =>
lang('Cancel'),
+ 'lang_submit'
=> lang('Submit'),
+ 'lang_cancel'
=> lang('Cancel'),
- 'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'lang_save' =>
lang('save')
- );
+ 'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
+ 'lang_save'
=> lang('save')
+ );
-//_debug_array($data);
+ //_debug_array($data);
- $appname = lang('Invoice');
+ $appname = lang('Invoice');
$function_msg = lang('Rollback invoice');
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('rollback' => $data));
- // $GLOBALS['phpgw']->xslttpl->pp();
}
}
-
Modified: trunk/property/inc/class.uiresponsible.inc.php
===================================================================
--- trunk/property/inc/class.uiresponsible.inc.php 2010-12-25 23:13:55 UTC
(rev 6704)
+++ trunk/property/inc/class.uiresponsible.inc.php 2010-12-26 23:10:55 UTC
(rev 6705)
@@ -46,71 +46,71 @@
protected $start = 0;
/**
- * @var string $sort how to sort the queries - ASC/DESC
- */
+ * @var string $sort how to sort the queries - ASC/DESC
+ */
protected $sort;
/**
- * @var string $order field to order by in queries
- */
+ * @var string $order field to order by in queries
+ */
protected $order;
/**
- * @var object $nextmatchs paging handler
- */
+ * @var object $nextmatchs paging handler
+ */
private $nextmatchs;
/**
- * @var object $bo business logic
- */
+ * @var object $bo business logic
+ */
protected $bo;
/**
- * @var object $acl reference to global access control list
manager
- */
+ * @var object $acl reference to global access control list
manager
+ */
protected $acl;
/**
- * @var string $acl_location the access control location
- */
+ * @var string $acl_location the access control location
+ */
protected $acl_location;
/**
- * @var bool $acl_read does the current user have read access to
the current location
- */
+ * @var bool $acl_read does the current user have read access
to the current location
+ */
protected $acl_read;
/**
- * @var bool $acl_add does the current user have add access to
the current location
- */
+ * @var bool $acl_add does the current user have add access to
the current location
+ */
protected $acl_add;
/**
- * @var bool $acl_edit does the current user have edit access to
the current location
- */
+ * @var bool $acl_edit does the current user have edit access
to the current location
+ */
protected $acl_edit;
/**
- * @var bool $allrows display all rows of result set?
- */
+ * @var bool $allrows display all rows of result set?
+ */
protected $allrows;
/**
- * @var array $public_functions publicly available methods of
the class
- */
+ * @var array $public_functions publicly available methods of
the class
+ */
public $public_functions = array
- (
- 'index' => true,
- 'contact' => true,
- 'edit_type' => true,
- 'edit_contact' => true,
- 'no_access' => true,
- 'delete_type' => true
- );
+ (
+ 'index' => true,
+ 'contact' => true,
+ 'edit_type' => true,
+ 'edit_contact' => true,
+ 'no_access' => true,
+ 'delete_type' => true
+ );
/**
- * Constructor
- */
+ * Constructor
+ */
public function __construct()
{
@@ -136,36 +136,36 @@
}
/**
- * Save sessiondata
- *
- * @return void
- */
+ * Save sessiondata
+ *
+ * @return void
+ */
private function _save_sessiondata()
{
$data = array
- (
- 'start' => $this->start,
- 'query' => $this->query,
- 'sort' => $this->sort,
- 'order' => $this->order,
- 'location' => $this->location,
- 'allrows' => $this->allrows,
- 'cat_id' => $this->cat_id
- );
+ (
+ 'start' => $this->start,
+ 'query' => $this->query,
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'location' => $this->location,
+ 'allrows' => $this->allrows,
+ 'cat_id' => $this->cat_id
+ );
$this->bo->save_sessiondata($data);
}
/**
- * list available responsible types
- *
- * @return void
- */
+ * list available responsible types
+ *
+ * @return void
+ */
public function index()
{
$bocommon = CreateObject('property.bocommon');
-
+
if(!$this->acl_read)
{
$this->no_access();
@@ -181,25 +181,25 @@
}
if( phpgw::get_var('phpgw_return_as') != 'json' )
- {
-
-
- $datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
- (
- 'menuaction'=>
'property.uiresponsible.index',
- 'query'
=> $this->query,
-
'location' => $this->location,
-
'lookup' => $lookup
+ {
- ));
-
- $datatable['config']['allow_allrows'] = true;
+ $datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
+ (
+ 'menuaction'=>
'property.uiresponsible.index',
+ 'query' => $this->query,
+ 'location' =>
$this->location,
+ 'lookup' => $lookup
+
+ ));
+
+ $datatable['config']['allow_allrows'] = true;
+
$datatable['config']['base_java_url'] =
"menuaction:'property.uiresponsible.index',"
-
."query:'{$this->query}',"
-
."location:'{$this->location}',"
-
."lookup:'{$lookup}'";
-
+ ."query:'{$this->query}',"
+ ."location:'{$this->location}',"
+ ."lookup:'{$lookup}'";
+
$values_combo_box[0] =
$this->bolocation->select_location('filter', $this->location);
$default_value = array
('id'=>'','descr'=>lang('No location'));
array_unshift
($values_combo_box[0],$default_value);
@@ -208,68 +208,79 @@
$_location['name'] =
$_location['descr'];
}
- $datatable['actions']['form'] = array(
- array(
- 'action' =>
$GLOBALS['phpgw']->link('/index.php',
- array(
-
'menuaction' => 'property.uiresponsible.index',
- 'query'
=> $this->query,
-
'location' => $this->location,
-
'lookup' => $lookup
+ $datatable['actions']['form'] = array
+ (
+ array
+ (
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php',
+ array
+ (
+ 'menuaction'
=> 'property.uiresponsible.index',
+ 'query'
=> $this->query,
+ 'location'
=> $this->location,
+ 'lookup'
=> $lookup
+ )
+ ),
+ 'fields' => array
+ (
+ 'field' => array
+ (
+ array
+ (
+ 'type'
=> 'select',
+ 'id' =>
'sel_location',
+ 'name'
=> 'location',
+ 'value'
=> lang('location'),
+ 'style'
=> 'filter',
+
'values' => $values_combo_box[0],
+
'onchange'=> 'onChangeSelect();',
+
'tab_index' => 1
+ ),
+ array
+ (
+ 'type'
=> 'button',
+ 'id'
=> 'btn_new',
+ 'value'
=> lang('add'),
+
'tab_index' => 4
+ ),
+ array
+ ( //boton
SEARCH
+ 'id' =>
'btn_search',
+ 'name'
=> 'search',
+ 'value'
=> lang('search'),
+ 'type'
=> 'button',
+
'tab_index' => 3
+ ),
+ array
+ ( // TEXT IMPUT
+ 'name'
=> 'query',
+ 'id'
=> 'txt_query',
+ 'value'
=> '',//$query,
+ 'type'
=> 'text',
+
'onkeypress' => 'return pulsar(event)',
+ 'size'
=> 28,
+
'tab_index' => 2
+ )
+ ),
+ 'hidden_value' => array
+ (
+ array
+ ( //div values
combo_box_0
+ 'id' =>
'values_combo_box_0',
+ 'value'
=> $bocommon->select2String($values_combo_box[0], 'id','descr') //i.e.
id,value/id,vale/
)
- ),
- 'fields' => array(
- 'field' => array(
- array(
- 'type'
=> 'select',
- 'id' =>
'sel_location',
- 'name' =>
'location',
- 'value'
=> lang('location'),
- 'style' =>
'filter',
- 'values' =>
$values_combo_box[0],
-
'onchange'=> 'onChangeSelect();',
- 'tab_index'
=> 1
- ),
-
array(
-
'type' => 'button',
-
'id' => 'btn_new',
-
'value' => lang('add'),
-
'tab_index' => 4
- ),
- array( //boton
SEARCH
- 'id' =>
'btn_search',
- 'name' =>
'search',
- 'value'
=> lang('search'),
- 'type' =>
'button',
- 'tab_index'
=> 3
- ),
-
array( // TEXT IMPUT
- 'name'
=> 'query',
- 'id' =>
'txt_query',
- 'value'
=> '',//$query,
- 'type' =>
'text',
-
'onkeypress' => 'return pulsar(event)',
- 'size'
=> 28,
- 'tab_index'
=> 2
- )
- ),
- 'hidden_value' => array(
-
array( //div values combo_box_0
-
'id' => 'values_combo_box_0',
-
'value' =>
$bocommon->select2String($values_combo_box[0], 'id','descr') //i.e.
id,value/id,vale/
-
)
-
)
-
)
-
)
+ )
+ )
+ )
);
}
$responsible_info = array();
$responsible_info = $this->bo->read_type();
-
+
$uicols = array (
- 'input_type' =>
array(hidden,text,text,text,text,hidden,text,text,hidden,hidden),
- 'name' =>
array(id,name,descr,category,created_by,created_on,app_name,active,loc,location),
+ 'input_type' =>
array('hidden','text','text','text','text','hidden','text','text','hidden','hidden'),
+ 'name' =>
array('id','name','descr','category','created_by','created_on','app_name','active','loc','location'),
'formatter' =>
array('','','','','','','','','',''),
'descr' =>
array('',lang('name'),lang('descr'),lang('category'),lang('supervisor'),'',lang('location'),lang('active'),'','')
);
@@ -281,25 +292,25 @@
{
for
($i=0;$i<count($uicols['name']);$i++)
{
-
$datatable['rows']['row'][$j]['column'][$i]['name'] = $uicols['name'][$i];
-
- if ($uicols['name'][$i]
== 'active')
- {
-
$datatable['rows']['row'][$j]['column'][$i]['value'] =
($entry[$uicols['name'][$i]] == 1 ? 'X' : '');
- }
- else if
($uicols['name'][$i] == 'loc')
- {
-
$datatable['rows']['row'][$j]['column'][$i]['value'] =
str_replace('property', '', $entry['app_name']);
- }
- else {
-
$datatable['rows']['row'][$j]['column'][$i]['value'] =
$entry[$uicols['name'][$i]];
- }
+
$datatable['rows']['row'][$j]['column'][$i]['name'] = $uicols['name'][$i];
+
+ if ($uicols['name'][$i] ==
'active')
+ {
+
$datatable['rows']['row'][$j]['column'][$i]['value'] =
($entry[$uicols['name'][$i]] == 1 ? 'X' : '');
+ }
+ else if ($uicols['name'][$i] ==
'loc')
+ {
+
$datatable['rows']['row'][$j]['column'][$i]['value'] =
str_replace('property', '', $entry['app_name']);
+ }
+ else {
+
$datatable['rows']['row'][$j]['column'][$i]['value'] =
$entry[$uicols['name'][$i]];
+ }
}
$j++;
}
}
-
-
+
+
$uicols_count = count($uicols['descr']);
for ($i=0;$i<$uicols_count;$i++)
@@ -313,7 +324,7 @@
$datatable['headers']['header'][$i]['text'] =
$uicols['descr'][$i];
$datatable['headers']['header'][$i]['visible'] = true;
$datatable['headers']['header'][$i]['sortable'] = false;
-
+
if($uicols['name'][$i]=='name')
{
$datatable['headers']['header'][$i]['sortable'] = true;
@@ -325,128 +336,132 @@
$datatable['headers']['header'][$i]['name'] =
$uicols['name'][$i];
$datatable['headers']['header'][$i]['text'] =
$uicols['descr'][$i];
$datatable['headers']['header'][$i]['visible'] = false;
-
$datatable['headers']['header'][$i]['sortable'] = false;
+
$datatable['headers']['header'][$i]['sortable'] = false;
$datatable['headers']['header'][$i]['format'] = 'hidden';
}
}
-
+
$datatable['rowactions']['action'] = array();
-
+
if(!$lookup)
{
$parameters = array
- (
- 'parameter' => array
(
- array
+ 'parameter' => array
(
- 'name' => 'id',
- 'source' => 'id'
- ),
- )
- );
-
+ array
+ (
+ 'name'
=> 'id',
+ 'source'
=> 'id'
+ ),
+ )
+ );
+
$parameters2 = array
- (
- 'parameter' => array
(
- array
+ 'parameter' => array
(
- 'name' =>
'type_id',
- 'source' => 'id'
- ),
- array
- (
- 'name' =>
'location',
- 'source' =>
'location'
+ array
+ (
+ 'name'
=> 'type_id',
+ 'source'
=> 'id'
+ ),
+ array
+ (
+ 'name'
=> 'location',
+ 'source'
=> 'location'
+ )
)
- )
- );
-
+ );
+
$parameters3 = array
- (
- 'parameter' => array
(
- array
+ 'parameter' => array
(
- 'name' => 'id',
- 'source' => 'id'
- ),
- array
- (
- 'name' =>
'location',
- 'source' =>
'location'
- ),
- )
- );
-
+ array
+ (
+ 'name'
=> 'id',
+ 'source'
=> 'id'
+ ),
+ array
+ (
+ 'name'
=> 'location',
+ 'source'
=> 'location'
+ ),
+ )
+ );
+
if($this->acl_edit)
{
- $datatable['rowactions']['action'][] =
array(
- 'my_name' =>
'edit',
- 'text' =>
lang('edit'),
- 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
-
(
-
'menuaction' => 'property.uiresponsible.edit_type',
-//
'location' => $this->location
-
)),
- 'parameters' => $parameters3
- );
+ $datatable['rowactions']['action'][] =
array
+ (
+ 'my_name'
=> 'edit',
+ 'text'
=> lang('edit'),
+ 'action'
=> $GLOBALS['phpgw']->link('/index.php',array
+ (
+ 'menuaction'
=> 'property.uiresponsible.edit_type',
+ //
'location' => $this->location
+ )),
+ 'parameters' =>
$parameters3
+ );
}
-
+
if($this->acl_delete)
{
- $datatable['rowactions']['action'][] =
array(
- 'my_name' =>
'delete',
- 'text' =>
lang('delete'),
- 'confirm_msg' => lang('do you
really want to delete this entry'),
+ $datatable['rowactions']['action'][] =
array
+ (
+ 'my_name'
=> 'delete',
+ 'text'
=> lang('delete'),
+ 'confirm_msg' =>
lang('do you really want to delete this entry'),
+ 'action'
=> $GLOBALS['phpgw']->link('/index.php',array
+ (
+ 'menuaction'
=> 'property.uiresponsible.delete_type'
+ )),
+ 'parameters' =>
$parameters
+ );
+ }
+
+ $datatable['rowactions']['action'][] = array
+ (
+ 'my_name' =>
'contacts',
+ 'text' =>
lang('contacts'),
'action' =>
$GLOBALS['phpgw']->link('/index.php',array
-
(
-
'menuaction' => 'property.uiresponsible.delete_type'
-
)),
- 'parameters' => $parameters
+ (
+ 'menuaction' =>
'property.uiresponsible.contact'
+ )),
+ 'parameters' => $parameters2
);
- }
-
- $datatable['rowactions']['action'][] = array(
- 'my_name' => 'contacts',
- 'text' =>
lang('contacts'),
- 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
- (
-
'menuaction' => 'property.uiresponsible.contact'
- )),
- 'parameters' => $parameters2
- );
if($this->acl_add)
{
- $datatable['rowactions']['action'][] =
array(
+ $datatable['rowactions']['action'][] =
array
+ (
'my_name'
=> 'add',
'text'
=> lang('add'),
'action'
=> $GLOBALS['phpgw']->link('/index.php',array
-
(
-
'menuaction' => 'property.uiresponsible.edit_type',
-
'location' => $this->location
-
))
- );
+ (
+ 'menuaction'
=> 'property.uiresponsible.edit_type',
+ 'location'
=> $this->location
+ ))
+ );
}
-
+
unset($parameters);
}
-
+
if($lookup)
{
$function_exchange_values = '';
-
+
$function_exchange_values .=
'opener.document.getElementsByName("responsibility_id")[0].value = "";' ."\r\n";
$function_exchange_values .=
'opener.document.getElementsByName("responsibility_name")[0].value = "";'
."\r\n";
-
+
$function_exchange_values .=
'opener.document.getElementsByName("responsibility_id")[0].value =
data.getData("id");' ."\r\n";
$function_exchange_values .=
'opener.document.getElementsByName("responsibility_name")[0].value =
data.getData("name");' ."\r\n";
-
+
$function_exchange_values .= 'window.close()';
-
+
$datatable['exchange_values'] =
$function_exchange_values;
$datatable['valida'] = '';
@@ -473,84 +488,85 @@
}
phpgwapi_yui::load_widget('dragdrop');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('menu');
- phpgwapi_yui::load_widget('connection');
- phpgwapi_yui::load_widget('loader');
+ phpgwapi_yui::load_widget('datatable');
+ phpgwapi_yui::load_widget('menu');
+ phpgwapi_yui::load_widget('connection');
+ phpgwapi_yui::load_widget('loader');
phpgwapi_yui::load_widget('tabview');
phpgwapi_yui::load_widget('paginator');
phpgwapi_yui::load_widget('animation');
-//-- BEGIN----------------------------- JSON CODE
------------------------------
+ //-- BEGIN----------------------------- JSON CODE
------------------------------
- //values for Pagination
- $json = array
- (
- 'recordsReturned' =>
$datatable['pagination']['records_returned'],
- 'totalRecords' =>
(int)$datatable['pagination']['records_total'],
- 'startIndex' =>
$datatable['pagination']['records_start'],
+ //values for Pagination
+ $json = array
+ (
+ 'recordsReturned' =>
$datatable['pagination']['records_returned'],
+ 'totalRecords' =>
(int)$datatable['pagination']['records_total'],
+ 'startIndex' =>
$datatable['pagination']['records_start'],
'sort' =>
$datatable['sorting']['order'],
- 'dir' =>
$datatable['sorting']['sort'],
+ 'dir' =>
$datatable['sorting']['sort'],
'records' =>
array()
- );
+ );
- // values for datatable
- if(isset($datatable['rows']['row']) &&
is_array($datatable['rows']['row'])){
- foreach( $datatable['rows']['row'] as $row )
- {
- $json_row = array();
- foreach( $row['column'] as $column)
- {
- if(isset($column['format']) &&
$column['format']== "link" && $column['java_link']==true)
- {
-
$json_row[$column['name']] = "<a href='#' id='".$column['link']."'
onclick='javascript:filter_data(this.id);'>" .$column['value']."</a>";
- }
- elseif(isset($column['format'])
&& $column['format']== "link")
- {
- $json_row[$column['name']] =
"<a href='".$column['link']."'>" .$column['value']."</a>";
- }else
- {
- $json_row[$column['name']] =
$column['value'];
- }
- }
- $json['records'][] = $json_row;
- }
- }
-
- $receipt =
$GLOBALS['phpgw']->session->appsession('session_data', 'responsible_receipt');
- $msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($receipt);
-
$GLOBALS['phpgw']->session->appsession('session_data', 'responsible_receipt',
'');
-
- // right in datatable
- if(isset($datatable['rowactions']['action']) &&
is_array($datatable['rowactions']['action']))
+ // values for datatable
+ if(isset($datatable['rows']['row']) &&
is_array($datatable['rows']['row'])){
+ foreach( $datatable['rows']['row'] as $row )
{
- $json ['rights'] =
$datatable['rowactions']['action'];
+ $json_row = array();
+ foreach( $row['column'] as $column)
+ {
+ if(isset($column['format']) &&
$column['format']== "link" && $column['java_link']==true)
+ {
+
$json_row[$column['name']] = "<a href='#' id='".$column['link']."'
onclick='javascript:filter_data(this.id);'>" .$column['value']."</a>";
+ }
+ else
if(isset($column['format']) && $column['format']== "link")
+ {
+
$json_row[$column['name']] = "<a href='".$column['link']."'>"
.$column['value']."</a>";
+ }
+ else
+ {
+
$json_row[$column['name']] = $column['value'];
+ }
+ }
+ $json['records'][] = $json_row;
}
- $json ['message'] =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
-
- if( phpgw::get_var('phpgw_return_as') == 'json'
)
- {
- return $json;
- }
+ }
+ $receipt =
$GLOBALS['phpgw']->session->appsession('session_data', 'responsible_receipt');
+ $msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($receipt);
+ $GLOBALS['phpgw']->session->appsession('session_data',
'responsible_receipt', '');
+ // right in datatable
+ if(isset($datatable['rowactions']['action']) &&
is_array($datatable['rowactions']['action']))
+ {
+ $json ['rights'] =
$datatable['rowactions']['action'];
+ }
+ $json ['message'] =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
+
+ if( phpgw::get_var('phpgw_return_as') == 'json' )
+ {
+ return $json;
+ }
+
+
$datatable['json_data'] = json_encode($json);
-//-------------------- JSON CODE ----------------------
+ //-------------------- JSON CODE ----------------------
// Prepare template variables and process XSLT
$template_vars = array();
$template_vars['datatable'] = $datatable;
$GLOBALS['phpgw']->xslttpl->add_file(array('datatable'));
- $GLOBALS['phpgw']->xslttpl->set_var('phpgw', $template_vars);
+ $GLOBALS['phpgw']->xslttpl->set_var('phpgw',
$template_vars);
- if ( !isset($GLOBALS['phpgw']->css) ||
!is_object($GLOBALS['phpgw']->css) )
- {
- $GLOBALS['phpgw']->css = createObject('phpgwapi.css');
- }
+ if ( !isset($GLOBALS['phpgw']->css) ||
!is_object($GLOBALS['phpgw']->css) )
+ {
+ $GLOBALS['phpgw']->css =
createObject('phpgwapi.css');
+ }
// Prepare CSS Style
- $GLOBALS['phpgw']->css->validate_file('datatable');
- $GLOBALS['phpgw']->css->validate_file('property');
-
$GLOBALS['phpgw']->css->add_external_file('property/templates/base/css/property.css');
+ $GLOBALS['phpgw']->css->validate_file('datatable');
+ $GLOBALS['phpgw']->css->validate_file('property');
+
$GLOBALS['phpgw']->css->add_external_file('property/templates/base/css/property.css');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/container/assets/skins/sam/container.css');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/paginator/assets/skins/sam/paginator.css');
@@ -560,17 +576,17 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('responsible matrix') . ":: {$function_msg}";
- // Prepare YUI Library
- $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'responsible.index', 'property' );
-
+ // Prepare YUI Library
+ $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'responsible.index', 'property' );
+
$this->_save_sessiondata();
}
/**
- * Add or Edit available responsible types
- *
- * @return void
- */
+ * Add or Edit available responsible types
+ *
+ * @return void
+ */
public function edit_type()
{
@@ -603,7 +619,7 @@
$values['location'] = $this->location;
if(!$values['cat_id'] ||
$values['cat_id'] == 'none')
{
- //
$receipt['error'][]=array('msg'=>lang('Please select a category!'));
+ //
$receipt['error'][]=array('msg'=>lang('Please select a category!'));
}
if(!$values['name'])
{
@@ -624,20 +640,20 @@
{
$GLOBALS['phpgw']->session->appsession('session_data', 'responsible_receipt',
$receipt);
$GLOBALS['phpgw']->redirect_link('/index.php', array
-
(
-
'menuaction'=> 'property.uiresponsible.index',
-
'location' => $this->location
-
));
+ (
+
'menuaction'=> 'property.uiresponsible.index',
+
'location' => $this->location
+ ));
}
}
}
else
{
$GLOBALS['phpgw']->redirect_link('/index.php', array
-
(
-
'menuaction'=> 'property.uiresponsible.index',
-
'location' => $this->location
-
));
+ (
+ 'menuaction'=>
'property.uiresponsible.index',
+ 'location' =>
$this->location
+ ));
}
}
@@ -653,57 +669,57 @@
}
$link_data = array
- (
- 'menuaction' =>
'property.uiresponsible.edit_type',
- 'id' => $id,
- 'location' => $this->location
- );
+ (
+ 'menuaction' =>
'property.uiresponsible.edit_type',
+ 'id' => $id,
+ 'location' =>
$this->location
+ );
$msgbox_data =
(isset($receipt)?$GLOBALS['phpgw']->common->msgbox_data($receipt):'');
$data = array
- (
- 'value_entry_date'
=> isset($values['entry_date']) ? $values['entry_date'] : '',
- 'value_name'
=> isset($values['name']) ? $values['name'] : '',
- 'value_descr'
=> isset($values['descr']) ? $values['descr'] : '',
- 'value_active'
=> isset($values['active']) ? $values['active'] : '',
+ (
+ 'value_entry_date'
=> isset($values['entry_date']) ? $values['entry_date'] : '',
+ 'value_name'
=> isset($values['name']) ? $values['name'] : '',
+ 'value_descr'
=> isset($values['descr']) ? $values['descr'] : '',
+ 'value_active'
=> isset($values['active']) ? $values['active'] : '',
- 'lang_entry_date'
=> lang('Entry date'),
- 'lang_name'
=> lang('name'),
- 'lang_descr'
=> lang('descr'),
+ 'lang_entry_date'
=> lang('Entry date'),
+ 'lang_name'
=> lang('name'),
+ 'lang_descr'
=> lang('descr'),
- 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'form_action'
=> $GLOBALS['phpgw']->link('/index.php', $link_data),
- 'lang_id'
=> lang('ID'),
- 'lang_save'
=> lang('save'),
- 'lang_cancel'
=> lang('cancel'),
- 'value_id'
=> $id,
- 'lang_active'
=> lang('active'),
- 'lang_active_on_statustext' =>
lang('set this item inactive'),
- 'lang_active_off_statustext' => lang('set
this item active'),
- 'lang_cancel_status_text' =>
lang('Back to the list'),
- 'lang_save_status_text' =>
lang('Save the responsible type'),
- 'lang_apply'
=> lang('apply'),
- 'lang_apply_status_text' =>
lang('Apply the values'),
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
+ 'form_action'
=> $GLOBALS['phpgw']->link('/index.php', $link_data),
+ 'lang_id'
=> lang('ID'),
+ 'lang_save'
=> lang('save'),
+ 'lang_cancel'
=> lang('cancel'),
+ 'value_id'
=> $id,
+ 'lang_active'
=> lang('active'),
+ 'lang_active_on_statustext'
=> lang('set this item inactive'),
+ 'lang_active_off_statustext' =>
lang('set this item active'),
+ 'lang_cancel_status_text'
=> lang('Back to the list'),
+ 'lang_save_status_text'
=> lang('Save the responsible type'),
+ 'lang_apply'
=> lang('apply'),
+ 'lang_apply_status_text'
=> lang('Apply the values'),
- 'lang_category'
=> lang('category'),
- 'lang_no_cat'
=> lang('no category'),
- 'cat_select'
=> $this->cats->formatted_xslt_list(array
-
(
-
'select_name' => 'values[cat_id]',
-
'selected' =>
isset($values['cat_id'])?$values['cat_id']:''
-
)),
- );
+ 'lang_category'
=> lang('category'),
+ 'lang_no_cat'
=> lang('no category'),
+ 'cat_select'
=> $this->cats->formatted_xslt_list(array
+ (
+ 'select_name' =>
'values[cat_id]',
+ 'selected' =>
isset($values['cat_id'])?$values['cat_id']:''
+ )),
+ );
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('responsible matrix') . "::{$this->location}::{$function_msg}";
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('edit_type' => $data));
}
/**
- * List of contacts given responsibilities within locations
- *
- * @return void
- */
+ * List of contacts given responsibilities within locations
+ *
+ * @return void
+ */
public function contact()
{
@@ -722,18 +738,18 @@
$content = array();
foreach ( $responsible_info as $entry )
{
- $link_edit
= '';
+ $link_edit
= '';
$lang_edit_demo_text = '';
$text_edit
= '';
if ($this->acl_edit)
{
$link_edit
= $GLOBALS['phpgw']->link('/index.php', array
-
(
-
'menuaction' => 'property.uiresponsible.edit_contact',
-
'id'
=> $entry['id'],
-
'location' => str_replace('property', '', $entry['app_name']),
-
'type_id' => $type_id
-
));
+ (
+ 'menuaction' =>
'property.uiresponsible.edit_contact',
+ 'id'
=> $entry['id'],
+ 'location'
=> str_replace('property', '', $entry['app_name']),
+ 'type_id'
=> $type_id
+ ));
$lang_edit_text =
lang('edit type');
$text_edit
= lang('edit');
}
@@ -751,94 +767,94 @@
$text_delete =
lang('delete');
$lang_delete_text =
lang('delete type');
}
- */
+ */
$content[] = array
- (
- 'location_code' =>
$entry['location_code'],
- 'item'
=> $entry['item'],
- 'active_from' =>
$entry['active_from'],
- 'active_to'
=> $entry['active_to'],
- 'created_by' =>
$entry['created_by'],
- 'created_on' =>
$entry['created_on'],
- 'contact_name' =>
$entry['contact_name'],
- 'remark'
=> $entry['remark'],
- 'ecodimb'
=> $entry['ecodimb'],
- 'link_edit'
=> $link_edit,
- 'text_edit'
=> $text_edit,
- 'lang_edit_text' =>
$lang_edit_text,
- 'link_delete' =>
$link_delete,
- 'text_delete' =>
$text_delete,
- 'lang_delete_text' =>
$lang_delete_text
- );
+ (
+ 'location_code'
=> $entry['location_code'],
+ 'item'
=> $entry['item'],
+ 'active_from'
=> $entry['active_from'],
+ 'active_to'
=> $entry['active_to'],
+ 'created_by'
=> $entry['created_by'],
+ 'created_on'
=> $entry['created_on'],
+ 'contact_name'
=> $entry['contact_name'],
+ 'remark'
=> $entry['remark'],
+ 'ecodimb'
=> $entry['ecodimb'],
+ 'link_edit'
=> $link_edit,
+ 'text_edit'
=> $text_edit,
+ 'lang_edit_text'
=> $lang_edit_text,
+ 'link_delete'
=> $link_delete,
+ 'text_delete'
=> $text_delete,
+ 'lang_delete_text'
=> $lang_delete_text
+ );
}
$table_header[] = array
- (
- 'sort_location' =>
$this->nextmatchs->show_sort_order(array
(
- 'sort' => $this->sort,
- 'var' => 'location_code',
- 'order' => $this->order,
- 'extra' => array
+ 'sort_location' =>
$this->nextmatchs->show_sort_order(array
(
- 'menuaction' =>
'property.uiresponsible.contact',
- 'allrows' =>
$this->allrows,
- 'location' =>
$this->location,
- 'type_id' =>
$type_id
- )
- )),
- 'sort_active_from' =>
$this->nextmatchs->show_sort_order(array
- (
- 'sort' => $this->sort,
- 'var' => 'active_from',
- 'order' => $this->order,
- 'extra' => array
+ 'sort' => $this->sort,
+ 'var' => 'location_code',
+ 'order' => $this->order,
+ 'extra' => array
+ (
+ 'menuaction' =>
'property.uiresponsible.contact',
+ 'allrows'
=> $this->allrows,
+ 'location'
=> $this->location,
+ 'type_id'
=> $type_id
+ )
+ )),
+ 'sort_active_from' =>
$this->nextmatchs->show_sort_order(array
(
- 'menuaction' =>
'property.uiresponsible.contact',
- 'allrows' =>
$this->allrows,
- 'location' =>
$this->location,
- 'type_id' =>
$type_id
- )
- )),
- 'sort_active_to' =>
$this->nextmatchs->show_sort_order(array
- (
- 'sort' => $this->sort,
- 'var' => 'active_to',
- 'order' => $this->order,
- 'extra' => array
+ 'sort' => $this->sort,
+ 'var' => 'active_from',
+ 'order' => $this->order,
+ 'extra' => array
+ (
+ 'menuaction' =>
'property.uiresponsible.contact',
+ 'allrows'
=> $this->allrows,
+ 'location'
=> $this->location,
+ 'type_id'
=> $type_id
+ )
+ )),
+ 'sort_active_to' =>
$this->nextmatchs->show_sort_order(array
(
- 'menuaction' =>
'property.uiresponsible.contact',
- 'allrows' =>
$this->allrows,
- 'location' =>
$this->location,
- 'type_id' =>
$type_id
- )
- )),
- 'sort_ecodimb' =>
$this->nextmatchs->show_sort_order(array
- (
- 'sort' => $this->sort,
- 'var' => 'ecodimb',
- 'order' => $this->order,
- 'extra' => array
+ 'sort' => $this->sort,
+ 'var' => 'active_to',
+ 'order' => $this->order,
+ 'extra' => array
+ (
+ 'menuaction' =>
'property.uiresponsible.contact',
+ 'allrows'
=> $this->allrows,
+ 'location'
=> $this->location,
+ 'type_id'
=> $type_id
+ )
+ )),
+ 'sort_ecodimb' =>
$this->nextmatchs->show_sort_order(array
(
- 'menuaction' =>
'property.uiresponsible.contact',
- 'allrows' =>
$this->allrows,
- 'location' =>
$this->location,
- 'type_id' =>
$type_id
- )
- )),
- 'lang_contact' => lang('contact'),
- 'lang_location' => lang('location'),
- 'lang_item' => lang('item'),
- 'lang_active_from' => lang('active from'),
- 'lang_active_to' => lang('active to'),
- 'lang_created_on' => lang('created'),
- 'lang_created_by' => lang('supervisor'),
- 'lang_remark' => lang('remark'),
- 'lang_ecodimb' => lang('dimb'),
- 'lang_edit' =>
$this->acl_edit ? lang('edit') : '',
- // 'lang_delete' => $this->acl_delete ?
lang('delete') : '',
- );
+ 'sort' => $this->sort,
+ 'var' => 'ecodimb',
+ 'order' => $this->order,
+ 'extra' => array
+ (
+ 'menuaction' =>
'property.uiresponsible.contact',
+ 'allrows'
=> $this->allrows,
+ 'location'
=> $this->location,
+ 'type_id'
=> $type_id
+ )
+ )),
+ 'lang_contact' =>
lang('contact'),
+ 'lang_location' =>
lang('location'),
+ 'lang_item' =>
lang('item'),
+ 'lang_active_from' => lang('active
from'),
+ 'lang_active_to' => lang('active
to'),
+ 'lang_created_on' =>
lang('created'),
+ 'lang_created_by' =>
lang('supervisor'),
+ 'lang_remark' =>
lang('remark'),
+ 'lang_ecodimb' => lang('dimb'),
+ 'lang_edit' =>
$this->acl_edit ? lang('edit') : '',
+ // 'lang_delete'
=> $this->acl_delete ? lang('delete') : '',
+ );
if(!$this->allrows)
{
@@ -850,33 +866,33 @@
}
$link_data = array
- (
- 'menuaction' =>
'property.uiresponsible.contact',
- 'sort' => $this->sort,
- 'order' => $this->order,
- 'query' => $this->query,
- 'location' => $this->location,
- 'type_id' => $type_id
+ (
+ 'menuaction' =>
'property.uiresponsible.contact',
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'query' => $this->query,
+ 'location' =>
$this->location,
+ 'type_id' => $type_id
- );
+ );
$link_add_action = array
- (
- 'menuaction' =>
'property.uiresponsible.edit_contact',
- 'location' => $this->location,
- 'type_id' => $type_id
- );
+ (
+ 'menuaction' =>
'property.uiresponsible.edit_contact',
+ 'location' =>
$this->location,
+ 'type_id' => $type_id
+ );
$table_add[] = array
- (
- 'lang_add'
=> lang('add'),
- 'lang_add_statustext' => lang('add
contact'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php', $link_add_action),
- 'lang_cancel' =>
lang('cancel'),
- 'lang_cancel_statustext' => lang('back
to list type'),
- 'cancel_action' =>
$GLOBALS['phpgw']->link('/index.php', array
-
('menuaction' =>
'property.uiresponsible.index'
-
))
+ (
+ 'lang_add'
=> lang('add'),
+ 'lang_add_statustext' =>
lang('add contact'),
+ 'add_action'
=> $GLOBALS['phpgw']->link('/index.php', $link_add_action),
+ 'lang_cancel'
=> lang('cancel'),
+ 'lang_cancel_statustext' =>
lang('back to list type'),
+ 'cancel_action'
=> $GLOBALS['phpgw']->link('/index.php', array
+ ('menuaction' =>
'property.uiresponsible.index'
+ ))
);
$receipt =
$GLOBALS['phpgw']->session->appsession('session_data',
'responsible_contact_receipt');
@@ -886,32 +902,32 @@
$type_info = $this->bo->read_single_type($type_id);
$category =
$this->cats->return_single($type_info['cat_id']);
$data = array
- (
- 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'allow_allrows'
=> true,
- 'allrows'
=> $this->allrows,
- 'start_record'
=> $this->start,
- 'record_limit'
=> $record_limit,
- 'num_records'
=> $responsible_info ? count($responsible_info) : 0,
- 'all_records'
=> $this->bo->total_records,
- 'select_action'
=> $GLOBALS['phpgw']->link('/index.php', $link_data),
- 'link_url'
=> $GLOBALS['phpgw']->link('/index.php', $link_data),
- 'img_path'
=>
$GLOBALS['phpgw']->common->get_image_path('phpgwapi', 'default'),
- 'lang_searchfield_statustext'
=> lang('Enter the search string. To show all entries, empty this field and
press the SUBMIT button again'),
- 'lang_searchbutton_statustext'
=> lang('Submit the search string'),
- 'query'
=> $this->query,
- 'lang_search'
=> lang('search'),
- 'table_header_contact'
=> $table_header,
- 'table_add'
=> $table_add,
- 'values_contact'
=> $content,
- 'lang_no_location'
=> lang('No location'),
- 'lang_location_statustext'
=> lang('Select submodule'),
- 'select_name_location'
=> 'location',
- 'location_name'
=> "property{$this->location}", //FIXME once interlink is
settled
- 'lang_no_cat'
=> lang('no category'),
- 'type_name'
=> $type_info['name'],
- 'category_name'
=> $category[0]['name']
- );
+ (
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
+ 'allow_allrows'
=> true,
+ 'allrows'
=> $this->allrows,
+ 'start_record'
=> $this->start,
+ 'record_limit'
=> $record_limit,
+ 'num_records'
=> $responsible_info ? count($responsible_info) : 0,
+ 'all_records'
=> $this->bo->total_records,
+ 'select_action'
=> $GLOBALS['phpgw']->link('/index.php', $link_data),
+ 'link_url'
=> $GLOBALS['phpgw']->link('/index.php',
$link_data),
+ 'img_path'
=>
$GLOBALS['phpgw']->common->get_image_path('phpgwapi', 'default'),
+ 'lang_searchfield_statustext'
=> lang('Enter the search string. To show all entries, empty this field
and press the SUBMIT button again'),
+ 'lang_searchbutton_statustext'
=> lang('Submit the search string'),
+ 'query'
=> $this->query,
+ 'lang_search'
=> lang('search'),
+ 'table_header_contact'
=> $table_header,
+ 'table_add'
=> $table_add,
+ 'values_contact'
=> $content,
+ 'lang_no_location'
=> lang('No location'),
+ 'lang_location_statustext'
=> lang('Select submodule'),
+ 'select_name_location'
=> 'location',
+ 'location_name'
=> "property{$this->location}", //FIXME once interlink
is settled
+ 'lang_no_cat'
=> lang('no category'),
+ 'type_name'
=> $type_info['name'],
+ 'category_name'
=> $category[0]['name']
+ );
$function_msg= lang('list available responsible
contacts');
@@ -923,10 +939,10 @@
/**
- * Add or Edit available contact related to responsible types
and (physical) locations
- *
- * @return void
- */
+ * Add or Edit available contact related to responsible types
and (physical) locations
+ *
+ * @return void
+ */
public function edit_contact()
{
@@ -1009,7 +1025,7 @@
if(!isset($values['location']['loc1']))
{
- //
$receipt['error'][]=array('msg'=>lang('Please select a location!'));
+ //
$receipt['error'][]=array('msg'=>lang('Please select a location!'));
}
if($GLOBALS['phpgw']->session->is_repost())
@@ -1026,21 +1042,21 @@
{
$GLOBALS['phpgw']->session->appsession('session_data',
'responsible_contact_receipt', $receipt);
$GLOBALS['phpgw']->redirect_link('/index.php', array
-
(
-
'menuaction'=>
'property.uiresponsible.contact',
-
'location' =>
$this->location,
-
'type_id' => $type_id
-
));
+ (
+
'menuaction'=> 'property.uiresponsible.contact',
+
'location' => $this->location,
+
'type_id' => $type_id
+ ));
}
else if
(isset($values['apply']) && $values['apply'])
{
$GLOBALS['phpgw']->redirect_link('/index.php', array
-
(
-
'menuaction'=>
'property.uiresponsible.edit_contact',
-
'location' =>
$this->location,
-
'type_id' => $type_id,
-
'id' => $id
-
));
+ (
+
'menuaction'=> 'property.uiresponsible.edit_contact',
+
'location' => $this->location,
+
'type_id' => $type_id,
+ 'id'
=> $id
+ ));
}
}
else
@@ -1062,11 +1078,11 @@
else
{
$GLOBALS['phpgw']->redirect_link('/index.php', array
-
(
-
'menuaction'=>
'property.uiresponsible.contact',
-
'location' => $this->location,
-
'type_id' => $type_id
-
));
+ (
+ 'menuaction'=>
'property.uiresponsible.contact',
+ 'location' =>
$this->location,
+ 'type_id' => $type_id
+ ));
}
}
@@ -1081,27 +1097,31 @@
$function_msg = lang('add responsible type');
}
- $location_data =
$bolocation->initiate_ui_location(array(
- 'values' =>
$values['location_data'],
- 'type_id' => -1, //
calculated from location_types
- 'no_link' => false, //
disable lookup links for location type less than type_id
- 'tenant' => false,
- 'lookup_type' => 'form',
- 'lookup_entity' =>
$bocommon->get_lookup_entity('project'),
- 'entity_data' =>
isset($values['p']) ? $values['p'] : ''
- ));
+ $location_data = $bolocation->initiate_ui_location(array
+ (
+ 'values' =>
$values['location_data'],
+ 'type_id' => -1, // calculated
from location_types
+ 'no_link' => false, // disable
lookup links for location type less than type_id
+ 'tenant' => false,
+ 'lookup_type' => 'form',
+ 'lookup_entity' =>
$bocommon->get_lookup_entity('project'),
+ 'entity_data' => isset($values['p'])
? $values['p'] : ''
+ )
+ );
- $ecodimb_data=$bocommon->initiate_ecodimb_lookup(array(
- 'ecodimb'
=> $values['ecodimb'],
- 'ecodimb_descr' =>
$values['ecodimb_descr']));
+ $ecodimb_data=$bocommon->initiate_ecodimb_lookup(array
+ (
+ 'ecodimb' =>
$values['ecodimb'],
+ 'ecodimb_descr' =>
$values['ecodimb_descr'])
+ );
$link_data = array
- (
- 'menuaction' =>
'property.uiresponsible.edit_contact',
- 'id' => $id,
- 'location' => $this->location,
- 'type_id' => $type_id
- );
+ (
+ 'menuaction' =>
'property.uiresponsible.edit_contact',
+ 'id' => $id,
+ 'location' =>
$this->location,
+ 'type_id' => $type_id
+ );
$msgbox_data =
(isset($receipt)?$GLOBALS['phpgw']->common->msgbox_data($receipt):'');
@@ -1117,12 +1137,12 @@
. " var strURL = phpGWLink('index.php',
oArgs);\n"
. '
Window1=window.open(strURL,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
. "\r\n"
. '}'."\r\n"
-// . 'function lookup_responsibility()' ."\r\n"
-// . "{\r\n"
-// . ' var oArgs = {' .
$lookup_link_responsibility . "};\n"
-// . " var strURL = phpGWLink('index.php',
oArgs);\n"
-// . '
Window1=window.open(strURL,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
. "\r\n"
-// . '}'."\r\n"
+ // . 'function
lookup_responsibility()' ."\r\n"
+ // . "{\r\n"
+ // . ' var oArgs =
{' . $lookup_link_responsibility . "};\n"
+ // . " var strURL
= phpGWLink('index.php', oArgs);\n"
+ // . '
Window1=window.open(strURL,"Search","width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");'
. "\r\n"
+ // . '}'."\r\n"
. '//]]' ."\n"
. "</script>\n";
@@ -1136,63 +1156,63 @@
$jscal = CreateObject('phpgwapi.jscalendar');
$jscal->add_listener('values_active_from');
$jscal->add_listener('values_active_to');
-
+
$type = $this->bo->read_single_type($type_id);
$data = array
- (
- 'ecodimb_data'
=> $ecodimb_data,
- 'value_entry_date'
=> isset($values['entry_date']) ? $values['entry_date'] : '',
- 'value_name'
=> isset($values['name']) ? $values['name'] : '',
- 'value_remark'
=> isset($values['remark']) ? $values['remark'] : '',
- 'lang_entry_date'
=> lang('Entry date'),
- 'lang_remark'
=> lang('remark'),
+ (
+ 'ecodimb_data'
=> $ecodimb_data,
+ 'value_entry_date'
=> isset($values['entry_date']) ? $values['entry_date'] : '',
+ 'value_name'
=> isset($values['name']) ? $values['name'] : '',
+ 'value_remark'
=> isset($values['remark']) ? $values['remark'] : '',
+ 'lang_entry_date'
=> lang('Entry date'),
+ 'lang_remark'
=> lang('remark'),
- 'lang_responsibility' =>
lang('responsibility'),
- 'lang_responsibility_status_text'=>
lang('responsibility'),
- 'value_responsibility_id' =>
$type_id,
- 'value_responsibility_name' =>
$type['name'],
+ 'lang_responsibility'
=> lang('responsibility'),
+ 'lang_responsibility_status_text'=>
lang('responsibility'),
+ 'value_responsibility_id'
=> $type_id,
+ 'value_responsibility_name'
=> $type['name'],
- 'lang_contact'
=> lang('contact'),
- 'lang_contact_status_text' =>
lang('click to select contact'),
- 'value_contact_id'
=> isset($values['contact_id']) ? $values['contact_id'] : '',
- 'value_contact_name' =>
isset($values['contact_name']) ? $values['contact_name'] : '',
+ 'lang_contact'
=> lang('contact'),
+ 'lang_contact_status_text'
=> lang('click to select contact'),
+ 'value_contact_id'
=> isset($values['contact_id']) ? $values['contact_id'] : '',
+ 'value_contact_name'
=> isset($values['contact_name']) ? $values['contact_name'] : '',
- 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'form_action'
=> $GLOBALS['phpgw']->link('/index.php', $link_data),
- 'lang_id'
=> lang('ID'),
- 'lang_save'
=> lang('save'),
- 'lang_cancel'
=> lang('cancel'),
- 'value_id'
=> $id,
- 'lang_cancel_status_text' =>
lang('Back to the list'),
- 'lang_save_status_text' =>
lang('Save the responsible type'),
- 'lang_apply'
=> lang('apply'),
- 'lang_apply_status_text' =>
lang('Apply the values'),
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
+ 'form_action'
=> $GLOBALS['phpgw']->link('/index.php', $link_data),
+ 'lang_id'
=> lang('ID'),
+ 'lang_save'
=> lang('save'),
+ 'lang_cancel'
=> lang('cancel'),
+ 'value_id'
=> $id,
+ 'lang_cancel_status_text'
=> lang('Back to the list'),
+ 'lang_save_status_text'
=> lang('Save the responsible type'),
+ 'lang_apply'
=> lang('apply'),
+ 'lang_apply_status_text'
=> lang('Apply the values'),
- 'lang_location'
=> lang('location'),
- 'value_location_name' =>
"property{$this->location}", //FIXME once interlink is settled
- 'location_data'
=> $location_data,
+ 'lang_location'
=> lang('location'),
+ 'value_location_name'
=> "property{$this->location}", //FIXME once interlink is settled
+ 'location_data'
=> $location_data,
- 'lang_active_from'
=> lang('active from'),
- 'lang_active_to'
=> lang('active to'),
- 'value_active_from'
=> isset($values['active_from']) ? $values['active_from'] : '',
- 'value_active_to'
=> isset($values['active_to']) ? $values['active_to'] : '',
- 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi', 'cal'),
- 'lang_datetitle'
=> lang('Select date'),
- 'lang_active_from_statustext' => lang('Select
the start date for this responsibility'),
- 'lang_active_to_statustext' =>
lang('Select the closing date for this responsibility'),
+ 'lang_active_from'
=> lang('active from'),
+ 'lang_active_to'
=> lang('active to'),
+ 'value_active_from'
=> isset($values['active_from']) ? $values['active_from'] : '',
+ 'value_active_to'
=> isset($values['active_to']) ? $values['active_to'] : '',
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi', 'cal'),
+ 'lang_datetitle'
=> lang('Select date'),
+ 'lang_active_from_statustext' =>
lang('Select the start date for this responsibility'),
+ 'lang_active_to_statustext'
=> lang('Select the closing date for this responsibility'),
- );
+ );
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('responsible matrix') . "::{$function_msg}";
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('edit_contact' => $data));
}
/**
- * Display an error in case of missing rights
- *
- * @return void
- */
+ * Display an error in case of missing rights
+ *
+ * @return void
+ */
public function no_access()
{
@@ -1203,9 +1223,9 @@
$msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($receipt);
$data = array
- (
- 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data)
- );
+ (
+ 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data)
+ );
$function_msg = lang('No access');
@@ -1214,10 +1234,10 @@
}
/**
- * Delete a responsibility type
- *
- * @return void
- */
+ * Delete a responsibility type
+ *
+ * @return void
+ */
public function delete_type()
{
Modified: trunk/property/inc/class.uis_agreement.inc.php
===================================================================
--- trunk/property/inc/class.uis_agreement.inc.php 2010-12-25 23:13:55 UTC
(rev 6704)
+++ trunk/property/inc/class.uis_agreement.inc.php 2010-12-26 23:10:55 UTC
(rev 6705)
@@ -45,18 +45,18 @@
var $filter;
var $public_functions = array
- (
- 'index' => true,
- 'view' => true,
- 'edit' => true,
- 'delete' => true,
- 'columns' => true,
- 'edit_item' => true,
- 'view_item' => true,
- 'view_file' => true,
- 'download' => true,
- 'import' => true
- );
+ (
+ 'index' => true,
+ 'view' => true,
+ 'edit' => true,
+ 'delete' => true,
+ 'columns' => true,
+ 'edit_item' => true,
+ 'view_item' => true,
+ 'view_file' => true,
+ 'download' => true,
+ 'import' => true
+ );
function property_uis_agreement()
{
@@ -94,17 +94,17 @@
function save_sessiondata()
{
$data = array
- (
- 'start' => $this->start,
- 'query' => $this->query,
- 'sort' => $this->sort,
- 'order' => $this->order,
- 'filter' => $this->filter,
- 'cat_id' => $this->cat_id,
- 'vendor_id' => $this->vendor_id,
- 'allrows' => $this->allrows,
- 'member_id' => $this->member_id
- );
+ (
+ 'start' => $this->start,
+ 'query' => $this->query,
+ 'sort' => $this->sort,
+ 'order' => $this->order,
+ 'filter' => $this->filter,
+ 'cat_id' => $this->cat_id,
+ 'vendor_id' => $this->vendor_id,
+ 'allrows' => $this->allrows,
+ 'member_id' => $this->member_id
+ );
$this->bo->save_sessiondata($data);
}
@@ -131,28 +131,27 @@
$function_msg = lang('Select Column');
$link_data = array
- (
- 'menuaction' =>
'property.uis_agreement.columns',
- 'role' => $this->role
- );
+ (
+ 'menuaction' =>
'property.uis_agreement.columns',
+ 'role' => $this->role
+ );
$msgbox_data = $this->bocommon->msgbox_data($receipt);
$data = array
- (
- 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'column_list' =>
$this->bo->column_list($values['columns'],$allrows=true),
- 'function_msg' => $function_msg,
- 'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'lang_columns' => lang('columns'),
- 'lang_none' => lang('None'),
- 'lang_save' => lang('save'),
- 'select_name' => 'period'
- );
+ (
+ 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
+ 'column_list' =>
$this->bo->column_list($values['columns'],$allrows=true),
+ 'function_msg' => $function_msg,
+ 'form_action' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
+ 'lang_columns' => lang('columns'),
+ 'lang_none' => lang('None'),
+ 'lang_save' => lang('save'),
+ 'select_name' => 'period'
+ );
$GLOBALS['phpgw_info']['flags']['app_header'] =
$function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('columns' => $data));
- // $GLOBALS['phpgw']->xslttpl->pp();
}
function view_file()
@@ -181,41 +180,41 @@
if( phpgw::get_var('phpgw_return_as') != 'json' )
{
$datatable['menu']
= $this->bocommon->get_menu();
- $datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
- (
- 'menuaction' =>
'property.uis_agreement.index',
- 'sort' =>$this->sort,
- 'order' =>$this->order,
- 'cat_id' =>$this->cat_id,
- 'filter' =>$this->filter,
- 'query' =>$this->query,
- 'role' => $this->role,
- 'member_id' => $this->member_id
- ));
+ $datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
+ (
+ 'menuaction' =>
'property.uis_agreement.index',
+ 'sort' =>$this->sort,
+ 'order' =>$this->order,
+ 'cat_id' =>$this->cat_id,
+ 'filter' =>$this->filter,
+ 'query' =>$this->query,
+ 'role' => $this->role,
+ 'member_id' =>
$this->member_id
+ ));
- $datatable['config']['base_java_url'] =
"menuaction:'property.uis_agreement.index',"
-
."sort:'{$this->sort}',"
-
."order:'{$this->order}',"
-
."cat_id: '{$this->cat_id}',"
-
."filter:'{$this->filter}',"
-
."query:'{$this->query}',"
-
."role:'{$this->role}',"
-
."member_id:'{$this->member_id}'";
+ $datatable['config']['base_java_url'] =
"menuaction:'property.uis_agreement.index',"
+ ."sort:'{$this->sort}',"
+ ."order:'{$this->order}',"
+ ."cat_id: '{$this->cat_id}',"
+ ."filter:'{$this->filter}',"
+ ."query:'{$this->query}',"
+ ."role:'{$this->role}',"
+ ."member_id:'{$this->member_id}'";
$datatable['config']['allow_allrows'] = true;
$link_data = array
- (
- 'menuaction' =>
'property.uis_agreement.index',
- 'sort' =>$this->sort,
- 'order' =>$this->order,
- 'cat_id' =>$this->cat_id,
- 'filter' =>$this->filter,
- 'query' =>$this->query,
- 'role' => $this->role,
- 'member_id' => $this->member_id
+ (
+ 'menuaction' =>
'property.uis_agreement.index',
+ 'sort' =>$this->sort,
+ 'order' =>$this->order,
+ 'cat_id' =>$this->cat_id,
+ 'filter' =>$this->filter,
+ 'query' =>$this->query,
+ 'role' => $this->role,
+ 'member_id' =>
$this->member_id
- );
+ );
$values_combo_box[0] =
$this->cats->formatted_xslt_list(array('selected' => $this->member_id,'globals'
=> true,'link_data' =>$link_data));
$default_value = array ('cat_id'=>'','name'=>
lang('no member'));
@@ -229,10 +228,13 @@
$default_value = array
('id'=>'','name'=>lang('no vendor'));
array_unshift
($values_combo_box[2],$default_value);
- $datatable['actions']['form'] = array(
- array(
- 'action' =>
$GLOBALS['phpgw']->link('/index.php',
- array(
+ $datatable['actions']['form'] = array
+ (
+ array
+ (
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php',
+ array
+ (
'menuaction'
=> 'property.uis_agreement.index',
'sort'
=>$this->sort,
'order'
=>$this->order,
@@ -243,83 +245,96 @@
'member_id'
=> $this->member_id
)
),
- 'fields' => array(
- 'field' => array(
- array(
//boton CATEGORY
-
'id' => 'btn_member_id',
-
'name' => 'member_id',
-
'value' => lang('Member'),
-
'type' => 'button',
-
'style' => 'filter',
-
'tab_index' => 1
- ),
- array(
//boton STATUS
-
'id' => 'btn_cat_id',
-
'name' => 'category_id',
-
'value' => lang('Category'),
-
'type' => 'button',
-
'style' => 'filter',
-
'tab_index' => 2
- ),
- array(
//boton HOUR CATEGORY
-
'id' => 'btn_vendor_id',
-
'name' => 'vendor_id',
-
'value' => lang('Vendor'),
-
'type' => 'button',
-
'style' => 'filter',
-
'tab_index' => 3
- ),
-
array(
-
'type' => 'button',
-
'id' => 'btn_new',
-
'value' => lang('add'),
-
'tab_index' => 8
-
),
- array(
//boton SEARCH
-
'id' => 'btn_search',
-
'name' => 'search',
-
'value' => lang('search'),
-
'type' => 'button',
-
'tab_index' => 7
- ),
-
array( // TEXT INPUT
-
'name' => 'query',
-
'id' => 'txt_query',
-
'value' => '',//$query,
-
'type' => 'text',
-
'onkeypress' => 'return pulsar(event)',
-
'size' => 28,
-
'tab_index' => 6
- ),
- array(
-
'type' => 'link',
-
'id' => 'btn_columns',
-
'url' =>
"Javascript:window.open('".$GLOBALS['phpgw']->link('/index.php',
-
array
-
(
-
'menuaction' => 'property.uis_agreement.columns',
-
'role' => $this->role
-
))."','','width=300,height=600,scrollbars=1')",
-
'value' => lang('columns'),
-
'tab_index' => 9
-
)
-
),
- 'hidden_value' => array(
-
array( //div values combo_box_0
-
'id' => 'values_combo_box_0',
-
'value' =>
$this->bocommon->select2String($values_combo_box[0]['cat_list'], 'cat_id')
-
),
-
array( //div values combo_box_1
-
'id' => 'values_combo_box_1',
-
'value' =>
$this->bocommon->select2String($values_combo_box[1])
-
),
-
array( //div values
combo_box_2
-
'id' => 'values_combo_box_2',
-
'value' =>
$this->bocommon->select2String($values_combo_box[2])
-
)
-
)
-
)
- )
+ 'fields' => array
+ (
+ 'field' => array
+ (
+ array
+ ( //boton
CATEGORY
+ 'id' =>
'btn_member_id',
+ 'name'
=> 'member_id',
+ 'value'
=> lang('Member'),
+ 'type'
=> 'button',
+ 'style'
=> 'filter',
+
'tab_index' => 1
+ ),
+ array
+ ( //boton
STATUS
+ 'id' =>
'btn_cat_id',
+ 'name'
=> 'category_id',
+ 'value'
=> lang('Category'),
+ 'type'
=> 'button',
+ 'style'
=> 'filter',
+
'tab_index' => 2
+ ),
+ array
+ ( //boton
HOUR CATEGORY
+ 'id' =>
'btn_vendor_id',
+ 'name'
=> 'vendor_id',
+ 'value'
=> lang('Vendor'),
+ 'type'
=> 'button',
+ 'style'
=> 'filter',
+
'tab_index' => 3
+ ),
+ array
+ (
+ 'type'
=> 'button',
+ 'id'
=> 'btn_new',
+ 'value'
=> lang('add'),
+
'tab_index' => 8
+ ),
+ array
+ ( //boton
SEARCH
+ 'id' =>
'btn_search',
+ 'name'
=> 'search',
+ 'value'
=> lang('search'),
+ 'type'
=> 'button',
+
'tab_index' => 7
+ ),
+ array
+ ( // TEXT INPUT
+ 'name'
=> 'query',
+ 'id'
=> 'txt_query',
+ 'value'
=> '',//$query,
+ 'type'
=> 'text',
+
'onkeypress' => 'return pulsar(event)',
+ 'size'
=> 28,
+
'tab_index' => 6
+ ),
+ array
+ (
+ 'type'
=> 'link',
+ 'id' =>
'btn_columns',
+ 'url'
=> "Javascript:window.open('".$GLOBALS['phpgw']->link('/index.php',
+ array
+ (
+
'menuaction' => 'property.uis_agreement.columns',
+
'role' => $this->role
+
))."','','width=300,height=600,scrollbars=1')",
+ 'value'
=> lang('columns'),
+
'tab_index' => 9
+ )
+ ),
+ 'hidden_value' => array
+ (
+ array
+ ( //div values
combo_box_0
+ 'id' =>
'values_combo_box_0',
+ 'value'
=> $this->bocommon->select2String($values_combo_box[0]['cat_list'], 'cat_id')
+ ),
+ array
+ ( //div values
combo_box_1
+ 'id' =>
'values_combo_box_1',
+ 'value'
=> $this->bocommon->select2String($values_combo_box[1])
+ ),
+ array
+ ( //div values
combo_box_2
+ 'id' =>
'values_combo_box_2',
+ 'value'
=> $this->bocommon->select2String($values_combo_box[2])
+ )
+ )
+ )
+ )
);
// $dry_run = true;
@@ -350,104 +365,109 @@
$datatable['rowactions']['action'] = array();
$parameters = array
- (
- 'parameter' => array
(
- array
+ 'parameter' => array
(
- 'name' => 'id',
- 'source' => 'id'
- ),
- )
- );
+ array
+ (
+ 'name' => 'id',
+ 'source' => 'id'
+ ),
+ )
+ );
$parameters2 = array
- (
- 'parameter' => array
(
- array
+ 'parameter' => array
(
- 'name' =>
's_agreement_id',
- 'source' => 'id'
- ),
- )
- );
+ array
+ (
+ 'name' =>
's_agreement_id',
+ 'source' => 'id'
+ ),
+ )
+ );
if($this->acl_read)
{
- $datatable['rowactions']['action'][] = array(
- 'my_name'
=> 'view',
- 'statustext' =>
lang('view this entity'),
- 'text'
=> lang('view'),
- 'action'
=> $GLOBALS['phpgw']->link('/index.php',array
- (
-
'menuaction' => 'property.uis_agreement.view',
-
'role' => $this->role
- )),
+ $datatable['rowactions']['action'][] = array
+ (
+ 'my_name'
=> 'view',
+ 'statustext' => lang('view
this entity'),
+ 'text' =>
lang('view'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
+ (
+ 'menuaction' =>
'property.uis_agreement.view',
+ 'role'
=> $this->role
+ )),
'parameters' => $parameters
- );
+ );
$jasper = execMethod('property.sojasper.read',
array('location_id' => $GLOBALS['phpgw']->locations->get_id('property',
$this->acl_location)));
foreach ($jasper as $report)
{
- $datatable['rowactions']['action'][] =
array(
+ $datatable['rowactions']['action'][] =
array
+ (
'my_name'
=> 'edit',
'text'
=> lang('open JasperReport %1 in new window', $report['title']),
'action'
=> $GLOBALS['phpgw']->link('/index.php',array
-
(
-
'menuaction' =>
'property.uijasper.view',
-
'jasper_id'
=> $report['id'],
-
'target'
=> '_blank'
-
)),
+ (
+ 'menuaction'
=> 'property.uijasper.view',
+ 'jasper_id'
=> $report['id'],
+ 'target'
=> '_blank'
+ )),
'parameters'
=> $parameters
- );
+ );
}
}
if($this->acl_edit)
{
- $datatable['rowactions']['action'][] = array(
- 'my_name'
=> 'edit',
- 'statustext' =>
lang('edit this entity'),
- 'text'
=> lang('edit'),
- 'action'
=> $GLOBALS['phpgw']->link('/index.php',array
- (
-
'menuaction' => 'property.uis_agreement.edit',
-
'role' => $this->role
- )),
+ $datatable['rowactions']['action'][] = array
+ (
+ 'my_name'
=> 'edit',
+ 'statustext' => lang('edit
this entity'),
+ 'text' =>
lang('edit'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
+ (
+ 'menuaction' =>
'property.uis_agreement.edit',
+ 'role'
=> $this->role
+ )),
'parameters' => $parameters
- );
+ );
}
if($this->acl_delete)
{
- $datatable['rowactions']['action'][] = array(
- 'my_name'
=> 'delete',
- 'statustext' =>
lang('delete this entity'),
- 'text'
=> lang('delete'),
- 'confirm_msg' =>
lang('do you really want to delete this entry'),
- 'action'
=> $GLOBALS['phpgw']->link('/index.php',array
- (
-
'menuaction' => 'property.uis_agreement.delete',
-
'role' => $this->role
- )),
+ $datatable['rowactions']['action'][] = array
+ (
+ 'my_name'
=> 'delete',
+ 'statustext' => lang('delete
this entity'),
+ 'text' =>
lang('delete'),
+ 'confirm_msg' => lang('do you
really want to delete this entry'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
+ (
+ 'menuaction' =>
'property.uis_agreement.delete',
+ 'role'
=> $this->role
+ )),
'parameters' => $parameters2
- );
+ );
}
if($this->acl_add)
{
- $datatable['rowactions']['action'][] = array(
- 'my_name'
=> 'add',
- 'statustext' =>
lang('add an entity'),
- 'text'
=> lang('add'),
- 'action'
=> $GLOBALS['phpgw']->link('/index.php',array
- (
-
'menuaction' => 'property.uis_agreement.edit',
-
'role' => $this->role
- ))
- );
+ $datatable['rowactions']['action'][] = array
+ (
+ 'my_name'
=> 'add',
+ 'statustext' => lang('add an
entity'),
+ 'text' =>
lang('add'),
+ 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
+ (
+ 'menuaction' =>
'property.uis_agreement.edit',
+ 'role'
=> $this->role
+ ))
+ );
}
unset($parameters);
@@ -500,77 +520,77 @@
}
phpgwapi_yui::load_widget('dragdrop');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('menu');
- phpgwapi_yui::load_widget('connection');
- phpgwapi_yui::load_widget('loader');
+ phpgwapi_yui::load_widget('datatable');
+ phpgwapi_yui::load_widget('menu');
+ phpgwapi_yui::load_widget('connection');
+ phpgwapi_yui::load_widget('loader');
phpgwapi_yui::load_widget('tabview');
phpgwapi_yui::load_widget('paginator');
phpgwapi_yui::load_widget('animation');
//-- BEGIN----------------------------- JSON CODE
------------------------------
- //values for Pagination
- $json = array
- (
- 'recordsReturned' =>
$datatable['pagination']['records_returned'],
- 'totalRecords' =>
(int)$datatable['pagination']['records_total'],
- 'startIndex' =>
$datatable['pagination']['records_start'],
+ //values for Pagination
+ $json = array
+ (
+ 'recordsReturned' =>
$datatable['pagination']['records_returned'],
+ 'totalRecords' =>
(int)$datatable['pagination']['records_total'],
+ 'startIndex' =>
$datatable['pagination']['records_start'],
'sort' =>
$datatable['sorting']['order'],
- 'dir' =>
$datatable['sorting']['sort'],
+ 'dir' =>
$datatable['sorting']['sort'],
'records' =>
array()
- );
+ );
- // values for datatable
- if(isset($datatable['rows']['row']) &&
is_array($datatable['rows']['row'])){
- foreach( $datatable['rows']['row'] as $row )
- {
- $json_row = array();
- foreach( $row['column'] as $column)
- {
- if(isset($column['format']) &&
$column['format']== "link" && $column['java_link']==true)
- {
-
$json_row[$column['name']] = "<a href='#' id='".$column['link']."'
onclick='javascript:filter_data(this.id);'>" .$column['value']."</a>";
- }
- elseif(isset($column['format'])
&& $column['format']== "link")
- {
- $json_row[$column['name']] =
"<a href='".$column['link']."'>" .$column['value']."</a>";
- }else
- {
- $json_row[$column['name']] =
$column['value'];
- }
- }
- $json['records'][] = $json_row;
- }
- }
-
- // right in datatable
- if(isset($datatable['rowactions']['action']) &&
is_array($datatable['rowactions']['action']))
+ // values for datatable
+ if(isset($datatable['rows']['row']) &&
is_array($datatable['rows']['row'])){
+ foreach( $datatable['rows']['row'] as $row )
{
- $json ['rights'] =
$datatable['rowactions']['action'];
+ $json_row = array();
+ foreach( $row['column'] as $column)
+ {
+ if(isset($column['format']) &&
$column['format']== "link" && $column['java_link']==true)
+ {
+
$json_row[$column['name']] = "<a href='#' id='".$column['link']."'
onclick='javascript:filter_data(this.id);'>" .$column['value']."</a>";
+ }
+ elseif(isset($column['format'])
&& $column['format']== "link")
+ {
+
$json_row[$column['name']] = "<a href='".$column['link']."'>"
.$column['value']."</a>";
+ }else
+ {
+
$json_row[$column['name']] = $column['value'];
+ }
+ }
+ $json['records'][] = $json_row;
}
+ }
- if( phpgw::get_var('phpgw_return_as') == 'json'
)
- {
- return $json;
- }
+ // right in datatable
+ if(isset($datatable['rowactions']['action']) &&
is_array($datatable['rowactions']['action']))
+ {
+ $json ['rights'] =
$datatable['rowactions']['action'];
+ }
+ if( phpgw::get_var('phpgw_return_as') == 'json' )
+ {
+ return $json;
+ }
+
$datatable['json_data'] = json_encode($json);
//-------------------- JSON CODE ----------------------
$template_vars = array();
$template_vars['datatable'] = $datatable;
$GLOBALS['phpgw']->xslttpl->add_file(array('datatable'));
- $GLOBALS['phpgw']->xslttpl->set_var('phpgw', $template_vars);
+ $GLOBALS['phpgw']->xslttpl->set_var('phpgw',
$template_vars);
- if ( !isset($GLOBALS['phpgw']->css) ||
!is_object($GLOBALS['phpgw']->css) )
- {
- $GLOBALS['phpgw']->css = createObject('phpgwapi.css');
- }
+ if ( !isset($GLOBALS['phpgw']->css) ||
!is_object($GLOBALS['phpgw']->css) )
+ {
+ $GLOBALS['phpgw']->css =
createObject('phpgwapi.css');
+ }
- $GLOBALS['phpgw']->css->validate_file('datatable');
- $GLOBALS['phpgw']->css->validate_file('property');
-
$GLOBALS['phpgw']->css->add_external_file('property/templates/base/css/property.css');
+ $GLOBALS['phpgw']->css->validate_file('datatable');
+ $GLOBALS['phpgw']->css->validate_file('property');
+
$GLOBALS['phpgw']->css->add_external_file('property/templates/base/css/property.css');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/paginator/assets/skins/sam/paginator.css');
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/container/assets/skins/sam/container.css');
@@ -624,7 +644,7 @@
}
}
-//html_print_r($content);
+ //html_print_r($content);
for ($i=0;$i<count($uicols['descr']);$i++)
{
if($uicols['input_type'][$i]!='hidden')
@@ -759,7 +779,7 @@
}
- if ($values['save'] || $values['apply']):
+ if ($values['save'] || $values['apply'])
{
$values['vendor_id'] =
phpgw::get_var('vendor_id', 'int', 'POST');
$values['vendor_name'] =
phpgw::get_var('vendor_name', 'string', 'POST');
@@ -813,9 +833,9 @@
$to_file =
"{$bofiles->fakebase}/service_agreement/{$values['s_agreement_id']}/{$values['file_name']}";
if(!$values['document_name_orig'] &&
$bofiles->vfs->file_exists(array(
- 'string' => $to_file,
- 'relatives' =>
Array(RELATIVE_NONE)
- )))
+ 'string' => $to_file,
+ 'relatives' =>
Array(RELATIVE_NONE)
+ )))
{
$receipt['error'][]=array('msg'=>lang('This file already exists !'));
}
@@ -850,7 +870,7 @@
}
}
}
- elseif($values['update']):
+ else if($values['update'])
{
if(!$values['date'])
{
@@ -867,7 +887,7 @@
}
$get_items = true;
}
- elseif($values['delete_alarm'] &&
count($values['alarm'])):
+ else if($values['delete_alarm'] &&
count($values['alarm']))
{
if(!$receipt['error'])
@@ -876,7 +896,7 @@
}
}
- elseif(($values['enable_alarm'] ||
$values['disable_alarm']) && count($values['alarm'])):
+ else if(($values['enable_alarm'] ||
$values['disable_alarm']) && count($values['alarm']))
{
if(!$receipt['error'])
@@ -885,7 +905,7 @@
}
}
- elseif($values['add_alarm']):
+ else if($values['add_alarm'])
{
$time =
intval($values['time']['days'])*24*3600 +
intval($values['time']['hours'])*3600 +
@@ -897,11 +917,10 @@
}
}
- elseif (!$values['save'] && !$values['apply']
&& !$values['update']):
+ else if (!$values['save'] && !$values['apply']
&& !$values['update'])
{
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uis_agreement.index', 'role'=> $this->role));
}
- endif;
}
$s_agreement =
$this->bo->read_single(array('s_agreement_id'=>$id));
@@ -937,67 +956,71 @@
$jscal->add_listener('values_date');
$table_update[] = array
- (
- 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
- 'lang_datetitle'
=> lang('Select date'),
- 'lang_new_index'
=> lang('New index'),
- 'lang_new_index_statustext'
=> lang('Enter a new index'),
- 'lang_date_statustext'
=> lang('Select the date for the update'),
- 'lang_update'
=> lang('Update'),
- 'lang_update_statustext'
=> lang('update selected investments')
- );
+ (
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
+ 'lang_datetitle'
=> lang('Select date'),
+ 'lang_new_index'
=> lang('New index'),
+
'lang_new_index_statustext' => lang('Enter a new index'),
+ 'lang_date_statustext'
=> lang('Select the date for the update'),
+ 'lang_update'
=> lang('Update'),
+
'lang_update_statustext' => lang('update selected investments')
+ );
}
}
$link_data = array
- (
- 'menuaction' =>
'property.uis_agreement.edit',
- 'id' => $id,
- 'role' => $this->role
- );
+ (
+ 'menuaction' =>
'property.uis_agreement.edit',
+ 'id' => $id,
+ 'role' => $this->role
+ );
-
$vendor_data=$this->bocommon->initiate_ui_vendorlookup(array(
- 'vendor_id' =>
$s_agreement['vendor_id'],
- 'vendor_name' =>
$s_agreement['vendor_name']));
+
$vendor_data=$this->bocommon->initiate_ui_vendorlookup(array
+ (
+ 'vendor_id' =>
$s_agreement['vendor_id'],
+ 'vendor_name' =>
$s_agreement['vendor_name']));
-
$b_account_data=$this->bocommon->initiate_ui_budget_account_lookup(array(
- 'b_account_id' =>
$s_agreement['b_account_id'],
- 'b_account_name' =>
$s_agreement['b_account_name']));
+
$b_account_data=$this->bocommon->initiate_ui_budget_account_lookup(array
+ (
+ 'b_account_id' =>
$s_agreement['b_account_id'],
+ 'b_account_name' =>
$s_agreement['b_account_name']));
-
$ecodimb_data=$this->bocommon->initiate_ecodimb_lookup(array(
- 'ecodimb'
=> $s_agreement['ecodimb'],
- 'ecodimb_descr' =>
$s_agreement['ecodimb_descr']));
+
$ecodimb_data=$this->bocommon->initiate_ecodimb_lookup(array
+ (
+ 'ecodimb' =>
$s_agreement['ecodimb'],
+ 'ecodimb_descr' =>
$s_agreement['ecodimb_descr']));
- $alarm_data=$this->bocommon->initiate_ui_alarm(array(
-
'acl_location'=>$this->acl_location,
- 'alarm_type' =>
's_agreement',
- 'type' => 'form',
- 'text' => 'Email
notification',
- 'times' => $times,
- 'id' => $id,
- 'method' => $method,
- 'data' => $data,
- 'account_id'=> $account_id
- ));
+ $alarm_data=$this->bocommon->initiate_ui_alarm(array
+ (
+ 'acl_location'=>$this->acl_location,
+ 'alarm_type' => 's_agreement',
+ 'type' => 'form',
+ 'text' => 'Email notification',
+ 'times' => $times,
+ 'id' => $id,
+ 'method' => $method,
+ 'data' => $data,
+ 'account_id'=> $account_id
+ ));
$msgbox_data = $this->bocommon->msgbox_data($receipt);
$member_of_data =
$this->cats->formatted_xslt_list(array('selected' => $this->member_id,'globals'
=> true,link_data => array()));
$table_add[] = array
- (
- 'lang_add' =>
lang('add detail'),
- 'lang_add_standardtext' => lang('add an item to
the details'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uis_agreement.edit_item', 's_agreement_id'=> $id))
- );
+ (
+ 'lang_add'
=> lang('add detail'),
+ 'lang_add_standardtext' => lang('add an
item to the details'),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uis_agreement.edit_item', 's_agreement_id'=> $id))
+ );
$link_file_data = array
- (
- 'menuaction' =>
'property.uis_agreement.view_file',
- 'id' =>$id
- );
+ (
+ 'menuaction' =>
'property.uis_agreement.view_file',
+ 'id' =>$id
+ );
$config->read();
$link_to_files = $config->config_data['files_url'];
@@ -1009,10 +1032,10 @@
}
$link_download = array
- (
- 'menuaction' =>
'property.uis_agreement.download',
- 'id' => $id
- );
+ (
+ 'menuaction' =>
'property.uis_agreement.download',
+ 'id' => $id
+ );
$GLOBALS['phpgw']->js->validate_file('overlib','overlib','property');
$GLOBALS['phpgw']->js->validate_file('core','check','property');
@@ -1037,7 +1060,7 @@
$attribute['link_history'] =
$GLOBALS['phpgw']->link('/index.php',$link_history_data);
}
}
- */
+ */
phpgwapi_yui::tabview_setup('edit_tabview');
$tabs['general'] = array('label' =>
lang('general'), 'link' => '#general');
@@ -1059,7 +1082,7 @@
$tabs['items'] = array('label' =>
lang('items'), 'link' => '#items');
}
-//----------JSON CODE ----------------------------------------------
+ //----------JSON CODE
----------------------------------------------
//---GET ITEMS
if( phpgw::get_var('phpgw_return_as') == 'json' &&
$get_items )
@@ -1105,7 +1128,8 @@
//---GET ALARM
else if( phpgw::get_var('phpgw_return_as') == 'json' &&
!$get_items )
{
-
$alarm_data=$this->bocommon->initiate_ui_alarm(array(
+
$alarm_data=$this->bocommon->initiate_ui_alarm(array
+ (
'acl_location'=>$this->acl_location,
'alarm_type'=> 's_agreement',
'type' => 'form',
@@ -1115,7 +1139,7 @@
'method' =>
isset($method)?$method:'',
'data' =>
isset($data)?$data:'',
'account_id'=>
isset($account_id)?$account_id:''
- ));
+ ));
//$alarm_data['values'] = array();
if(count($alarm_data['values']))
{
@@ -1138,101 +1162,104 @@
$parameters = array
- (
- 'parameter' => array
(
- array
+ 'parameter' => array
(
- 'name' =>
's_agreement_id',
- 'source' => $id,
- 'ready' => 1
- ),
- array
- (
- 'name' => 'id',
- 'source' => 'item_id'
- ),
- array
- (
- 'name' => 'from',
- 'source' =>
$view_only?'view':'edit',
- 'ready' => 1
+ array
+ (
+ 'name' =>
's_agreement_id',
+ 'source' => $id,
+ 'ready' => 1
+ ),
+ array
+ (
+ 'name' => 'id',
+ 'source' =>
'item_id'
+ ),
+ array
+ (
+ 'name' =>
'from',
+ 'source' =>
$view_only?'view':'edit',
+ 'ready' => 1
+ )
)
- )
- );
+ );
$parameters2 = array
- (
- 'parameter' => array
(
- array
+ 'parameter' => array
(
- 'name' =>
's_agreement_id',
- 'source' => $id,
- 'ready' => 1
- ),
- array
- (
- 'name' => 'id',
- 'source' => 'item_id'
+ array
+ (
+ 'name' =>
's_agreement_id',
+ 'source' => $id,
+ 'ready' => 1
+ ),
+ array
+ (
+ 'name' => 'id',
+ 'source' =>
'item_id'
+ )
)
- )
- );
+ );
$parameters3 = array
- (
- 'parameter' => array
(
- array
+ 'parameter' => array
(
- 'name' => 'id',
- 'source' => $id,
- 'ready' => 1
- ),
- array
- (
- 'name' => 'item_id',
- 'source' => 'item_id'
- ),
- array
- (
- 'name' =>
'delete_item',
- 'source' => 1,
- 'ready' => 1
+ array
+ (
+ 'name' => 'id',
+ 'source' => $id,
+ 'ready' => 1
+ ),
+ array
+ (
+ 'name' =>
'item_id',
+ 'source' =>
'item_id'
+ ),
+ array
+ (
+ 'name' =>
'delete_item',
+ 'source' => 1,
+ 'ready' => 1
+ )
)
- )
- );
+ );
//_debug_array($parameters3);die;
/*REQUIRES VALIDATION OF PERMISSIONS*/
- $permissions['rowactions'][] = array(
+ $permissions['rowactions'][] = array
+ (
'text' => lang('View'),
'action' =>
$GLOBALS['phpgw']->link('/index.php',array
- (
-
'menuaction' => 'property.uis_agreement.view_item'
- )),
+ (
+ 'menuaction' =>
'property.uis_agreement.view_item'
+ )),
'parameters' => $parameters
- );
+ );
- $permissions['rowactions'][] = array(
+ $permissions['rowactions'][] = array
+ (
'text' => lang('Edit'),
'action' =>
$GLOBALS['phpgw']->link('/index.php',array
- (
-
'menuaction' => 'property.uis_agreement.edit_item'
- )),
+ (
+ 'menuaction' =>
'property.uis_agreement.edit_item'
+ )),
'parameters' => $parameters2
- );
+ );
- $permissions['rowactions'][] = array(
+ $permissions['rowactions'][] = array
+ (
'text' =>
lang('Delete'),
'action' =>
$GLOBALS['phpgw']->link('/index.php',array
- (
-
'menuaction' => 'property.uis_agreement.edit'
- )),
+ (
+ 'menuaction' =>
'property.uis_agreement.edit'
+ )),
'confirm_msg' => lang('do you really
want to delete this entry'),
'parameters' => $parameters3
- );
+ );
$content_values = array();
@@ -1247,60 +1274,59 @@
}
}
-//------- alarm--------
- $datavalues[0] = array
- (
- 'name' => "0",
- 'values' => json_encode($alarm_data['values']),
- 'total_records' => count($alarm_data['values']),
- 'is_paginator' => 0,
- 'permission'=> '""',
- 'footer' => 0
- );
+ //------- alarm--------
+ $datavalues[0] = array
+ (
+ 'name' => "0",
+ 'values' =>
json_encode($alarm_data['values']),
+ 'total_records' =>
count($alarm_data['values']),
+ 'is_paginator' => 0,
+ 'permission'=> '""',
+ 'footer' => 0
+ );
- $myColumnDefs[0] = array
- (
- 'name' => "0",
- 'values' => json_encode(array( array('key' => 'time',
'label'=>$alarm_data['header'][0]['lang_time'],
'sortable'=>true,'resizeable'=>true,'width'=>140),
- array('key' => 'text',
'label'=>$alarm_data['header'][0]['lang_text'],
'sortable'=>true,'resizeable'=>true,'width'=>340),
- array('key' => 'user',
'label'=>$alarm_data['header'][0]['lang_user'],
'sortable'=>true,'resizeable'=>true,'width'=>200),
- array('key' =>
'enabled','label'=>$alarm_data['header'][0]['lang_enabled'],'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterCenter','width'=>60),
- array('key' =>
'alarm_id','label'=>"dummy",'sortable'=>true,'resizeable'=>true,'hidden'=>true),
- array('key' =>
'select','label'=>$alarm_data['header'][0]['lang_select'],
'sortable'=>false,'resizeable'=>false,'formatter'=>'myFormatterCheck','width'=>60)))
- );
+ $myColumnDefs[0] = array
+ (
+ 'name' => "0",
+ 'values' => json_encode(array(
array('key' => 'time', 'label'=>$alarm_data['header'][0]['lang_time'],
'sortable'=>true,'resizeable'=>true,'width'=>140),
+
array('key' => 'text',
'label'=>$alarm_data['header'][0]['lang_text'],
'sortable'=>true,'resizeable'=>true,'width'=>340),
+
array('key' => 'user',
'label'=>$alarm_data['header'][0]['lang_user'],
'sortable'=>true,'resizeable'=>true,'width'=>200),
+
array('key' =>
'enabled','label'=>$alarm_data['header'][0]['lang_enabled'],'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterCenter','width'=>60),
+
array('key' =>
'alarm_id','label'=>"dummy",'sortable'=>true,'resizeable'=>true,'hidden'=>true),
+
array('key' =>
'select','label'=>$alarm_data['header'][0]['lang_select'],
'sortable'=>false,'resizeable'=>false,'formatter'=>'myFormatterCheck','width'=>60)))
+ );
- $myButtons[0] = array
- (
- 'name' => "0",
- 'values' => json_encode(array( array('id'
=>'values[enable_alarm]','type'=>'buttons', 'value'=>'Enable',
'label'=>$alarm_data[alter_alarm][0][lang_enable], 'funct'=> 'onActionsClick' ,
'classname'=> 'actionButton', 'value_hidden'=>""),
- array('id' =>'values[disable_alarm]','type'=>'buttons',
'value'=>'Disable', 'label'=>$alarm_data[alter_alarm][0][lang_disable],
'funct'=> 'onActionsClick' , 'classname'=> 'actionButton', 'value_hidden'=>""),
- array('id' =>'values[delete_alarm]','type'=>'buttons',
'value'=>'Delete', 'label'=>$alarm_data[alter_alarm][0][lang_delete], 'funct'=>
'onActionsClick' , 'classname'=> 'actionButton', 'value_hidden'=>""),
- ))
- );
+ $myButtons[0] = array
+ (
+ 'name' => "0",
+ 'values' => json_encode(array(
array('id' =>'values[enable_alarm]','type'=>'buttons', 'value'=>'Enable',
'label'=>$alarm_data[alter_alarm][0][lang_enable], 'funct'=> 'onActionsClick' ,
'classname'=> 'actionButton', 'value_hidden'=>""),
+
array('id' =>'values[disable_alarm]','type'=>'buttons',
'value'=>'Disable', 'label'=>$alarm_data[alter_alarm][0][lang_disable],
'funct'=> 'onActionsClick' , 'classname'=> 'actionButton', 'value_hidden'=>""),
+
array('id' =>'values[delete_alarm]','type'=>'buttons',
'value'=>'Delete', 'label'=>$alarm_data[alter_alarm][0][lang_delete], 'funct'=>
'onActionsClick' , 'classname'=> 'actionButton', 'value_hidden'=>""),
+ ))
+ );
- $myButtons[1] = array
- (
- 'name' => "1",
- 'values' => json_encode(array( array(id =>'values[time][days]',
'type'=>'menu',
'value'=>$this->bocommon->make_menu_date($alarm_data['add_alarm']['day_list'],"1_0",'values[time][days]'
), 'label'=>"0", 'classname'=> 'actionsFilter', 'value_hidden'=>"0"),
- array('id' =>'values[time][hours]', 'type'=>'menu',
'value'=>$this->bocommon->make_menu_date($alarm_data['add_alarm']['hour_list'],"1_1",'values[time][hours]'),
'label'=>"0", 'classname'=> 'actionsFilter', 'value_hidden'=>"0"),
- array('id' =>'values[time][mins]', 'type'=>'menu',
'value'=>$this->bocommon->make_menu_date($alarm_data['add_alarm']['minute_list'],"1_2",'values[time][mins]'),
'label'=>"0", 'classname'=> 'actionsFilter', 'value_hidden'=>"0"),
- array('id' =>'values[user_id]', 'type'=>'menu',
'value'=>$this->bocommon->make_menu_user($alarm_data['add_alarm']['user_list'],"1_3",'values[user_id]'),
'label'=>$this->bocommon->choose_select($alarm_data['add_alarm']['user_list'],"name"),'classname'=>
'actionsFilter',
'value_hidden'=>$this->bocommon->choose_select($alarm_data['add_alarm']['user_list'],"id")),
+ $myButtons[1] = array
+ (
+ 'name' => "1",
+ 'values' => json_encode(array(
array(id =>'values[time][days]', 'type'=>'menu',
'value'=>$this->bocommon->make_menu_date($alarm_data['add_alarm']['day_list'],"1_0",'values[time][days]'
), 'label'=>"0", 'classname'=> 'actionsFilter', 'value_hidden'=>"0"),
+
array('id' =>'values[time][hours]', 'type'=>'menu',
'value'=>$this->bocommon->make_menu_date($alarm_data['add_alarm']['hour_list'],"1_1",'values[time][hours]'),
'label'=>"0", 'classname'=> 'actionsFilter', 'value_hidden'=>"0"),
+
array('id' =>'values[time][mins]', 'type'=>'menu',
'value'=>$this->bocommon->make_menu_date($alarm_data['add_alarm']['minute_list'],"1_2",'values[time][mins]'),
'label'=>"0", 'classname'=> 'actionsFilter', 'value_hidden'=>"0"),
+
array('id' =>'values[user_id]', 'type'=>'menu',
'value'=>$this->bocommon->make_menu_user($alarm_data['add_alarm']['user_list'],"1_3",'values[user_id]'),
'label'=>$this->bocommon->choose_select($alarm_data['add_alarm']['user_list'],"name"),'classname'=>
'actionsFilter',
'value_hidden'=>$this->bocommon->choose_select($alarm_data['add_alarm']['user_list'],"id")),
+
array('id' =>'values[add_alarm]', 'type'=>'buttons',
'value'=>'Add', 'label'=>$alarm_data['add_alarm']['lang_add'], 'funct'=>
'onAddClick' , 'classname'=> 'actionButton', 'value_hidden'=>""),
+ ))
+ );
- array('id' =>'values[add_alarm]', 'type'=>'buttons',
'value'=>'Add', 'label'=>$alarm_data['add_alarm']['lang_add'], 'funct'=>
'onAddClick' , 'classname'=> 'actionButton', 'value_hidden'=>""),
- ))
- );
-
-//---------items------------------------------------
+ //---------items------------------------------------
$datavalues[1] = array
- (
+ (
'name'
=> "1",
'values'
=> json_encode($content_values),
'total_records' =>
count($content_values),
'is_paginator' => 0,
'permission' =>
json_encode($permissions['rowactions']),
'footer'
=> 0
- );
+ );
$td_count = 0;
$ColumnDefs_data = array();
@@ -1311,40 +1337,40 @@
if($input_type != 'hidden')
{
$ColumnDefs_data[] = array
- (
- 'key'
=> $uicols['name'][$key],
- 'label'
=> $uicols['descr'][$key],
- 'sortable'
=> true,
- 'resizeable' => true
- );
+ (
+ 'key'
=> $uicols['name'][$key],
+ 'label'
=> $uicols['descr'][$key],
+ 'sortable'
=> true,
+ 'resizeable'
=> true
+ );
$td_count ++;
}
}
}
$ColumnDefs_data[] = array
- (
- 'key' => 'update',
- 'label' => lang('Update'),
- 'sortable' => true,
- 'resizeable' => true,
- 'formatter' =>
'myFormatterCheckUpdate'
- );
-//_debug_array($ColumnDefs_data);
- $myColumnDefs[1] = array
- (
- 'name' => "1",
- 'values' =>
json_encode($ColumnDefs_data)
- );
+ (
+ 'key' => 'update',
+ 'label' =>
lang('Update'),
+ 'sortable' => true,
+ 'resizeable' => true,
+ 'formatter' =>
'myFormatterCheckUpdate'
+ );
+ //_debug_array($ColumnDefs_data);
+ $myColumnDefs[1] = array
+ (
+ 'name' => "1",
+ 'values' =>
json_encode($ColumnDefs_data)
+ );
unset($ColumnDefs_data);
$myButtons[2] = array
- (
- 'name' => "2",
- 'values' =>
json_encode(array( array('type'=>'text', 'label'=>' New index:',
'classname'=> 'index-opt'),
-
array('id' =>'values[new_index]',
'type'=>'inputText', size=>12, 'classname'=> 'index-opt'),
-
array('id'
=>'values[update]','type'=>'buttons', 'value'=>'Update',
'label'=>'Update', funct=> onUpdateClick , 'classname'=> '')
-
))
+ (
+ 'name' => "2",
+ 'values' =>
json_encode(array( array('type'=>'text', 'label'=>' New index:',
'classname'=> 'index-opt'),
+
array('id' =>'values[new_index]',
'type'=>'inputText', size=>12, 'classname'=> 'index-opt'),
+
array('id'
=>'values[update]','type'=>'buttons', 'value'=>'Update',
'label'=>'Update', funct=> onUpdateClick , 'classname'=> '')
+ ))
);
$link_view_file =
$GLOBALS['phpgw']->link('/index.php',$link_file_data);
@@ -1361,21 +1387,21 @@
}
$datavalues[2] = array
- (
+ (
'name'
=> "2",
'values'
=> json_encode($content_files),
'total_records' =>
count($content_files),
'permission' => "''",
'is_paginator' => 0,
'footer'
=> 0
- );
+ );
$myColumnDefs[2] = array
- (
- 'name' => "2",
- 'values' => json_encode(array(
array('key' =>
'file_name','label'=>lang('Filename'),'sortable'=>false,'resizeable'=>true),
-
array('key' => 'delete_file','label'=>lang('Delete
file'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterCenter')))
- );
+ (
+ 'name' => "2",
+ 'values' =>
json_encode(array( array('key' =>
'file_name','label'=>lang('Filename'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'delete_file','label'=>lang('Delete
file'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterCenter')))
+ );
if($id)
{
@@ -1387,147 +1413,147 @@
}
$datavalues[3] = array
- (
+ (
'name'
=> "3",
'values'
=> json_encode($content_budget),
'total_records' =>
count($content_budget),
'permission' => "''",
'is_paginator' => 0,
'footer'
=> 1
- );
+ );
-
+
$myColumnDefs[3] = array
- (
- 'name' => "3",
- 'values' => json_encode(array(
array('key' =>
'year','label'=>lang('year'),'sortable'=>false,'resizeable'=>true),
-
array('key' =>
'category','label'=>lang('category'),'sortable'=>false,'resizeable'=>true),
-
array('key' =>
'ecodimb','label'=>lang('dimb'),'sortable'=>false,'resizeable'=>true),
-
array('key' => 'budget_account','label'=>lang('budget
account'),'sortable'=>false,'resizeable'=>true),
-
array('key' =>
'budget','label'=>lang('budget'),'sortable'=>false,'resizeable'=>true),
-
array('key' => 'actual_cost','label'=>lang('actual
cost'),'sortable'=>false,'resizeable'=>true),
-
array('key' => 'delete_year','label'=>lang('Delete
budget'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterCenter')))
- );
+ (
+ 'name' => "3",
+ 'values' =>
json_encode(array( array('key' =>
'year','label'=>lang('year'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'category','label'=>lang('category'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'ecodimb','label'=>lang('dimb'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'budget_account','label'=>lang('budget
account'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'budget','label'=>lang('budget'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'actual_cost','label'=>lang('actual
cost'),'sortable'=>false,'resizeable'=>true),
+
array('key' =>
'delete_year','label'=>lang('Delete
budget'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterCenter')))
+ );
-//--------------------------------------------JSON CODE------------
+ //--------------------------------------------JSON
CODE------------
$this->cats->set_appname('property','.project');
$data = array
- (
- 'td_count'
=> $td_count,
- 'property_js'
=>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
- 'base_java_url'
=> json_encode(array('menuaction' =>
"property.uis_agreement.edit",'id'=>$id)),
- 'datatable'
=> $datavalues,
- 'myColumnDefs'
=> $myColumnDefs,
- 'myButtons'
=> $myButtons,
+ (
+ 'td_count'
=> $td_count,
+ 'property_js'
=>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
+ 'base_java_url'
=> json_encode(array('menuaction' =>
"property.uis_agreement.edit",'id'=>$id)),
+ 'datatable'
=> $datavalues,
+ 'myColumnDefs'
=> $myColumnDefs,
+ 'myButtons'
=> $myButtons,
- 'link_import' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
'property.uis_agreement.import', 'tab' => 'items')),
- 'alarm_data' =>
$alarm_data,
- 'lang_alarm' =>
lang('Alarm'),
- 'lang_download' =>
'download',
- 'link_download' =>
$GLOBALS['phpgw']->link('/index.php',$link_download),
- 'lang_download_help' =>
lang('Download table to your browser'),
+ 'link_import'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
'property.uis_agreement.import', 'tab' => 'items')),
+ 'alarm_data'
=> $alarm_data,
+ 'lang_alarm'
=> lang('Alarm'),
+ 'lang_download'
=> 'download',
+ 'link_download'
=> $GLOBALS['phpgw']->link('/index.php',$link_download),
+ 'lang_download_help'
=> lang('Download table to your browser'),
- 'fileupload' => true,
- 'link_view_file' =>
$GLOBALS['phpgw']->link('/index.php',$link_file_data),
- 'link_to_files' =>
$link_to_files,
- 'files' =>
$s_agreement['files'],
- 'lang_files' =>
lang('files'),
- 'lang_filename' =>
lang('Filename'),
- 'lang_file_action' =>
lang('Delete file'),
- 'lang_view_file_statustext' =>
lang('click to view file'),
- 'lang_file_action_statustext' =>
lang('Check to delete file'),
- 'lang_upload_file' =>
lang('Upload file'),
- 'lang_file_statustext' =>
lang('Select file to upload'),
+ 'fileupload'
=> true,
+ 'link_view_file'
=> $GLOBALS['phpgw']->link('/index.php',$link_file_data),
+ 'link_to_files'
=> $link_to_files,
+ 'files'
=> $s_agreement['files'],
+ 'lang_files'
=> lang('files'),
+ 'lang_filename'
=> lang('Filename'),
+ 'lang_file_action'
=> lang('Delete file'),
+ 'lang_view_file_statustext'
=> lang('click to view file'),
+ 'lang_file_action_statustext'
=> lang('Check to delete file'),
+ 'lang_upload_file'
=> lang('Upload file'),
+ 'lang_file_statustext'
=> lang('Select file to upload'),
- 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'edit_url' =>
$GLOBALS['phpgw']->link('/index.php',$link_data),
- 'lang_id' =>
lang('ID'),
- 'value_s_agreement_id' => $id,
- 'lang_category' =>
lang('category'),
- 'lang_save' =>
lang('save'),
- 'lang_cancel' =>
lang('cancel'),
- 'lang_apply' =>
lang('apply'),
- 'value_cat' =>
$s_agreement['cat'],
- 'lang_apply_statustext' =>
lang('Apply the values'),
- 'lang_cancel_statustext' =>
lang('Leave the service agreement untouched and return back to the list'),
- 'lang_save_statustext' =>
lang('Save the service agreement and return back to the list'),
- 'lang_no_cat' =>
lang('no category'),
- 'lang_cat_statustext' =>
lang('Select the category the s_agreement belongs to. To do not use a category
select NO CATEGORY'),
- 'select_name' =>
'values[cat_id]',
- 'cat_list' =>
$this->bocommon->select_category_list(array('format'=>'select','selected' =>
$this->cat_id,'type' =>'s_agreement','order'=>'descr')),
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
+ 'edit_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
+ 'lang_id'
=> lang('ID'),
+ 'value_s_agreement_id'
=> $id,
+ 'lang_category'
=> lang('category'),
+ 'lang_save'
=> lang('save'),
+ 'lang_cancel'
=> lang('cancel'),
+ 'lang_apply'
=> lang('apply'),
+ 'value_cat'
=> $s_agreement['cat'],
+ 'lang_apply_statustext'
=> lang('Apply the values'),
+ 'lang_cancel_statustext'
=> lang('Leave the service agreement untouched and return back to the
list'),
+ 'lang_save_statustext'
=> lang('Save the service agreement and return back to the list'),
+ 'lang_no_cat'
=> lang('no category'),
+ 'lang_cat_statustext'
=> lang('Select the category the s_agreement belongs to. To do not use
a category select NO CATEGORY'),
+ 'select_name'
=> 'values[cat_id]',
+ 'cat_list'
=>
$this->bocommon->select_category_list(array('format'=>'select','selected' =>
$this->cat_id,'type' =>'s_agreement','order'=>'descr')),
- 'lang_member_of' =>
lang('member of'),
- 'member_of_name' =>
'member_id',
- 'member_of_list' =>
$member_of_data['cat_list'],
+ 'lang_member_of'
=> lang('member of'),
+ 'member_of_name'
=> 'member_id',
+ 'member_of_list'
=> $member_of_data['cat_list'],
- 'attributes_group'
=> $attributes,
- 'lookup_functions' =>
$s_agreement['lookup_functions'],
- 'dateformat' =>
$dateformat,
+ 'attributes_group'
=> $attributes,
+ 'lookup_functions'
=> $s_agreement['lookup_functions'],
+ 'dateformat'
=> $dateformat,
- 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
- 'lang_datetitle' =>
lang('Select date'),
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
+ 'lang_datetitle'
=> lang('Select date'),
- 'lang_start_date_statustext' =>
lang('Select the estimated end date for the Project'),
- 'lang_start_date' =>
lang('start date'),
- 'value_start_date' =>
$s_agreement['start_date'],
+ 'lang_start_date_statustext'
=> lang('Select the estimated end date for the Project'),
+ 'lang_start_date'
=> lang('start date'),
+ 'value_start_date'
=> $s_agreement['start_date'],
- 'lang_end_date_statustext' =>
lang('Select the estimated end date for the Project'),
- 'lang_end_date' =>
lang('end date'),
- 'value_end_date' =>
$s_agreement['end_date'],
+ 'lang_end_date_statustext'
=> lang('Select the estimated end date for the Project'),
+ 'lang_end_date'
=> lang('end date'),
+ 'value_end_date'
=> $s_agreement['end_date'],
- 'lang_termination_date_statustext' =>
lang('Select the estimated termination date'),
- 'lang_termination_date' =>
lang('termination date'),
- 'value_termination_date' =>
$s_agreement['termination_date'],
+ 'lang_termination_date_statustext'
=> lang('Select the estimated termination date'),
+ 'lang_termination_date'
=> lang('termination date'),
+ 'value_termination_date'
=> $s_agreement['termination_date'],
- 'vendor_data'
=> $vendor_data,
+ 'vendor_data'
=> $vendor_data,
- 'lang_budget'
=> lang('Budget'),
- 'lang_budget_statustext' =>
lang('Budget for selected year'),
- 'value_budget'
=> $s_agreement['budget'],
- 'currency'
=> $GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
+ 'lang_budget'
=> lang('Budget'),
+ 'lang_budget_statustext'
=> lang('Budget for selected year'),
+ 'value_budget'
=> $s_agreement['budget'],
+ 'currency'
=>
$GLOBALS['phpgw_info']['user']['preferences']['common']['currency'],
- 'lang_year'
=> lang('year'),
- 'lang_year_statustext' =>
lang('Budget year'),
- 'year'
=>
$this->bocommon->select_list($s_agreement['year'],$this->bo->get_year_list($id)),
+ 'lang_year'
=> lang('year'),
+ 'lang_year_statustext'
=> lang('Budget year'),
+ 'year'
=>
$this->bocommon->select_list($s_agreement['year'],$this->bo->get_year_list($id)),
- 'b_account_data' =>
$b_account_data,
- 'ecodimb_data' =>
$ecodimb_data,
- 'lang_category'
=> lang('category'),
- 'lang_no_cat'
=> lang('Select category'),
- 'cat_select'
=> $this->cats->formatted_xslt_list(array('select_name' =>
'values[order_category]','selected' => $s_agreement['order_category'])),
+ 'b_account_data'
=> $b_account_data,
+ 'ecodimb_data'
=> $ecodimb_data,
+ 'lang_category'
=> lang('category'),
+ 'lang_no_cat'
=> lang('Select category'),
+ 'cat_select'
=> $this->cats->formatted_xslt_list(array('select_name' =>
'values[order_category]','selected' => $s_agreement['order_category'])),
- 'lang_name' =>
lang('name'),
- 'lang_name_statustext' =>
lang('name'),
- 'value_name' =>
$s_agreement['name'],
- 'lang_descr' =>
lang('descr'),
- 'lang_descr_statustext' =>
lang('descr'),
- 'value_descr' =>
$s_agreement['descr'],
- 'table_add' =>
$table_add,
- 'values' =>
$content,
- 'table_header' =>
$table_header,
- 'acl_manage' =>
$this->acl_manage,
- 'table_update' =>
$table_update,
- 'update_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uis_agreement.edit', 'id'=> $id)),
- 'lang_select_all' =>
lang('Select All'),
- 'img_check' =>
$GLOBALS['phpgw']->common->get_image_path('property').'/check.png',
- 'set_column' =>
$set_column,
- 'lang_import_detail' => lang('import
detail'),
- 'lang_detail_import_statustext'=> lang('import
details to this agreement from spreadsheet'),
- 'lang_import' =>
lang('import'),
- 'textareacols' =>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] : 40,
- 'textarearows' =>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] : 6,
- 'tabs'
=> phpgwapi_yui::tabview_generate($tabs, $active_tab)
- );
+ 'lang_name'
=> lang('name'),
+ 'lang_name_statustext'
=> lang('name'),
+ 'value_name'
=> $s_agreement['name'],
+ 'lang_descr'
=> lang('descr'),
+ 'lang_descr_statustext'
=> lang('descr'),
+ 'value_descr'
=> $s_agreement['descr'],
+ 'table_add'
=> $table_add,
+ 'values'
=> $content,
+ 'table_header'
=> $table_header,
+ 'acl_manage'
=> $this->acl_manage,
+ 'table_update'
=> $table_update,
+ 'update_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uis_agreement.edit', 'id'=> $id)),
+ 'lang_select_all'
=> lang('Select All'),
+ 'img_check'
=>
$GLOBALS['phpgw']->common->get_image_path('property').'/check.png',
+ 'set_column'
=> $set_column,
+ 'lang_import_detail'
=> lang('import detail'),
+ 'lang_detail_import_statustext'
=> lang('import details to this agreement from spreadsheet'),
+ 'lang_import'
=> lang('import'),
+ 'textareacols'
=>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] : 40,
+ 'textarearows'
=>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] : 6,
+ 'tabs'
=> phpgwapi_yui::tabview_generate($tabs, $active_tab)
+ );
-//_debug_array($data);die;
+ //_debug_array($data);die;
phpgwapi_yui::load_widget('dragdrop');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('menu');
- phpgwapi_yui::load_widget('connection');
- phpgwapi_yui::load_widget('loader');
+ phpgwapi_yui::load_widget('datatable');
+ phpgwapi_yui::load_widget('menu');
+ phpgwapi_yui::load_widget('connection');
+ phpgwapi_yui::load_widget('loader');
phpgwapi_yui::load_widget('tabview');
phpgwapi_yui::load_widget('paginator');
phpgwapi_yui::load_widget('animation');
@@ -1583,7 +1609,7 @@
$insert_record_entity =
$GLOBALS['phpgw']->session->appsession('insert_record_entity','property');
$insert_record_s_agreement1 =
$GLOBALS['phpgw']->session->appsession('insert_record_values.s_agreement.detail','property');
-//_debug_array($insert_record_s_agreement1);
+ //_debug_array($insert_record_s_agreement1);
for ($j=0;$j<count($insert_record_entity);$j++)
{
@@ -1596,8 +1622,8 @@
}
$values =
$this->bocommon->collect_locationdata($values,$insert_record);
-//_debug_array($values);
- if ($values['save'] || $values['apply']):
+ //_debug_array($values);
+ if ($values['save'] || $values['apply'])
{
if(!$receipt['error'])
@@ -1631,7 +1657,7 @@
}
}
}
- elseif($values['update']):
+ else if($values['update'])
{
if(!$values['date'])
{
@@ -1648,23 +1674,22 @@
}
}
- elseif (!$values['save'] && !$values['apply']
&& !$values['update']):
+ else if (!$values['save'] && !$values['apply']
&& !$values['update'])
{
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uis_agreement.edit', 'id'=> $s_agreement_id));
}
- endif;
}
$s_agreement =
$this->bo->read_single(array('s_agreement_id'=>$s_agreement_id, 'view' =>
true));
$values =
$this->bo->read_single_item(array('s_agreement_id'=>$s_agreement_id,'id'=>$id));
$link_data = array
- (
- 'menuaction' =>
'property.uis_agreement.edit_item',
- 's_agreement_id' => $s_agreement_id,
- 'id' => $id,
- 'role' => $this->role
- );
+ (
+ 'menuaction' =>
'property.uis_agreement.edit_item',
+ 's_agreement_id' =>
$s_agreement_id,
+ 'id' => $id,
+ 'role' => $this->role
+ );
$msgbox_data = $this->bocommon->msgbox_data($receipt);
@@ -1672,11 +1697,11 @@
$member_of_data =
$this->cats->formatted_xslt_list(array('selected' => $this->member_id,'globals'
=> true,link_data => array()));
$table_add[] = array
- (
- 'lang_add' =>
lang('add detail'),
- 'lang_add_standardtext' => lang('add an item to
the details'),
- 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uis_agreement.edit_item', 's_agreement_id'=> $s_agreement_id))
- );
+ (
+ 'lang_add'
=> lang('add detail'),
+ 'lang_add_standardtext' => lang('add an
item to the details'),
+ 'add_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uis_agreement.edit_item', 's_agreement_id'=> $s_agreement_id))
+ );
if($id)
@@ -1729,33 +1754,34 @@
{
$set_column[]=true;
}
-//_debug_array($list);
+ //_debug_array($list);
$table_update[] = array
- (
+ (
- 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
- 'lang_datetitle' => lang('Select
date'),
- 'lang_new_index' => lang('New
index'),
- 'lang_new_index_statustext' => lang('Enter
a new index'),
- 'lang_date_statustext' => lang('Select
the date for the update'),
- 'lang_update' =>
lang('Update'),
- 'lang_update_statustext' => lang('update
selected investments')
- );
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
+ 'lang_datetitle'
=> lang('Select date'),
+ 'lang_new_index'
=> lang('New index'),
+ 'lang_new_index_statustext'
=> lang('Enter a new index'),
+ 'lang_date_statustext'
=> lang('Select the date for the update'),
+ 'lang_update'
=> lang('Update'),
+ 'lang_update_statustext'
=> lang('update selected investments')
+ );
$lookup_type='form';
-//_debug_array($values);
- $location_data=$bolocation->initiate_ui_location(array(
- 'values' =>
$values['location_data'],
- 'type_id' => -1, //
calculated from location_types
- 'no_link' => false, //
disable lookup links for location type less than type_id
- 'tenant' => false,
- 'lookup_type' => $lookup_type,
- 'lookup_entity' =>
$this->bocommon->get_lookup_entity('s_agreement'),
- 'entity_data' => $values['p']
- ));
+ //_debug_array($values);
+ $location_data=$bolocation->initiate_ui_location(array
+ (
+ 'values' =>
$values['location_data'],
+ 'type_id' => -1, // calculated
from location_types
+ 'no_link' => false, // disable
lookup links for location type less than type_id
+ 'tenant' => false,
+ 'lookup_type' => $lookup_type,
+ 'lookup_entity' =>
$this->bocommon->get_lookup_entity('s_agreement'),
+ 'entity_data' => $values['p']
+ ));
$GLOBALS['phpgw']->js->validate_file('overlib','overlib','property');
$GLOBALS['phpgw']->js->validate_file('core','check','property');
@@ -1769,15 +1795,15 @@
if($attribute['history'] == true)
{
$link_history_data = array
- (
- 'menuaction' =>
'property.uientity.attrib_history',
- 'acl_location' =>
'.s_agreement',
- 'id'
=> $s_agreement_id,
- 'attrib_id'
=> $attribute['id'],
- 'detail_id'
=> $id,
- 'edit'
=> true,
- 'role'
=>'detail'
- );
+ (
+ 'menuaction'
=> 'property.uientity.attrib_history',
+ 'acl_location'
=> '.s_agreement',
+ 'id'
=> $s_agreement_id,
+ 'attrib_id'
=> $attribute['id'],
+ 'detail_id'
=> $id,
+ 'edit'
=> true,
+ 'role'
=>'detail'
+ );
$attribute['link_history'] =
$GLOBALS['phpgw']->link('/index.php',$link_history_data);
}
@@ -1838,135 +1864,136 @@
$parameters = array
- (
- 'parameter' => array
(
- array
+ 'parameter' => array
(
- 'name' =>
's_agreement_id',
- 'source' =>
$s_agreement_id,
- 'ready' => 1
- ),
- array
- (
- 'name' => 'from',
- 'source' =>
$view_only?'view':'edit',
- 'ready' => 1
+ array
+ (
+ 'name' =>
's_agreement_id',
+ 'source' =>
$s_agreement_id,
+ 'ready' => 1
+ ),
+ array
+ (
+ 'name' =>
'from',
+ 'source' =>
$view_only?'view':'edit',
+ 'ready' => 1
+ )
)
- )
- );
+ );
/*REQUIRES VALIDATION OF PERMISSIONS*/
- $permissions['rowactions'][] = array(
+ $permissions['rowactions'][] = array
+ (
'text' => lang('View'),
'action' =>
$GLOBALS['phpgw']->link('/index.php',array
- (
-
'menuaction' => 'property.uis_agreement.view_item'
- )),
+ (
+ 'menuaction' =>
'property.uis_agreement.view_item'
+ )),
'parameters' => $parameters
- );
+ );
$datavalues[0] = array
- (
+ (
'name'
=> "0",
'values'
=> json_encode($content_values),
'total_records' =>
count($content_values),
'is_paginator' => 0,
'permission' =>
json_encode($permissions['rowactions']),
'footer'
=> 0
- );
+ );
- $myColumnDefs[0] = array
- (
- 'name' => "0",
- 'values' => json_encode(array(
array('key' =>
'item_id','label'=>lang('ID'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'cost','label'=>lang('Cost'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'this_index','label'=>lang('index'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'index_count','label'=>lang('index_count'),'sortable'=>true,'resizeable'=>true),
-
array('key' =>
'index_date','label'=>lang('Date'),'sortable'=>true,'resizeable'=>true)))
- );
+ $myColumnDefs[0] = array
+ (
+ 'name' => "0",
+ 'values' =>
json_encode(array( array('key' =>
'item_id','label'=>lang('ID'),'sortable'=>true,'resizeable'=>true),
+
array('key' =>
'cost','label'=>lang('Cost'),'sortable'=>true,'resizeable'=>true),
+
array('key' =>
'this_index','label'=>lang('index'),'sortable'=>true,'resizeable'=>true),
+
array('key' =>
'index_count','label'=>lang('index_count'),'sortable'=>true,'resizeable'=>true),
+
array('key' =>
'index_date','label'=>lang('Date'),'sortable'=>true,'resizeable'=>true)))
+ );
$myButtons[0] = array
- (
- 'name' => "0",
- 'values' =>
json_encode(array( array('type'=>'text', 'label'=>'New index',
'classname'=> 'index-opt'),
-
array('id' =>'values[new_index]',
'type'=>'inputText', size=>12, 'classname'=> 'index-opt'),
-
array('id'
=>'values[update]','type'=>'buttons', 'value'=>'Update',
'label'=>'Update', 'funct'=> 'onAddClick' , 'classname'=> ''),
-
array('id' =>'delete','type'=>'buttons',
'value'=>'Delete', 'label'=>lang('delete last index'), 'funct'=>
'onDeleteClick' , 'classname'=> '')
-
))
+ (
+ 'name' => "0",
+ 'values' =>
json_encode(array( array('type'=>'text', 'label'=>'New index',
'classname'=> 'index-opt'),
+
array('id' =>'values[new_index]',
'type'=>'inputText', size=>12, 'classname'=> 'index-opt'),
+
array('id'
=>'values[update]','type'=>'buttons', 'value'=>'Update',
'label'=>'Update', 'funct'=> 'onAddClick' , 'classname'=> ''),
+
array('id' =>'delete','type'=>'buttons',
'value'=>'Delete', 'label'=>lang('delete last index'), 'funct'=>
'onDeleteClick' , 'classname'=> '')
+ ))
);
$data = array
- (
- 'property_js'
=>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
- 'base_java_url'
=> json_encode(array('menuaction' =>
"property.uis_agreement.edit_item",'id'=>$id,'s_agreement_id'=>$s_agreement_id)),
- 'datatable'
=> $datavalues,
- 'myColumnDefs'
=> $myColumnDefs,
- 'myButtons'
=> $myButtons,
+ (
+ 'property_js'
=>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
+ 'base_java_url'
=> json_encode(array('menuaction' =>
"property.uis_agreement.edit_item",'id'=>$id,'s_agreement_id'=>$s_agreement_id)),
+ 'datatable'
=> $datavalues,
+ 'myColumnDefs'
=> $myColumnDefs,
+ 'myButtons'
=> $myButtons,
- 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
- 'edit_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
- 'lang_id'
=> lang('ID'),
- 'value_id'
=> $values['id'],
- 'value_s_agreement_id' =>
$s_agreement_id,
- 'lang_category'
=> lang('category'),
- 'lang_save'
=> lang('save'),
- 'lang_cancel'
=> lang('cancel'),
- 'lang_apply'
=> lang('apply'),
- 'lang_apply_statustext' =>
lang('Apply the values'),
- 'lang_cancel_statustext' =>
lang('Leave the service agreement untouched and return back to the list'),
- 'lang_save_statustext' =>
lang('Save the service agreement and return back to the list'),
+ 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
+ 'edit_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
+ 'lang_id'
=> lang('ID'),
+ 'value_id'
=> $values['id'],
+ 'value_s_agreement_id'
=> $s_agreement_id,
+ 'lang_category'
=> lang('category'),
+ 'lang_save'
=> lang('save'),
+ 'lang_cancel'
=> lang('cancel'),
+ 'lang_apply'
=> lang('apply'),
+ 'lang_apply_statustext'
=> lang('Apply the values'),
+ 'lang_cancel_statustext'
=> lang('Leave the service agreement untouched and return back to the list'),
+ 'lang_save_statustext'
=> lang('Save the service agreement and return back to the list'),
- 'attributes_group'
=> $attributes,
- 'lookup_functions'
=> $values['lookup_functions'],
+ 'attributes_group'
=> $attributes,
+ 'lookup_functions'
=> $values['lookup_functions'],
- // 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
- 'lang_datetitle'
=> lang('Select date'),
+ // 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
+ 'lang_datetitle'
=> lang('Select date'),
- 'lang_agreement'
=> lang('Agreement'),
- 'agreement_name'
=> $s_agreement['name'],
+ 'lang_agreement'
=> lang('Agreement'),
+ 'agreement_name'
=> $s_agreement['name'],
- 'table_add'
=> $table_add,
- 'values'
=> $content,
- 'table_header'
=> $table_header,
- 'acl_manage'
=> $this->acl_manage,
- 'table_update'
=> $table_update,
- 'update_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uis_agreement.edit_item', 's_agreement_id'=> $s_agreement_id, 'id'=>
$id)),
- 'lang_select_all'
=> lang('Select All'),
- 'img_check'
=> $GLOBALS['phpgw']->common->get_image_path('property').'/check.png',
- 'location_data'
=> $location_data,
+ 'table_add'
=> $table_add,
+ 'values'
=> $content,
+ 'table_header'
=> $table_header,
+ 'acl_manage'
=> $this->acl_manage,
+ 'table_update'
=> $table_update,
+ 'update_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uis_agreement.edit_item', 's_agreement_id'=> $s_agreement_id, 'id'=>
$id)),
+ 'lang_select_all'
=> lang('Select All'),
+ 'img_check'
=>
$GLOBALS['phpgw']->common->get_image_path('property').'/check.png',
+ 'location_data'
=> $location_data,
- 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
- 'lang_cost'
=> lang('cost'),
- 'lang_cost_statustext' =>
lang('cost'),
- 'value_cost'
=> $values['cost'],
- 'set_column'
=> $set_column,
- 'lang_delete_last'
=> lang('delete last index'),
- 'lang_delete_last_statustext' => lang('delete
the last index'),
- 'delete_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uis_agreement.edit_item', 'delete_last'=>1, 's_agreement_id'=>
$s_agreement_id, 'id'=> $id)),
+ 'img_cal'
=> $GLOBALS['phpgw']->common->image('phpgwapi','cal'),
+ 'lang_cost'
=> lang('cost'),
+ 'lang_cost_statustext'
=> lang('cost'),
+ 'value_cost'
=> $values['cost'],
+ 'set_column'
=> $set_column,
+ 'lang_delete_last'
=> lang('delete last index'),
+ 'lang_delete_last_statustext' =>
lang('delete the last index'),
+ 'delete_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uis_agreement.edit_item', 'delete_last'=>1, 's_agreement_id'=>
$s_agreement_id, 'id'=> $id)),
- 'lang_history'
=> lang('history'),
- 'lang_history_help'
=> lang('history of this attribute'),
- 'lang_history_date_statustext' => lang('Enter
the date for this reading'),
- 'textareacols'
=>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] : 40,
- 'textarearows'
=>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] : 6,
- //'tabs'
=> phpgwapi_yui::tabview_generate($tabs, 'general')
- );
+ 'lang_history'
=> lang('history'),
+ 'lang_history_help'
=> lang('history of this attribute'),
+ 'lang_history_date_statustext' =>
lang('Enter the date for this reading'),
+ 'textareacols'
=>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] : 40,
+ 'textarearows'
=>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'])
&& $GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] ?
$GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] : 6,
+ //'tabs'
=> phpgwapi_yui::tabview_generate($tabs, 'general')
+ );
//_debug_array($data['values']);die;
phpgwapi_yui::load_widget('dragdrop');
- phpgwapi_yui::load_widget('datatable');
- phpgwapi_yui::load_widget('menu');
- phpgwapi_yui::load_widget('connection');
- phpgwapi_yui::load_widget('loader');
+ phpgwapi_yui::load_widget('datatable');
+ phpgwapi_yui::load_widget('menu');
+ phpgwapi_yui::load_widget('connection');
+ phpgwapi_yui::load_widget('loader');
phpgwapi_yui::load_widget('tabview');
phpgwapi_yui::load_widget('paginator');
phpgwapi_yui::load_widget('animation');
@@ -2002,10 +2029,10 @@
$values =
$this->bo->read_single_item(array('s_agreement_id'=>$s_agreement_id,'id'=>$id));
$link_data = array
- (
- 'menuaction' => 'property.uis_agreement.' .
$from,
- 'id' => $s_agreement_id
- );
+ (
+ 'menuaction' =>
'property.uis_agreement.' . $from,
+ 'id' => $s_agreement_id
+ );
@@ Diff output truncated at 153600 characters. @@
| [Prev in Thread] | Current Thread | [Next in Thread] |