Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Finish task #91811.

Browse Source
This commit is contained in:
wangyuting2
2023-04-21 10:01:46 +08:00
parent eee83dc5d4
commit 6473ae0ce0
6 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/chart/lang/de.php
+14
View File
@@ -31,3 +31,17 @@ $lang->chart->aggList['avg'] = 'AVG';
$lang->chart->aggList['sum'] = 'SUM';
$lang->chart->aggList['max'] = 'MAX';
$lang->chart->aggList['min'] = 'MIN';
$lang->chart->typeList = array();
$lang->chart->typeList['table'] = 'Table';
$lang->chart->typeList['agg'] = 'Agg';
$lang->chart->typeList['value'] = 'Value';
$lang->chart->typeList['bar'] = 'Bar';
$lang->chart->typeList['piecircle'] = 'Circle Pie';
$lang->chart->typeList['pie'] = 'Pie';
$lang->chart->typeList['line'] = 'Line';
$lang->chart->typeList['radar'] = 'Radar';
$lang->chart->typeList['cluBarY'] = 'clustered Bar Y';
$lang->chart->typeList['stackedBarY'] = 'stacked Bar Y';
$lang->chart->typeList['cluBarX'] = 'clustered Bar X';
$lang->chart->typeList['stackedBar'] = 'stacked Bar';
module/chart/lang/en.php
+14
View File
@@ -31,3 +31,17 @@ $lang->chart->aggList['avg'] = 'AVG';
$lang->chart->aggList['sum'] = 'SUM';
$lang->chart->aggList['max'] = 'MAX';
$lang->chart->aggList['min'] = 'MIN';
$lang->chart->typeList = array();
$lang->chart->typeList['table'] = 'Table';
$lang->chart->typeList['agg'] = 'Agg';
$lang->chart->typeList['value'] = 'Value';
$lang->chart->typeList['bar'] = 'Bar';
$lang->chart->typeList['piecircle'] = 'Circle Pie';
$lang->chart->typeList['pie'] = 'Pie';
$lang->chart->typeList['line'] = 'Line';
$lang->chart->typeList['radar'] = 'Radar';
$lang->chart->typeList['cluBarY'] = 'clustered Bar Y';
$lang->chart->typeList['stackedBarY'] = 'stacked Bar Y';
$lang->chart->typeList['cluBarX'] = 'clustered Bar X';
$lang->chart->typeList['stackedBar'] = 'stacked Bar';
module/chart/lang/fr.php
+14
View File
@@ -31,3 +31,17 @@ $lang->chart->aggList['avg'] = 'AVG';
$lang->chart->aggList['sum'] = 'SUM';
$lang->chart->aggList['max'] = 'MAX';
$lang->chart->aggList['min'] = 'MIN';
$lang->chart->typeList = array();
$lang->chart->typeList['table'] = 'Table';
$lang->chart->typeList['agg'] = 'Agg';
$lang->chart->typeList['value'] = 'Value';
$lang->chart->typeList['bar'] = 'Bar';
$lang->chart->typeList['piecircle'] = 'Circle Pie';
$lang->chart->typeList['pie'] = 'Pie';
$lang->chart->typeList['line'] = 'Line';
$lang->chart->typeList['radar'] = 'Radar';
$lang->chart->typeList['cluBarY'] = 'clustered Bar Y';
$lang->chart->typeList['stackedBarY'] = 'stacked Bar Y';
$lang->chart->typeList['cluBarX'] = 'clustered Bar X';
$lang->chart->typeList['stackedBar'] = 'stacked Bar';
module/chart/lang/zh-cn.php
+15
View File
@@ -31,3 +31,18 @@ $lang->chart->aggList['avg'] = '平均值';
$lang->chart->aggList['sum'] = '求和';
$lang->chart->aggList['max'] = '最大值';
$lang->chart->aggList['min'] = '最小值';
$lang->chart->typeList = array();
$lang->chart->typeList['table'] = '报表';
$lang->chart->typeList['agg'] = '计数';
$lang->chart->typeList['value'] = '取值';
$lang->chart->typeList['bar'] = '柱状图';
$lang->chart->typeList['piecircle'] = '环形饼图';
$lang->chart->typeList['pie'] = '饼图';
$lang->chart->typeList['card'] = '卡片';
$lang->chart->typeList['line'] = '折线图';
$lang->chart->typeList['radar'] = '雷达图';
$lang->chart->typeList['cluBarY'] = '簇状条形图';
$lang->chart->typeList['stackedBarY'] = '堆积条形图';
$lang->chart->typeList['cluBarX'] = '簇状柱形图';
$lang->chart->typeList['stackedBar'] = '堆积柱形图';
module/chart/model.php
+1 -2
View File
@@ -580,8 +580,7 @@ class chartModel extends model
*/
public static function isClickable($chart, $action)
{
global $config;
if($chart->builtin and in_array($chart->id, $config->screen->builtinChart)) return false;
if($chart->builtin) return false;
return true;
}
module/pivot/model.php
+1 -8
View File
@@ -75,9 +75,6 @@ class pivotModel extends model
{
$pivots += $this->dao->select('*')->from(TABLE_PIVOT)
->where('deleted')->eq(0)
->andWhere('builtin', true)->eq('0')
->orWhere('id')->in($this->config->screen->builtinPivot)
->markRight(1)
->beginIF(!empty($groupID))->andWhere("FIND_IN_SET($groupID, `group`)")->fi()
->beginIF(!empty($dimensionID))->andWhere('dimension')->eq($dimensionID)->fi()
->orderBy($orderBy)
@@ -89,9 +86,6 @@ class pivotModel extends model
{
$pivots = $this->dao->select('*')->from(TABLE_PIVOT)
->where('deleted')->eq(0)
->andWhere('builtin', true)->eq('0')
->orWhere('id')->in($this->config->screen->builtinPivot)
->markRight(1)
->beginIF(!empty($dimensionID))->andWhere('dimension')->eq($dimensionID)->fi()
->orderBy($orderBy)
->page($pager)
@@ -1988,8 +1982,7 @@ class pivotModel extends model
*/
public static function isClickable($pivot, $action)
{
global $config;
if($pivot->builtin and in_array($pivot->id, $config->screen->builtinPivot)) return false;
if($pivot->builtin) return false;
return true;
}