Update ExtJs functionality for Additional Tables

2011-02-17 15:32:15 +00:00
parent 2e49c3c5ae
commit 987ae73936
9 changed files with 340 additions and 157 deletions
--- a/workflow/engine/methods/additionalTables/additionalTablesAjax.php
+++ b/workflow/engine/methods/additionalTables/additionalTablesAjax.php
@@ -62,6 +62,28 @@ if(isset($_POST['action'])) {
    	$G_PUBLISH->AddContent('propeltable', 'additionalTables/paged-table', 'additionalTables/additionalTablesExportList', $oCriteria);
    	G::RenderPage('publish', 'raw');
    break;
+    case 'updatePageSize':
+      G::LoadClass('configuration');
+      $c = new Configurations();
+      $arr['pageSize'] = $_REQUEST['size'];
+      $arr['dateSave'] = date('Y-m-d H:i:s');
+      $config = Array();
+      $config[] = $arr;
+      $c->aConfig = $config;
+      $c->saveConfig('additionalTablesList', 'pageSize','',$_SESSION['USER_LOGGED']);
+      echo '{success: true}';
+    break;
+    case 'updatePageSizeData':
+      G::LoadClass('configuration');
+      $c = new Configurations();
+      $arr['pageSize'] = $_REQUEST['size'];
+      $arr['dateSave'] = date('Y-m-d H:i:s');
+      $config = Array();
+      $config[] = $arr;
+      $c->aConfig = $config;
+      $c->saveConfig('additionalTablesData', 'pageSize','',$_SESSION['USER_LOGGED']);
+      echo '{success: true}';
+    break;
    
    case 'doExport':
    	# @Author: Erik Amaru Ortiz <aortiz.erik@gmail.com>
--- a/workflow/engine/methods/additionalTables/additionalTablesData.php
+++ b/workflow/engine/methods/additionalTables/additionalTablesData.php
@@ -35,8 +35,10 @@ $oAdditionalTables->createXmlList($_GET['sUID']);
 $arrTable = $oAdditionalTables->load($_GET['sUID'],true);
 $fields = $arrTable['FIELDS'];

-//print_r($arrTable);
-//die;
+G::LoadClass('configuration');
+$c = new Configurations();
+$configPage = $c->getConfiguration('additionalTablesData', 'pageSize','',$_SESSION['USER_LOGGED']);
+$Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;

 $arrNames = Array();
 $arrDescrip = Array();
@@ -56,10 +58,6 @@ foreach ($fields as $field){
 $oHeadPublisher->addExtJsScript('additionalTables/additionalTablesData', false);    //adding a javascript file .js
 $oHeadPublisher->addContent('additionalTables/additionalTablesData'); //adding a html file  .html.

-$labels = G::getTranslations(Array('ID_EXPORT','ID_IMPORT','ID_EDIT','ID_DELETE', 'ID_DATA',
-  'ID_NEW_ADD_TABLE','ID_DESCRIPTION','ID_NAME','ID_CONFIRM','ID_ADDITIONAL_TABLES','ID_SELECT_FIRST_PM_TABLE_ROW',
-  'ID_CONFIRM_DELETE_PM_TABLE','ID_ADD_ROW','ID_BACK','ID_SELECT_FIRST_ROW','ID_MSG_CONFIRM_DELETE_ROW'));
-
 $table_uid = Array();
 $table_uid['UID'] = $_GET['sUID'];
 $table_uid['COUNTER'] = $c;
@@ -67,57 +65,9 @@ $table_uid['TABLE_NAME'] = $arrTable['ADD_TAB_NAME'];
 $table_uid['PKF'] = $xPKF;


-$oHeadPublisher->assign('TRANSLATIONS', $labels);
 $oHeadPublisher->assign('TABLES', $table_uid);
 $oHeadPublisher->assign('NAMES', $arrNames);
 $oHeadPublisher->assign('VALUES', $arrDescrip);
+$oHeadPublisher->assign('CONFIG', $Config);

-G::RenderPage('publish', 'extJs');
-//global $RBAC;
-//if ($RBAC->userCanAccess('PM_SETUP') != 1) {
-//  G::SendTemporalMessage('ID_USER_HAVENT_RIGHTS_PAGE', 'error', 'labels');
-//	G::header('location: ../login/login');
-//	die;
-//}
-//
-//require_once 'classes/model/AdditionalTables.php';
-//$oAdditionalTables = new AdditionalTables();
-//$oAdditionalTables->createXmlList($_GET['sUID']);
-//
-//$G_MAIN_MENU            = 'processmaker';
-////$G_SUB_MENU             = 'setup';
-//$G_ID_MENU_SELECTED     = 'SETUP';
-////$G_ID_SUB_MENU_SELECTED = 'ADDITIONAL_TABLES';
-//
-//$ocaux = $oAdditionalTables->getDataCriteria($_GET['sUID']);
-//
-////var_dump($ocaux);
-//
-//$rs = AdditionalTablesPeer::DoSelectRs ($ocaux);
-//$rs->setFetchmode (ResultSet::FETCHMODE_ASSOC);
-//
-//$fieldN = Array('DUMMY'=>'char');
-//
-//$rows = Array();
-//while($rs->next()){
-//	$rows[] = $rs->getRow();
-//}
-//
-//$rows = array_merge(Array($fieldN), $rows);
-//
-//print_r($rows);
-////die();
-//
-//global $_DBArray;
-//$_DBArray['virtual_pmtable']   = $rows;
-//$_SESSION['_DBArray'] = $_DBArray;
-//G::LoadClass('ArrayPeer');
-//$oCriteria = new Criteria('dbarray');
-//$oCriteria->setDBArrayTable('virtual_pmtable');
-//
-//
-//$G_PUBLISH = new Publisher;
-////$G_PUBLISH->AddContent('xmlform', 'xmlform', 'additionalTables/additionalTablesTitle', '', $oAdditionalTables->load($_GET['sUID']));
-//
-//$G_PUBLISH->AddContent('propeltable', 'paged-table', 'xmlLists/' . $_GET['sUID'], $oCriteria, array('ADD_TAB_UID' => $_GET['sUID']), '', '', '', PATH_DYNAFORM);
-//G::RenderPage('publishBlank', 'blank');
+G::RenderPage('publish', 'extJs');
--- a/workflow/engine/methods/additionalTables/additionalTablesList.php
+++ b/workflow/engine/methods/additionalTables/additionalTablesList.php
@@ -26,17 +26,18 @@ global $RBAC;
 $RBAC->requirePermissions('PM_SETUP_ADVANCE');
 $G_PUBLISH = new Publisher;

+G::LoadClass('configuration');
+$c = new Configurations();
+$configPage = $c->getConfiguration('additionalTablesList', 'pageSize','',$_SESSION['USER_LOGGED']);
+$Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
+
 $oHeadPublisher =& headPublisher::getSingleton();

 //$oHeadPublisher->usingExtJs('ux/Ext.ux.fileUploadField');
 $oHeadPublisher->addExtJsScript('additionalTables/additionalTablesList', false);    //adding a javascript file .js
 $oHeadPublisher->addContent('additionalTables/additionalTablesList'); //adding a html file  .html.
-
-$labels = G::getTranslations(Array('ID_EXPORT','ID_IMPORT','ID_EDIT','ID_DELETE', 'ID_DATA',
-  'ID_NEW_ADD_TABLE','ID_DESCRIPTION','ID_NAME','ID_CONFIRM','ID_ADDITIONAL_TABLES','ID_SELECT_FIRST_PM_TABLE_ROW',
-  'ID_CONFIRM_DELETE_PM_TABLE'));
-
-$oHeadPublisher->assign('TRANSLATIONS', $labels);
+$oHeadPublisher->assign('FORMATS',$c->getFormats());
+$oHeadPublisher->assign('CONFIG', $Config);
 G::RenderPage('publish', 'extJs');

 /*global $RBAC;
--- a/workflow/engine/methods/additionalTables/additionalTablesToExport.php
+++ b/workflow/engine/methods/additionalTables/additionalTablesToExport.php
@@ -29,18 +29,14 @@ $G_PUBLISH = new Publisher;

 $oHeadPublisher =& headPublisher::getSingleton();

-//$oHeadPublisher->usingExtJs('ux/Ext.ux.fileUploadField');
+
 $oHeadPublisher->addExtJsScript('additionalTables/additionalTablesExport', false);    //adding a javascript file .js
 $oHeadPublisher->addContent('additionalTables/additionalTablesExport'); //adding a html file  .html.

-$labels = G::getTranslations(Array('ID_EXPORT','ID_IMPORT','ID_EDIT','ID_DELETE', 'ID_DATA',
-  'ID_NEW_ADD_TABLE','ID_DESCRIPTION','ID_NAME','ID_CONFIRM','ID_ADDITIONAL_TABLES','ID_SELECT_FIRST_PM_TABLE_ROW',
-  'ID_CONFIRM_DELETE_PM_TABLE', 'ID_CANCEL','ID_CLOSE','ID_ACTION_EXPORT','ID_ACTION_IGNORE','ID_TITLE_EXPORT_RESULT','ID_TITLE_EXPORT_TOOL'));
-
 $toSend = Array();
 $toSend['UID_LIST'] = $_GET["sUID"];

-$oHeadPublisher->assign('TRANSLATIONS', $labels);
+
 $oHeadPublisher->assign('EXPORT_TABLES', $toSend);
 G::RenderPage('publish', 'extJs');
 ?>
--- a/workflow/engine/methods/additionalTables/data_additionalTablesData.php
+++ b/workflow/engine/methods/additionalTables/data_additionalTablesData.php
@@ -24,16 +24,34 @@
 */

 require_once 'classes/model/AdditionalTables.php';
+
+G::LoadClass('configuration');
+$co = new Configurations();
+$config = $co->getConfiguration('additionalTablesData', 'pageSize','',$_SESSION['USER_LOGGED']);
+$limit_size = isset($config['pageSize']) ? $config['pageSize'] : 20;
+$start   = isset($_REQUEST['start'])  ? $_REQUEST['start'] : 0;
+$limit   = isset($_REQUEST['limit'])  ? $_REQUEST['limit'] : $limit_size; 
+
 $oAdditionalTables = new AdditionalTables();
 $oAdditionalTables->createXmlList($_GET['sUID']);

 $ocaux = $oAdditionalTables->getDataCriteria($_GET['sUID']);
+$rsc = AdditionalTablesPeer::doSelectRS($ocaux);
+$rsc->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+$total_rows = 0;
+while ($rsc->next()){
+	$total_rows++;
+}

-$rs = AdditionalTablesPeer::DoSelectRs ($ocaux);
+$ocaux1 = $oAdditionalTables->getDataCriteria($_GET['sUID']);
+$ocaux1->setLimit($limit);
+$ocaux1->setOffset($start);
+
+$rs = AdditionalTablesPeer::DoSelectRs ($ocaux1);
 $rs->setFetchmode (ResultSet::FETCHMODE_ASSOC);

 $rows = Array();
 while($rs->next()){
 	$rows[] = $rs->getRow();
 }
-echo G::json_encode($rows);
+echo '{rows: '.G::json_encode($rows).', total_rows: '.$total_rows.'}';
--- a/workflow/engine/methods/additionalTables/data_additionalTablesList.php
+++ b/workflow/engine/methods/additionalTables/data_additionalTablesList.php
@@ -24,19 +24,50 @@
 */

 require_once 'classes/model/AdditionalTables.php';
+G::LoadClass('configuration');
+$co = new Configurations();
+$config = $co->getConfiguration('additionalTablesList', 'pageSize','',$_SESSION['USER_LOGGED']);
+$env = $co->getConfiguration('ENVIRONMENT_SETTINGS', '');
+$limit_size = isset($config['pageSize']) ? $config['pageSize'] : 20;
+$start   = isset($_REQUEST['start'])  ? $_REQUEST['start'] : 0;
+$limit   = isset($_REQUEST['limit'])  ? $_REQUEST['limit'] : $limit_size; 
+$filter = isset($_REQUEST['textFilter']) ? $_REQUEST['textFilter'] : '';

 $oCriteria = new Criteria('workflow');
 $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_UID);
 $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_NAME);
 $oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_DESCRIPTION);
+if ($filter!=''){
+	$oCriteria->add(
+	  $oCriteria->getNewCriterion(AdditionalTablesPeer::ADD_TAB_NAME, '%'.$filter.'%',Criteria::LIKE)->addOr(
+	  $oCriteria->getNewCriterion(AdditionalTablesPeer::ADD_TAB_DESCRIPTION, '%'.$filter.'%',Criteria::LIKE)));
+}
+$total_tables = AdditionalTablesPeer::doCount($oCriteria);
+//$oDataset = AdditionalTablesPeer::doSelectRS ( $oCriteria );
+//$oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC );
+//$oDataset->next();
+//$row = $oDataset->getRow();
+//$total_tables = $row['CNT'];
+
+$oCriteria->clear();
+$oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_UID);
+$oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_NAME);
+$oCriteria->addSelectColumn(AdditionalTablesPeer::ADD_TAB_DESCRIPTION);
 $oCriteria->add(AdditionalTablesPeer::ADD_TAB_UID, '', Criteria::NOT_EQUAL);
+if ($filter!=''){
+	$oCriteria->add(
+	  $oCriteria->getNewCriterion(AdditionalTablesPeer::ADD_TAB_NAME, '%'.$filter.'%',Criteria::LIKE)->addOr(
+	  $oCriteria->getNewCriterion(AdditionalTablesPeer::ADD_TAB_DESCRIPTION, '%'.$filter.'%',Criteria::LIKE)));
+}
+
+$oCriteria->setLimit($limit);
+$oCriteria->setOffset($start);

 $oDataset = AdditionalTablesPeer::doSelectRS ( $oCriteria );
 $oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC );

 $addTables = Array();
 while( $oDataset->next() ) {
-    $addTables[] = $oDataset->getRow();
-      
+    $addTables[] = $oDataset->getRow(); 
 }
