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

* Finish task #112811.

Browse Source
This commit is contained in:
zhouxin
2024-03-27 17:23:12 +08:00
committed by liyang
parent 9d67a7f35c
commit 5ecc7a5289
9 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/metric/config/form.php
+12 -9
View File
@@ -11,19 +11,22 @@ $config->metric->form->create['purpose'] = array('required' => true, 'type'
$config->metric->form->create['scope'] = array('required' => true, 'type' => 'string');
$config->metric->form->create['object'] = array('required' => true, 'type' => 'string');
$config->metric->form->create['dateType'] = array('required' => true, 'type' => 'string');
$config->metric->form->create['alias'] = array('required' => false, 'type' => 'string');
$config->metric->form->create['desc'] = array('required' => false, 'type' => 'string', 'filter' => 'trim');
$config->metric->form->create['definition'] = array('required' => false, 'type' => 'string', 'filter' => 'trim');
$config->metric->form->edit = array();
$config->metric->form->edit['name'] = array('required' => true, 'type' => 'string', 'filter' => 'trim');
$config->metric->form->edit['code'] = array('required' => true, 'type' => 'string', 'filter' => 'trim');
$config->metric->form->edit['status'] = array('required' => true, 'type' => 'string');
$config->metric->form->edit['confirm'] = array('required' => true, 'type' => 'string');
$config->metric->form->edit['purpose'] = array('required' => true, 'type' => 'string');
$config->metric->form->edit['scope'] = array('required' => true, 'type' => 'string');
$config->metric->form->edit['object'] = array('required' => true, 'type' => 'string');
$config->metric->form->edit['desc'] = array('required' => false, 'type' => 'string', 'filter' => 'trim');
$config->metric->form->edit['definition'] = array('required' => false, 'type' => 'string', 'filter' => 'trim');
$config->metric->form->edit['name'] = array('required' => true, 'type' => 'string', 'filter' => 'trim');
$config->metric->form->edit['code'] = array('required' => true, 'type' => 'string', 'filter' => 'trim');
$config->metric->form->edit['status'] = array('required' => true, 'type' => 'string');
$config->metric->form->edit['confirm'] = array('required' => true, 'type' => 'string');
$config->metric->form->edit['purpose'] = array('required' => true, 'type' => 'string');
$config->metric->form->edit['scope'] = array('required' => true, 'type' => 'string');
$config->metric->form->edit['object'] = array('required' => true, 'type' => 'string');
$config->metric->form->edit['dateType'] = array('required' => true, 'type' => 'string');
$config->metric->form->edit['alias'] = array('required' => false, 'type' => 'string');
$config->metric->form->edit['desc'] = array('required' => false, 'type' => 'string', 'filter' => 'trim');
$config->metric->form->edit['definition'] = array('required' => false, 'type' => 'string', 'filter' => 'trim');
$config->metric->form->change = array();
$config->metric->form->change['name'] = array('required' => true, 'type' => 'string', 'filter' => 'trim');
module/metric/control.php
+1 -1
View File
@@ -152,7 +152,7 @@ class metric extends control
$metric = $this->metric->getByID($metricID);
$this->view->metric = $metric;
$this->view->legendBasic = $this->metricZen->getBasicInfo($this->view,'scope,object,purpose,dateType,name,code,unit,desc,definition');
$this->view->legendBasic = $this->metricZen->getBasicInfo($this->view,'scope,object,purpose,dateType,name,alias,code,unit,desc,definition');
$this->view->createEditInfo = $this->metricZen->getCreateEditInfo($this->view, 'createdBy,implementedBy,lastEdited');
$this->display();
module/metric/lang/de.php
+2
View File
@@ -7,6 +7,7 @@ $lang->metric->object = "Object";
$lang->metric->purpose = "Purpose";
$lang->metric->dateType = "Date Type";
$lang->metric->unit = "Unit";
$lang->metric->alias = "Abbreviation";
$lang->metric->code = "Metric Code";
$lang->metric->desc = "Description";
$lang->metric->formula = "Formula";
@@ -114,6 +115,7 @@ $lang->metric->viewType->multiple = 'Multiple view';
$lang->metric->descTip = 'Enter the meaning, purpose, and impact of the metric';
$lang->metric->definitionTip = 'Enter the calculation rules and filtering conditions of the metric';
$lang->metric->aliasTip = 'This metric will be displayed with its abbreviation on the metric library';
$lang->metric->collectConfText = "%s %s %s";
$lang->metric->emptyCollect = 'There are no collect metrics at this time.';
$lang->metric->moveFailTip = 'Move metric file failed';
module/metric/lang/en.php
+2
View File
@@ -7,6 +7,7 @@ $lang->metric->object = "Object";
$lang->metric->purpose = "Purpose";
$lang->metric->dateType = "Date Type";
$lang->metric->unit = "Unit";
$lang->metric->alias = "Abbreviation";
$lang->metric->code = "Metric Code";
$lang->metric->desc = "Description";
$lang->metric->formula = "Formula";
@@ -114,6 +115,7 @@ $lang->metric->viewType->multiple = 'Multiple view';
$lang->metric->descTip = 'Enter the meaning, purpose, and impact of the metric';
$lang->metric->definitionTip = 'Enter the calculation rules and filtering conditions of the metric';
$lang->metric->aliasTip = 'This metric will be displayed with its abbreviation on the metric library';
$lang->metric->collectConfText = "%s %s %s";
$lang->metric->emptyCollect = 'There are no collect metrics at this time.';
$lang->metric->moveFailTip = 'Move metric file failed';
module/metric/lang/fr.php
+2
View File
@@ -7,6 +7,7 @@ $lang->metric->object = "Object";
$lang->metric->purpose = "Purpose";
$lang->metric->dateType = "Date Type";
$lang->metric->unit = "Unit";
$lang->metric->alias = "Abbreviation";
$lang->metric->code = "Metric Code";
$lang->metric->desc = "Description";
$lang->metric->formula = "Formula";
@@ -114,6 +115,7 @@ $lang->metric->viewType->multiple = 'Multiple view';
$lang->metric->descTip = 'Enter the meaning, purpose, and impact of the metric';
$lang->metric->definitionTip = 'Enter the calculation rules and filtering conditions of the metric';
$lang->metric->aliasTip = 'This metric will be displayed with its abbreviation on the metric library';
$lang->metric->collectConfText = "%s %s %s";
$lang->metric->emptyCollect = 'There are no collect metrics at this time.';
$lang->metric->moveFailTip = 'Move metric file failed';
module/metric/lang/zh-cn.php
+2
View File
@@ -7,6 +7,7 @@ $lang->metric->object = "对象";
$lang->metric->purpose = "目的";
$lang->metric->dateType = "时间属性";
$lang->metric->unit = "单位";
$lang->metric->alias = "度量项简称";
$lang->metric->code = "代号";
$lang->metric->desc = "描述";
$lang->metric->formula = "计算规则";
@@ -114,6 +115,7 @@ $lang->metric->viewType->multiple = '组合查看';
$lang->metric->descTip = '请输入度量项含义、目的和作用等';
$lang->metric->definitionTip = '请输入度量项的计算规则及过滤条件等';
$lang->metric->aliasTip = '在度量库页面会用简称展示此度量项';
$lang->metric->collectConfText = "每%s的%s的%s";
$lang->metric->emptyCollect = '暂时没有收藏度量项。';
$lang->metric->moveFailTip = '移动度量项文件失败。';
module/metric/ui/create.html.php
+7
View File
@@ -80,6 +80,13 @@ formPanel
set::required(true)
),
formGroup
(
set::label($lang->metric->alias),
set::name('alias'),
set::required(false),
set::placeholder($lang->metric->aliasTip)
),
formGroup
(
set::label($lang->metric->code),
set::name('code'),
module/metric/ui/edit.html.php
+8
View File
@@ -98,6 +98,14 @@ formPanel
set::required(true)
),
formGroup
(
set::label($lang->metric->alias),
set::name('alias'),
set::value($metric->alias),
set::required(false),
set::placeholder($lang->metric->aliasTip)
),
formGroup
(
set::label($lang->metric->code),
set::name('code'),
module/metric/zen.php
+2 -1
View File
@@ -371,7 +371,7 @@ class metricZen extends metric
* @access protected
* @return array
*/
protected function getBasicInfo(object $view, string $fields = 'scope,object,purpose,dateType,code,unit,stage')
protected function getBasicInfo(object $view, string $fields = 'scope,object,purpose,dateType,name,alias,code,unit,stage')
{
extract((array)$view);
@@ -384,6 +384,7 @@ class metricZen extends metric
if(strpos($fields, 'purpose') !== false) $legendBasic['purpose'] = array('name' => $this->lang->metric->purpose, 'text' => zget($this->lang->metric->purposeList, $metric->purpose));
if(strpos($fields, 'dateType') !== false) $legendBasic['dateType'] = array('name' => $this->lang->metric->dateType, 'text' => zget($this->lang->metric->dateTypeList, $metric->dateType));
if(strpos($fields, 'name') !== false) $legendBasic['name'] = array('name' => $this->lang->metric->name, 'text' => $metric->name);
if(strpos($fields, 'alias') !== false) $legendBasic['alias'] = array('name' => $this->lang->metric->alias, 'text' => $metric->alias);
if(strpos($fields, 'code') !== false) $legendBasic['code'] = array('name' => $this->lang->metric->code, 'text' => $metric->code);
if(strpos($fields, 'unit') !== false) $legendBasic['unit'] = array('name' => $this->lang->metric->unit, 'text' => $unit);
if($isOldMetric)