abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

44
site/controllers/customers_controller.php
View File

@@ -31,25 +31,25 @@ class CustomersController extends AppController {
*/
function index() { $this->current(); }
function current() { $this->jqGridView('Current Tenants', 'current'); }
function past() { $this->jqGridView('Past Tenants'); }
function all() { $this->jqGridView('All Customers'); }
function current() { $this->gridView('Current Tenants', 'current'); }
function past() { $this->gridView('Past Tenants'); }
function all() { $this->gridView('All Customers'); }
/**************************************************************************
**************************************************************************
**************************************************************************
* 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 jqGridDataCountTables(&$params, &$model) {
function gridDataCountTables(&$params, &$model) {
return array
('link' =>
array(// Models
@@ -59,13 +59,13 @@ class CustomersController extends AppController {
);
}
function jqGridDataTables(&$params, &$model) {
$link = $this->jqGridDataCountTables($params, $model);
function gridDataTables(&$params, &$model) {
$link = $this->gridDataCountTables($params, $model);
$link['link']['StatementEntry'] = array('fields' => array());
return $link;
}
function jqGridDataFields(&$params, &$model) {
function gridDataFields(&$params, &$model) {
$db = &$model->getDataSource();
$fields = $db->fields($model, $model->alias);
$fields[] = ('COUNT(DISTINCT CurrentLease.id) AS lease_count');
@@ -74,8 +74,8 @@ class CustomersController extends AppController {
return $fields;
}
function jqGridDataConditions(&$params, &$model) {
$conditions = parent::jqGridDataConditions($params, $model);
function gridDataConditions(&$params, &$model) {
$conditions = parent::gridDataConditions($params, $model);
if ($params['action'] === 'current') {
$conditions[] = 'CurrentLease.id IS NOT NULL';
@@ -87,24 +87,24 @@ class CustomersController extends AppController {
return $conditions;
}
function jqGridDataOrder(&$params, &$model, $index, $direction) {
function gridDataOrder(&$params, &$model, $index, $direction) {
$order = array();
$order[] = parent::jqGridDataOrder($params, $model, $index, $direction);
$order[] = parent::gridDataOrder($params, $model, $index, $direction);
if ($index !== 'PrimaryContact.last_name')
$order[] = parent::jqGridDataOrder($params, $model,
$order[] = parent::gridDataOrder($params, $model,
'PrimaryContact.last_name', $direction);
if ($index !== 'PrimaryContact.first_name')
$order[] = parent::jqGridDataOrder($params, $model,
$order[] = parent::gridDataOrder($params, $model,
'PrimaryContact.first_name', $direction);
if ($index !== 'Customer.id')
$order[] = parent::jqGridDataOrder($params, $model,
$order[] = parent::gridDataOrder($params, $model,
'Customer.id', $direction);
return $order;
}
function jqGridDataRecordCount(&$params, &$model, $query) {
function gridDataCount(&$params, &$model, $query) {
// We don't have a good way to use the query to obtain
// our count. The problem is that we're relying on the
@@ -112,7 +112,7 @@ class CustomersController extends AppController {
// whether we omit the group by or leave it in.
// So, build a fresh query for counting.
$query['conditions'] = parent::jqGridDataConditions($params, $model);
$query['conditions'] = parent::gridDataConditions($params, $model);
$count = $model->find('count',
array_merge(array('link' => array_diff_key($query['link'],
@@ -137,9 +137,9 @@ class CustomersController extends AppController {
return $count;
}
function jqGridRecordLinks(&$params, &$model, &$records, $links) {
function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
$links['Customer'] = array('name');
return parent::jqGridRecordLinks($params, $model, $records, $links);
return parent::gridDataPostProcessLinks($params, $model, $records, $links);
}