-echo G::json_encode($addTables);
+echo '{tables: '.G::json_encode($addTables).', total_tables: '.$total_tables.'}';
--- a/workflow/engine/templates/additionalTables/additionalTablesData.js
+++ b/workflow/engine/templates/additionalTables/additionalTablesData.js
@@ -35,49 +35,51 @@ var viewport;
 var smodel;

 var FIELD_CM;
-var FIELD_DS
+var FIELD_DS;

 Ext.onReady(function(){
 	var xColumns = new Array();
 	var xFields = new Array();
 	
+	pageSize = parseInt(CONFIG.pageSize);
+	
 	newButton = new Ext.Action({
-		text: TRANSLATIONS.ID_ADD_ROW,
-		iconCls: 'silk-add',
-		icon: '/images/addc.png',
+		text: _('ID_ADD_ROW'),
+		iconCls: 'button_menu_ext ss_sprite ss_add',
 		handler: NewPMTableRow
 	});
 	
 	editButton = new Ext.Action({
-		text: TRANSLATIONS.ID_EDIT,
+		text: _('ID_EDIT'),
 		iconCls: 'button_menu_ext ss_sprite  ss_pencil',
-		//icon: '/images/addc.png',
 		handler: EditPMTableRow,
 		disabled: true
 	});

 	deleteButton = new Ext.Action({
-		text: TRANSLATIONS.ID_DELETE,
+		text: _('ID_DELETE'),
 		iconCls: 'button_menu_ext ss_sprite  ss_delete',
-		//icon: '/images/addc.png',
 		handler: DeletePMTableRow,
 		disabled: true
 	});

 	importButton = new Ext.Action({
-		text: TRANSLATIONS.ID_IMPORT,
+		text: _('ID_IMPORT'),
 		iconCls: 'silk-add',
 		icon: '/images/import.gif',
 		handler: ImportPMTableCSV
 	});
 	
 	backButton = new Ext.Action({
-		text: TRANSLATIONS.ID_BACK,
-		iconCls: 'silk-add',
-		icon: '/images/cases-selfservice.png',
+		text: _('ID_BACK'),
+		iconCls: 'button_menu_ext ss_sprite ss_arrow_redo',
 		handler: BackPMList
 	});
 	
+	contextMenu = new Ext.menu.Menu({
+    	items: [editButton, deleteButton]
+    });
+	
 	//This loop loads columns and fields to store and column model
 	for (var c=0; c<NAMES.length; c++){
 		var xLabel = VALUES[c];
@@ -121,7 +123,8 @@ Ext.onReady(function(){
 			url: 'data_additionalTablesData?sUID=' + TABLES.UID
 		}),
 		reader : new Ext.data.JsonReader( {
-			root: '',
+			root: 'rows',
+			totalProperty: 'total_rows',
 			fields : xFields
 		})
 	});	
@@ -134,6 +137,41 @@ Ext.onReady(function(){
 	      columns: xColumns
 	});
 	
+	storePageSize = new Ext.data.SimpleStore({
+        fields: ['size'],
+         data: [['20'],['30'],['40'],['50'],['100']],
+         autoLoad: true
+      });
+        
+      comboPageSize = new Ext.form.ComboBox({
+        typeAhead     : false,
+        mode          : 'local',
+        triggerAction : 'all',
+        store: storePageSize,
+        valueField: 'size',
+        displayField: 'size',
+        width: 50,
+        editable: false,
+        listeners:{
+          select: function(c,d,i){
+            UpdatePageConfig(d.data['size']);
+            bbarpaging.pageSize = parseInt(d.data['size']);
+            bbarpaging.moveFirst();
+          }
+        }
+      });
+        
+      comboPageSize.setValue(pageSize);
+	
+	bbarpaging = new Ext.PagingToolbar({
+        pageSize: pageSize,
+        store: store,
+        displayInfo: true,
+        displayMsg: _('ID_GRID_PAGE_DISPLAYING_ROWS_MESSAGE') + '&nbsp; &nbsp; ',
+        emptyMsg: _('ID_GRID_PAGE_NO_ROWS_MESSAGE'),
+        items: ['-',_('ID_PAGE_SIZE')+':',comboPageSize]
+      });
+	
    
 	infoGrid = new Ext.grid.GridPanel({
 		region: 'center',
@@ -141,17 +179,12 @@ Ext.onReady(function(){
 		id: 'infoGrid',
 		height:100,
 		autoWidth : true,
-	//width: 350,
-	//autoHeight: true,
-		title : TRANSLATIONS.ID_ADDITIONAL_TABLES + " : " +TABLES.TABLE_NAME, // + " (" + xColumns.length + ")",
+		title : _('ID_PM_TABLE') + " : " +TABLES.TABLE_NAME,
 		stateful : true,
 		stateId : 'grid',
 		enableColumnResize: true,
 		enableHdMenu: true,
 		frame:false,
-		//plugins: expander,
-		//cls : 'grid_with_checkbox',
-		iconCls:'icon-grid',
 		columnLines: false,
 		viewConfig: {
 			forceFit:true
@@ -160,16 +193,31 @@ Ext.onReady(function(){
 		cm: cmodel,
 		sm: smodel,
 		tbar:[newButton,'-',editButton, deleteButton,'-',importButton,{xtype: 'tbfill' }, backButton],
+		bbar: bbarpaging,
 		listeners: {
-			rowdblclick: EditPMTableRow
+			rowdblclick: EditPMTableRow,
+			render: function(){
+    			this.loadMask = new Ext.LoadMask(this.body, {msg:_('ID_LOADING_GRID')});
+    		}
 		},
 		view: new Ext.grid.GroupingView({
 			forceFit:true,
 			groupTextTpl: '{text}'
 		})
 	});
+	
+	infoGrid.on('rowcontextmenu', 
+    		function (grid, rowIndex, evt) {
+        		var sm = grid.getSelectionModel();
+        		sm.selectRow(rowIndex, sm.isSelected(rowIndex));
+    		},
+    		this
+    );
+    
+    infoGrid.on('contextmenu', function(evt){evt.preventDefault();}, this);
+    infoGrid.addListener('rowcontextmenu',onMessageContextMenu, this);

-	infoGrid.store.load({params: {"function":"additionalTablesData"}});
+	infoGrid.store.load();

 	viewport = new Ext.Viewport({
 		layout: 'fit',
@@ -180,6 +228,13 @@ Ext.onReady(function(){
 	});	
 });

+//Funtion Handles Context Menu Opening
+onMessageContextMenu = function (grid, rowIndex, e) {
+    e.stopEvent();
+    var coords = e.getXY();
+    contextMenu.showAt([coords[0], coords[1]]);
+};
+


 /////JS FUNCTIONS
@@ -191,41 +246,41 @@ capitalize = function(s){
 };

 //Do Nothing Function
-DoNothing = function(){}
+DoNothing = function(){};

 //Load New PM Table Row Forms
 NewPMTableRow = function(){
 	location.href = 'additionalTablesDataNew?sUID=' + TABLES.UID;
-}
+};

 //Load PM Table Edition Row Form
 EditPMTableRow = function(){
 	iGrid = Ext.getCmp('infoGrid');
 	rowsSelected = iGrid.getSelectionModel().getSelections();
   	location.href = 'additionalTablesDataEdit?sUID='+TABLES.UID+'&'+TABLES.PKF+'='+RetrieveRowsID(rowsSelected);
-}
+};

 //Confirm PM Table Row Deletion Tasks
 DeletePMTableRow = function(){
 	iGrid = Ext.getCmp('infoGrid');
 	rowsSelected = iGrid.getSelectionModel().getSelections();
-	Ext.Msg.confirm(TRANSLATIONS.ID_CONFIRM, TRANSLATIONS.ID_MSG_CONFIRM_DELETE_ROW,
+	Ext.Msg.confirm(_('ID_CONFIRM'), _('ID_MSG_CONFIRM_DELETE_ROW'),
 	        function(btn, text){
 	            if (btn=="yes"){
 	            	location.href = 'additionalTablesDataDelete?sUID='+TABLES.UID+'&'+TABLES.PKF+'='+RetrieveRowsID(rowsSelected);
 	            }
 	});
-}
+};

 //Load Import PM Table From CSV Source
 ImportPMTableCSV = function(){
 	location.href = 'additionalTablesDataImportForm?sUID=' + TABLES.UID;
-}
+};

 //Load PM Table List
 BackPMList = function(){
 	location.href = 'additionalTablesList';
-}
+};

 //Gets UIDs from a array of rows
 RetrieveRowsID = function(rows){
@@ -234,4 +289,12 @@ RetrieveRowsID = function(rows){
 		arrAux[c] = rows[c].get(TABLES.PKF);
 	}
 	return arrAux.join(',');
-}
+};
+
+//Update Page Size Configuration
+UpdatePageConfig = function(pageSize){
+  Ext.Ajax.request({
+  url: 'additionalTablesAjax',
+  params: {action:'updatePageSizeData', size: pageSize}
+  });
+};
--- a/workflow/engine/templates/additionalTables/additionalTablesExport.js
+++ b/workflow/engine/templates/additionalTables/additionalTablesExport.js
@@ -26,7 +26,7 @@ var store;
 var cmodel;
 var smodel;
 var infoGrid;
-var viewport
+var viewport;

 var cancelButton;
 var exportButton;
@@ -44,16 +44,15 @@ Ext.onReady(function(){
    });
    
 	exportButton = new Ext.Action({
-		text: TRANSLATIONS.ID_EXPORT,
+		text: _('ID_EXPORT'),
 		iconCls: 'silk-add',
 		icon: '/images/export.png',
 		handler: ExportPMTables
 	});
 	
 	cancelButton = new Ext.Action({
-		text: TRANSLATIONS.ID_CANCEL,
-		iconCls: 'silk-add',
-		icon: '/images/cases-selfservice.png',
+		text: _('ID_CANCEL'),
+		iconCls: 'button_menu_ext ss_sprite ss_arrow_redo',
 		handler: CancelExport
 	});
 	
@@ -91,9 +90,9 @@ Ext.onReady(function(){
            new Ext.grid.RowNumberer(),
            //smodel,
            {id:'ADD_TAB_UID', dataIndex: 'ADD_TAB_UID', hidden:true, hideable:false},
-            {header: TRANSLATIONS.ID_NAME, dataIndex: 'ADD_TAB_NAME', width: 20, align:'left'},
-            {header: TRANSLATIONS.ID_DESCRIPTION, dataIndex: 'ADD_TAB_DESCRIPTION', width: 50, hidden:false, align:'left'},//,
-            {header: 'SCHEMA', dataIndex: 'CH_SCHEMA', hidden: false, width: 20, editor: action_edit, align: 'center'},            
+            {header: _('ID_NAME'), dataIndex: 'ADD_TAB_NAME', width: 20, align:'left'},
+            {header: _('ID_DESCRIPTION'), dataIndex: 'ADD_TAB_DESCRIPTION', width: 50, hidden:false, align:'left'},//,
+            {header: _('ID_SCHEMA'), dataIndex: 'CH_SCHEMA', hidden: false, width: 20, editor: action_edit, align: 'center'},            
            {header: 'DATA', dataIndex: 'CH_DATA', hidden: false, width: 20, editor: action_edit, align: 'center'}
        ]
    });
