vitalif
/
olap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

empty field, &nbsp

master
vitalif 2010-07-30 06:16:33 +00:00
parent 3cfdac9de4
commit 4daa602797
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
olap.php
View File

@ -49,6 +49,8 @@ class OLAP
set_time_limit(300);
$time_start = microtime(true);
$template->compiletime_functions['fformat'] = "OLAP::tpl_field_format";
foreach (self::$sources as $k => &$s)
$s['id'] = $k;
self::$current_srcid = $request['datasource'];
self::$current_src = self::$sources[self::$current_srcid];
$template->vars('sources', array_values(self::$sources));
@ -244,9 +246,14 @@ class OLAP
static function sql_trans_field($field, $func)
{
$fd = &self::$current_src['fielddescs'][$field];
$sql = $field;
if ($fd['sql'])
$sql = $fd['sql'];
if ($field === '')
$sql = '1';
else
{
$sql = $field;
if ($fd['sql'])
$sql = $fd['sql'];
}
if ($fd['is_time'] && $fd['format'] == TS_UNIX &&
(!self::$functions[$func] || self::$functions[$func]['time_format']))
$sql = "FROM_UNIXTIME($sql)";

4
templates/default/admin_olap.tpl
View File

@ -87,7 +87,7 @@
и &le; <input type="hidden" name="field-{i}" value="{s f.id}" /><input type="hidden" name="type-{i}" value="le" /><input style="width: 100px" type="text" name="value-{i}" value="{s get(wh,concat('value-',i))}" /><!-- SET i = add(i,1) -->
<!-- END -->
<!-- IF f.is_time --> (YYYY-MM-DD HH:MM:SS)<!-- END -->
<!-- IF eq(concat('',f.id),'in_trust') --> (0-9)<!-- END -->
{f.comment}
</td></tr>
<!-- END -->
</table>
@ -109,7 +109,7 @@
<!-- SET cv = get(get(data,v),k) -->
<!-- IF hascg -->
<!-- FOR ck = keys(cv) -->
{fformat(cell_group_field,cell_group_func,'',ck)}: {fformat(cell_field,cell_func,cell_aggr,get(cv,ck))}<br />
{fformat(cell_group_field,cell_group_func,'',ck)}:&nbsp;{fformat(cell_field,cell_func,cell_aggr,get(cv,ck))}<br />
<!-- END -->
<!-- ELSE -->
{fformat(cell_field,cell_func,cell_aggr,cv)}