From 7c157e852dcb375f7e4b0adebc5a0080cbf9ea7b Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Thu, 29 Feb 2024 16:16:25 +0800
Subject: [PATCH] * Add datetype form group to create-metric.

---
 module/metric/config/form.php    | 1 +
 module/metric/lang/de.php        | 1 +
 module/metric/lang/en.php        | 1 +
 module/metric/lang/fr.php        | 1 +
 module/metric/lang/zh-cn.php     | 7 +++++++
 module/metric/ui/create.html.php | 9 +++++++++
 module/metric/ui/edit.html.php   | 9 +++++++++
 7 files changed, 29 insertions(+)

diff --git a/module/metric/config/form.php b/module/metric/config/form.php
index 4b54a9502e..1d348c3976 100755
--- a/module/metric/config/form.php
+++ b/module/metric/config/form.php
@@ -10,6 +10,7 @@ $config->metric->form->create['code']       = array('required' => true,  'type'
 $config->metric->form->create['purpose']    = array('required' => true,  'type' => 'string');
 $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['desc']       = array('required' => false,  'type' => 'string', 'filter' => 'trim');
 $config->metric->form->create['definition'] = array('required' => false,  'type' => 'string', 'filter' => 'trim');
 
diff --git a/module/metric/lang/de.php b/module/metric/lang/de.php
index 95b5f8d1a2..64f01188db 100755
--- a/module/metric/lang/de.php
+++ b/module/metric/lang/de.php
@@ -5,6 +5,7 @@ $lang->metric->stage         = "Stage";
 $lang->metric->scope         = "Scope";
 $lang->metric->object        = "Object";
 $lang->metric->purpose       = "Purpose";
+$lang->metric->dateType      = "Date Type";
 $lang->metric->unit          = "Unit";
 $lang->metric->code          = "Metric Code";
 $lang->metric->desc          = "Description";
diff --git a/module/metric/lang/en.php b/module/metric/lang/en.php
index 95b5f8d1a2..64f01188db 100755
--- a/module/metric/lang/en.php
+++ b/module/metric/lang/en.php
@@ -5,6 +5,7 @@ $lang->metric->stage         = "Stage";
 $lang->metric->scope         = "Scope";
 $lang->metric->object        = "Object";
 $lang->metric->purpose       = "Purpose";
+$lang->metric->dateType      = "Date Type";
 $lang->metric->unit          = "Unit";
 $lang->metric->code          = "Metric Code";
 $lang->metric->desc          = "Description";
diff --git a/module/metric/lang/fr.php b/module/metric/lang/fr.php
index 95b5f8d1a2..64f01188db 100755
--- a/module/metric/lang/fr.php
+++ b/module/metric/lang/fr.php
@@ -5,6 +5,7 @@ $lang->metric->stage         = "Stage";
 $lang->metric->scope         = "Scope";
 $lang->metric->object        = "Object";
 $lang->metric->purpose       = "Purpose";
+$lang->metric->dateType      = "Date Type";
 $lang->metric->unit          = "Unit";
 $lang->metric->code          = "Metric Code";
 $lang->metric->desc          = "Description";
diff --git a/module/metric/lang/zh-cn.php b/module/metric/lang/zh-cn.php
index 54743f4cc2..b71a0217fc 100755
--- a/module/metric/lang/zh-cn.php
+++ b/module/metric/lang/zh-cn.php
@@ -5,6 +5,7 @@ $lang->metric->stage         = "阶段";
 $lang->metric->scope         = "范围";
 $lang->metric->object        = "对象";
 $lang->metric->purpose       = "目的";
+$lang->metric->dateType      = "时间属性";
 $lang->metric->unit          = "单位";
 $lang->metric->code          = "代号";
 $lang->metric->desc          = "描述";
@@ -261,6 +262,12 @@ $lang->metric->chartTypeList['barX'] = '柱形图';
 $lang->metric->chartTypeList['barY'] = '条形图';
 $lang->metric->chartTypeList['pie']  = '饼图';
 
+$lang->metric->dateTypeList['year']   = '按年统计';
+$lang->metric->dateTypeList['month']  = '按月统计';
+$lang->metric->dateTypeList['week']   = '按周统计';
+$lang->metric->dateTypeList['day']    = '按日统计';
+$lang->metric->dateTypeList['nodate'] = '无';
+
 $lang->metric->filter = new stdclass();
 $lang->metric->filter->common  = '筛选';
 $lang->metric->filter->scope   = '范围';
diff --git a/module/metric/ui/create.html.php b/module/metric/ui/create.html.php
index 63d0986c18..480b5be112 100644
--- a/module/metric/ui/create.html.php
+++ b/module/metric/ui/create.html.php
@@ -49,6 +49,15 @@ formPanel
         )
     ),
     formGroup
+    (
+        set::label($lang->metric->dateType),
+        set::name('dateType'),
+        set::items($lang->metric->dateTypeList),
+        set::value('nodate'),
+        set::width('1/2'),
+        set::required(true)
+    ),
+    formGroup
     (
         set::label($lang->metric->name),
         set::name('name'),
diff --git a/module/metric/ui/edit.html.php b/module/metric/ui/edit.html.php
index 0a10b40cf1..27b0f19bc6 100644
--- a/module/metric/ui/edit.html.php
+++ b/module/metric/ui/edit.html.php
@@ -65,6 +65,15 @@ formPanel
         )
     ),
     formGroup
+    (
+        set::label($lang->metric->dateType),
+        set::name('dateType'),
+        set::items($lang->metric->dateTypeList),
+        set::value('nodate'),
+        set::width('1/2'),
+        set::required(true)
+    ),
+    formGroup
     (
         set::label($lang->metric->name),
         set::name('name'),