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

Many, many changes, and yet still much to do. Many things are working, but certainly nothing beyond simply data retrieval (no editing or adding of any data). Also, some work is still required to ensure the grids have the right columns; we can strip out certain columns for some views (such as removing customer from the leases grid of the customer view... completely redundant). And of course, there are still many bugs and lots to clean up.

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@368 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-07-23 01:49:46 +00:00
parent 0ba5007438
commit 234999b4d2
46 changed files with 616 additions and 1128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
site/controllers/customers_controller.php
View File

@@ -45,10 +45,6 @@ class CustomersController extends AppController {
* to jqGrid.
*/
function gridDataSetup(&$params) {
parent::gridDataSetup($params);
}
function gridDataCountTables(&$params, &$model) {
return array
('link' =>
@@ -61,17 +57,16 @@ class CustomersController extends AppController {
function gridDataTables(&$params, &$model) {
$link = $this->gridDataCountTables($params, $model);
// StatementEntry is needed to determine customer balance
$link['link']['StatementEntry'] = array('fields' => array());
return $link;
}
function gridDataFields(&$params, &$model) {
$db = &$model->getDataSource();
$fields = $db->fields($model, $model->alias);
$fields = parent::gridDataFields($params, $model);
$fields[] = ('COUNT(DISTINCT CurrentLease.id) AS lease_count');
$fields = array_merge($fields,
$this->Customer->StatementEntry->chargePaymentFields(true));
return $fields;
return array_merge($fields,
$this->Customer->StatementEntry->chargePaymentFields(true));
}
function gridDataConditions(&$params, &$model) {
@@ -104,37 +99,28 @@ class CustomersController extends AppController {
return $order;
}
function gridDataCount(&$params, &$model, $query) {
function gridDataCount(&$params, &$model) {
if ($params['action'] != 'current')
return parent::gridDataCount($params, $model);
// OK, for current customers, we have an issue.
// We don't have a good way to use the query to obtain
// our count. The problem is that we're relying on the
// group by for the query, which will destroy the count,
// whether we omit the group by or leave it in.
// So, build a fresh query for counting.
// group by for the query, but that simply won't work
// for the count. However, it's not difficult to simply
// derive it since 'current' customers are mutually
// exclusive to 'past' customers.
$query['conditions'] = parent::gridDataConditions($params, $model);
$tmp_params = $params;
$tmp_params['action'] = 'all';
$all_count = parent::gridDataCount($tmp_params, $model);
$tmp_params['action'] = 'past';
$past_count = parent::gridDataCount($tmp_params, $model);
$count = $model->find('count',
array_merge(array('link' => array_diff_key($query['link'],
array('CurrentLease'=>1))),
array_diff_key($query, array('link'=>1))));
if ($params['action'] == 'all')
return $count;
$query['conditions'][] = 'CurrentLease.id IS NULL';
$count_past = $model->find('count', $query);
// Since we can't easily count 'current' directly, we
// can quickly derive it since 'current' customers
// are mutually exclusive to 'past' customers.
if ($params['action'] == 'current')
$count = $count - $count_past;
elseif ($params['action'] == 'past') {
$count = $count_past;
}
return $count;
// The current customer count is simply calculated
// as all customers that are not past customers.
return $all_count - $past_count;
}
function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {