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

10
site/views/accounts/collected.ctp
View File

@@ -31,10 +31,10 @@ function updateEntriesGrid() {
account_ids.push($(this).val());
});
cust['collected_account_id'] = <?php echo $account['id']; ?>;
cust['collected_from_date'] = $('#TxFromDate').val();
cust['collected_through_date'] = $('#TxThroughDate').val();
cust['collected_payment_accounts'] = account_ids;
cust['account_id'] = <?php echo $account['id']; ?>;
cust['from_date'] = $('#TxFromDate').val();
cust['through_date'] = $('#TxThroughDate').val();
cust['payment_accounts'] = account_ids;
$('#collected-total').html('Calculating...');
$('#collected-entries-jqGrid').clearGridData();
@@ -155,7 +155,7 @@ echo '<div CLASS="detail supporting">' . "\n";
echo $this->element('ledger_entries', array
(// Element configuration
'collected_account_id' => $account['id'],
'account_id' => $account['id'],
// Grid configuration
'config' => array

62
site/views/accounts/view.ctp
View File

@@ -9,12 +9,19 @@ echo '<div class="account view">' . "\n";
* Account Detail Main Section
*/
$rows = array(array('ID', $account['Account']['id']),
array('Name', $account['Account']['name']),
array('Type', $account['Account']['type']),
array('External Name', $account['Account']['external_name']),
array('External Account', $account['Account']['external_account']),
array('Comment', $account['Account']['comment']));
$ledger = $account['Ledger'];
$current_ledger = $account['CurrentLedger'];
if (isset($account['Account']))
$account = $account['Account'];
$rows = array();
$rows[] = array('ID', $account['id']);
$rows[] = array('Name', $account['name']);
$rows[] = array('Type', $account['type']);
$rows[] = array('External Name', $account['external_name']);
$rows[] = array('External Account', $account['external_account']);
$rows[] = array('Comment', $account['comment']);
echo $this->element('table',
array('class' => 'item account detail',
@@ -56,9 +63,10 @@ echo '<div CLASS="detail supporting">' . "\n";
*/
echo $this->element('ledgers', array
('config' => array
('caption' => $account['Account']['name'] . " Ledgers",
'rows' => $account['Ledger'],
(// Grid configuration
'config' => array
('caption' => $account['name'] . " Ledgers",
'filter' => array('account_id' => $account['id']),
)));
@@ -66,21 +74,29 @@ echo $this->element('ledgers', array
* Current Ledger
*/
echo $this->element('entries', array
(// Element configuration
'ledger_id' => $account['CurrentLedger']['id'],
'account_type' => $account['Account']['type'],
// Grid configuration
echo $this->element('ledger_entries', array
(// Grid configuration
'config' => array
('caption' =>
"Current Ledger: (" .
"#{$account['Account']['id']}" .
"-" .
"{$account['CurrentLedger']['sequence']}" .
")",
),
));
('caption' => ("Current Ledger: " .
"(". $current_ledger['name'] .")"),
'filter' => array('ledger_id' => $current_ledger['id']),
)));
/**********************************************************************
* Entire Account
*/
echo $this->element('ledger_entries', array
(// Grid configuration
'config' => array
('grid_setup' => array('hiddengrid' => true),
'caption' => "Entire Ledger",
'filter' => array('account_id' => $account['id']),
)));
/* End "detail supporting" div */
echo '</div>' . "\n";