Renamed jqGridData functions to be just gridData. Restructured the virtual function calls with an anticipated need for gridDataCount to be overridden as a whole, instead of just overriding the individual pieces.

git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@361 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-07-22 17:06:44 +00:00
parent 93ebc450fe
commit 7aa026f4e0
13 changed files with 391 additions and 279 deletions

View File

@@ -19,17 +19,17 @@ class StatementEntriesController extends AppController {
/**************************************************************************
**************************************************************************
**************************************************************************
* virtuals: jqGridData
* - With the application controller handling the jqGridData action,
* virtuals: gridData
* - With the application controller handling the gridData action,
* these virtual functions ensure that the correct data is passed
* to jqGrid.
*/
function jqGridDataSetup(&$params) {
parent::jqGridDataSetup($params);
function gridDataSetup(&$params) {
parent::gridDataSetup($params);
}
function jqGridDataTables(&$params, &$model) {
function gridDataTables(&$params, &$model) {
$link =
array(// Models
'Transaction' =>
@@ -67,8 +67,8 @@ class StatementEntriesController extends AppController {
return array('link' => $link);
}
function jqGridDataFields(&$params, &$model) {
$fields = parent::jqGridDataFields($params, $model);
function gridDataFields(&$params, &$model) {
$fields = parent::gridDataFields($params, $model);
if (!isset($fields))
$fields = array('StatementEntry.*');
@@ -97,8 +97,8 @@ class StatementEntriesController extends AppController {
return $fields;
}
function jqGridDataConditions(&$params, &$model) {
$conditions = parent::jqGridDataConditions($params, $model);
function gridDataConditions(&$params, &$model) {
$conditions = parent::gridDataConditions($params, $model);
extract($params['custom']);
if (isset($transaction_id))
@@ -138,22 +138,22 @@ class StatementEntriesController extends AppController {
return $conditions;
}
function jqGridRecordLinks(&$params, &$model, &$records, $links) {
function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
$links['StatementEntry'] = array('id');
$links['Transaction'] = array('id');
$links['Account'] = array('name');
$links['Customer'] = array('name');
$links['Lease'] = array('number');
$links['Unit'] = array('name');
return parent::jqGridRecordLinks($params, $model, $records, $links);
return parent::gridDataPostProcessLinks($params, $model, $records, $links);
}
function jqGridDataGroup(&$params, &$model) {
return parent::jqGridDataGroup($params, $model);
function gridDataGroup(&$params, &$model) {
return parent::gridDataGroup($params, $model);
}
function jqGridDataOrder(&$params, &$model, $index, $direction) {
$order = parent::jqGridDataOrder($params, $model, $index, $direction);
function gridDataOrder(&$params, &$model, $index, $direction) {
$order = parent::gridDataOrder($params, $model, $index, $direction);
if ($index === 'Transaction.stamp')
$order[] = 'StatementEntry.id ' . $direction;
@@ -161,7 +161,7 @@ class StatementEntriesController extends AppController {
return $order;
}
function jqGridDataRecords(&$params, &$model, $query) {
function gridDataRecords(&$params, &$model, $query) {
if ($params['action'] === 'collected') {
$tquery = array_diff_key($query, array(/*'fields'=>1,*/'group'=>1,'limit'=>1,'order'=>1));
$tquery['group'] = array('AppliedPayment.id');
@@ -182,7 +182,7 @@ class StatementEntriesController extends AppController {
$params['userdata']['balance'] = $total[0]['balance'];
}
return parent::jqGridDataRecords($params, $model, $query);
return parent::gridDataRecords($params, $model, $query);
}