From 83e46145c131fc2bbb7a3aade63e7a121e95aed0 Mon Sep 17 00:00:00 2001 From: zhouxin Date: Fri, 15 Sep 2023 09:43:35 +0800 Subject: [PATCH] * Add tips of no calculator in metric-view. --- module/metric/config.php | 6 +++--- module/metric/control.php | 1 + module/metric/lang/de.php | 6 +++--- module/metric/lang/en.php | 6 +++--- module/metric/lang/fr.php | 6 +++--- module/metric/lang/zh-cn.php | 6 +++--- module/metric/model.php | 12 +++++++++--- module/metric/ui/viewphpmetric.html.php | 23 ++++++++++++++++++----- 8 files changed, 43 insertions(+), 23 deletions(-) diff --git a/module/metric/config.php b/module/metric/config.php index 3a59cb6682..0d528e8718 100644 --- a/module/metric/config.php +++ b/module/metric/config.php @@ -57,6 +57,6 @@ $config->metric->oldObjectMap['softRequest'] = 'story'; $config->metric->oldObjectMap['userRequest'] = 'requirement'; $config->metric->verifyList = array(); -$config->metric->verifyList['checkCalcExists'] = $lang->metric->verifyList['checkCalcExists']; -$config->metric->verifyList['checkCalcClass'] = $lang->metric->verifyList['checkCalcClass']; -$config->metric->verifyList['checkCalcMethods'] = $lang->metric->verifyList['checkCalcMethods']; +$config->metric->verifyList['checkCustomCalcExists'] = $lang->metric->verifyList['checkCustomCalcExists']; +$config->metric->verifyList['checkCalcClass'] = $lang->metric->verifyList['checkCalcClass']; +$config->metric->verifyList['checkCalcMethods'] = $lang->metric->verifyList['checkCalcMethods']; diff --git a/module/metric/control.php b/module/metric/control.php index ee0d5c67ce..6db5304c59 100755 --- a/module/metric/control.php +++ b/module/metric/control.php @@ -337,6 +337,7 @@ class metric extends control $this->view->title = $metric->name; $this->view->metric = $metric; $this->view->isOldMetric = $isOldMetric; + $this->view->isCalcExists = $this->metric->checkCalcExists($metric); $this->view->result = $result; $this->view->resultHeader = $this->metricZen->getViewTableHeader($result); $this->view->resultData = $this->metricZen->getViewTableData($metric, $result); diff --git a/module/metric/lang/de.php b/module/metric/lang/de.php index 662ad24cc4..0a862f83aa 100755 --- a/module/metric/lang/de.php +++ b/module/metric/lang/de.php @@ -193,9 +193,9 @@ $lang->metric->implementTips[] = '3. Place the developed code.php file in the [U $lang->metric->implementTips[] = '4. Execute the command to grant executable permissions to the file.'; $lang->metric->verifyList = array(); -$lang->metric->verifyList['checkCalcExists'] = 'Check whether the metric exists'; -$lang->metric->verifyList['checkCalcClass'] = 'Check the metric class name is correct'; -$lang->metric->verifyList['checkCalcMethods'] = 'Check whether the metrics defines the required methods'; +$lang->metric->verifyList['checkCustomCalcExists'] = 'Check whether the metric exists'; +$lang->metric->verifyList['checkCalcClass'] = 'Check the metric class name is correct'; +$lang->metric->verifyList['checkCalcMethods'] = 'Check whether the metrics defines the required methods'; $lang->metric->weekList = array(); $lang->metric->weekList['1'] = 'Monday'; diff --git a/module/metric/lang/en.php b/module/metric/lang/en.php index 662ad24cc4..0a862f83aa 100755 --- a/module/metric/lang/en.php +++ b/module/metric/lang/en.php @@ -193,9 +193,9 @@ $lang->metric->implementTips[] = '3. Place the developed code.php file in the [U $lang->metric->implementTips[] = '4. Execute the command to grant executable permissions to the file.'; $lang->metric->verifyList = array(); -$lang->metric->verifyList['checkCalcExists'] = 'Check whether the metric exists'; -$lang->metric->verifyList['checkCalcClass'] = 'Check the metric class name is correct'; -$lang->metric->verifyList['checkCalcMethods'] = 'Check whether the metrics defines the required methods'; +$lang->metric->verifyList['checkCustomCalcExists'] = 'Check whether the metric exists'; +$lang->metric->verifyList['checkCalcClass'] = 'Check the metric class name is correct'; +$lang->metric->verifyList['checkCalcMethods'] = 'Check whether the metrics defines the required methods'; $lang->metric->weekList = array(); $lang->metric->weekList['1'] = 'Monday'; diff --git a/module/metric/lang/fr.php b/module/metric/lang/fr.php index 662ad24cc4..0a862f83aa 100755 --- a/module/metric/lang/fr.php +++ b/module/metric/lang/fr.php @@ -193,9 +193,9 @@ $lang->metric->implementTips[] = '3. Place the developed code.php file in the [U $lang->metric->implementTips[] = '4. Execute the command to grant executable permissions to the file.'; $lang->metric->verifyList = array(); -$lang->metric->verifyList['checkCalcExists'] = 'Check whether the metric exists'; -$lang->metric->verifyList['checkCalcClass'] = 'Check the metric class name is correct'; -$lang->metric->verifyList['checkCalcMethods'] = 'Check whether the metrics defines the required methods'; +$lang->metric->verifyList['checkCustomCalcExists'] = 'Check whether the metric exists'; +$lang->metric->verifyList['checkCalcClass'] = 'Check the metric class name is correct'; +$lang->metric->verifyList['checkCalcMethods'] = 'Check whether the metrics defines the required methods'; $lang->metric->weekList = array(); $lang->metric->weekList['1'] = 'Monday'; diff --git a/module/metric/lang/zh-cn.php b/module/metric/lang/zh-cn.php index 641d3fe1b5..5134110896 100755 --- a/module/metric/lang/zh-cn.php +++ b/module/metric/lang/zh-cn.php @@ -199,9 +199,9 @@ $lang->metric->implement->instructionTips[] = '2.请将开发后的文件放到 $lang->metric->implement->instructionTips[] = '3.执行命令赋予文件可执行权限：

chmod 777 {tmpRoot}metric

chmod 777 {tmpRoot}metric/{code}.php

'; $lang->metric->verifyList = array(); -$lang->metric->verifyList['checkCalcExists'] = '检查度量项是否存在'; -$lang->metric->verifyList['checkCalcClass'] = '检查度量项类名是否正确'; -$lang->metric->verifyList['checkCalcMethods'] = '检查度量项是否定义了必须的方法'; +$lang->metric->verifyList['checkCustomCalcExists'] = '检查度量项是否存在'; +$lang->metric->verifyList['checkCalcClass'] = '检查度量项类名是否正确'; +$lang->metric->verifyList['checkCalcMethods'] = '检查度量项是否定义了必须的方法'; $lang->metric->weekList = array(); $lang->metric->weekList['1'] = '星期一'; diff --git a/module/metric/model.php b/module/metric/model.php index 44c2f4d267..811f8284e6 100755 --- a/module/metric/model.php +++ b/module/metric/model.php @@ -640,6 +640,12 @@ class metricModel extends model return false; } + public function checkCalcExists($metric) + { + $calcName = $this->metricTao->getCalcRoot() . $metric->scope . DS . $metric->purpose . DS . $metric->code . '.php'; + return file_exists($calcName); + } + /** * 检查度量项计算文件是否存在。 * Check if the calculator file exists or not. @@ -648,7 +654,7 @@ class metricModel extends model * @access public * @return bool */ - public function checkCalcExists($metric) + public function checkCustomCalcExists($metric) { $calcName = $this->metricTao->getCustomCalcRoot() . $metric->code . '.php'; return file_exists($calcName); @@ -664,7 +670,7 @@ class metricModel extends model */ public function checkCalcClass($metric) { - if(!$this->checkCalcExists($metric)) return false; + if(!$this->checkCustomCalcExists($metric)) return false; $this->includeCalc($metric->code); return class_exists($metric->code); @@ -680,7 +686,7 @@ class metricModel extends model */ public function checkCalcMethods($metric) { - if(!$this->checkCalcExists($metric)) return false; + if(!$this->checkCustomCalcExists($metric)) return false; $methodNameList = $this->metricTao->getMethodNameList($metric->code); foreach($this->config->metric->necessaryMethodList as $method) diff --git a/module/metric/ui/viewphpmetric.html.php b/module/metric/ui/viewphpmetric.html.php index 0594ac6bb9..784c0dd4e3 100644 --- a/module/metric/ui/viewphpmetric.html.php +++ b/module/metric/ui/viewphpmetric.html.php @@ -108,6 +108,23 @@ $fnGenerateDataDisplay = function() use($resultData, $resultHeader, $lang, $metr ); }; +if(!$this->metric->checkCalcExists($metric)) +{ + $metricDataSection = section + ( + set::title($lang->metric->metricData), + set::content($lang->metric->noCalc), + ); +} +else +{ + $metricDataSection = section + ( + set::title($lang->metric->metricData), + $fnGenerateDataDisplay($resultData, $resultHeader, $lang, $metric), + ); +} + $actionMenuList = !$metric->deleted ? $this->metric->buildOperateMenu($metric) : array(); detailBody ( @@ -125,11 +142,7 @@ detailBody set::content(empty(trim($metric->definition)) ? $lang->metric->noFormula : $metric->definition), set::useHtml(true) ), - section - ( - set::title($lang->metric->metricData), - $fnGenerateDataDisplay($resultData, $resultHeader, $lang, $metric), - ) + $metricDataSection, ), history (