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

The previous checkin was _supposed_ to be just the jqGrid.ctp file, but an accidental keystroke checked in the work that was intended for this checkin. This would have been the addition of unit counts, as well as occupancy and vacancy, to the unit_sizes grid. Since that has already been checked in, this is just the cleanup.

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/pre_0.1_work_20090819@788 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-08-26 19:58:46 +00:00
parent 1e34cc1de8
commit b938b5f028
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
site/views/elements/unit_sizes.ctp
View File

@@ -16,11 +16,10 @@ $cols['Unavailable'] = array('index' => 'unavailable', 'formatter' => 'nu
$cols['Occupied'] = array('index' => 'occupied', 'formatter' => 'number'); $cols['Occupied'] = array('index' => 'occupied', 'formatter' => 'number');
$cols['Available'] = array('index' => 'available', 'formatter' => 'number'); $cols['Available'] = array('index' => 'available', 'formatter' => 'number');
$cols['Total'] = array('index' => 'units', 'formatter' => 'number'); $cols['Total'] = array('index' => 'units', 'formatter' => 'number');
$cols['Occupancy'] = array('index' => 'occupancy', 'formatter' => 'percentage', 'formatoptions' => array('precision' => 3)); $cols['Occupancy'] = array('index' => 'occupancy', 'formatter' => 'percentage', 'formatoptions' => array('precision' => 0));
$cols['Vacancy'] = array('index' => 'vacancy', 'formatter' => 'percentage'); $cols['Vacancy'] = array('index' => 'vacancy', 'formatter' => 'percentage', 'formatoptions' => array('precision' => 0));
$cols['Comment'] = array('index' => 'Unit.comment', 'formatter' => 'comment'); $cols['Comment'] = array('index' => 'Unit.comment', 'formatter' => 'comment');
// Render the grid // Render the grid
$grid $grid
->columns($cols) ->columns($cols)
@@ -28,4 +27,7 @@ $grid
->defaultFields(array('Size', 'Area')) ->defaultFields(array('Size', 'Area'))
->searchFields(array('Size', 'Width', 'Depth', 'Area', 'Deposit', 'Rent')) ->searchFields(array('Size', 'Width', 'Depth', 'Area', 'Deposit', 'Rent'))
->render($this, isset($config) ? $config : null, ->render($this, isset($config) ? $config : null,
array_diff(array_keys($cols), array('Height', 'Volume', 'A. Cost', 'V. Cost', 'Comment'))); array_diff(array_keys($cols), array('Height', 'Volume',
'A. Cost', 'V. Cost',
'Occupied', 'Total', 'Occupancy', 'Vacancy',
'Comment')));