@@ -103,10 +102,9 @@ Ext.onReady(function(){
        cm: cmodel,
        width: 600,
        height: 300,
-        title: TRANSLATIONS.ID_ADDITIONAL_TABLES + ': ' +TRANSLATIONS.ID_TITLE_EXPORT_TOOL,
-        frame: true,
+        title: _('ID_ADDITIONAL_TABLES') + ': ' +_('ID_TITLE_EXPORT_TOOL'),
+        frame: false,
        clicksToEdit: 1,
-        iconCls:'icon-grid',
        id: 'infoGrid',

    	sm: new Ext.grid.RowSelectionModel({singleSelect: false}),
@@ -117,7 +115,7 @@ Ext.onReady(function(){
    	})
    });

-    infoGrid.store.load({params: {"function":"additionalTablesExport"}});
+    infoGrid.store.load();
    
    viewport = new Ext.Viewport({
    	layout: 'fit',
@@ -132,7 +130,7 @@ Ext.onReady(function(){
 //Cancels Export View
 CancelExport = function(){
 	location.href = 'additionalTablesList';
-}
+};

 //Export Schema/Data from PM Tables
 ExportPMTables = function(){
@@ -144,12 +142,12 @@ ExportPMTables = function(){
    for (var r=0; r<storeExport.getCount(); r++){
    	row = storeExport.getAt(r);
    	UIDs[r] = row.data['ADD_TAB_UID'];
-    	if (row.data['CH_SCHEMA']==TRANSLATIONS.ID_ACTION_EXPORT){
+    	if (row.data['CH_SCHEMA']==_('ID_ACTION_EXPORT')){
    		SCHs[r] = row.data['ADD_TAB_UID'];
    	}else{
    		SCHs[r] = 0;
    	}
-    	if (row.data['CH_DATA']==TRANSLATIONS.ID_ACTION_EXPORT){
+    	if (row.data['CH_DATA']==_('ID_ACTION_EXPORT')){
    		DATs[r] = row.data['ADD_TAB_UID'];
    	}else{
    		DATs[r] = 0;
@@ -161,7 +159,7 @@ ExportPMTables = function(){
    	   failure: DoNothing,
    	   params: { action: 'doExport',  tables: UIDs.join(','), schema: SCHs.join(','), data: DATs.join(',') }
    });
-}
+};

 //Response Export Handler
 SuccessExport = function(response, opts){
@@ -171,25 +169,25 @@ SuccessExport = function(response, opts){
 		resizable: false,
 	    html: response.responseText,
 	    autoscroll: false,
-		title: TRANSLATIONS.ID_TITLE_EXPORT_RESULT,
+		title: _('ID_TITLE_EXPORT_RESULT'),
 		closable: true,
 		buttons: [{
-			text: TRANSLATIONS.ID_CLOSE,
+			text: _('ID_CLOSE'),
 //			iconCls: 'silk-add',
 			handler: CloseExport
 		}]
 	});
 	w.show();
-} 
+}; 

 //Close Export Dialog
 CloseExport = function(){
 	w.close();
-}
+};


 //Do Nothing Function
-DoNothing = function(){}
+DoNothing = function(){};

 Ext.grid.dummyData = [['Export'],['Ignore']];

--- a/workflow/engine/templates/additionalTables/additionalTablesList.js
+++ b/workflow/engine/templates/additionalTables/additionalTablesList.js