|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [12622] convert some lookup functions |
| Date: | Mon, 19 Jan 2015 13:08:22 +0000 |
Revision: 12622
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12622
Author: sigurdne
Date: 2015-01-19 13:08:21 +0000 (Mon, 19 Jan 2015)
Log Message:
-----------
convert some lookup functions
Modified Paths:
--------------
branches/dev-syncromind/property/inc/class.bolookup.inc.php
branches/dev-syncromind/property/inc/class.custom_fields.inc.php
branches/dev-syncromind/property/inc/class.uilookup.inc.php
branches/dev-syncromind/property/templates/base/tts.xsl
Modified: branches/dev-syncromind/property/inc/class.bolookup.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.bolookup.inc.php 2015-01-16
23:34:40 UTC (rev 12621)
+++ branches/dev-syncromind/property/inc/class.bolookup.inc.php 2015-01-19
13:08:21 UTC (rev 12622)
@@ -186,7 +186,7 @@
* @return array of contacts
*/
- function read_organisation()
+ function read_organisation($data = array())
{
if($GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'] > 0)
@@ -198,7 +198,7 @@
$limit = 15;
}
- $limit = $this->allrows ? 0 : $limit;
+ $limit = $data['allrows'] ? 0 : $limit;
$fields = array
(
@@ -220,11 +220,11 @@
$qfield = 'org';
$criteria =
$addressbook->criteria_contacts(PHPGW_CONTACTS_ALL,PHPGW_CONTACTS_CATEGORIES_ALL,array(),'',$fields);
- $token_criteria =
$addressbook->criteria_contacts($access = 1, $category_filter, $qfield,
$this->query, $fields);
+ $token_criteria =
$addressbook->criteria_contacts($access = 1, $category_filter, $qfield,
$data['query'], $fields);
- $orgs = $addressbook->get_orgs($fields, $this->start,
$limit, $orderby='org_name', $sort='ASC', $criteria='', $token_criteria);
+ $orgs = $addressbook->get_orgs($fields,$data['start'],
$limit, $orderby='org_name', $sort='ASC', $criteria='', $token_criteria);
- $this->total = $addressbook->total;
+ $this->total_records = $addressbook->total;
foreach($orgs as &$contact)
{
@@ -307,8 +307,8 @@
function read_b_account($data)
{
- $b_account = $this->so->read_b_account(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
- 'filter' => $this->filter,'cat_id' =>
$this->cat_id, 'allrows' => $this->allrows,
+ $b_account = $this->so->read_b_account(array('start' =>
$data['start'],'query' => $data['query'],'sort' => $data['sort'],'order' =>
$data['order'],
+ 'filter' => $data['filter'],'cat_id' =>
$this->cat_id, 'allrows' => $data['allrows'],
'role' => $data['role'], 'parent' =>
$data['parent']));
$this->total_records = $this->so->total_records;
@@ -361,7 +361,7 @@
return $values;
}
- function read_ecodimb()
+ function read_ecodimb($data = array())
{
$config =
CreateObject('phpgwapi.config','property');
$config->read();
@@ -374,8 +374,8 @@
$ecodimb = CreateObject('property.sogeneric');
$ecodimb->get_location_info('dimb',false);
- $values = $ecodimb->read(array('start' =>
$this->start,'query' => $this->query,'sort' => $this->sort,'order' =>
$this->order,
- 'allrows'=>$this->allrows, 'custom_criteria' =>
$custom_criteria));
+ $values = $ecodimb->read(array('start' =>
$data['start'],'query' => $data['query'],'sort' => $data['sort'],'order' =>
$data['order'],
+ 'allrows'=>$data['allrows'], 'custom_criteria'
=> $custom_criteria));
$this->total_records = $ecodimb->total_records;
Modified: branches/dev-syncromind/property/inc/class.custom_fields.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.custom_fields.inc.php
2015-01-16 23:34:40 UTC (rev 12621)
+++ branches/dev-syncromind/property/inc/class.custom_fields.inc.php
2015-01-19 13:08:21 UTC (rev 12622)
@@ -170,15 +170,15 @@
$lookup_link
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uilookup.addressbook', 'column'=> $attributes['name']));
$lookup_functions[$m]['name'] =
'lookup_'. $attributes['name'] .'()';
- $lookup_functions[$m]['action'] =
'Window1=window.open('."'" . $lookup_link ."'"
.',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
+ $lookup_functions[$m]['action'] =
'TINY.box.show({iframe:"'.$lookup_link.'",
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
$clear_functions[$m]['name'] =
"clear_{$attributes['name']}()";
$confirm_msg = lang('delete') . '?';
$clear_functions[$m]['action'] = <<<JS
if(confirm("{$confirm_msg}"))
{
-
document.getElementsByName('{$attributes['name']}')[0].value = '';
-
document.getElementsByName('{$attributes['name']}_name')[0].value = '';
+
parent.getElementsByName('{$attributes['name']}')[0].value = '';
+
parent.getElementsByName('{$attributes['name']}_name')[0].value = '';
}
JS;
$m++;
@@ -212,7 +212,7 @@
$lookup_link
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uilookup.organisation', 'column'=> $attributes['name']));
$lookup_functions[$m]['name'] =
'lookup_'. $attributes['name'] .'()';
- $lookup_functions[$m]['action'] =
'Window1=window.open('."'" . $lookup_link ."'"
.',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
+ $lookup_functions[$m]['action'] =
'TINY.box.show({iframe:"'.$lookup_link.'",
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
$m++;
}
else if($attributes['datatype'] == 'VENDOR')
@@ -235,7 +235,6 @@
$lookup_link
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uilookup.vendor', 'column'=> $attributes['name']));
$lookup_functions[$m]['name'] =
'lookup_'. $attributes['name'] .'()';
- //$lookup_functions[$m]['action']
= 'Window1=window.open('."'" . $lookup_link ."'"
.',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
$lookup_functions[$m]['action'] =
'TINY.box.show({iframe:"'.$lookup_link.'",
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
$m++;
}
@@ -282,7 +281,7 @@
));
$lookup_functions[$m]['name'] =
'lookup_'. $attributes['name'] .'()';
- $lookup_functions[$m]['action'] =
'Window1=window.open('."'" . $lookup_link ."'"
.',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");';
+ $lookup_functions[$m]['action'] =
'TINY.box.show({iframe:"'.$lookup_link.'",
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});';
$m++;
}
else if($attributes['datatype'] == 'custom3')
//autocomplete
Modified: branches/dev-syncromind/property/inc/class.uilookup.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uilookup.inc.php 2015-01-16
23:34:40 UTC (rev 12621)
+++ branches/dev-syncromind/property/inc/class.uilookup.inc.php 2015-01-19
13:08:21 UTC (rev 12622)
@@ -273,158 +273,61 @@
self::render_template_xsl('datatable_jquery', $data);
}
-
function organisation()
{
- $bocommon = CreateObject('property.bocommon');
- $this->cats =
CreateObject('phpgwapi.categories', -1, 'addressbook');
- $this->cats->supress_info = true;
-
- $second_display = phpgw::get_var('second_display',
'bool');
- $column = phpgw::get_var('column');
-
- $default_category =
$GLOBALS['phpgw_info']['user']['preferences']['addressbook']['default_category'];
-
- if ($default_category && !$second_display)
+ if( phpgw::get_var('phpgw_return_as') == 'json' )
{
- $this->bo->cat_id = $default_category;
- $this->cat_id = $default_category;
- }
+ $search = phpgw::get_var('search');
+ $order = phpgw::get_var('order');
+ $draw = phpgw::get_var('draw', 'int');
+ $columns = phpgw::get_var('columns');
- if( phpgw::get_var('phpgw_return_as') != 'json' )
- {
+ $params = array(
+ 'start' => phpgw::get_var('start',
'int', 'REQUEST', 0),
+ 'results' => phpgw::get_var('length',
'int', 'REQUEST', 0),
+ 'query' => $search['value'],
+ 'order' =>
$columns[$order[0]['column']]['data'],
+ 'sort' => $order[0]['dir'],
+ 'dir' => $order[0]['dir'],
+ 'allrows' => phpgw::get_var('length',
'int') == -1,
+ 'filter' => ''
+ );
- $datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
- (
- 'menuaction'
=> 'property.uilookup.organisation',
- 'second_display' => true,
- 'cat_id'
=> $this->cat_id,
- 'query'
=> $this->query,
- 'filter'
=> $this->filter,
- 'column'
=> $column
+ $values = $this->bo->read_organisation($params);
- ));
+ /**
+ * Sigurd: For some reason - this one starts on
1 - not 0 as it is supposed to.
+ */
+ $results = array();
+ foreach($values as $entry)
+ {
+ $results[] = $entry;
+ }
+ $result_data = array('results' => $results);
- $datatable['config']['allow_allrows'] = true;
+ $result_data['total_records'] =
$this->bo->total_records;
+ $result_data['draw'] = $draw;
- $datatable['config']['base_java_url'] =
"menuaction:'property.uilookup.organisation',"
- ."second_display:true,"
- ."cat_id:'{$this->cat_id}',"
- ."query:'{$this->query}',"
- ."filter:'{$this->filter}',"
- ."column:'{$column}'";
-
- $values_combo_box[0] =
$this->cats->formatted_xslt_list(array('selected' => $this->cat_id,'globals' =>
true));;
- $default_value = array
('cat_id'=>'','name'=>lang('no category'));
- array_unshift
($values_combo_box[0]['cat_list'],$default_value);
-
- $datatable['actions']['form'] = array
- (
- array
- (
- 'action' =>
$GLOBALS['phpgw']->link('/index.php',
- array
- (
- 'menuaction'
=> 'property.uilookup.organisation',
-
'second_display' => true,
- 'cat_id'
=> $this->cat_id,
- 'query'
=> $this->query,
- 'filter'
=> $this->filter,
- 'column'
=> $column
- )
- ),
- 'fields' => array
- (
- 'field' => array
- (
- array
- ( //boton
CATEGORY
- 'id' =>
'btn_cat_id',
- 'name'
=> 'cat_id',
- 'value'
=> lang('Category'),
- 'type'
=> 'button',
- 'style'
=> 'filter',
-
'tab_index' => 1
- ),
- 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',
- 'size'
=> 28,
-
'onkeypress' => 'return pulsar(event)',
-
'tab_index' => 2
- )
- ),
- 'hidden_value' => array
- (
- array
- ( //div values
combo_box_0
- 'id' =>
'values_combo_box_0',
- 'value'
=> $bocommon->select2String($values_combo_box[0]['cat_list'], 'cat_id') //i.e.
id,value/id,vale/
- )
- )
- )
- )
- );
+ $ret = $this->jquery_results($result_data);
+ return $ret;
}
- $uicols = array (
- 'input_type' =>
array('text','text','text','text'),
- 'name' =>
array('contact_id','org_name','email','wphone'),
- 'sort_field' =>
array('person_id','last_name','',''),
- 'sortable' =>
array(true,true,false,false),
- 'formatter' =>
array('','','','',''),
- 'descr' =>
array(lang('ID'),lang('Name'),lang('email'),lang('phone'))
- );
+ $this->cats =
CreateObject('phpgwapi.categories', -1, 'addressbook');
+ $this->cats->supress_info = true;
- $organisation_list = array();
- $organisation_list = $this->bo->read_organisation();
+ $column = phpgw::get_var('column');
- $content = array();
- $j=0;
- if (isset($organisation_list) &&
is_array($organisation_list))
- {
- foreach($organisation_list as
$organisation_entry)
- {
- for
($i=0;$i<count($uicols['name']);$i++)
- {
- if ($uicols['name'][$i] ==
'contact_name')
- {
-
$datatable['rows']['row'][$j]['column'][$i]['value'] =
$organisation_entry['per_last_name'] . ', ' .
$organisation_entry['per_first_name'];
- }
- else
- {
-
$datatable['rows']['row'][$j]['column'][$i]['value'] =
$organisation_entry[$uicols['name'][$i]];
- }
-
$datatable['rows']['row'][$j]['column'][$i]['name'] = $uicols['name'][$i];
- }
- $j++;
- }
- }
+ $default_category =
$GLOBALS['phpgw_info']['user']['preferences']['addressbook']['default_category'];
- $uicols_count = count($uicols['descr']);
- $datatable['rowactions']['action'] = array();
- for ($i=0;$i<$uicols_count;$i++)
+ if ($default_category && !$second_display)
{
- //all colums should be have formatter
-
$datatable['headers']['header'][$i]['formatter'] =
($uicols['formatter'][$i]==''? '""' : $uicols['formatter'][$i]);
- $datatable['headers']['header'][$i]['name']
= $uicols['name'][$i];
- $datatable['headers']['header'][$i]['text']
= $uicols['descr'][$i];
- $datatable['headers']['header'][$i]['visible']
= true;
- $datatable['headers']['header'][$i]['sortable']
= $uicols['sortable'][$i];
-
$datatable['headers']['header'][$i]['sort_field'] =
$uicols['sort_field'][$i];
+ $this->bo->cat_id = $default_category;
+ $this->cat_id = $default_category;
}
+ self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.jeditable.js');
+ self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.dataTables.editable.js');
+
if($column)
{
$contact_id =$column;
@@ -436,128 +339,91 @@
$contact_name ='contact_name';
}
- $function_exchange_values = '';
+ $action = '';
+ $action .=
'parent.document.getElementsByName("'.$contact_id.'")[0].value = "";' ."\r\n";
+ $action .=
'parent.document.getElementsByName("'.$contact_name.'")[0].value = "";' ."\r\n";
+ $action .=
'parent.document.getElementsByName("'.$contact_id.'")[0].value =
aData["contact_id"];' ."\r\n";
+ $action .=
'parent.document.getElementsByName("'.$contact_name.'")[0].value =
aData["org_name"];' ."\r\n";
+ //trigger ajax-call
+ $action .=
"parent.document.getElementsByName('{$contact_id}')[0].setAttribute('{$contact_id}','{$contact_id}',0);\r\n";
- $function_exchange_values .=
'opener.document.getElementsByName("'.$contact_id.'")[0].value = "";' ."\r\n";
- $function_exchange_values .=
'opener.document.getElementsByName("'.$contact_name.'")[0].value = "";' ."\r\n";
+ $action .=
'parent.JqueryPortico.onPopupClose("close");'."\r";
- $function_exchange_values .=
'opener.document.getElementsByName("'.$contact_id.'")[0].value =
data.getData("contact_id");' ."\r\n";
- $function_exchange_values .=
'opener.document.getElementsByName("'.$contact_name.'")[0].value =
data.getData("org_name");' ."\r\n";
+ $data = array(
+ 'left_click_action' => $action,
+ 'datatable_name' => '',
+ 'form' => array(
+ 'toolbar' => array(
+ 'item' => array()
+ )
+ ),
+ 'datatable' => array(
+ 'source' => self::link(array(
+ 'menuaction'
=> 'property.uilookup.organisation',
+ 'query'
=> $this->query,
+ 'filter'
=> $this->filter,
+ 'cat_id'
=> $this->cat_id,
+ 'column'
=> $column,
+ 'phpgw_return_as'
=> 'json'
+ )),
+ 'allrows' => true,
+ 'editor_action' => '',
+ 'field' => array()
+ )
+ );
- $function_exchange_values .= 'window.close()';
-
- $datatable['exchange_values'] =
$function_exchange_values;
- $datatable['valida'] = '';
-
- // path for property.js
- $property_js = "/property/js/yahoo/property.js";
-
- if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
+ $values_combo_box =
$this->cats->formatted_xslt_list(array('selected' => $this->cat_id,'globals' =>
true));
+ foreach ($values_combo_box['cat_list'] as &$val)
{
- $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
- $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
+ $val['id'] = $val['cat_id'];
}
+ $default_value = array ('id'=>'', 'name'=>lang('no
category'));
+ array_unshift ($values_combo_box['cat_list'],
$default_value);
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
+ $filter = array('type' => 'filter',
+ 'name' => 'cat_id',
+ 'text' => lang('Category'),
+ 'list' =>
$values_combo_box['cat_list']
+ );
- // Pagination and sort values
- $datatable['pagination']['records_start'] =
(int)$this->start;
- $datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
- $datatable['pagination']['records_returned']=
count($organisation_list);
- $datatable['pagination']['records_total'] =
$this->bo->total_records;
+ array_unshift ($data['form']['toolbar']['item'],
$filter);
- if ( (phpgw::get_var("start")== "") &&
(phpgw::get_var("order",'string')== ""))
- {
- $datatable['sorting']['order']
= 'contact_id'; // name key Column in myColumnDef
- $datatable['sorting']['sort']
= 'asc'; // ASC / DESC
- }
- else
- {
- $datatable['sorting']['order']
= phpgw::get_var('order', 'string'); // name of column of Database
- $datatable['sorting']['sort']
= phpgw::get_var('sort', 'string'); // ASC / DESC
- }
+ $uicols = array (
+ 'name' =>
array('contact_id','org_name','email','wphone'),
+ 'sort_field' =>
array('person_id','last_name','',''),
+ 'sortable' =>
array(true,true,false,false),
+ 'formatter' =>
array('','','','',''),
+ 'descr' =>
array(lang('ID'),lang('Name'),lang('email'),lang('phone'))
+ );
- $appname
= lang('organisation');
- $function_msg =
lang('list organisations');
+ $count_uicols_name = count($uicols['name']);
-
- //-- BEGIN----------------------------- JSON CODE
------------------------------
-
- //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'],
- '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>";
- }
- else
if(isset($column['format']) && $column['format']== "link")
- {
-
$json_row[$column['name']] = "<a href='".$column['link']."' target='_blank'>"
.$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']))
+ for($k=0;$k<$count_uicols_name;$k++)
{
- $json ['rights'] =
$datatable['rowactions']['action'];
- }
+ $params = array(
+ 'key' =>
$uicols['name'][$k],
+ 'label' =>
$uicols['descr'][$k],
+ 'sortable' =>
$uicols['sortable'][$k],
+ 'hidden' =>
false
+ );
- if( phpgw::get_var('phpgw_return_as') == 'json' )
- {
- return $json;
+ array_push ($data['datatable']['field'],
$params);
}
+ $appname
= lang('addressbook');
+ $function_msg =
lang('list contacts');
- $datatable['json_data'] = json_encode($json);
- //-------------------- 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);
-
- //Title of Page
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
- // Prepare YUI Library
- $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'lookup.vendor.index', 'property' );
-
- $this->save_sessiondata();
+ self::render_template_xsl('datatable_jquery', $data);
}
+
function vendor()
{
- $this->cats =
CreateObject('phpgwapi.categories', -1, 'property', '.vendor');
-
- $second_display = phpgw::get_var('second_display',
'bool');
- $column = phpgw::get_var('column');
-
$default_category =
$GLOBALS['phpgw_info']['user']['preferences']['property']['default_vendor_category'];
- if ($default_category && !$second_display)
+ if ($default_category)
{
$this->bo->cat_id = $default_category;
$this->cat_id = $default_category;
@@ -583,16 +449,19 @@
$values = $this->bo->read_vendor($params);
- $result_data = array('results' => $values);
+ $result_data = array
+ (
+ 'results' => $values,
+ 'total_records' =>
$this->bo->total_records,
+ 'draw' => $draw
+ );
- $result_data['total_records'] =
$this->bo->total_records;
- $result_data['draw'] = $draw;
-
return $this->jquery_results($result_data);
}
- self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.jeditable.js');
- self::add_javascript('phpgwapi', 'jquery',
'editable/jquery.dataTables.editable.js');
+ $this->cats =
CreateObject('phpgwapi.categories', -1, 'property', '.vendor');
+
+ $column = phpgw::get_var('column');
if($column)
{
@@ -628,7 +497,6 @@
'datatable' => array(
'source' => self::link(array(
'menuaction'
=> 'property.uilookup.vendor',
- 'second_display'
=> true,
'query'
=> $this->query,
'filter'
=> $this->filter,
'column'
=> $column,
@@ -685,164 +553,93 @@
self::render_template_xsl('datatable_jquery', $data);
}
+
function b_account()
{
$role = phpgw::get_var('role');
$parent = phpgw::get_var('parent');
- if( phpgw::get_var('phpgw_return_as') != 'json' )
+ $parent = $this->cat_id ? $this->cat_id : $parent;
+
+ if( phpgw::get_var('phpgw_return_as') == 'json' )
{
+ $search = phpgw::get_var('search');
+ $order = phpgw::get_var('order');
+ $draw = phpgw::get_var('draw', 'int');
+ $columns = phpgw::get_var('columns');
- $datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
- (
- 'menuaction'
=> 'property.uilookup.b_account',
- 'second_display' => true,
- 'cat_id'
=> $this->cat_id,
- 'query'
=> $this->query,
- 'role'
=> $role,
- 'parent'
=> $parent,
- 'filter'
=> $this->filter
- ));
- $datatable['config']['allow_allrows'] = true;
+ $params = array(
+ 'start' => phpgw::get_var('start',
'int', 'REQUEST', 0),
+ 'results' => phpgw::get_var('length',
'int', 'REQUEST', 0),
+ 'query' => $search['value'],
+ 'order' =>
$columns[$order[0]['column']]['data'],
+ 'sort' => $order[0]['dir'],
+ 'dir' => $order[0]['dir'],
+ 'allrows' => phpgw::get_var('length',
'int') == -1,
+ 'filter' => '',
+ 'role' => $role,
+ 'parent' => $parent
+ );
- $datatable['config']['base_java_url'] =
"menuaction:'property.uilookup.b_account',"
- ."second_display:true,"
- ."cat_id:'{$this->cat_id}',"
- ."query:'{$this->query}',"
- ."role:'{$role}',"
- ."parent:'{$parent}',"
- ."filter:'{$this->filter}'";
+ $values = $this->bo->read_b_account($params);
- $datatable['actions']['form'] = array
- (
- array
- (
- 'action' =>
$GLOBALS['phpgw']->link('/index.php',
- array
- (
- 'menuaction'
=> 'property.uilookup.b_account',
-
'second_display' => true,
- 'cat_id'
=> $this->cat_id,
- 'query'
=> $this->query,
- 'filter'
=> $this->filter
- )
- ),
- 'fields' => array
- (
- 'field' => array
- (
- array
- ( //boton
SEARCH
- 'id' =>
'btn_search',
- 'name'
=> 'search',
- 'value'
=> lang('search'),
- 'type'
=> 'button',
-
'tab_index' => 2
- ),
- array
- ( // TEXT IMPUT
- 'name'
=> 'query',
- 'id'
=> 'txt_query',
- 'value'
=> '',//'',//$query,
- 'type'
=> 'text',
- 'size'
=> 28,
-
'onkeypress' => 'return pulsar(event)',
-
'tab_index' => 1
- )
- ),
- 'hidden_value' => array
- (
- )
- )
- )
- );
+ $result_data = array
+ (
+ 'results' => $values,
+ 'total_records' =>
$this->bo->total_records,
+ 'draw' => $draw
+ );
+ return $this->jquery_results($result_data);
+ }
- $values_combo_box = array();
- $i = 0;
- $button_def = array();
- $code_inner = array();
- if ( $role != 'group' )
- {
-
$datatable['actions']['form'][0]['fields']['field'][] = array
- (
- 'id' => "btn_parent",
- 'name' => 'parent',
- 'value' => 'parent',
- 'type' => 'button',
- 'style' => 'filter',
- 'tab_index' => $i
- );
+ $action = '';
+ $action .=
'parent.document.getElementsByName("b_account_id")[0].value = "";'."\r";
+ $action .=
'parent.document.getElementsByName("b_account_name")[0].value = "";'."\r";
+ $action .=
'parent.document.getElementsByName("b_account_id")[0].value =
aData["id"];'."\r";
+ $action .=
'parent.document.getElementsByName("b_account_name")[0].value =
aData["descr"];'."\r";
- $button_def[] = "oMenuButton_{$i}";
- $code_inner[] = "{order:{$i},
var_URL:'parent',name:'btn_parent',style:'genericbutton',dependiente:[]}";
+// $action .=
'parent.document.getElementsByName("b_account_id")[0].setAttribute("b_account_id","b_account_id",0);'."\r";
+// $action .=
'parent.document.getElementsByName("b_account_id")[0].removeAttribute("b_account_id");'."\r";
- $values_combo_box[] =
execMethod('property.bogeneric.get_list',array('type' => 'b_account','selected'
=> $parent,'filter' => array('active' =>1)));
- $default_value = array
('id'=>'','name'=> lang('select'));
- array_unshift
($values_combo_box[$i],$default_value);
- }
+ $action .=
'parent.JqueryPortico.onPopupClose("close");'."\r";
- if($button_def)
- {
- $code = 'var ' . implode(',',
$button_def) . ";\n";
- $code .= 'var selectsButtons = [' .
"\n" . implode(",\n",$code_inner) . "\n];";
- $code .= <<<JS
- this.particular_setting =
function()
- {
-
if(flag_particular_setting=='init')
- {
- //parent
- index =
locate_in_array_options(0,"value",path_values.parent);
- if(index)
- {
-
oMenuButton_0.set("label", ("<em>" + array_options[0][index][1] + "</em>"));
- }
+ $data = array(
+ 'left_click_action' => $action,
+ 'datatable_name' => '',
+ 'form' => array(
+ 'toolbar' => array(
+ 'item' => array()
+ )
+ ),
+ 'datatable' => array(
+ 'source' => self::link(array(
+ 'menuaction'
=> 'property.uilookup.b_account',
+ 'query'
=> $this->query,
+ 'filter'
=> $this->filter,
+ 'role'
=> $role,
+ 'parent'
=> $parent,
+ 'phpgw_return_as'
=> 'json'
+ )),
+ 'allrows' => true,
+ 'editor_action' => '',
+ 'field' => array()
+ )
+ );
- //--focus for
txt_query---
-
YAHOO.util.Dom.get(textImput[0].id).focus();
- }
- else
if(flag_particular_setting=='update')
- {
- // nothing
- }
- }
-JS;
+ if ( $role != 'group' )
+ {
+ $values_combo_box =
execMethod('property.bogeneric.get_list',array('type' => 'b_account','selected'
=> $parent,'filter' => array('active' =>1)));
+ $default_value = array ('id'=>'','name'=>
lang('select'));
+ array_unshift
($values_combo_box,$default_value);
- }
- else
- {
- $code = 'var selectsButtons = [];';
- $code .= <<<JS
- this.particular_setting =
function()
- {
-
if(flag_particular_setting=='init')
- {
- //--focus for
txt_query---
-
YAHOO.util.Dom.get(textImput[0].id).focus();
- }
- else
if(flag_particular_setting=='update')
- {
- // nothing
- }
- }
-JS;
- }
-
- $GLOBALS['phpgw']->js->add_code('', $code);
-
- if($values_combo_box)
- {
- $i = 0;
- foreach ( $values_combo_box as $combo )
- {
-
$datatable['actions']['form'][0]['fields']['hidden_value'][] = array
- (
- 'id' =>
"values_combo_box_{$i}",
- 'value' =>
execMethod('property.bocommon.select2String',$combo)
+ $filter = array('type' => 'filter',
+ 'name' => 'cat_id',
+ 'text' =>
lang('Category'),
+ 'list' =>
$values_combo_box
);
- $i++;
- }
- }
+
+ array_unshift
($data['form']['toolbar']['item'], $filter);
}
$uicols = array (
@@ -852,149 +649,26 @@
'descr' =>
array(lang('ID'),lang('Name'))
);
- $b_account_list = array();
+ $count_uicols_name = count($uicols['name']);
- $b_account_list =
$this->bo->read_b_account(array('role'=>$role, 'parent' => $parent));
-
- $content = array();
- $j=0;
- if (isset($b_account_list) && is_array($b_account_list))
+ for($k=0;$k<$count_uicols_name;$k++)
{
- foreach($b_account_list as $b_account_entry)
- {
- for
($i=0;$i<count($uicols['name']);$i++)
- {
-
$datatable['rows']['row'][$j]['column'][$i]['value'] =
$b_account_entry[$uicols['name'][$i]];
-
$datatable['rows']['row'][$j]['column'][$i]['name'] = $uicols['name'][$i];
- }
- $j++;
- }
- }
+ $params = array(
+ 'key' =>
$uicols['name'][$k],
+ 'label' =>
$uicols['descr'][$k],
+ 'sortable' =>
false,
+ 'hidden' =>
false
+ );
- $uicols_count = count($uicols['descr']);
- $datatable['rowactions']['action'] = array();
- for ($i=0;$i<$uicols_count;$i++)
- {
- //all colums should be have formatter
-
$datatable['headers']['header'][$i]['formatter'] =
($uicols['formatter'][$i]==''? '""' : $uicols['formatter'][$i]);
-
- $datatable['headers']['header'][$i]['name']
= $uicols['name'][$i];
- $datatable['headers']['header'][$i]['text']
= $uicols['descr'][$i];
- $datatable['headers']['header'][$i]['visible']
= true;
- $datatable['headers']['header'][$i]['sortable']
= true;
-
$datatable['headers']['header'][$i]['sort_field'] = $uicols['name'][$i];
+ array_push ($data['datatable']['field'],
$params);
}
- $function_exchange_values = '';
+ $appname = lang('vendor');
+ $function_msg = lang('list vendors');
- $function_exchange_values .=
'opener.document.getElementsByName("b_account_id")[0].value = "";' ."\r\n";
- $function_exchange_values .=
'opener.document.getElementsByName("b_account_name")[0].value = "";' ."\r\n";
-
- $function_exchange_values .=
'opener.document.getElementsByName("b_account_id")[0].value =
data.getData("id");' ."\r\n";
- $function_exchange_values .=
'opener.document.getElementsByName("b_account_name")[0].value =
data.getData("descr");' ."\r\n";
-
- $function_exchange_values .= 'window.close()';
-
- $datatable['exchange_values'] =
$function_exchange_values;
- $datatable['valida'] = '';
-
- // path for property.js
- $property_js = "/property/js/yahoo/property.js";
-
- if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
- {
- $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
- $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
- }
-
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
-
- // Pagination and sort values
- $datatable['pagination']['records_start'] =
(int)$this->start;
- $datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
- $datatable['pagination']['records_returned']=
count($b_account_list);
- $datatable['pagination']['records_total'] =
$this->bo->total_records;
-
- if ( (phpgw::get_var("start")== "") &&
(phpgw::get_var("order",'string')== ""))
- {
- $datatable['sorting']['order']
= 'id'; // name key Column in myColumnDef
- $datatable['sorting']['sort']
= 'desc'; // ASC / DESC
- }
- else
- {
- $datatable['sorting']['order']
= phpgw::get_var('order', 'string'); // name of column of Database
- $datatable['sorting']['sort']
= phpgw::get_var('sort', 'string'); // ASC / DESC
- }
-
- $appname
= lang('budget account');
- $function_msg =
lang('list budget account');
-
-
- //-- BEGIN----------------------------- JSON CODE
------------------------------
-
- //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'],
- '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>";
- }
- else
if(isset($column['format']) && $column['format']== "link")
- {
-
$json_row[$column['name']] = "<a href='".$column['link']."' target='_blank'>"
.$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']))
- {
- $json ['rights'] =
$datatable['rowactions']['action'];
- }
-
- if( phpgw::get_var('phpgw_return_as') == 'json' )
- {
- return $json;
- }
-
-
- $datatable['json_data'] = json_encode($json);
- //-------------------- 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);
-
- //Title of Page
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
- // Prepare YUI Library
- $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'lookup.b_account.index', 'property' );
-
- $this->save_sessiondata();
+ self::render_template_xsl('datatable_jquery', $data);
}
@@ -2250,290 +1924,158 @@
function ecodimb()
{
- if( phpgw::get_var('phpgw_return_as') != 'json' )
+ if( phpgw::get_var('phpgw_return_as') == 'json' )
{
+ $search = phpgw::get_var('search');
+ $order = phpgw::get_var('order');
+ $draw = phpgw::get_var('draw', 'int');
+ $columns = phpgw::get_var('columns');
- $datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
- (
- 'menuaction'
=> 'property.uilookup.ecodimb',
- 'second_display' => true,
- 'cat_id'
=> $this->cat_id,
- 'query'
=> $this->query,
- 'filter'
=> $this->filter
- ));
- $datatable['config']['allow_allrows'] = true;
+ $params = array(
+ 'start' => phpgw::get_var('start',
'int', 'REQUEST', 0),
+ 'results' => phpgw::get_var('length',
'int', 'REQUEST', 0),
+ 'query' => $search['value'],
+ 'order' =>
$columns[$order[0]['column']]['data'],
+ 'sort' => $order[0]['dir'],
+ 'dir' => $order[0]['dir'],
+ 'allrows' => phpgw::get_var('length',
'int') == -1,
+ 'filter' => ''
+ );
- $datatable['config']['base_java_url'] =
"menuaction:'property.uilookup.ecodimb',"
- ."second_display:true,"
- ."cat_id:'{$this->cat_id}',"
- ."query:'{$this->query}',"
- ."filter:'{$this->filter}'";
+ $values = $this->bo->read_ecodimb($params);
- $datatable['actions']['form'] = array
- (
- array
- (
- 'action' =>
$GLOBALS['phpgw']->link('/index.php',
- array
- (
- 'menuaction'
=> 'property.uilookup.ecodimb',
-
'second_display' => true,
- 'cat_id'
=> $this->cat_id,
- 'query'
=> $this->query,
- 'filter'
=> $this->filter
- )
- ),
- 'fields' => array
- (
- 'field' => array
- (
- array
- ( //boton
SEARCH
- 'id' =>
'btn_search',
- 'name'
=> 'search',
- 'value'
=> lang('search'),
- 'type'
=> 'button',
-
'tab_index' => 2
- ),
- array
- ( // TEXT IMPUT
- 'name'
=> 'query',
- 'id'
=> 'txt_query',
- 'value'
=> '',//'',//$query,
- 'type'
=> 'text',
- 'size'
=> 28,
-
'onkeypress' => 'return pulsar(event)',
-
'tab_index' => 1
- )
- ),
- 'hidden_value' => array
- (
- )
- )
- )
- );
+ $result_data = array
+ (
+ 'results' => $values,
+ 'total_records' =>
$this->bo->total_records,
+ 'draw' => $draw
+ );
+ return $this->jquery_results($result_data);
}
+ $action = '';
+ $action .=
'parent.document.getElementsByName("ecodimb")[0].value = "";' ."\r\n";
+ $action .=
'parent.document.getElementsByName("ecodimb_descr")[0].value = "";' ."\r\n";
+ $action .=
'parent.document.getElementsByName("ecodimb")[0].value = aData["id"];' ."\r\n";
+ $action .=
'parent.document.getElementsByName("ecodimb_descr")[0].value = aData["descr"];'
."\r\n";
+ //trigger ajax-call
+ $action .=
"parent.document.getElementsByName('ecodimb')[0].setAttribute('ecodimb','ecodimb',0);\r\n";
+
+ $action .=
'parent.JqueryPortico.onPopupClose("close");'."\r";
+
+ $data = array(
+ 'left_click_action' => $action,
+ 'datatable_name' => '',
+ 'form' => array(
+ 'toolbar' => array(
+ 'item' => array()
+ )
+ ),
+ 'datatable' => array(
+ 'source' => self::link(array(
+ 'menuaction'
=> 'property.uilookup.ecodimb',
+ 'query'
=> $this->query,
+ 'filter'
=> $this->filter,
+ 'cat_id'
=> $this->cat_id,
+ 'phpgw_return_as'
=> 'json'
+ )),
+ 'allrows' => true,
+ 'editor_action' => '',
+ 'field' => array()
+ )
+ );
+
$uicols = array (
- 'input_type' => array('text','text'),
'name' =>
array('id','descr'),
+ 'sortable' =>
array(true,true),
'formatter' => array('',''),
'descr' =>
array(lang('ID'),lang('Name'))
);
- $ecodimb_list = array();
- $ecodimb_list = $this->bo->read_ecodimb();
+ $count_uicols_name = count($uicols['name']);
- $content = array();
- $j=0;
- if (isset($ecodimb_list) && is_array($ecodimb_list))
+ for($k=0;$k<$count_uicols_name;$k++)
{
- foreach($ecodimb_list as $ecodimb_entry)
- {
- for
($i=0;$i<count($uicols['name']);$i++)
- {
-
$datatable['rows']['row'][$j]['column'][$i]['value'] =
$ecodimb_entry[$uicols['name'][$i]];
-
$datatable['rows']['row'][$j]['column'][$i]['name'] = $uicols['name'][$i];
- }
- $j++;
- }
- }
+ $params = array(
+ 'key' =>
$uicols['name'][$k],
+ 'label' =>
$uicols['descr'][$k],
+ 'sortable' =>
$uicols['sortable'][$k],
+ 'hidden' =>
false
+ );
- $uicols_count = count($uicols['descr']);
- $datatable['rowactions']['action'] = array();
- for ($i=0;$i<$uicols_count;$i++)
- {
- //all colums should be have formatter
-
$datatable['headers']['header'][$i]['formatter'] =
($uicols['formatter'][$i]==''? '""' : $uicols['formatter'][$i]);
-
- $datatable['headers']['header'][$i]['name']
= $uicols['name'][$i];
- $datatable['headers']['header'][$i]['text']
= $uicols['descr'][$i];
- $datatable['headers']['header'][$i]['visible']
= true;
- $datatable['headers']['header'][$i]['sortable']
= true;
-
$datatable['headers']['header'][$i]['sort_field'] = $uicols['name'][$i];
+ array_push ($data['datatable']['field'],
$params);
}
- $function_exchange_values = '';
+ $appname
= lang('ecodimb');
+ $function_msg =
lang('lookup');
- $function_exchange_values .=
'opener.document.getElementsByName("ecodimb")[0].value = "";' ."\r\n";
- $function_exchange_values .=
'opener.document.getElementsByName("ecodimb_descr")[0].value = "";' ."\r\n";
-
- $function_exchange_values .=
'opener.document.getElementsByName("ecodimb")[0].value = data.getData("id");'
."\r\n";
- $function_exchange_values .=
'opener.document.getElementsByName("ecodimb_descr")[0].value =
data.getData("descr");' ."\r\n";
-
- $function_exchange_values .= 'window.close()';
-
- $datatable['exchange_values'] =
$function_exchange_values;
- $datatable['valida'] = '';
-
- // path for property.js
- $property_js = "/property/js/yahoo/property.js";
-
- if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
- {
- $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
- $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
- }
-
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
-
- // Pagination and sort values
- $datatable['pagination']['records_start'] =
(int)$this->start;
- $datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
- $datatable['pagination']['records_returned']=
count($ecodimb_list);
- $datatable['pagination']['records_total'] =
$this->bo->total_records;
-
- if ( (phpgw::get_var("start")== "") &&
(phpgw::get_var("order",'string')== ""))
- {
- $datatable['sorting']['order']
= 'id'; // name key Column in myColumnDef
- $datatable['sorting']['sort']
= 'asc'; // ASC / DESC
- }
- else
- {
- $datatable['sorting']['order']
= phpgw::get_var('order', 'string'); // name of column of Database
- $datatable['sorting']['sort']
= phpgw::get_var('sort', 'string'); // ASC / DESC
- }
-
- $appname
= lang('project group');
- $function_msg =
lang('list project group');
-
-
- //-- BEGIN----------------------------- JSON CODE
------------------------------
-
- //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'],
- '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>";
- }
- else
if(isset($column['format']) && $column['format']== "link")
- {
-
$json_row[$column['name']] = "<a href='".$column['link']."' target='_blank'>"
.$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']))
- {
- $json ['rights'] =
$datatable['rowactions']['action'];
- }
-
- if( phpgw::get_var('phpgw_return_as') == 'json' )
- {
- return $json;
- }
-
-
- $datatable['json_data'] = json_encode($json);
- //-------------------- 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);
-
-
- //Title of Page
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
- // Prepare YUI Library
- $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'lookup.tenant.index', 'property' );
-
- $this->save_sessiondata();
+ self::render_template_xsl('datatable_jquery', $data);
}
function order_template()
{
- if( phpgw::get_var('phpgw_return_as') != 'json' )
+ if( phpgw::get_var('phpgw_return_as') == 'json' )
{
+ $search = phpgw::get_var('search');
+ $order = phpgw::get_var('order');
+ $draw = phpgw::get_var('draw', 'int');
+ $columns = phpgw::get_var('columns');
- $datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
- (
- 'menuaction'
=> 'property.uilookup.order_template',
- 'second_display' => true,
- 'cat_id'
=> $this->cat_id,
- 'query'
=> $this->query,
- 'filter'
=> $this->filter
- ));
- $datatable['config']['allow_allrows'] = true;
+ $params = array(
+ 'start' => phpgw::get_var('start',
'int', 'REQUEST', 0),
+ 'results' => phpgw::get_var('length',
'int', 'REQUEST', 0),
+ 'query' => $search['value'],
+ 'order' =>
$columns[$order[0]['column']]['data'],
+ 'sort' => $order[0]['dir'],
+ 'dir' => $order[0]['dir'],
+ 'allrows' => phpgw::get_var('length',
'int') == -1,
+ 'filter' => ''
+ );
- $datatable['config']['base_java_url'] =
"menuaction:'property.uilookup.order_template',"
- ."second_display:true,"
- ."type:'order_template',"
- ."cat_id:'{$this->cat_id}',"
- ."query:'{$this->query}',"
- ."filter:'{$this->filter}'";
+ $values = array();
+ $bo =
CreateObject('property.bogeneric',true);
+ $bo->get_location_info('order_template');
+ $values = $bo->read($params);
- $datatable['actions']['form'] = array
- (
- array
- (
- 'action' =>
$GLOBALS['phpgw']->link('/index.php',
- array
- (
- 'menuaction'
=> 'property.uilookup.order_template',
-
'second_display' => true,
- 'cat_id'
=> $this->cat_id,
- 'query'
=> $this->query,
- 'filter'
=> $this->filter,
- 'type'
=> 'order_template'
- )
- ),
- 'fields' => array
- (
- 'field' => array
- (
- array
- ( //boton
SEARCH
- 'id' =>
'btn_search',
- 'name'
=> 'search',
- 'value'
=> lang('search'),
- 'type'
=> 'button',
-
'tab_index' => 2
- ),
- array
- ( // TEXT IMPUT
- 'name'
=> 'query',
- 'id'
=> 'txt_query',
- 'value'
=> '',//'',//$query,
- 'type'
=> 'text',
- 'size'
=> 28,
-
'onkeypress' => 'return pulsar(event)',
-
'tab_index' => 1
- )
- ),
- 'hidden_value' => array
- (
- )
- )
- )
- );
+ $result_data = array
+ (
+ 'results' => $values,
+ 'total_records' =>
$this->bo->total_records,
+ 'draw' => $draw
+ );
+ return $this->jquery_results($result_data);
}
+ $action = 'var temp =
parent.document.getElementsByName("values[order_descr]")[0].value;' ."\r\n";
+ $action .= 'if(temp){temp = temp + "\n";}' ."\r\n";
+ $action .=
'parent.document.getElementsByName("values[order_descr]")[0].value = temp +
aData["content"];' ."\r\n";
+ $action .=
'parent.JqueryPortico.onPopupClose("close");'."\r";
+
+ $data = array(
+ 'left_click_action' => $action,
+ 'datatable_name' => '',
+ 'form' => array(
+ 'toolbar' => array(
+ 'item' => array()
+ )
+ ),
+ 'datatable' => array(
+ 'source' => self::link(array(
+ 'menuaction'
=> 'property.uilookup.order_template',
+ 'query'
=> $this->query,
+ 'filter'
=> $this->filter,
+ 'cat_id'
=> $this->cat_id,
+ 'type'
=> 'order_template',
+ 'phpgw_return_as'
=> 'json'
+ )),
+ 'allrows' => true,
+ 'editor_action' => '',
+ 'field' => array()
+ )
+ );
+
$uicols = array (
'input_type' =>
array('text','text','text'),
'name' =>
array('id','name','content'),
@@ -2541,219 +2083,92 @@
'descr' =>
array(lang('ID'),lang('name'),lang('content'))
);
- $template_list = array();
- $bo = CreateObject('property.bogeneric',true);
- $bo->get_location_info('order_template');
+ $count_uicols_name = count($uicols['name']);
- $template_list = $bo->read();
-
- $content = array();
- $j=0;
- if (isset($template_list) && is_array($template_list))
+ for($k=0;$k<$count_uicols_name;$k++)
{
- foreach($template_list as $template_entry)
- {
- for
($i=0;$i<count($uicols['name']);$i++)
- {
-
$datatable['rows']['row'][$j]['column'][$i]['value'] =
$template_entry[$uicols['name'][$i]];
-
$datatable['rows']['row'][$j]['column'][$i]['name'] = $uicols['name'][$i];
- }
- $j++;
- }
- }
+ $params = array(
+ 'key' =>
$uicols['name'][$k],
+ 'label' =>
$uicols['descr'][$k],
+ 'sortable' =>
$uicols['sortable'][$k],
+ 'hidden' =>
false
+ );
- $uicols_count = count($uicols['descr']);
- $datatable['rowactions']['action'] = array();
- for ($i=0;$i<$uicols_count;$i++)
- {
- //all colums should be have formatter
-
$datatable['headers']['header'][$i]['formatter'] =
($uicols['formatter'][$i]==''? '""' : $uicols['formatter'][$i]);
-
- $datatable['headers']['header'][$i]['name']
= $uicols['name'][$i];
- $datatable['headers']['header'][$i]['text']
= $uicols['descr'][$i];
- $datatable['headers']['header'][$i]['visible']
= true;
- $datatable['headers']['header'][$i]['sortable']
= true;
-
$datatable['headers']['header'][$i]['sort_field'] =
$uicols['name'][$i];
+ array_push ($data['datatable']['field'],
$params);
}
- $function_exchange_values = '';
-
- $function_exchange_values .= 'var temp =
opener.document.getElementsByName("values[order_descr]")[0].value;' ."\r\n";
- $function_exchange_values .= 'if(temp){temp = temp +
"\n";}' ."\r\n";
- $function_exchange_values .=
'opener.document.getElementsByName("values[order_descr]")[0].value = temp +
data.getData("content");' ."\r\n";
-
- $function_exchange_values .= 'window.close()';
-
- $datatable['exchange_values'] =
$function_exchange_values;
- $datatable['valida'] = '';
-
- // path for property.js
- $property_js = "/property/js/yahoo/property.js";
-
- if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
- {
- $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
- $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
- }
-
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
-
- // Pagination and sort values
- $datatable['pagination']['records_start'] =
(int)$this->start;
- $datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
- $datatable['pagination']['records_returned']=
count($template_list);
- $datatable['pagination']['records_total'] =
$this->bo->total_records;
-
- if ( (phpgw::get_var("start")== "") &&
(phpgw::get_var("order",'string')== ""))
- {
- $datatable['sorting']['order']
= 'id'; // name key Column in myColumnDef
- $datatable['sorting']['sort']
= 'name'; // ASC / DESC
- }
- else
- {
- $datatable['sorting']['order']
= phpgw::get_var('order', 'string'); // name of column of Database
- $datatable['sorting']['sort']
= phpgw::get_var('sort', 'string'); // ASC / DESC
- }
-
$appname
= lang('template');
$function_msg =
lang('list order template');
-
- //-- BEGIN----------------------------- JSON CODE
------------------------------
-
- //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'],
- '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>";
- }
- else
if(isset($column['format']) && $column['format']== "link")
- {
-
$json_row[$column['name']] = "<a href='".$column['link']."' target='_blank'>"
.$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']))
- {
- $json['rights'] =
$datatable['rowactions']['action'];
- }
-
- if( phpgw::get_var('phpgw_return_as') == 'json' )
- {
- return $json;
- }
-
- $datatable['json_data'] = json_encode($json);
- //-------------------- 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);
-
-
- //Title of Page
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
- // Prepare YUI Library
- $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'lookup.tenant.index', 'property' );
-
- $this->save_sessiondata();
+ self::render_template_xsl('datatable_jquery', $data);
}
function response_template()
{
- if( phpgw::get_var('phpgw_return_as') != 'json' )
+ if( phpgw::get_var('phpgw_return_as') == 'json' )
{
+ $search = phpgw::get_var('search');
+ $order = phpgw::get_var('order');
+ $draw = phpgw::get_var('draw', 'int');
+ $columns = phpgw::get_var('columns');
- $datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
- (
- 'menuaction'
=> 'property.uilookup.response_template',
- 'second_display' => true,
- 'cat_id'
=> $this->cat_id,
- 'query'
=> $this->query,
- 'filter'
=> $this->filter
- ));
- $datatable['config']['allow_allrows'] = true;
+ $params = array(
+ 'start' => phpgw::get_var('start',
'int', 'REQUEST', 0),
+ 'results' => phpgw::get_var('length',
'int', 'REQUEST', 0),
+ 'query' => $search['value'],
+ 'order' =>
$columns[$order[0]['column']]['data'],
+ 'sort' => $order[0]['dir'],
+ 'dir' => $order[0]['dir'],
+ 'allrows' => phpgw::get_var('length',
'int') == -1,
+ 'filter' => ''
+ );
- $datatable['config']['base_java_url'] =
"menuaction:'property.uilookup.response_template',"
- ."second_display:true,"
- ."type:'response_template',"
- ."cat_id:'{$this->cat_id}',"
- ."query:'{$this->query}',"
- ."filter:'{$this->filter}'";
+ $values = array();
+ $bo =
CreateObject('property.bogeneric',true);
+ $bo->get_location_info('response_template');
+ $values = $bo->read($params);
- $datatable['actions']['form'] = array
- (
- array
- (
- 'action' =>
$GLOBALS['phpgw']->link('/index.php',
- array
- (
- 'menuaction'
=> 'property.uilookup.response_template',
-
'second_display' => true,
- 'cat_id'
=> $this->cat_id,
- 'query'
=> $this->query,
- 'filter'
=> $this->filter,
- 'type'
=> 'response_template'
- )
- ),
- 'fields' => array
- (
- 'field' => array
- (
- array
- ( //boton
SEARCH
- 'id' =>
'btn_search',
- 'name'
=> 'search',
- 'value'
=> lang('search'),
- 'type'
=> 'button',
-
'tab_index' => 2
- ),
- array
- ( // TEXT IMPUT
- 'name'
=> 'query',
- 'id'
=> 'txt_query',
- 'value'
=> '',//'',//$query,
- 'type'
=> 'text',
- 'size'
=> 28,
-
'onkeypress' => 'return pulsar(event)',
-
'tab_index' => 1
- )
- ),
- 'hidden_value' => array
- (
- )
- )
- )
- );
+ $result_data = array
+ (
+ 'results' => $values,
+ 'total_records' =>
$this->bo->total_records,
+ 'draw' => $draw
+ );
+ return $this->jquery_results($result_data);
}
+ $action = 'var temp =
parent.document.getElementsByName("values[response_text]")[0].value;' ."\r\n";
+ $action .= 'if(temp){temp = temp + "\n";}' ."\r\n";
+ $action .=
'parent.document.getElementsByName("values[response_text]")[0].value = temp +
aData["content"];' ."\r\n";
+ $action .= 'parent.SmsCountKeyUp(160);' ."\r\n";
+
+ $action .=
'parent.JqueryPortico.onPopupClose("close");'."\r";
+
+ $data = array(
+ 'left_click_action' => $action,
+ 'datatable_name' => '',
+ 'form' => array(
+ 'toolbar' => array(
+ 'item' => array()
+ )
+ ),
+ 'datatable' => array(
+ 'source' => self::link(array(
+ 'menuaction'
=> 'property.uilookup.response_template',
+ 'query'
=> $this->query,
+ 'filter'
=> $this->filter,
+ 'cat_id'
=> $this->cat_id,
+ 'type'
=> 'response_template',
+ 'phpgw_return_as'
=> 'json'
+ )),
+ 'allrows' => true,
+ 'editor_action' => '',
+ 'field' => array()
+ )
+ );
+
$uicols = array (
'input_type' =>
array('text','text','text'),
'name' =>
array('id','name','content'),
@@ -2761,149 +2176,26 @@
'descr' =>
array(lang('ID'),lang('name'),lang('content'))
);
- $template_list = array();
- $bo = CreateObject('property.bogeneric',true);
- $bo->get_location_info('response_template');
- $template_list = $bo->read();
+ $count_uicols_name = count($uicols['name']);
- $content = array();
- $j=0;
- if (isset($template_list) && is_array($template_list))
+ for($k=0;$k<$count_uicols_name;$k++)
{
- foreach($template_list as $template_entry)
- {
- for
($i=0;$i<count($uicols['name']);$i++)
- {
-
$datatable['rows']['row'][$j]['column'][$i]['value'] =
$template_entry[$uicols['name'][$i]];
-
$datatable['rows']['row'][$j]['column'][$i]['name'] = $uicols['name'][$i];
- }
- $j++;
- }
- }
+ $params = array(
+ 'key' =>
$uicols['name'][$k],
+ 'label' =>
$uicols['descr'][$k],
+ 'sortable' =>
$uicols['sortable'][$k],
+ 'hidden' =>
false
+ );
- $uicols_count = count($uicols['descr']);
- $datatable['rowactions']['action'] = array();
- for ($i=0;$i<$uicols_count;$i++)
- {
- //all colums should be have formatter
-
$datatable['headers']['header'][$i]['formatter'] =
($uicols['formatter'][$i]==''? '""' : $uicols['formatter'][$i]);
-
- $datatable['headers']['header'][$i]['name']
= $uicols['name'][$i];
- $datatable['headers']['header'][$i]['text']
= $uicols['descr'][$i];
- $datatable['headers']['header'][$i]['visible']
= true;
- $datatable['headers']['header'][$i]['sortable']
= true;
-
$datatable['headers']['header'][$i]['sort_field'] =
$uicols['name'][$i];
+ array_push ($data['datatable']['field'],
$params);
}
- $function_exchange_values = '';
-
- $function_exchange_values .= 'var temp =
opener.document.getElementsByName("values[response_text]")[0].value;' ."\r\n";
- $function_exchange_values .= 'if(temp){temp = temp +
"\n";}' ."\r\n";
- $function_exchange_values .=
'opener.document.getElementsByName("values[response_text]")[0].value = temp +
data.getData("content");' ."\r\n";
- $function_exchange_values .=
'opener.SmsCountKeyUp(160);' ."\r\n";
-
- $function_exchange_values .= 'window.close()';
-
- $datatable['exchange_values'] =
$function_exchange_values;
- $datatable['valida'] = '';
-
- // path for property.js
- $property_js = "/property/js/yahoo/property.js";
-
- if
(!isset($GLOBALS['phpgw_info']['server']['no_jscombine']) ||
!$GLOBALS['phpgw_info']['server']['no_jscombine'])
- {
- $cachedir =
urlencode($GLOBALS['phpgw_info']['server']['temp_dir']);
- $property_js =
"/phpgwapi/inc/combine.php?cachedir={$cachedir}&type=javascript&files=" .
str_replace('/', '--', ltrim($property_js,'/'));
- }
-
- $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] . $property_js;
-
- // Pagination and sort values
- $datatable['pagination']['records_start'] =
(int)$this->start;
- $datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
- $datatable['pagination']['records_returned']=
count($template_list);
- $datatable['pagination']['records_total'] =
$this->bo->total_records;
-
- if ( (phpgw::get_var("start")== "") &&
(phpgw::get_var("order",'string')== ""))
- {
- $datatable['sorting']['order']
= 'id'; // name key Column in myColumnDef
- $datatable['sorting']['sort']
= 'name'; // ASC / DESC
- }
- else
- {
- $datatable['sorting']['order']
= phpgw::get_var('order', 'string'); // name of column of Database
- $datatable['sorting']['sort']
= phpgw::get_var('sort', 'string'); // ASC / DESC
- }
-
$appname
= lang('template');
$function_msg =
lang('list response template');
-
- //-- BEGIN----------------------------- JSON CODE
------------------------------
-
- //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'],
- '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>";
- }
- else
if(isset($column['format']) && $column['format']== "link")
- {
-
$json_row[$column['name']] = "<a href='".$column['link']."' target='_blank'>"
.$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']))
- {
- $json['rights'] =
$datatable['rowactions']['action'];
- }
-
- if( phpgw::get_var('phpgw_return_as') == 'json' )
- {
- return $json;
- }
-
- $datatable['json_data'] = json_encode($json);
- //-------------------- 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);
-
-
- //Title of Page
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
- // Prepare YUI Library
- $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'lookup.tenant.index', 'property' );
-
- $this->save_sessiondata();
+ self::render_template_xsl('datatable_jquery', $data);
}
function custom()
Modified: branches/dev-syncromind/property/templates/base/tts.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/tts.xsl 2015-01-16
23:34:40 UTC (rev 12621)
+++ branches/dev-syncromind/property/templates/base/tts.xsl 2015-01-19
13:08:21 UTC (rev 12622)
@@ -261,14 +261,14 @@
{
var oArgs =
{menuaction:'property.uilookup.order_template',type:'order_template'};
var strURL = phpGWLink('index.php', oArgs);
-
Window1=window.open(strURL,"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});
}
function response_lookup()
{
var oArgs =
{menuaction:'property.uilookup.response_template',type:'response_template'};
var strURL = phpGWLink('index.php', oArgs);
-
Window1=window.open(strURL,"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+ TINY.box.show({iframe:strURL,
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
mask:true, animate:true, close: true});
}
function preview_html(id)
@@ -1324,4 +1324,4 @@
</script>
- </xsl:template>
\ No newline at end of file
+ </xsl:template>
| [Prev in Thread] | Current Thread | [Next in Thread] |