From 5329594cb8bffae731bfd5e359222a13bd1aebfd Mon Sep 17 00:00:00 2001 From: Chenjianyu Date: Thu, 27 Jul 2023 14:52:13 +0800 Subject: [PATCH] * fix get project data for prompt. --- module/ai/config.php | 4 ++-- module/ai/lang/en.php | 50 ++++++++++++++++++++-------------------- module/ai/lang/zh-cn.php | 50 ++++++++++++++++++++-------------------- module/ai/model.php | 2 ++ 4 files changed, 54 insertions(+), 52 deletions(-) diff --git a/module/ai/config.php b/module/ai/config.php index 2e547d0c62..6edf689d40 100644 --- a/module/ai/config.php +++ b/module/ai/config.php @@ -56,8 +56,8 @@ $config->ai->dataSource['release']['stories'] = array('title', 'estimate'); $config->ai->dataSource['release']['bugs'] = array('title'); $config->ai->dataSource['project']['project'] = array('name', 'type', 'desc', 'begin', 'end', 'estimate'); -$config->ai->dataSource['project']['programplan'] = array('name', 'desc', 'status', 'begin', 'end', 'realBegan', 'realEnd', 'planDuration', 'progress', 'estimate', 'consumed', 'left'); -$config->ai->dataSource['project']['execution'] = array('name', 'desc', 'status', 'begin', 'end', 'realBegan', 'realEnd', 'estimate', 'consumed', 'progress'); +$config->ai->dataSource['project']['programplans'] = array('name', 'desc', 'status', 'begin', 'end', 'realBegan', 'realEnd', 'planDuration', 'progress', 'estimate', 'consumed', 'left'); +$config->ai->dataSource['project']['executions'] = array('name', 'desc', 'status', 'begin', 'end', 'realBegan', 'realEnd', 'estimate', 'consumed', 'progress'); $config->ai->dataSource['story']['story'] = array('title', 'spec', 'verify', 'product', 'module', 'pri', 'category', 'estimate'); $config->ai->dataSource['execution']['execution'] = array('name', 'desc', 'estimate'); diff --git a/module/ai/lang/en.php b/module/ai/lang/en.php index 83583c6a7f..ea5def0086 100644 --- a/module/ai/lang/en.php +++ b/module/ai/lang/en.php @@ -189,32 +189,32 @@ $lang->ai->dataSource['project']['project']['begin'] = 'Begin'; $lang->ai->dataSource['project']['project']['end'] = 'End'; $lang->ai->dataSource['project']['project']['estimate'] = 'Estimates'; -$lang->ai->dataSource['project']['programplan']['common'] = 'Program Plan'; -$lang->ai->dataSource['project']['programplan']['name'] = 'Name'; -$lang->ai->dataSource['project']['programplan']['desc'] = 'Description'; -$lang->ai->dataSource['project']['programplan']['status'] = 'Status'; -$lang->ai->dataSource['project']['programplan']['begin'] = 'Begin'; -$lang->ai->dataSource['project']['programplan']['end'] = 'End'; -$lang->ai->dataSource['project']['programplan']['realBegan'] = 'Actual Start'; -$lang->ai->dataSource['project']['programplan']['realEnd'] = 'Actual End'; -$lang->ai->dataSource['project']['programplan']['planDuration'] = 'Plan Duration'; -$lang->ai->dataSource['project']['programplan']['progress'] = 'Progress'; -$lang->ai->dataSource['project']['programplan']['estimate'] = 'Estimates'; -$lang->ai->dataSource['project']['programplan']['consumed'] = 'Consumed'; -$lang->ai->dataSource['project']['programplan']['left'] = 'Left'; +$lang->ai->dataSource['project']['programplans']['common'] = 'Program Plan'; +$lang->ai->dataSource['project']['programplans']['name'] = 'Name'; +$lang->ai->dataSource['project']['programplans']['desc'] = 'Description'; +$lang->ai->dataSource['project']['programplans']['status'] = 'Status'; +$lang->ai->dataSource['project']['programplans']['begin'] = 'Begin'; +$lang->ai->dataSource['project']['programplans']['end'] = 'End'; +$lang->ai->dataSource['project']['programplans']['realBegan'] = 'Actual Start'; +$lang->ai->dataSource['project']['programplans']['realEnd'] = 'Actual End'; +$lang->ai->dataSource['project']['programplans']['planDuration'] = 'Plan Duration'; +$lang->ai->dataSource['project']['programplans']['progress'] = 'Progress'; +$lang->ai->dataSource['project']['programplans']['estimate'] = 'Estimates'; +$lang->ai->dataSource['project']['programplans']['consumed'] = 'Consumed'; +$lang->ai->dataSource['project']['programplans']['left'] = 'Left'; -$lang->ai->dataSource['project']['execution']['common'] = 'Execution'; -$lang->ai->dataSource['project']['execution']['name'] = 'Name'; -$lang->ai->dataSource['project']['execution']['desc'] = 'Description'; -$lang->ai->dataSource['project']['execution']['status'] = 'Status'; -$lang->ai->dataSource['project']['execution']['begin'] = 'Begin'; -$lang->ai->dataSource['project']['execution']['end'] = 'End'; -$lang->ai->dataSource['project']['execution']['realBegan'] = 'Actual Start'; -$lang->ai->dataSource['project']['execution']['realEnd'] = 'Actual End'; -$lang->ai->dataSource['project']['execution']['estimate'] = 'Estimates'; -$lang->ai->dataSource['project']['execution']['consumed'] = 'Consumed'; -$lang->ai->dataSource['project']['execution']['left'] = 'Left'; -$lang->ai->dataSource['project']['execution']['progress'] = 'Progress'; +$lang->ai->dataSource['project']['executions']['common'] = 'Execution'; +$lang->ai->dataSource['project']['executions']['name'] = 'Name'; +$lang->ai->dataSource['project']['executions']['desc'] = 'Description'; +$lang->ai->dataSource['project']['executions']['status'] = 'Status'; +$lang->ai->dataSource['project']['executions']['begin'] = 'Begin'; +$lang->ai->dataSource['project']['executions']['end'] = 'End'; +$lang->ai->dataSource['project']['executions']['realBegan'] = 'Actual Start'; +$lang->ai->dataSource['project']['executions']['realEnd'] = 'Actual End'; +$lang->ai->dataSource['project']['executions']['estimate'] = 'Estimates'; +$lang->ai->dataSource['project']['executions']['consumed'] = 'Consumed'; +$lang->ai->dataSource['project']['executions']['left'] = 'Left'; +$lang->ai->dataSource['project']['executions']['progress'] = 'Progress'; $lang->ai->dataSource['story']['story']['common'] = 'Story'; $lang->ai->dataSource['story']['story']['title'] = 'Title'; diff --git a/module/ai/lang/zh-cn.php b/module/ai/lang/zh-cn.php index 5023fa08e7..aa398f3b9e 100644 --- a/module/ai/lang/zh-cn.php +++ b/module/ai/lang/zh-cn.php @@ -189,32 +189,32 @@ $lang->ai->dataSource['project']['project']['begin'] = '计划开始'; $lang->ai->dataSource['project']['project']['end'] = '计划结束'; $lang->ai->dataSource['project']['project']['estimate'] = '预计工时'; -$lang->ai->dataSource['project']['programplan']['common'] = '阶段列表'; -$lang->ai->dataSource['project']['programplan']['name'] = '阶段名称'; -$lang->ai->dataSource['project']['programplan']['desc'] = '阶段描述'; -$lang->ai->dataSource['project']['programplan']['status'] = '阶段状态'; -$lang->ai->dataSource['project']['programplan']['begin'] = '计划开始'; -$lang->ai->dataSource['project']['programplan']['end'] = '计划完成'; -$lang->ai->dataSource['project']['programplan']['realBegan'] = '实际开始'; -$lang->ai->dataSource['project']['programplan']['realEnd'] = '实际完成'; -$lang->ai->dataSource['project']['programplan']['planDuration'] = '工期'; -$lang->ai->dataSource['project']['programplan']['progress'] = '任务进度'; -$lang->ai->dataSource['project']['programplan']['estimate'] = '预计工时'; -$lang->ai->dataSource['project']['programplan']['consumed'] = '消耗工时'; -$lang->ai->dataSource['project']['programplan']['left'] = '剩余工时'; +$lang->ai->dataSource['project']['programplans']['common'] = '阶段列表'; +$lang->ai->dataSource['project']['programplans']['name'] = '阶段名称'; +$lang->ai->dataSource['project']['programplans']['desc'] = '阶段描述'; +$lang->ai->dataSource['project']['programplans']['status'] = '阶段状态'; +$lang->ai->dataSource['project']['programplans']['begin'] = '计划开始'; +$lang->ai->dataSource['project']['programplans']['end'] = '计划完成'; +$lang->ai->dataSource['project']['programplans']['realBegan'] = '实际开始'; +$lang->ai->dataSource['project']['programplans']['realEnd'] = '实际完成'; +$lang->ai->dataSource['project']['programplans']['planDuration'] = '工期'; +$lang->ai->dataSource['project']['programplans']['progress'] = '任务进度'; +$lang->ai->dataSource['project']['programplans']['estimate'] = '预计工时'; +$lang->ai->dataSource['project']['programplans']['consumed'] = '消耗工时'; +$lang->ai->dataSource['project']['programplans']['left'] = '剩余工时'; -$lang->ai->dataSource['project']['execution']['common'] = '迭代列表'; -$lang->ai->dataSource['project']['execution']['name'] = '执行名称'; -$lang->ai->dataSource['project']['execution']['desc'] = '执行描述'; -$lang->ai->dataSource['project']['execution']['status'] = '执行状态'; -$lang->ai->dataSource['project']['execution']['begin'] = '计划开始'; -$lang->ai->dataSource['project']['execution']['end'] = '计划完成'; -$lang->ai->dataSource['project']['execution']['realBegan'] = '实际开始'; -$lang->ai->dataSource['project']['execution']['realEnd'] = '实际完成'; -$lang->ai->dataSource['project']['execution']['estimate'] = '预计工时'; -$lang->ai->dataSource['project']['execution']['consumed'] = '消耗工时'; -$lang->ai->dataSource['project']['execution']['left'] = '剩余工时'; -$lang->ai->dataSource['project']['execution']['progress'] = '进度'; +$lang->ai->dataSource['project']['executions']['common'] = '迭代列表'; +$lang->ai->dataSource['project']['executions']['name'] = '执行名称'; +$lang->ai->dataSource['project']['executions']['desc'] = '执行描述'; +$lang->ai->dataSource['project']['executions']['status'] = '执行状态'; +$lang->ai->dataSource['project']['executions']['begin'] = '计划开始'; +$lang->ai->dataSource['project']['executions']['end'] = '计划完成'; +$lang->ai->dataSource['project']['executions']['realBegan'] = '实际开始'; +$lang->ai->dataSource['project']['executions']['realEnd'] = '实际完成'; +$lang->ai->dataSource['project']['executions']['estimate'] = '预计工时'; +$lang->ai->dataSource['project']['executions']['consumed'] = '消耗工时'; +$lang->ai->dataSource['project']['executions']['left'] = '剩余工时'; +$lang->ai->dataSource['project']['executions']['progress'] = '进度'; $lang->ai->dataSource['story']['story']['common'] = '需求'; $lang->ai->dataSource['story']['story']['title'] = '需求标题'; diff --git a/module/ai/model.php b/module/ai/model.php index 4d3585ee66..53a3e0d2f4 100644 --- a/module/ai/model.php +++ b/module/ai/model.php @@ -758,6 +758,8 @@ class aiModel extends model break; case 'project': if(isset($sourceGroups['project'])) $object->project = $this->loadModel('project')->getById($objectId); + if($object->project->model == 'waterfall' && isset($sourceGroups['programplans'])) $object->programplans = array_values($this->loadModel('execution')->getByProject($object->project->id)); + if($object->project->model != 'waterfall' && isset($sourceGroups['executions'])) $object->executions = array_values($this->loadModel('execution')->getByProject($object->project->id)); break; case 'release': if(isset($sourceGroups['release'])) $object->release = $this->loadModel('release')->getById($objectId);