[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [14580] clean up from yui
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [14580] clean up from yui |
|
Date: |
Fri, 11 Dec 2015 15:04:28 +0000 |
Revision: 14580
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14580
Author: sigurdne
Date: 2015-12-11 15:04:27 +0000 (Fri, 11 Dec 2015)
Log Message:
-----------
clean up from yui
Modified Paths:
--------------
branches/dev-syncromind/property/inc/class.uigallery.inc.php
branches/dev-syncromind/property/inc/class.uigeneric.inc.php
branches/dev-syncromind/property/inc/class.uiinvestment.inc.php
branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
branches/dev-syncromind/property/inc/class.uijasper.inc.php
branches/dev-syncromind/property/inc/class.uilocation.inc.php
branches/dev-syncromind/property/inc/class.uipricebook.inc.php
branches/dev-syncromind/property/inc/class.uiproject.inc.php
branches/dev-syncromind/property/inc/class.uirequest.inc.php
branches/dev-syncromind/property/inc/class.uiresponsible.inc.php
branches/dev-syncromind/property/inc/class.uis_agreement.inc.php
branches/dev-syncromind/property/inc/class.uitemplate.inc.php
branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php
branches/dev-syncromind/property/inc/class.uiwo_hour.inc.php
Removed Paths:
-------------
branches/dev-syncromind/property/test_menu.php
Modified: branches/dev-syncromind/property/inc/class.uigallery.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uigallery.inc.php
2015-12-11 14:25:41 UTC (rev 14579)
+++ branches/dev-syncromind/property/inc/class.uigallery.inc.php
2015-12-11 15:04:27 UTC (rev 14580)
@@ -26,9 +26,7 @@
* @subpackage admin
* @version $Id$
*/
- //phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon_jquery');
- phpgw::import_class('phpgwapi.jquery');
/**
* Description
@@ -426,162 +424,6 @@
)
)
);
- //$this->save_sessiondata();
- //$datatable = array();
-
- /* if( phpgw::get_var('phpgw_return_as') != 'json' )
- {
- $datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
- (
- 'menuaction' => 'property.uigallery.index',
- 'mime_type' => $this->mime_type,
- 'cat_id' => $this->cat_id,
- 'query' => $this->query,
- 'allrows' => $this->allrows,
- 'user_id' => $this->user_id
- ));
-
- $datatable['config']['base_java_url'] =
"menuaction:'property.uigallery.index',"
- ."mime_type:'{$this->mime_type}',"
- ."cat_id:'{$this->cat_id}',"
- ."query:'{$this->query}',"
- ."allrows:'{$this->allrows}',"
- ."user_id:'{$this->user_id}'";
-
- $values_combo_box = array();
-
- $values_combo_box[0] = $this->bo->get_filetypes();
- $default_value = array ('id'=> '', 'name'=>lang('no
filetype'));
- array_unshift ($values_combo_box[0],$default_value);
-
- $values_combo_box[1] =
$this->bo->get_gallery_location();
- $default_value = array ('id'=> '', 'name'=>lang('no
category'));
- array_unshift ($values_combo_box[1],$default_value);
-
- $values_combo_box[2] =
$this->bocommon->get_user_list_right2('filter',2,$this->user_id,$this->acl_location);
- array_unshift
($values_combo_box[2],array('id'=>$GLOBALS['phpgw_info']['user']['account_id'],'name'=>lang('mine
documents')));
- $default_value = array('id'=>'','name'=>lang('no
user'));
- array_unshift ($values_combo_box[2],$default_value);
-
- $datatable['config']['allow_allrows'] = true;
-
- $datatable['actions']['form'] = array
- (
- array
- (
- 'action' => $GLOBALS['phpgw']->link('/index.php',
- array
- (
- 'menuaction' => 'property.uigallery.index',
- 'type' => $type,
- 'type_id' => $type_id
- )
- ),
- 'fields' => array
- (
- 'field' => array
- (
- array
- ( //boton filetype
- 'id' => 'btn_mime_type',
- 'name' => 'mime_type',
- 'value' => lang('filetype'),
- 'type' => 'button',
- 'style' => 'filter',
- 'tab_index' => 1
- ),
- array
- ( //boton CATEGORY
- 'id' => 'btn_cat_id',
- 'name' => 'cat_id',
- 'value' => lang('Category'),
- 'type' => 'button',
- 'style' => 'filter',
- 'tab_index' => 2
- ),
- array
- ( //boton USER
- 'id' => 'btn_user_id',
- 'name' => 'user_id',
- 'value' => lang('User'),
- 'type' => 'button',
- 'style' => 'filter',
- 'tab_index' => 3
- ),
- array
- ( //hidden start_date
- 'type' => 'hidden',
- 'id' => 'start_date',
- 'value' => $start_date
- ),
- array
- ( //hidden end_date
- 'type' => 'hidden',
- 'id' => 'end_date',
- 'value' => $end_date
- ),
- array
- (//for link "None",
- 'type'=> 'label_date'
- ),
- array
- (//for link "Date search",
- 'type'=> 'link',
- 'id' => 'btn_data_search',
- 'url' =>
"Javascript:window.open('".$GLOBALS['phpgw']->link('/index.php',
- array(
- 'menuaction' =>
'property.uiproject.date_search'))."','','left=50,top=100,width=350,height=250')",
- 'value' => lang('Date search'),
- 'tab_index' => 6
- ),
- array
- ( //button SEARCH
- 'id' => 'btn_search',
- 'name' => 'search',
- 'value' => lang('search'),
- 'type' => 'button',
- 'tab_index' => 5
- ),
- array
- ( // TEXT INPUT
- 'name' => 'query',
- 'id' => 'txt_query',
- 'value' => $this->query,
- 'type' => 'text',
- 'onkeypress' => 'return pulsar(event)',
- 'size' => 28,
- 'tab_index' => 4
- ),
- array
- ( //place holder for selected events
- 'type' => 'hidden',
- 'id' => 'event',
- 'value' => ''
- )
- ),
- 'hidden_value' => array
- (
- array
- ( //div values combo_box_0
- 'id' => 'values_combo_box_0',
- 'value' =>
$this->bocommon->select2String($values_combo_box[0])
- ),
- 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;
- } */
$filters = $this->_get_Filters();
foreach($filters as $filter)
{
@@ -589,332 +431,10 @@
}
$values
= $this->bo->read(array('dry_run' => true));
- /* $uicols = array();
- $this->bo->uicols;
- $uicols['name'][] = 'img_id';
- $uicols['descr'][] = 'dummy';
- $uicols['sortable'][] = false;
- $uicols['sort_field'][] = '';
- $uicols['format'][] = '';
- $uicols['formatter'][] = '';
- $uicols['input_type'][] = 'hidden';
-
- $uicols['name'][] = 'directory';
- $uicols['descr'][] = 'directory';
- $uicols['sortable'][] = false;
- $uicols['sort_field'][] = '';
- $uicols['format'][] = '';
- $uicols['formatter'][] = '';
- $uicols['input_type'][] = '';//'hidden';
-
- $uicols['name'][] = 'id';
- $uicols['descr'][] = lang('id');
- $uicols['sortable'][] = true;
- $uicols['sort_field'][] = 'id';
- $uicols['format'][] = '';
- $uicols['formatter'][] = '';
- $uicols['input_type'][] = '';
-
- $uicols['name'][] = 'date';
- $uicols['descr'][] = lang('date');
- $uicols['sortable'][] = true;
- $uicols['sort_field'][] = 'date';
- $uicols['format'][] = '';
- $uicols['formatter'][] = '';
- $uicols['input_type'][] = '';
-
- $uicols['name'][] = 'name';
- $uicols['descr'][] = lang('name');
- $uicols['sortable'][] = false;
- $uicols['sort_field'][] = '';
- $uicols['format'][] = '';
- $uicols['formatter'][] = '';
- $uicols['input_type'][] = '';
-
- $uicols['name'][] = 'size';
- $uicols['descr'][] = lang('size');
- $uicols['sortable'][] = true;
- $uicols['sort_field'][] = 'size';
- $uicols['format'][] = '';
- $uicols['formatter'][] = '';
- $uicols['input_type'][] = '';
-
- $uicols['name'][] = 'location_name';
- $uicols['descr'][] = lang('location name');
- $uicols['sortable'][] = false;
- $uicols['sort_field'][] = '';
- $uicols['format'][] = '';
- $uicols['formatter'][] = '';
- $uicols['input_type'][] = '';
-
- $uicols['name'][] = 'url';
- $uicols['descr'][] = lang('url');
- $uicols['sortable'][] = false;
- $uicols['sort_field'][] = '';
- $uicols['format'][] = 'link';
- $uicols['formatter'][] = '';
- $uicols['input_type'][] = '';
-
- $uicols['name'][] = 'document_url';
- $uicols['descr'][] = lang('document');
- $uicols['sortable'][] = false;
- $uicols['sort_field'][] = '';
- $uicols['format'][] = 'link';
- $uicols['formatter'][] = '';
- $uicols['input_type'][] = '';
-
- $uicols['name'][] = 'user';
- $uicols['descr'][] = lang('user');
- $uicols['sortable'][] = false;
- $uicols['sort_field'][] = '';
- $uicols['format'][] = '';
- $uicols['formatter'][] = '';
- $uicols['input_type'][] = '';
-
- $uicols['name'][] = 'picture';
- $uicols['descr'][] = lang('picture');
- $uicols['sortable'][] = false;
- $uicols['sort_field'][] = '';
- $uicols['format'][] = '';
- $uicols['formatter'][] = 'show_picture';
- $uicols['input_type'][] = '';
-
- $j = 0;
- $count_uicols_name = count($uicols['name']);
-
- foreach($values as $entry)
- {
- for ($k=0;$k<$count_uicols_name;$k++)
- {
- $datatable['rows']['row'][$j]['column'][$k]['name']
= $uicols['name'][$k];
- $datatable['rows']['row'][$j]['column'][$k]['value']
= $entry[$uicols['name'][$k]];
- if($uicols['format'][$k]=='link' &&
$entry[$uicols['name'][$k]])
- {
- $datatable['rows']['row'][$j]['column'][$k]['format']
= 'link';
- $datatable['rows']['row'][$j]['column'][$k]['value']
= lang('link');
- $datatable['rows']['row'][$j]['column'][$k]['link']
= $entry[$uicols['name'][$k]];
- $datatable['rows']['row'][$j]['column'][$k]['target']
= '_blank';
- }
- }
- $j++;
- }
-
- //$datatable['rowactions']['action'] = array();
- /*
- $parameters = array
- (
- 'parameter' => array
- (
- array
- (
- 'name' => 'location',
- 'source' => 'location'
- ),
- array
- (
- 'name' => 'attrib_id',
- 'source' => 'attrib_id'
- ),
- array
- (
- 'name' => 'item_id',
- 'source' => 'location_item_id'
- ),
- array
- (
- 'name' => 'id',
- 'source' => 'id'
- )
- )
- );
-
- if($this->acl_edit)
- {
- $datatable['rowactions']['action'][] = array
- (
- 'my_name' => 'edit',
- 'text' => lang('edit serie'),
- 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
- (
- 'menuaction' => 'property.uigallery.edit',
- 'type' => $type,
- 'type_id' => $type_id,
- 'target' => '_blank'
- )),
- 'parameters' => $parameters
- );
- }
-
-
- if($this->acl_delete)
- {
- $datatable['rowactions']['action'][] = array
- (
- 'my_name' => 'delete',
- 'statustext' => lang('delete the actor'),
- 'text' => lang('delete'),
- 'confirm_msg' => lang('do you really want to delete
this entry'),
- 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
- (
- 'menuaction' => 'property.uigallery.delete',
- 'type' => $type,
- 'type_id' => $type_id
- )),
- 'parameters' => $parameters
- );
- }
- */
unset($parameters);
$data['datatable']['actions'][] = array();
-// if($this->acl_add)
-// {
-// $data['datatable']['actions'][] = array
-// (
-// 'my_name'
=> 'add',
-// 'statustext' => lang('add'),
-// 'text' =>
lang('add'),
-// 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
-// (
-// 'menuaction' =>
'property.uigallery.edit',
-// 'type'
=> $type,
-// 'type_id'
=> $type_id
-// ))
-// );
-// }
- /* for ($i=0;$i<$count_uicols_name;$i++)
- {
- $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']
= $uicols['input_type'][$i]!='hidden';
- $datatable['headers']['header'][$i]['sortable']
= $uicols['sortable'][$i];
- $datatable['headers']['header'][$i]['sort_field']
= $uicols['sort_field'][$i];
- $datatable['headers']['header'][$i]['format']
= $uicols['format'][$i];
- }
-
- //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->bo->start;
- $datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
-
- if($dry_run)
- {
- $datatable['pagination']['records_returned'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
- }
- else
- {
- $datatable['pagination']['records_returned']=
count($values);
- }
-
- $datatable['pagination']['records_total'] =
$this->bo->total_records;
-
- if ( ($this->start == 0) && (!$this->order))
- {
- $datatable['sorting']['order']
= 'date'; // name key Column in myColumnDef
- $datatable['sorting']['sort']
= 'asc'; // ASC / DESC
- }
- else
- {
- $datatable['sorting']['order']
= $this->order; // name of column of Database
- $datatable['sorting']['sort']
= $this->sort; // ASC / DESC
- }
-
- 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('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'],
- '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>";
- // $json_row[$column['name']] =
"<a href='{$column['value']}' title='test' id='img-0' rel='colorbox'
target='_blank'><img src='{$column['value']}&thumb=1' alt='name' /></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(isset($receipt) && is_array($receipt) &&
count($receipt))
- {
- $json['message'][] = $receipt;
- }
-
- 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);
-
- 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->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');
-
- $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'gallery.index', 'property' ); */
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind/property/inc/class.uigeneric.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uigeneric.inc.php
2015-12-11 14:25:41 UTC (rev 14579)
+++ branches/dev-syncromind/property/inc/class.uigeneric.inc.php
2015-12-11 15:04:27 UTC (rev 14580)
@@ -26,9 +26,7 @@
* @subpackage admin
* @version $Id$
*/
- //phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon_jquery');
- phpgw::import_class('phpgwapi.jquery');
/**
* Description
Modified: branches/dev-syncromind/property/inc/class.uiinvestment.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiinvestment.inc.php
2015-12-11 14:25:41 UTC (rev 14579)
+++ branches/dev-syncromind/property/inc/class.uiinvestment.inc.php
2015-12-11 15:04:27 UTC (rev 14580)
@@ -30,10 +30,8 @@
* Description
* @package property
*/
-// phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon_jquery');
- phpgw::import_class('phpgwapi.jquery');
class property_uiinvestment extends phpgwapi_uicommon_jquery
{
@@ -193,13 +191,6 @@
}
}
- /* $my_district = "";
- $my_district .= "<input type=\"hidden\"
name=\"values[entity_id][".$counter."]\" value=\"".$investment['entity_id']."\"
class=\"entity_id\" />";
- $my_district .= "<input type=\"hidden\"
name=\"values[investment_id][".$counter."]\"
value=\"".$investment['investment_id']."\" class=\"investment_id\" />";
- $my_district .= "<input type=\"hidden\"
name=\"values[initial_value][".$counter."]\"
value=\"".$investment['initial_value']."\" class=\"initial_value\" />";
- $my_district .= "<input type=\"hidden\"
name=\"values[value][".$counter."]\" value=\"".$investment['value']."\"
class=\"value\" />";
- $my_district .= $investment['district_id']; */
-
$content[] = array
(
'order_dummy' =>
$investment['part_of_town'],
@@ -210,9 +201,9 @@
'descr' =>
$investment['descr'],
'entity_name' =>
$investment['entity_name'],
'initial_value_ex' =>
($investment['initial_value'] == "" ? 0 : $investment['initial_value']),
- 'initial_value' =>
number_format($investment['initial_value'], 0, ',', ''), //to avoid error in
YUI's sum
+ 'initial_value' =>
number_format($investment['initial_value'], 0, ',', ''),
'value_ex' =>
($investment['value'] == "" ? 0 : $investment['value']),
- 'value' =>
number_format($investment['value'], 0, ',', ''), //to avoid error in YUI's sum
+ 'value' =>
number_format($investment['value'], 0, ',', ''),
'this_index' =>
$investment['this_index'],
'this_write_off_ex' =>
$investment['this_write_off'],
'this_write_off' =>
number_format($investment['this_write_off'], 0, ',', ''),
Modified: branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
2015-12-11 14:25:41 UTC (rev 14579)
+++ branches/dev-syncromind/property/inc/class.uiinvoice2.inc.php
2015-12-11 15:04:27 UTC (rev 14580)
@@ -606,14 +606,7 @@
'update_action' =>
self::link(array('menuaction' => 'property.uiinvoice2.update_voucher')),
'powered_by' => $powered_by
);
-//_debug_array($data);die();
-// $GLOBALS['phpgw_info']['flags']['noframework'] = true;
-/*
-
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/layout/assets/skins/sam/layout.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');
-*/
+
phpgwapi_jquery::load_widget('core');
phpgwapi_jquery::load_widget('layout');
phpgwapi_jquery::load_widget('numberformat');
@@ -621,12 +614,6 @@
self::add_javascript('property', 'portico',
'ajax_invoice.js');
self::add_javascript('property', 'portico',
'invoice2.index.js');
self::add_javascript('phpgwapi', 'tinybox2',
'packed.js');
-/* self::add_javascript('phpgwapi', 'yui3',
'yui/yui-min.js');
- self::add_javascript('phpgwapi', 'yui3-gallery',
'gallery-sm-menu/gallery-sm-menu-min.js');
- self::add_javascript('phpgwapi', 'yui3-gallery',
'gallery-sm-menu/gallery-sm-base-min.js');
- self::add_javascript('phpgwapi', 'yui3-gallery',
'gallery-sm-menu/gallery-sm-item-min.js');
- self::add_javascript('phpgwapi', 'yui3-gallery',
'gallery-sm-menu-templates/gallery-sm-menu-templates-min.js');
-*/
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('invoice');
Modified: branches/dev-syncromind/property/inc/class.uijasper.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uijasper.inc.php 2015-12-11
14:25:41 UTC (rev 14579)
+++ branches/dev-syncromind/property/inc/class.uijasper.inc.php 2015-12-11
15:04:27 UTC (rev 14580)
@@ -26,14 +26,12 @@
* @subpackage admin
* @version $Id$
*/
- //phpgw::import_class('phpgwapi.yui');
/**
* Description
* @package property
*/
phpgw::import_class('phpgwapi.uicommon_jquery');
- phpgw::import_class('phpgwapi.jquery');
class property_uijasper extends phpgwapi_uicommon_jquery
{
@@ -636,104 +634,6 @@
$tabs = array();
$tabs['general'] = array('label' => lang('general'),
'link' => '#general');
$active_tab = 'general';
-// $GLOBALS['phpgw']->xslttpl->add_file(array('jasper'));
-
- /* if ((isset($values['save']) && $values['save']) ||
(isset($values['apply']) && $values['apply']))
- {
- if($GLOBALS['phpgw']->session->is_repost())
- {
- //
$receipt['error'][]=array('msg'=>lang('Hmm... looks like a repost!'));
- }
-
-
- if(!isset($values['location']) ||
!$values['location'])
- {
- $receipt['error'][]=array('msg'=>lang('Please select
a location!'));
- }
-
- if(!isset($values['title']) || !$values['title'])
- {
- $receipt['error'][]=array('msg'=>lang('Please enter a
title!'));
- }
-
- if($id)
- {
- $values['id']=$id;
- }
- else
- {
- $id = $values['id'];
- }
-
- if(!$receipt['error'])
- {
- $receipt = $this->bo->save($values);
- $id = $receipt['id'];
-
- //-------------start files
- $bofiles = CreateObject('property.bofiles');
- $file = array();
- if(isset($_FILES['file']['name']) &&
$_FILES['file']['name'])
- {
- $file_name = str_replace ('
','_',$_FILES['file']['name']);
- $values['file_name'] = $file_name;
-
- $to_file =
"{$bofiles->fakebase}/jasper/{$id}/{$file_name}";
-
- if ($old_file = $bofiles->vfs->ls(array(
- 'string' => "{$bofiles->fakebase}/jasper/{$id}",
- 'relatives' => Array(RELATIVE_NONE)
- )))
- {
- $bofiles->vfs->rm(array(
- 'string' =>
"{$bofiles->fakebase}/jasper/{$id}/{$old_file[0]['name']}",
- 'relatives' => Array(RELATIVE_NONE)
- ));
- $receipt['message'][]=array('msg'=>lang('old file %1
removed',$old_file[0]['name']));
- }
-
-
- $file = array
- (
- 'from_file' => $_FILES['file']['tmp_name'],
- 'to_file' => $to_file
- );
-
-
- unset($to_file);
-
-
- if ($file)
- {
- $bofiles->create_document_dir("jasper/{$id}");
- $bofiles->vfs->override_acl = 1;
-
- if($bofiles->vfs->cp (array (
- 'from' => $file['from_file'],
- 'to' => $file['to_file'],
- 'relatives' => array (RELATIVE_NONE|VFS_REAL,
RELATIVE_ALL))))
- {
- $receipt['message'][]=array('msg'=>lang('file %1
uploaded', $file_name));
- }
- else
- {
- $receipt['error'][]=array('msg'=>lang('Failed to
upload file !'));
- }
- $bofiles->vfs->override_acl = 0;
- }
- unset($file);
- unset($file_name);
- }
- //-------------end files
-
- if (isset($values['save']) && $values['save'])
- {
-
$GLOBALS['phpgw']->session->appsession('session_data','jasper_receipt',$receipt);
-
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
'property.uijasper.index', 'app' => $this->app));
- }
- }
- } */
-
if(isset($values['cancel']) && $values['cancel'])
{
$GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'property.uijasper.index',
@@ -815,7 +715,6 @@
}
}
- //---datatable settings--------------------------
$datavalues[0] = array
(
'name' => "0",
@@ -824,12 +723,6 @@
'is_paginator' => 0,
'footer' => 0
);
-// $myColumnDefs[0] = array
-// (
-// 'name' => "0",
-// 'values' =>
json_encode($type_def)
-// );
- //-----------------------------------------------
$datatable_def[] = array
(
@@ -843,7 +736,6 @@
)
);
-// echo '<pre>'; print_r($datatable_def);echo '</pre>'; exit();
$msgbox_data =
$GLOBALS['phpgw']->common->msgbox_data($receipt);
@@ -867,21 +759,11 @@
'base_java_url' =>
"{menuaction:'property.uijasper.edit'}",
'property_js' =>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] .
"/property/js/yahoo/property2.js"),
'datatable' => $datavalues,
-// 'myColumnDefs'
=> $myColumnDefs,
'tabs' =>
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
'validator' =>
phpgwapi_jquery::formvalidator_generate(array('location', 'date',
'security', 'file'))
);
- //---datatable settings--------------------
-// phpgwapi_yui::load_widget('dragdrop');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('loader');
-//
-// $GLOBALS['phpgw']->css->validate_file('property');
-//
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css');
-// $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'jasper.edit', 'property' );
- //-----------------------datatable settings---
$appname = 'JasperReports';
@@ -891,8 +773,6 @@
phpgwapi_jquery::load_widget('numberformat');
self::render_template_xsl(array('jasper',
'datatable_inline'), array('edit' => $data));
-
-//
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
}
function view()
Modified: branches/dev-syncromind/property/inc/class.uilocation.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uilocation.inc.php
2015-12-11 14:25:41 UTC (rev 14579)
+++ branches/dev-syncromind/property/inc/class.uilocation.inc.php
2015-12-11 15:04:27 UTC (rev 14580)
@@ -30,10 +30,8 @@
* Description
* @package property
*/
- //phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon_jquery');
- phpgw::import_class('phpgwapi.jquery');
class property_uilocation extends phpgwapi_uicommon_jquery
{
@@ -1767,7 +1765,6 @@
}
}
- //phpgwapi_yui::tabview_setup('location_edit_tabview');
$tabs = array();
$tabs['general'] = array('label' =>
$location_types[($type_id - 1)]['name'], 'link' => '#general');
Modified: branches/dev-syncromind/property/inc/class.uipricebook.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uipricebook.inc.php
2015-12-11 14:25:41 UTC (rev 14579)
+++ branches/dev-syncromind/property/inc/class.uipricebook.inc.php
2015-12-11 15:04:27 UTC (rev 14580)
@@ -30,10 +30,8 @@
* Description
* @package property
*/
-// phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon_jquery');
- phpgw::import_class('phpgwapi.jquery');
class property_uipricebook extends phpgwapi_uicommon_jquery
{
@@ -755,162 +753,11 @@
'parameters' => json_encode($parameters)
);
-// $data['datatable']['actions'][] = array
-// (
-// 'my_name' =>
'add',
-// 'text' => lang('add'),
-// 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
-// (
-// 'menuaction' =>
'property.uipricebook.edit_agreement_group'
-// ))
-// );
-
unset($parameters);
-
-// $uicols_count = count($uicols['descr']);
-// 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']
= false;
-//
-// if ($uicols['name'][$i] == 'num')
-// {
-//
$datatable['headers']['header'][$i]['sortable'] = true;
-//
$datatable['headers']['header'][$i]['sort_field'] = $uicols['name'][$i];
-// }
-// }
-//
-// // 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($agreement_list);
-// $datatable['pagination']['records_total'] =
$this->bo->total_records;
-//
-// if ( (phpgw::get_var("start")== "") &&
(phpgw::get_var("order",'string')== ""))
-// {
-// $datatable['sorting']['order']
= 'num'; // 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('pricebook');
-// $function_msg = lang('list agreement group');
-//
-// phpgwapi_yui::load_widget('dragdrop');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('menu');
-// phpgwapi_yui::load_widget('connection');
-// //// cramirez: necesary for include a partucular js
-// phpgwapi_yui::load_widget('loader');
-// //cramirez: necesary for use opener . Avoid error JS
-// phpgwapi_yui::load_widget('tabview');
-// phpgwapi_yui::load_widget('paginator');
-// //FIXME this one is only needed when $lookup==true - so
there is probably an error
-// 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'],
-// '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>";
-// }
-// elseif(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);
-//
-// 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->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');
-//
-// //Title of Page
-// $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
-//
-// // Prepare YUI Library
-// $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'pricebook.agreement_group', 'property' );
-//
-// $this->save_sessiondata();
phpgwapi_jquery::load_widget('core');
phpgwapi_jquery::load_widget('numberformat');
-// self::add_javascript('property', 'portico', 'uialarm.index.js');
self::render_template_xsl('datatable_jquery', $data);
}
@@ -1408,112 +1255,6 @@
{
array_unshift($data['form']['toolbar']['item'],
$filter);
}
-// $datatable = array();
-//
-// if( phpgw::get_var('phpgw_return_as') != 'json' )
-// {
-//
-// if(!$lookup)
-// {
-// $datatable['menu'] =
$this->bocommon->get_menu();
-// }
-//
-// $datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
-// (
-// 'menuaction'=>
'property.uipricebook.activity',
-// 'cat_id' =>$this->cat_id,
-// 'filter' =>
$this->filter,
-// 'query' =>$this->query
-//
-// ));
-//
-// $datatable['config']['allow_allrows'] = true;
-//
-// $datatable['config']['base_java_url'] =
"menuaction:'property.uipricebook.activity',"
-// ."cat_id:'{$this->cat_id}',"
-// ."filter:'{$this->filter}',"
-// ."query:'{$this->query}'";
-//
-//
-// $values_combo_box[0] =
$this->bo->get_agreement_group_list('filter',$this->cat_id);
-// $default_value = array
('id'=>'','name'=>lang('select agreement_group'));
-// array_unshift
($values_combo_box[0],$default_value);
-//
-//
-// $datatable['actions']['form'] = array
-// (
-// array
-// (
-// 'action' =>
$GLOBALS['phpgw']->link('/index.php',
-// array
-// (
-// 'menuaction'
=> 'property.uipricebook.activity',
-// 'cat_id'
=>$this->cat_id,
-// 'filter'
=> $this->filter,
-// 'query'
=>$this->query
-// )
-// ),
-// 'fields' => array
-// (
-// 'field' => array
-// (
-// array
-// (
-// 'id' =>
'btn_cat_id',
-// 'name'
=> 'cat_id',
-// 'value'
=> lang('Category'),
-// 'type'
=> 'button',
-// 'style'
=> 'filter',
-//
'tab_index' => 1
-// ),
-// array
-// (
-// 'type'
=> 'button',
-// 'id'
=> 'btn_export',
-// 'value'
=> lang('download'),
-//
'tab_index' => 5
-// ),
-// 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'
=> $this->bocommon->select2String($values_combo_box[0]) //i.e.
id,value/id,vale/
-// )
-// )
-// )
-// )
-// );
-// }
-// $pricebook_list = array();
-// $pricebook_list =
$this->bo->read_activities_pr_agreement_group();
-
$uicols = array(
'name' => array('activity_id', 'num',
'descr', 'unit_name', 'ns3420', 'base_descr',
'branch', 'dim_d'),
@@ -1539,21 +1280,6 @@
array_push($data['datatable']['field'],
$params);
}
-// $j=0;
-// if (isset($pricebook_list) && is_array($pricebook_list))
-// {
-// foreach ($pricebook_list as $pricebook)
-// {
-// for ($i=0; $i<count($uicols['name']);
$i++)
-// {
-//
$datatable['rows']['row'][$j]['column'][$i]['name'] = $uicols['name'][$i];
-//
$datatable['rows']['row'][$j]['column'][$i]['value'] =
$pricebook[$uicols['name'][$i]];
-// }
-//
-// $j++;
-// }
-// }
-// $datatable['rowactions']['action'] = array();
$parameters = array
(
@@ -1630,170 +1356,8 @@
'parameters' => json_encode($parameters)
);
-// $datatable['rowactions']['action'][] = array
-// (
-// 'my_name' =>
'add',
-// 'text' => lang('add'),
-// 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
-// (
-// 'menuaction' =>
'property.uipricebook.edit_activity',
-// 'agreement_group' =>
$this->cat_id
-// ))
-// );
-
unset($parameters);
-//
-// $uicols_count = count($uicols['descr']);
-// for ($i=0;$i<$uicols_count;$i++)
-// {
-// //all colums should be have formatter
-//
$datatable['headers']['header'][$i]['formatter'] =
($uicols['formatter'][$i]==''? '""' : $uicols['formatter'][$i]);
-//
-// if($uicols['input_type'][$i]!='hidden')
-// {
-//
$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'] = false;
-//
-// if ($uicols['name'][$i] == 'num')
-// {
-//
$datatable['headers']['header'][$i]['sortable'] = true;
-//
$datatable['headers']['header'][$i]['sort_field'] = $uicols['name'][$i];
-// }
-// }
-// else
-// {
-//
$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;
-// }
-// }
-//
-// // 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($pricebook_list);
-// $datatable['pagination']['records_total'] =
$this->bo->total_records;
-//
-// if ( (phpgw::get_var("start")== "") &&
(phpgw::get_var("order",'string')== ""))
-// {
-// $datatable['sorting']['order']
= 'num'; // 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('pricebook');
-// $function_msg = lang('list activities per
agreement_group');
-//
-// phpgwapi_yui::load_widget('dragdrop');
-// phpgwapi_yui::load_widget('datatable');
-// phpgwapi_yui::load_widget('menu');
-// phpgwapi_yui::load_widget('connection');
-// //// cramirez: necesary for include a partucular js
-// phpgwapi_yui::load_widget('loader');
-// //cramirez: necesary for use opener . Avoid error JS
-// phpgwapi_yui::load_widget('tabview');
-// phpgwapi_yui::load_widget('paginator');
-// //FIXME this one is only needed when $lookup==true - so
there is probably an error
-// 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'],
-// '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);
-//
-// 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->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');
-//
-// //Title of Page
-// $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
-//
-// // Prepare YUI Library
-// $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'pricebook.activity', 'property' );
-//
-// $this->save_sessiondata();
-// echo '<pre>'; print_r($data); echo '</pre>'; exit('activity');
self::render_template_xsl('datatable_jquery', $data);
}
@@ -1949,63 +1513,6 @@
)
);
-// $pricebook_list =
$this->bo->read_vendor_pr_activity($activity_id);
-//
-// foreach ($pricebook_list as $pricebook)
-// {
-// $content[] = array
-// (
-// 'activity_id'
=> $pricebook['activity_id'],
-// 'num'
=> $pricebook['num'],
-// 'branch'
=> $pricebook['branch'],
-// 'vendor_name'
=> $pricebook['vendor_name'],
-// 'link_prizing'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiagreement.edit_item', 'id'=> $pricebook['activity_id'],
'agreement_id'=> $pricebook['agreement_id'], 'from'
=>'uipricebook.activity_vendor')),
-// 'link_delete'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uipricebook.delete', 'method'=>'activity_vendor','activity_id'=>
$pricebook['activity_id'], 'agreement_id'=> $pricebook['agreement_id'])),
-// 'lang_prizing_statustext'
=> lang('view edit the prize for this activity'),
-// 'lang_delete_statustext'
=> lang('delete this vendor from this activity'),
-// 'text_prizing'
=> lang('Prizing'),
-// 'text_delete'
=> lang('delete')
-// );
-// }
-//
-// $table_header[] = array
-// (
-// 'sort_vendor' =>
$this->nextmatchs->show_sort_order(array
-// (
-// 'sort' => $this->sort,
-// 'var' => 'org_name',
-// 'order' => $this->order,
-// 'extra' => array
-// (
-// 'menuaction' =>
'property.uipricebook.activity_vendor',
-// 'cat_id' => $this->cat_id,
-// 'activity_id' => $activity_id,
-// 'allrows' => $this->allrows)
-// )
-// ),
-// 'lang_num' => lang('Activity Num'),
-// 'lang_branch' => lang('Branch'),
-// 'lang_vendor' => lang('Vendor'),
-// 'lang_prizing' => lang('Prizing'),
-// 'lang_delete' => lang('delete')
-// );
-// echo '<pre>'; print_r($data); echo '</pre>';
-// echo '<pre>'; print_r($table_header); echo '</pre>';
-// echo '<pre>'; print_r($content); echo '</pre>';
-// exit('activity_vendor');
-//
-// $link_data = array
-// (
-// 'menuaction' =>
'property.uipricebook.activity_vendor',
-// 'sort' => $this->sort,
-// 'order' => $this->order,
-// 'cat_id' => $this->cat_id,
-// 'filter' => $this->filter,
-// 'query' => $this->query,
-// 'activity_id' => $activity_id
-// );
-
-
$vendor_data =
$this->bocommon->initiate_ui_vendorlookup(array('vendor_id' => ''));
@@ -2082,41 +1589,6 @@
'parameters' => json_encode($parameters)
);
-// $data = array
-// (
-// 'msgbox_data'
=> $GLOBALS['phpgw']->common->msgbox($msgbox_data),
-// 'activity_id'
=> $activity_id,
-// 'vendor_data'
=> $vendor_data,
-// 'allrows'
=> $this->allrows,
-// 'allow_allrows'
=> true,
-// 'start_record'
=> $this->start,
-// 'record_limit'
=> $record_limit,
-// 'num_records'
=> count($pricebook_list),
-// 'all_records'
=> $this->bo->total_records,
-// 'link_url'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
-// 'img_path'
=>
$GLOBALS['phpgw']->common->get_image_path('phpgwapi','default'),
-// 'lang_no_cat'
=> lang('select agreement_group'),
-// 'lang_cat_statustext'
=> lang('Select the agreement_group the pricebook belongs to. To do not use a
category select NO CATEGORY'),
-// 'select_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
-// '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_activity_vendor' =>
$table_header,
-// 'values_activity_vendor'
=> $content,
-// 'lang_done_statustext'
=> lang('Back to the list'),
-// 'lang_save_statustext'
=> lang('Add this vendor to this activity'),
-// 'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
-// 'done_action'
=> $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uipricebook.activity', 'cat_id'=> $values['cat_id'])),
-// 'lang_save'
=> lang('save'),
-// 'lang_done'
=> lang('done'),
-//
-// );
-// $appname = lang('pricebook');
-// $function_msg = lang('list vendors per activity');
-//
-// $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
-//
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('list_activity_vendor' =>
$data));
$this->save_sessiondata();
self::render_template_xsl('datatable_jquery', $data);
@@ -2410,6 +1882,5 @@
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('delete' => $data));
- // $GLOBALS['phpgw']->xslttpl->pp();
}
}
\ No newline at end of file
Modified: branches/dev-syncromind/property/inc/class.uiproject.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiproject.inc.php
2015-12-11 14:25:41 UTC (rev 14579)
+++ branches/dev-syncromind/property/inc/class.uiproject.inc.php
2015-12-11 15:04:27 UTC (rev 14580)
@@ -679,8 +679,6 @@
function date_search()
{
- //cramirez: necesary for windows.open . Avoid error JS
- phpgwapi_yui::load_widget('tabview');
$GLOBALS['phpgw']->xslttpl->add_file(array('date_search'));
$GLOBALS['phpgw_info']['flags']['noframework'] = true;
// $GLOBALS['phpgw_info']['flags']['nonavbar'] =
true;
@@ -2672,28 +2670,4 @@
return phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
}
- /*
- protected function _generate_tabs2($tabs_ = array(),
$suppress = array(), $selected = 'general')
- {
- $tabs = array
- (
- 'general' => array('label' => lang('general'),
'link' => '#general'),
- 'location' => array('label' => lang('location'),
'link' => '#location'),
- 'budget' => array('label' => lang('Time and
budget'), 'link' => '#budget'),
- 'coordination' => array('label' =>
lang('coordination'), 'link' => '#coordination'),
- 'documents' => array('label' => lang('documents'),
'link' => '#documents'),
- 'history' => array('label' => lang('history'),
'link' => '#history')
- );
- $tabs = array_merge($tabs, $tabs_);
- foreach($suppress as $tab => $remove)
- {
- if($remove)
- {
- unset($tabs[$tab]);
- }
- }
- phpgwapi_yui::tabview_setup('project_tabview');
-
- return phpgwapi_yui::tabview_generate($tabs, $selected);
- } */
}
\ No newline at end of file
Modified: branches/dev-syncromind/property/inc/class.uirequest.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uirequest.inc.php
2015-12-11 14:25:41 UTC (rev 14579)
+++ branches/dev-syncromind/property/inc/class.uirequest.inc.php
2015-12-11 15:04:27 UTC (rev 14580)
@@ -26,10 +26,8 @@
* @subpackage project
* @version $Id$
*/
- //phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon_jquery');
- phpgw::import_class('phpgwapi.jquery');
/**
* Description
@@ -1700,18 +1698,6 @@
}
}
-//_debug_Array($values);die();
-
- /*
- 'values' => json_encode(array(
array('key' => 'id','label'=>lang('id'),'sortable'=>true,'resizeable'=>false,
'formatter' => FormatterRight),
- array('key' =>
'type','label'=>lang('type'),'sortable'=>true,'resizeable'=>true),
- array('key' =>
'title','label'=>lang('title'),'sortable'=>false,'resizeable'=>true),
- array('key' => 'start_date','label'=>lang('start
date'),'sortable'=>true,'resizeable'=>true),
- array('key' => 'end_date','label'=>lang('end
date'),'sortable'=>true,'resizeable'=>true),
- array('key' =>
'budget','label'=>lang('budget'),'sortable'=>true,'resizeable'=>false)))
-
- */
-
//------ Start pagination
$start = phpgw::get_var('startIndex', 'int', 'REQUEST',
0);
Modified: branches/dev-syncromind/property/inc/class.uiresponsible.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiresponsible.inc.php
2015-12-11 14:25:41 UTC (rev 14579)
+++ branches/dev-syncromind/property/inc/class.uiresponsible.inc.php
2015-12-11 15:04:27 UTC (rev 14580)
@@ -33,10 +33,8 @@
* @subpackage property
* @category core
*/
- //phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon_jquery');
- phpgw::import_class('phpgwapi.jquery');
class property_uiresponsible extends phpgwapi_uicommon_jquery
{
@@ -325,183 +323,7 @@
)
);
- /* 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,
- 'appname' => $this->appname
-
- ));
-
- $datatable['config']['allow_allrows'] = true;
-
- $datatable['config']['base_java_url'] =
"menuaction:'property.uiresponsible.index',"
- ."query:'{$this->query}',"
- ."location:'{$this->location}',"
- ."lookup:'{$lookup}',"
- ."appname:'{$this->appname}'";
-
- $values_combo_box = array();
-
- $locations =
$GLOBALS['phpgw']->locations->get_locations(false, $this->appname, false,
false, true);
- foreach ( $locations as $loc_id => $loc_descr )
- {
- $values_combo_box[0][] = array
- (
- 'id' => $loc_id,
- 'name' => "{$loc_id} [{$loc_descr}]",
- );
- }
-
- $default_value = array ('id'=>'','name'=>lang('No
location'));
- array_unshift ($values_combo_box[0],$default_value);
-
- $datatable['actions']['form'] = array
- (
- array
- (
- 'action' => $GLOBALS['phpgw']->link('/index.php',
- array
- (
- 'menuaction' => 'property.uiresponsible.index',
- 'query' => $this->query,
- 'location' => $this->location,
- 'lookup' => $lookup,
- 'appname' => $this->appname
- )
- ),
- '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','name') //i.e.
id,value/id,vale/
- )
- )
- )
- )
- );
- } */
-
- //$responsible_info = array();
- //$responsible_info = $this->bo->read_type();
-
- /* $uicols = array (
- 'input_type' =>
array('text','text','text','hidden','hidden','hidden','text','hidden','hidden','hidden'),
- 'name' =>
array('id','name','descr','category','created_by','created_on','appname','active','loc','location'),
- 'formatter' =>
array('','','','','','','','','',''),
- 'descr' =>
array(lang('id'),lang('name'),lang('descr'),lang('category'),lang('user'),'',lang('application'),lang('active'),'','')
- );
-
- $j=0;
- if (isset($responsible_info) &&
is_array($responsible_info))
- {
- foreach($responsible_info as $entry)
- {
- 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]];
- }
- }
- $j++;
- }
- } */
-
-
- /* $uicols_count = count($uicols['descr']);
-
- for ($i=0;$i<$uicols_count;$i++)
- {
- //all colums should be have formatter
- $datatable['headers']['header'][$i]['formatter'] =
($uicols['formatter'][$i]==''? '""' : $uicols['formatter'][$i]);
-
- if($uicols['input_type'][$i]!='hidden')
- {
- $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']
= false;
-
- if($uicols['name'][$i]=='name')
- {
- $datatable['headers']['header'][$i]['sortable']
= true;
- $datatable['headers']['header'][$i]['sort_field']
= 'name';
- }
- else if($uicols['name'][$i]=='id')
- {
- $datatable['headers']['header'][$i]['sortable']
= true;
- $datatable['headers']['header'][$i]['sort_field']
= 'id';
- }
- }
- else
- {
- $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]['format']
= 'hidden';
- }
- } */
-
- //$datatable['rowactions']['action'] = array();
$filters = $this->_get_Filter();
- #echo '<pre>'; print_r($filters); echo '</pre>';
foreach($filters as $filter)
{
array_unshift($data['form']['toolbar']['item'],
$filter);
@@ -586,19 +408,7 @@
'parameters' =>
json_encode($parameters)
);
}
- /*
- $data['datatable']['actions'][] = array
- (
- 'my_name' => 'contacts',
- 'text' =>
lang('contacts'),
- 'action' =>
$GLOBALS['phpgw']->link('/index.php',array
- (
- 'menuaction' =>
'property.uiresponsible.contact',
- 'appname' => $this->appname
- )),
- 'parameters' => json_encode($parameters2)
- );
- */
+
if($this->acl_add)
{
$data['datatable']['actions'][] = array
@@ -634,128 +444,6 @@
$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->bo->start;
- $datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
- $datatable['pagination']['records_returned'] =
count($responsible_info);
- $datatable['pagination']['records_total'] =
$this->bo->total_records;
-
- if ( (phpgw::get_var("start")== "") &&
(phpgw::get_var("order",'string')== ""))
- {
- $datatable['sorting']['order']
= 'name'; // 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
- }
-
- 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('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'],
- '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']."'>" .$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']))
- {
- $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
----------------------
-
- // 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);
-
- 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->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');
-
- //Title of Page
- $function_msg= lang('list available responsible
types');
-
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('responsible matrix') . ":: {$function_msg}";
-
- // Prepare YUI Library
- $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'responsible.index', 'property' );
-
- $this->_save_sessiondata(); */
-
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind/property/inc/class.uis_agreement.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uis_agreement.inc.php
2015-12-11 14:25:41 UTC (rev 14579)
+++ branches/dev-syncromind/property/inc/class.uis_agreement.inc.php
2015-12-11 15:04:27 UTC (rev 14580)
@@ -31,10 +31,7 @@
* @package property
*/
phpgw::import_class('phpgwapi.uicommon_jquery');
- phpgw::import_class('phpgwapi.jquery');
- //phpgw::import_class('phpgwapi.yui');
-
class property_uis_agreement extends phpgwapi_uicommon_jquery
{
@@ -305,207 +302,7 @@
'field' => array()
)
);
- //$datatable = array();
- //$this->save_sessiondata();
- /* 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,
- 'p_num' => $this->p_num,
- 'status_id' => $this->status_id,
- 'location_code' => $this->location_code
- ));
-
- $datatable['config']['base_java_url'] =
"menuaction:'property.uis_agreement.index',"
- ."sort:'{$this->sort}',"
- ."order:'{$this->order}',"
- ."cat_id: '{$this->cat_id}',"
- ."vendor_id: '{$this->vendor_id}',"
- ."status_id: '{$this->status_id}',"
- ."filter:'{$this->filter}',"
- ."query:'{$this->query}',"
- ."p_num: '{$this->p_num}',"
- ."role:'{$this->role}',"
- ."location_code:'{$this->location_code}',"
- ."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,
- 'status_id' => $this->status_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'));
- array_unshift
($values_combo_box[0]['cat_list'],$default_value);
-
- $values_combo_box[1] =
$this->bocommon->select_category_list(array('format'=>'filter','selected' =>
$this->cat_id,'type' =>'s_agreement','order'=>'descr'));
- $default_value = array ('id'=>'','name'=>lang('no
category'));
- array_unshift ($values_combo_box[1],$default_value);
-
- $values_combo_box[2] =
$this->bo->select_vendor_list('filter',$this->vendor_id);
- $default_value = array ('id'=>'','name'=>lang('no
vendor'));
- array_unshift ($values_combo_box[2],$default_value);
-
- $values_combo_box[3] =
$this->bo->select_status_list('filter',$this->status_id);
- $default_value = array ('id'=>'','name'=>lang('no
status'));
- array_unshift ($values_combo_box[3],$default_value);
-
- $datatable['actions']['form'] = array
- (
- array
- (
- 'action' => $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,
- 'status_id' => $this->status_id,
- 'location_code' => $this->location_code
- )
- ),
- '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
- ( //boton STATUS
- 'id' => 'btn_status_id',
- 'name' => 'status_id',
- 'value' => lang('status'),
- 'type' => 'button',
- 'style' => 'filter',
- 'tab_index' => 4
- ),
- 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' => $this->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
- ),
- array
- (
- 'type' => 'button',
- 'id' => 'btn_export',
- 'value' => lang('download'),
- 'tab_index' => 10
- )
- ),
- '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])
- ),
- array
- ( //div values combo_box_3
- 'id' => 'values_combo_box_3',
- 'value' =>
$this->bocommon->select2String($values_combo_box[3])
- )
- )
- )
- )
- );
-
- // $dry_run = true;
- } */
-
$filters = $this->_get_Filters();
foreach($filters as $filter)
{
@@ -529,24 +326,7 @@
array_push($data['datatable']['field'],
$params);
}
- /* if (isset($list) AND is_array($list))
- {
- foreach($list as $list_entry)
- {
- for ($k=0;$k<$count_uicols_name;$k++)
- {
- if($uicols['input_type'][$k]!='hidden')
- {
- $datatable['rows']['row'][$j]['column'][$k]['name']
= $uicols['name'][$k];
- $datatable['rows']['row'][$j]['column'][$k]['value']
= $list_entry[$uicols['name'][$k]];
- }
- }
- $j++;
- }
- } */
- //$datatable['rowactions']['action'] = array();
-
$parameters = array
(
'parameter' => array
@@ -638,152 +418,9 @@
);
}
-// if($this->acl_add)
-// {
-// $data['datatable']['actions'][] = 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);
unset($parameters2);
- /* for ($i=0;$i<$count_uicols_name;$i++)
- {
- if($uicols['input_type'][$i]!='hidden')
- {
- $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']
= false;
- if($uicols['name'][$i]=='id' ||
$uicols['name'][$i]=='name' || $uicols['name'][$i]=='org_name' ||
$uicols['name'][$i]=='category' || $uicols['name'][$i]=='start_date' ||
$uicols['name'][$i]=='end_date' || $uicols['name'][$i]=='status' ||
$uicols['name'][$i]=='termination_date')
- {
- $datatable['headers']['header'][$i]['sortable']
= true;
- $datatable['headers']['header'][$i]['sort_field']
= $uicols['name'][$i];
- }
- }
- }
-
- //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->bo->start;
- $datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
- $datatable['pagination']['records_returned']=
count($list);
- $datatable['pagination']['records_total'] =
$this->bo->total_records;
-
- $appname =
lang('agreement');
- $function_msg = lang('List') . ' ' .
lang($this->role);
-
- 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
- }
-
- 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('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'],
- '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>";
- }
- 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']))
- {
- $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);
-
- 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->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');
-
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . $appname . ': ' . $function_msg;
-
- $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'uisagreement.index', 'property' ); */
-
self::render_template_xsl('datatable_jquery', $data);
}
@@ -1558,16 +1195,6 @@
}
}
- /* $datavalues[0] = array
- (
- 'name'
=> "0",
- 'values' =>
json_encode($content_values),
- 'total_records' =>
count($content_values),
- 'edit_action' => "''",
- 'is_paginator' => 0,
- 'permission' =>
json_encode($permissions['rowactions']),
- 'footer' => 0
- ); */
if(count($content_values))
{
return json_encode($content_values);
@@ -1718,35 +1345,6 @@
}
}
- //------- 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)))
-// );
-// $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'=>""),
-// ))
-// );
$requestUrl_Alarm = json_encode(self::link(array(
'menuaction' =>
'property.uis_agreement.get_contentalarm',
'acl_location' => $this->acl_location,
@@ -1861,17 +1459,6 @@
)
);
- //---------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();
if(isset($uicols['input_type']) &&
$uicols['input_type'])
@@ -1892,14 +1479,6 @@
}
}
-// $ColumnDefs_data[] = array
-// (
-// 'key' => 'update',
-// 'label' =>
lang('Update'),
-// 'sortable' => true,
-// 'resizeable' => true,
-// 'formatter' => 'JqueryPortico.FormatterCenter'
-// );
$parameters = array
(
'parameter' => array
@@ -1927,10 +1506,6 @@
array('my_name' => 'select_none')
);
-// $list = $this->bo->read_details($id);
-// $list = $this->list_content($list,$uicols);
-// $content = $list['content'];
-
$datatable_def[] = array
(
'container' => 'datatable-container_1',
@@ -1945,24 +1520,9 @@
)
);
-// $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'=> '')
-// ))
-// );
-
$link_view_file = $GLOBALS['phpgw']->link('/index.php',
$link_file_data);
for($z = 0; $z < count($values['files']); $z++)
@@ -1970,33 +1530,14 @@
if($link_to_files != '')
{
$content_files[$z]['file_name'] = '<a
href="' . $link_to_files . '/' . $values['files'][$z]['directory'] . '/' .
$values['files'][$z]['file_name'] . '" target="_blank" title="' . lang('click
to view file') . '">' . $values['files'][$z]['name'] . '</a>';
-// $content_files[$z]['file_name'] = '';
}
else
{
$content_files[$z]['file_name'] = '<a
href="' . $link_view_file . '&file_name=' .
$values['files'][$z]['file_name'] . '" target="_blank" title="' . lang('click
to view file') . '">' . $values['files'][$z]['name'] . '</a>';
-// $content_files[$z]['file_name'] = '';
}
$content_files[$z]['delete_file'] = '<input
type="checkbox" name="values[file_action][]" value="' .
$values['files'][$z]['name'] . '" title="' . lang('Check to delete file') .
'">';
}
-// $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')))
-// );
-
$myColumnDefs2 = array
(
array('key' => 'file_name', 'label' =>
lang('Filename'), 'sortable' => false,
@@ -2071,9 +1612,6 @@
'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,
@@ -2690,30 +2228,12 @@
'tabs'
=> phpgwapi_jquery::tabview_generate($tabs, $active_tab),
'validator'
=> phpgwapi_jquery::formvalidator_generate(array('location',
'date', 'security', 'file'))
- //'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('tabview');
-// phpgwapi_yui::load_widget('paginator');
-// phpgwapi_yui::load_widget('animation');
-
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('service agreement') . ': ' . ($values['id'] ? lang('edit item') . ' ' .
$s_agreement['name'] : lang('add item') . ' ' . $s_agreement['name']);
phpgwapi_jquery::load_widget('core');
phpgwapi_jquery::load_widget('numberformat');
-//
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit_item' => $data));
-//
$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');
-// $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'uis_agreement.edit_item', 'property' );
-
self::add_javascript('property', 'portico',
's_agreement.edit.js');
self::render_template_xsl(array('s_agreement',
'datatable_inline', 'attributes_form'), array(
'edit_item' => $data));
@@ -2736,8 +2256,6 @@
$active_tab = 'general';
$bolocation =
CreateObject('property.bolocation');
-//
$GLOBALS['phpgw']->xslttpl->add_file(array('s_agreement','attributes_view'));
-
$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,
@@ -2851,26 +2369,6 @@
}
}
}
-
-// $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'=>$table_header[0]['header'],
'sortable'=>true,'resizeable'=>true,'width'=>140),
-//
array('key' => 'cost',
'label'=>$table_header[2]['header'],
'sortable'=>true,'resizeable'=>true,'width'=>340),
-//
array('key' => 'this_index',
'label'=>$table_header[3]['header'],
'sortable'=>true,'resizeable'=>true,'width'=>200),
-//
array('key' => 'index_count',
'label'=>$table_header[4]['header'],'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterCenter','width'=>60),
-//
array('key' => 'index_date',
'label'=>$table_header[5]['header'],'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterCenter','width'=>60)))
-// );
$parameters = array
(
'parameter' => array
@@ -2953,27 +2451,12 @@
'security', 'file'))
);
-// 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('tabview');
-// phpgwapi_yui::load_widget('paginator');
-// phpgwapi_yui::load_widget('animation');
-
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('service agreement') . ': ' . lang('view item') . ' ' .
$s_agreement['name'];
phpgwapi_jquery::load_widget('core');
phpgwapi_jquery::load_widget('numberformat');
self::render_template_xsl(array('s_agreement',
'datatable_inline', 'attributes_view'), array(
'view_item' => $data));
-//
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view_item' => $data));
-//
$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');
-// $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'uis_agreement.edit', 'property' );
}
function delete()
@@ -3033,7 +2516,6 @@
$s_agreement_id = phpgw::get_var('id'); // in case of
bigint
$config =
CreateObject('phpgwapi.config', 'property');
-//
$GLOBALS['phpgw']->xslttpl->add_file(array('s_agreement', 'attributes_view',
'files'));
$tabs = array();
$tabs['general'] = array('label' => lang('general'),
'link' => '#general');
@@ -3127,23 +2609,11 @@
(
'parameter' => array
(
-// array
-// (
-// 'name' =>
's_agreement_id',
-// 'source' =>
$s_agreement_id,
-// 'ready' => 1
-// ),
array
(
'name' => 'id',
'source' => 'item_id'
- ),
-// array
-// (
-// 'name' =>
'from',
-// 'source' =>
'view',
-// 'ready' => 1
-// )
+ )
)
);
@@ -3158,26 +2628,6 @@
);
- //------- 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)))
-// );
-
$myColumnDefs0 = array
(
array('key' => 'time', 'label' =>
$alarm_data['header'][0]['lang_time'], 'sortable' => true,
@@ -3198,7 +2648,6 @@
'container' => 'datatable-container_0',
'requestUrl' => "''",
'data' =>
json_encode($alarm_data['values']),
-// 'tabletools' => $tabletools,
'ColumnDefs' => $myColumnDefs0,
'config' => array(
array('disableFilter' => true),
@@ -3219,16 +2668,6 @@
}
}
- //---------items------------------------------------
-// $datavalues[1] = array
-// (
-// 'name'
=> "1",
-// 'values'
=> json_encode($content_values),
-// 'total_records' =>
count($content_values),
-// 'is_paginator' => 1,
-// 'permission' =>
json_encode($permissions['rowactions']),
-// 'footer'
=> 0
-// );
$td_count = 0;
$ColumnDefs_data = array();
@@ -3249,17 +2688,7 @@
}
}
}
-
-// $myColumnDefs[1] = array
-// (
-// 'name' => "1",
-// 'values' =>
json_encode($ColumnDefs_data)
-// );
-// $myColumnDefs1 = array
-// (
-// array('key' =>
'file_name','label'=>lang('Filename'),'sortable'=>false,'resizeable'=>true)
-// );
-//
+
$tabletools = array
(
array('my_name' => 'view', 'text'
=> lang('View'),
@@ -3299,21 +2728,6 @@
}
}
-// $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)))
-// );
-
$myColumnDefs2 = array
(
array('key' => 'file_name', 'label' =>
lang('Filename'), 'sortable' => false,
@@ -3325,7 +2739,6 @@
'container' => 'datatable-container_2',
'requestUrl' => "''",
'data' => json_encode($content_files),
-// 'tabletools' => $tabletools,
'ColumnDefs' => $myColumnDefs2,
'config' => array(
array('disableFilter' => true),
@@ -3335,26 +2748,6 @@
$content_budget =
$this->bo->get_budget($s_agreement_id);
-// $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)))
-// );
-
$myColumnDefs3 = array
(
array('key' => 'year', 'label' => lang('year'),
'sortable' => false, 'resizeable' => true),
@@ -3373,7 +2766,6 @@
'container' => 'datatable-container_3',
'requestUrl' => "''",
'data' =>
json_encode($content_budget),
-// 'tabletools' => $tabletools,
'ColumnDefs' => $myColumnDefs3,
'config' => array(
array('disableFilter' => true),
@@ -3439,26 +2831,8 @@
'security', 'file'))
);
-// 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('tabview');
-// phpgwapi_yui::load_widget('paginator');
-// phpgwapi_yui::load_widget('animation');
-
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('service agreement') . ': ' . lang('view');
-//
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
-//
$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');
-// $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'uis_agreement.edit', 'property' );
-
//$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
- // $GLOBALS['phpgw']->xslttpl->pp();
-
phpgwapi_jquery::load_widget('core');
phpgwapi_jquery::load_widget('numberformat');
Modified: branches/dev-syncromind/property/inc/class.uitemplate.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uitemplate.inc.php
2015-12-11 14:25:41 UTC (rev 14579)
+++ branches/dev-syncromind/property/inc/class.uitemplate.inc.php
2015-12-11 15:04:27 UTC (rev 14580)
@@ -30,9 +30,7 @@
* Description
* @package property
*/
- //phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon_jquery');
- phpgw::import_class('phpgwapi.jquery');
class property_uitemplate extends phpgwapi_uicommon_jquery
{
@@ -79,25 +77,7 @@
$this->chapter_id = $this->bo->chapter_id;
$this->allrows = $this->bo->allrows;
}
- /* function property_uitemplate()
- {
- $GLOBALS['phpgw_info']['flags']['xslt_app'] = true;
- $GLOBALS['phpgw_info']['flags']['menu_selection'] =
'property::project::template';
- $this->bo =
CreateObject('property.botemplate',true);
- $this->bowo_hour =
CreateObject('property.bowo_hour');
- $this->bocommon =
CreateObject('property.bocommon');
-
- $this->start = $this->bo->start;
- $this->query = $this->bo->query;
- $this->sort =
$this->bo->sort;
- $this->order = $this->bo->order;
- $this->filter = $this->bo->filter;
- $this->cat_id = $this->bo->cat_id;
- $this->chapter_id = $this->bo->chapter_id;
- $this->allrows =
$this->bo->allrows;
- } */
-
function save_sessiondata()
{
$data = array
@@ -551,158 +531,7 @@
)
)
);
-// $datatable = array();
-// $values_combo_box = array();
- /* if( phpgw::get_var('phpgw_return_as') != 'json' )
- {
- $datatable['config']['base_url'] =
$GLOBALS['phpgw']->link('/index.php', array
- (
- 'menuaction' =>
'property.uitemplate.hour',
- 'query' => $this->query,
- 'template_id' => $template_id,
-
- ));
- $datatable['config']['allow_allrows'] = true;
- $datatable['config']['base_java_url'] =
"menuaction:'property.uitemplate.hour',"
- ."template_id:'{$template_id}'";
- $datatable['actions']['form'] = array
- (
- array
- (
- 'action' => $GLOBALS['phpgw']->link('/index.php',
- array
- (
- 'menuaction' => 'property.uitemplate.hour',
- 'query' => $this->query,
- 'template_id' => $template_id
- )
- ),
- 'fields' => array
- (
- 'field' => array
- (
- array
- (
- 'type' => 'button',
- 'id' => 'btn_done',
- 'value' => lang('done'),
- 'tab_index' => 4
- ),
- array
- (
- 'type' => 'button',
- 'id' => 'btn_new',
- 'value' => lang('add'),
- 'tab_index' => 3
- ),
- array
- ( //boton SEARCH
- 'id' => 'btn_search',
- 'name' => 'search',
- 'value' => lang('search'),
- 'type' => 'button',
- 'tab_index' => 2
- ),
- array
- ( // TEXT INPUT
- 'name' => 'query',
- 'id' => 'txt_query',
- 'value' => '',//$query,
- 'type' => 'text',
- 'onkeypress' => 'return pulsar(event)',
- 'size' => 28,
- 'tab_index' => 1
- )
- )
- )
- )
- );
- } */
-
-// $uicols = array (
-// array(
-// 'col_name'=>hour_id,
'visible'=>false, 'name'=>hour_id, 'label'=>'',
'className'=>'',
'sortable'=>false, 'sort_field'=>'',
'formatter'=>''),
-// array(
-// 'col_name'=>template_id,
'visible'=>false, 'name'=>template_id, 'label'=>'',
'className'=>'',
'sortable'=>false, 'sort_field'=>'',
'formatter'=>''),
-// array(
-// 'col_name'=>counter,
'visible'=>false, 'name'=>counter, 'label'=>'',
'className'=>'',
'sortable'=>false, 'sort_field'=>'',
'formatter'=>''),
-// array(
-// 'col_name'=>records,
'visible'=>true, 'name'=>record,
'label'=>lang('Record'), 'className'=>'centerClasss',
'sortable'=>false, 'sort_field'=>'',
'formatter'=>''),
-// array(
-// 'col_name'=>building_part ,
'visible'=>true, 'name'=>building_part, 'label'=>lang('Building part'),
'className'=>'centerClasss', 'sortable'=>true,
'sort_field'=>'building_part','formatter'=>''),
-// array(
-// 'col_name'=>code,
'visible'=>true, 'name'=>'',
'label'=>lang('Code'), 'className'=>'centerClasss',
'sortable'=>false, 'sort_field'=>'',
'formatter'=>''),
-// array(
-// 'col_name'=>grouping_descr,
'visible'=>true, 'name'=>grouping_descr, 'label'=>lang('Grouping'),
'className'=>'centerClasss', 'sortable'=>false,
'sort_field'=>'', 'formatter'=>''),
-// array(
-// 'col_name'=>hours_descr,
'visible'=>true, 'name'=>hours_descr, 'label'=>lang('Description'),
'className'=>'leftClasss', 'sortable'=>false,
'sort_field'=>'', 'formatter'=>''),
-// array(
-// 'col_name'=>unit,
'visible'=>true, 'name'=>unit, 'label'=>lang('Unit'),
'className'=>'centerClasss', 'sortable'=>false,
'sort_field'=>'', 'formatter'=>''),
-// array(
-// 'col_name'=>billperae,
'visible'=>true, 'name'=>billperae, 'label'=>lang('Bill per
unit'), 'className'=>'rightClasss', 'sortable'=>true,
'sort_field'=>'billperae', 'formatter'=>'')
-// );
-//
-// $template_list =
$this->bo->read_template_hour($template_id);
-// $i=0;
-// $grouping_descr_old='';
-// while (is_array($template_list) && list(,$template) =
each($template_list))
-// {
-//
-//
if($template['grouping_descr']!=$grouping_descr_old)
-// {
-// $new_grouping = true;
-// }
-// else
-// {
-// $new_grouping = false;
-// }
-//
-// $grouping_descr_old =
$template['grouping_descr'];
-//
-// if($template['activity_num'])
-// {
-// $code = $template['activity_num'];
-// }
-// else
-// {
-// $code =
str_replace("-",$template['tolerance'],$template['ns3420_id']);
-// }
-//
-// $content[] = array
-// (
-// 'hour_id'
=> $template['hour_id'],
-// 'template_id' =>
$template_id,
-// 'counter'
=> $i,
-// 'record'
=> $template['record'],
-// 'grouping_descr' =>
$template['grouping_descr'],
-// 'building_part' =>
$template['building_part'],
-// 'code'
=> $code,
-// 'hours_descr' =>
$template['remark']!= "" ? $template['hours_descr']."<br>".$template['remark']
: $template['hours_descr'],
-// 'unit'
=> $template['unit'],
-// 'billperae'
=> $template['billperae'],
-// );
-// unset($new_grouping);
-// unset($grouping_descr_old);
-// unset($code);
-//
-// $i++;
-// }
-//
-// $j=0;
-// if (isset($content) && is_array($content))
-// {
-// foreach($content as $template)
-// {
-// for ($i=0;$i<count($uicols);$i++)
-// {
-//
$datatable['rows']['row'][$j]['column'][$i]['name'] =
$uicols[$i]['col_name'];
-//
$datatable['rows']['row'][$j]['column'][$i]['value'] =
$template[$uicols[$i]['name']];
-// }
-// $j++;
-// }
-// }
-// $data['datatable']['actions'][] = array();
$parameters = array();
$parameters[] = array('parameter' =>
array(array('name' => 'hour_id', 'source' => 'hour_id'),
array('name' => 'template_id', 'source'
=> 'template_id')));
@@ -728,117 +557,8 @@
'parameters' => json_encode($parameters[1])
);
-// $data['datatable']['actions'][] = array
-// (
-// 'my_name' => 'add',
-// 'text' => lang('add'),
-// 'action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uitemplate.edit_hour','template_id'=> $template_id)),
-// );
unset($parameters);
-// for ($i=0;$i<count($uicols);$i++)
-// {
-// $datatable['headers']['header'][$i]['name']
= $uicols[$i]['col_name'];
-// $datatable['headers']['header'][$i]['text']
= $uicols[$i]['label'];
-// $datatable['headers']['header'][$i]['visible']
= $uicols[$i]['visible'];
-// $datatable['headers']['header'][$i]['sortable']
= $uicols[$i]['sortable'];
-//
$datatable['headers']['header'][$i]['sort_field'] =
$uicols[$i]['sort_field'];
-//
$datatable['headers']['header'][$i]['className'] =
$uicols[$i]['className'];
-//
$datatable['headers']['header'][$i]['formatter'] =
($uicols[$i]['formatter']==''? '""' : $uicols[$i]['formatter']);
-// }
- // path for property.js
-// $datatable['property_js'] =
$GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property.js";
-//
-// // Pagination and sort values
-// $datatable['pagination']['records_start'] =
(int)$this->bo->start;
-// $datatable['pagination']['records_limit'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
-// $datatable['pagination']['records_returned']=
count($content);
-// $datatable['pagination']['records_total'] =
$this->bo->total_records;
-//
-// if ( (phpgw::get_var("start")== "") &&
(phpgw::get_var("order",'string')== ""))
-// {
-// $datatable['sorting']['order']
= $uicols[1]['col_name']; // 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
-// }
-//
-// 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('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'],
-// '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)
-// {
-// $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);
-//
-// 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->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');
-//
-// //Title of Page
-// $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('property') . ' - ' . lang('template') . ': ' . lang('view template
detail');
-//
-// // Prepare YUI Library
-// $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'template.hour', 'property' );
self::render_template_xsl('datatable_jquery', $data);
}
Modified: branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php
2015-12-11 14:25:41 UTC (rev 14579)
+++ branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php
2015-12-11 15:04:27 UTC (rev 14580)
@@ -30,9 +30,7 @@
* Description
* @package property
*/
- #phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon_jquery');
- phpgw::import_class('phpgwapi.jquery');
class property_uitenant_claim extends phpgwapi_uicommon_jquery
{
@@ -171,9 +169,6 @@
'perm' => PHPGW_ACL_READ,
'acl_location' => $this->acl_location));
}
- #$receipt =
$GLOBALS['phpgw']->session->appsession('session_data','tenant_claim_receipt');
-
#$GLOBALS['phpgw']->session->appsession('session_data','tenant_claim_receipt','');
- #$datatable = array();
if(phpgw::get_var('phpgw_return_as') == 'json')
{
return $this->query(array('project_id' =>
$project_id));
@@ -301,115 +296,6 @@
'query' => $this->query
);
- /* $datatable['actions']['form'] = array
- (
- array
- (
- 'action' => $GLOBALS['phpgw']->link('/index.php',
- array
- (
- 'menuaction' =>
'property.uitenant_claim.index',
- 'query' => $this->query,
- 'cat_id' => $this->cat_id
- )
- ),
- '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 STATUS
- 'id' => 'btn_district_id',
- 'name' => 'district_id',
- 'value' => lang('District'),
- 'type' => 'button',
- 'style' => 'filter',
- 'tab_index' => 2
- ),
- array
- ( //boton STATUS
- 'id' => 'btn_status_id',
- 'name' => 'status_id',
- 'value' => lang('Status'),
- 'type' => 'button',
- 'style' => 'filter',
- 'tab_index' => 3
- ),
- array
- ( //boton USER
- 'id' => 'sel_user_id',
- 'name' => 'user_id',
- 'value' => lang('User'),
- 'type' => 'select',
- 'style' => 'filter',
- 'values' => $values_combo_box[3],
- 'onchange'=> 'onChangeSelect();',
- 'tab_index' => 4
- ),
- array
- (
- 'type' => 'button',
- 'id' => 'btn_new',
- 'value' => lang('add'),
- 'tab_index' => 7
- ),
- array
- ( //boton SEARCH
- 'id' => 'btn_search',
- 'name' => 'search',
- 'value' => lang('search'),
- 'type' => 'button',
- 'tab_index' => 6
- ),
- array
- ( // TEXT INPUT
- 'name' => 'query',
- 'id' => 'txt_query',
- 'value' => '',//$query,
- 'type' => 'text',
- 'onkeypress' => 'return pulsar(event)',
- 'size' => 28,
- 'tab_index' => 5
- ),
- ),
- 'hidden_value' => array
- (
- array
- ( //div values combo_box_0
- 'id' => 'values_combo_box_0',
- 'value' =>
$this->bocommon->select2String($values_combo_box[0])
- ),
- 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])
- ),
- array
- ( //div values combo_box_3
- 'id' => 'values_combo_box_3',
- 'value' =>
$this->bocommon->select2String($values_combo_box[3])
- ),
-
- )
- )
- )
- ); */
-
$parameters = array
(
'parameter' => array
@@ -814,32 +700,6 @@
}
}
- //---datatable0
settings---------------------------------------------------
-// $datavalues[0] = array
-// (
-// 'name' => "0",
-// 'values' =>
json_encode($project_values['workorder_budget']),
-// 'total_records' =>
count($project_values['workorder_budget']),
-// 'edit_action' =>
json_encode($GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
'property.uiworkorder.edit'))),
-// 'is_paginator' => 1,
-// 'footer' => 0
-// );
-// $myColumnDefs[0] = array
-// (
-// 'name' => "0",
-// 'values' =>
json_encode(array( array('key' => 'workorder_id',
'label'=>lang('Workorder'),
'sortable'=>true,'resizeable'=>true,'formatter'=>'YAHOO.widget.DataTable.formatLink'),
-//
array('key' => 'budget',
'label'=>lang('Budget'),
'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount0'),
-//
array('key' =>
'budget_hidden','hidden'=>true),
-//
array('key' => 'calculation',
'label'=>lang('Calculation'),
'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount0'),
-//
array('key' =>
'calculation_hidden','hidden'=>true),
-//
array('key' =>
'actual_cost','label'=>lang('actual
cost'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterAmount0'),
-//
array('key' =>
'actual_cost_hidden','hidden'=>true),
-//
array('key' =>
'vendor_name','label'=>lang('Vendor'),'sortable'=>true,'resizeable'=>true),
-//
array('key' =>
'charge_tenant','label'=>lang('Charge
tenant'),'sortable'=>true,'resizeable'=>true,'formatter'=>'FormatterCenter'),
-//
array('key' =>
'status','label'=>'Status','sortable'=>true,'resizeable'=>true),
-//
array('key' =>
'voucher_id','label'=>lang('voucher'),'sortable'=>true,'resizeable'=>true),
-//
array('key' => 'selected','label'=>
lang('select'), 'sortable'=>false,'resizeable'=>false)))
-// );
$myColumnDefs0 = array
(
@@ -916,24 +776,6 @@
$z++;
}
-// $datavalues[1] = array
-// (
-// 'name' => "1",
-// 'values' =>
json_encode($content_files),
-// 'total_records' =>
count($content_files),
-// 'edit_action' => "''",
-// 'is_paginator' => 1,
-// 'rows_per_page' =>
5,//$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'],
-// 'footer' => 0
-// );
-//
-// $myColumnDefs[1] = array
-// (
-// 'name' => "1",
-// '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)))
-// );
-
$myColumnDefs1 = array
(
array('key' => 'file_name', 'label' =>
lang('Filename'), 'sortable' => false,
@@ -953,26 +795,6 @@
array('disablePagination' => true)
)
);
-//--------------files
-// $datavalues[2] = array
-// (
-// 'name'
=> "2",
-// 'values'
=> json_encode($record_history),
-// 'total_records' =>
count($record_history),
-// 'edit_action' => "''",
-// 'is_paginator' => 0,
-// 'footer'
=> 0
-// );
-//
-// $myColumnDefs[2] = array
-// (
-// 'name' => "2",
-// 'values' =>
json_encode(array( array('key' => 'value_date','label' =>
lang('Date'),'sortable'=>true,'resizeable'=>true),
-//
array('key' => 'value_user','label' =>
lang('User'),'Action'=>true,'resizeable'=>true),
-//
array('key' => 'value_action','label' =>
lang('Action'),'sortable'=>true,'resizeable'=>true),
-//
array('key' => 'value_old_value','label' =>
lang('old value'), 'sortable'=>true,'resizeable'=>true),
-//
array('key' => 'value_new_value','label' =>
lang('New Value'),'sortable'=>true,'resizeable'=>true)))
-// );
$myColumnDefs2 = array
(
@@ -1010,9 +832,6 @@
'property_js' =>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] .
"/property/js/yahoo/property2.js"),
'base_java_url' =>
json_encode(array(menuaction => "property.uitenant_claim.edit",
claim_id => $claim_id)),
-// 'datatable'
=> $datavalues,
-// 'myColumnDefs'
=> $myColumnDefs,
- //'myButtons'
=> $myButtons,
'lang_end_date' => lang('Project end date'),
'value_end_date' => $project_values['end_date'],
'lang_charge_tenant' => lang('Charge tenant'),
@@ -1094,7 +913,6 @@
'security', 'file'))
);
-// echo '<pre>'; print_r($data); echo '</pre>';
$GLOBALS['phpgw_info']['flags']['app_header'] =
lang('Tenant claim') . ': ' . ($claim_id ? lang('edit claim') : lang('add
claim'));
phpgwapi_jquery::load_widget('core');
@@ -1104,30 +922,6 @@
self::render_template_xsl(array('tenant_claim',
'datatable_inline', 'files'), array(
'edit' => $data));
-
-//
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('edit' => $data));
-//
-// //_debug_array($data);die;
-//
-// //---datatable settings--------------------
-// 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('tabview');
-// phpgwapi_yui::load_widget('paginator');
-// phpgwapi_yui::load_widget('animation');
-//
-// $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');
-// $GLOBALS['phpgw']->js->validate_file( 'yahoo',
'uitenant.edit', 'property' );
- //-----------------------datatable settings---
- // $GLOBALS['phpgw']->xslttpl->pp();
}
function delete()
@@ -1259,19 +1053,6 @@
}
}
- /*
- for
($i=0;$i<count($project_values['workorder_budget']);$i++)
- {
- $claimed=
$this->bo->check_claim_workorder($project_values['workorder_budget'][$i]['workorder_id']);
-
- if($claimed)
- {
- $project_values['workorder_budget'][$i]['claimed'] =
$claimed;
- }
- }
-
- */
-
$b_account_data =
$this->bocommon->initiate_ui_budget_account_lookup(array(
'b_account_id' => $values['b_account_id'],
'b_account_name' => $values['b_account_name'],
@@ -1366,7 +1147,6 @@
phpgwapi_jquery::load_widget('core');
phpgwapi_jquery::load_widget('numberformat');
-//
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('view' => $data));
self::render_template_xsl(array('tenant_claim',
'datatable_inline', 'nextmatchs'), array(
'view' => $data));
}
Modified: branches/dev-syncromind/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiwo_hour.inc.php
2015-12-11 14:25:41 UTC (rev 14579)
+++ branches/dev-syncromind/property/inc/class.uiwo_hour.inc.php
2015-12-11 15:04:27 UTC (rev 14580)
@@ -30,9 +30,7 @@
* Description
* @package property
*/
- //phpgw::import_class('phpgwapi.yui');
phpgw::import_class('phpgwapi.uicommon_jquery');
- phpgw::import_class('phpgwapi.jquery');
class property_uiwo_hour extends phpgwapi_uicommon_jquery
{
@@ -1225,33 +1223,6 @@
$sms_data['encoded_text'] =
'data:image/png;base64,' . base64_encode(file_get_contents($filename));
}
$lang_reminder = '';
- /*
- $action_params = array
- (
- 'appname' => 'property',
- 'location' => '.project.workorder',
- 'id' => $workorder_id,
- 'responsible' => $workorder['vendor_id'],
- 'responsible_type' => 'vendor',
- 'action' => 'remind',
- 'deadline' => '',
- 'created_by' => '',
- );
-
-
- $pending_action =
execMethod('property.sopending_action.get_pending_action', $action_params);
-
- $lang_reminder = '';
- if( $pending_action )
- {
- $reminder = (int)$pending_action[0]['reminder'] +1;
- $lang_reminder = lang('reminder') . " # {$reminder}";
- }
- else if ($this->boworkorder->order_sent_adress)
- {
- $lang_reminder = lang('reminder') . " # 1";
- }
- */
if($this->boworkorder->order_sent_adress || $sent_ok)
{
$lang_reminder = lang('reminder');
Deleted: branches/dev-syncromind/property/test_menu.php
===================================================================
--- branches/dev-syncromind/property/test_menu.php 2015-12-11 14:25:41 UTC
(rev 14579)
+++ branches/dev-syncromind/property/test_menu.php 2015-12-11 15:04:27 UTC
(rev 14580)
@@ -1,88 +0,0 @@
-<?php
-
- $GLOBALS['phpgw_info'] = array();
-
- $GLOBALS['phpgw_info']['flags'] = array
- (
- 'noheader' => true,
- 'nonavbar' => false,
- 'currentapp' => 'home',
- 'enable_network_class' => true,
- 'enable_contacts_class' => true,
- 'enable_nextmatchs_class' => true
- );
-
-
- include_once('../header.inc.php');
-//checking 2
-//checking3
-// Start-------------------------------------------------
-
- phpgw::import_class('phpgwapi.yui');
-
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/examples/treeview/assets/css/folders/tree.css');
- phpgwapi_yui::load_widget('treeview');
- phpgwapi_yui::load_widget('cookie');
- $GLOBALS['phpgw']->js->validate_file( 'yahoo', 'test.menu', 'property'
);
-
- $currentapp = $GLOBALS['phpgw_info']['flags']['currentapp'];
- $applications = array();
- $mapping = array(0 => array('name' =>
'first_element_is_dummy'));
- $exclude = array('home', 'preferences', 'about', 'logout');
- $navbar = execMethod('phpgwapi.menu.get', 'navbar');
-
- $i = 1;
- foreach ( $navbar as $app => $app_data )
- {
- if ( in_array($app, $exclude) )
- {
- continue;
- }
-
- $applications[] = array
- (
- 'value'=> array
- (
- 'id' => $i,
- 'app' => $app,
- 'label' => $app_data['text'],
- // 'href' => str_replace('&','&',
$app_data['url']) . '&phpgw_return_as=noframes',
- 'href' => str_replace('&','&',
$app_data['url']),
- ),
- 'children' => array()
- );
-
- $mapping[$i] = array
- (
- 'id' => $i,
- 'name' => $app,
- 'expanded' => false,
- 'highlight' => true,//$app == $currentapp ?
true : false,
- 'is_leaf' => false
- );
-
- $i ++;
- }
- $applications = json_encode($applications);
- $mapping = json_encode($mapping);
-
-$html = <<<HTML
- <div id="MenutreeDiv1"></div>
- <script type="text/javascript">
- var apps = {$applications};
- var mapping = {$mapping};
- var proxy_data = ['first_element_is_dummy'];
- </script>
-HTML;
-
-
-// End--------------------------------------------------
-
- $GLOBALS['phpgw']->common->phpgw_header();
- echo parse_navbar();
-
- echo $html;
-
-
- $GLOBALS['phpgw']->common->phpgw_footer();
-
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [14580] clean up from yui,
Sigurd Nes <=