Merge in from pre_0.1 branch
git-svn-id: file:///svn-source/pmgr/trunk/site@847 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
@@ -121,6 +121,11 @@ foreach ($jqGridColumns AS $header => &$col) {
|
||||
// No special formatting for number
|
||||
unset($col['formatter']);
|
||||
}
|
||||
elseif ($col['formatter'] === 'percentage') {
|
||||
$col['formatter'] = array('--special' => 'percentageFormatter');
|
||||
$default['width'] = 60;
|
||||
$default['align'] = 'right';
|
||||
}
|
||||
elseif ($col['formatter'] === 'currency') {
|
||||
// Use our custom formatting for currency
|
||||
$col['formatter'] = array('--special' => 'currencyFormatter');
|
||||
@@ -143,8 +148,14 @@ foreach ($jqGridColumns AS $header => &$col) {
|
||||
// No special formatting for name
|
||||
unset($col['formatter']);
|
||||
}
|
||||
elseif ($col['formatter'] === 'enum') {
|
||||
elseif (preg_match("/^(long|short)?enum$/",
|
||||
$col['formatter'], $matches)) {
|
||||
$default['width'] = 60;
|
||||
if (!empty($matches[1]) && $matches[1] === 'long')
|
||||
$default['width'] *= 1.5;
|
||||
if (!empty($matches[1]) && $matches[1] === 'short')
|
||||
$default['width'] *= 0.7;
|
||||
|
||||
//$default['align'] = 'right';
|
||||
|
||||
// No special formatting for enum
|
||||
@@ -161,7 +172,8 @@ foreach ($jqGridColumns AS $header => &$col) {
|
||||
|
||||
// Just a rough approximation to ensure columns
|
||||
// are wide enough to fully display their header.
|
||||
$min_width = strlen($header) * 10;
|
||||
$min_width = strlen($header) * 7;
|
||||
$min_width = 0; // REVISIT <AP>: 20090829; if/while jqGrid is fixed width
|
||||
if ((!isset($default['width']) || $default['width'] < $min_width) && !$default['force'])
|
||||
$default['width'] = $min_width;
|
||||
}
|
||||
@@ -234,6 +246,7 @@ $jqGrid_setup = array_merge
|
||||
'colNames' => array_keys($jqGridColumns),
|
||||
'colModel' => array('--special' => $jqGridColumns),
|
||||
'height' => $height,
|
||||
'width' => 700,
|
||||
'rowNum' => $limit,
|
||||
'rowList' => $limitOptions,
|
||||
'sortname' => $sortname,
|
||||
@@ -253,37 +266,46 @@ $jqGrid_setup = array_merge
|
||||
// to kick this thing off.
|
||||
?>
|
||||
|
||||
<?php if ($first_grid): ?>
|
||||
<script type="text/javascript"><!--
|
||||
var currencyFormatter = function(cellval, opts, rowObject) {
|
||||
if (!cellval)
|
||||
return "";
|
||||
return fmtCurrency(cellval);
|
||||
}
|
||||
|
||||
var percentageFormatter = function(cellval, opts, rowObject) {
|
||||
var precision;
|
||||
if (typeof(opts.colModel) != 'undefined' &&
|
||||
typeof(opts.colModel.formatoptions) != 'undefined' &&
|
||||
typeof(opts.colModel.formatoptions.precision) != 'undefined')
|
||||
precision = opts.colModel.formatoptions.precision;
|
||||
else
|
||||
precision = 0;
|
||||
amount = cellval.toString().replace(/\%/g,'');
|
||||
amount = (amount*100).toFixed(precision);
|
||||
return amount+'%';
|
||||
}
|
||||
|
||||
var idFormatter = function(cellval, opts, rowObject) {
|
||||
if (!cellval)
|
||||
return cellval;
|
||||
return '#'+cellval;
|
||||
}
|
||||
--></script>
|
||||
<?php endif; ?>
|
||||
|
||||
|
||||
<DIV ID="<?php echo $grid_div_id; ?>" CLASS="<?php echo $grid_div_class; ?>">
|
||||
<table id="<?php echo $grid_id; ?>" class="scroll"></table>
|
||||
<div id="<?php echo $grid_id; ?>-pager" class="scroll" style="text-align:right"></div>
|
||||
<script type="text/javascript"><!--
|
||||
|
||||
jQuery(document).ready(function(){
|
||||
currencyFormatter = function(cellval, opts, rowObject) {
|
||||
if (!cellval)
|
||||
return "";
|
||||
return fmtCurrency(cellval);
|
||||
}
|
||||
|
||||
idFormatter = function(cellval, opts, rowObject) {
|
||||
if (!cellval)
|
||||
return cellval;
|
||||
return '#'+cellval;
|
||||
}
|
||||
|
||||
jQuery('#<?php echo $grid_id; ?>').jqGrid(
|
||||
<?php echo FormatHelper::phpVarToJavascript($jqGrid_setup); ?>
|
||||
).navGrid('#<?php echo $grid_id; ?>-pager',
|
||||
{ view:false,
|
||||
edit:false,
|
||||
add:false,
|
||||
del:false,
|
||||
search:true,
|
||||
refresh:true});
|
||||
<?php echo FormatHelper::phpVarToJavascript($jqGrid_setup) . "\n"; ?>
|
||||
).navGrid('#<?php echo $grid_id; ?>-pager', { view:false,edit:false,add:false,del:false,search:true,refresh:true});
|
||||
});
|
||||
|
||||
--></script>
|
||||
|
||||
<?php
|
||||
if (count($search_fields) > 0) {
|
||||
echo('<div>Search By:<BR>' . "\n");
|
||||
|
||||
Reference in New Issue
Block a user