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

* Cherry pick 7840285fa3.

Browse Source
This commit is contained in:
刘刚
2024-02-29 15:41:45 +08:00
parent c30a71f983
commit f6f9834962
3 changed files with 19 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/metric/config/datetype.php
-166
View File
@@ -1,30 +1,10 @@
<?php
declare(strict_types=1);
$config->metric->dateType = array();
$config->metric->dateType['count_of_program'] = 'nodate';
$config->metric->dateType['count_of_doing_program'] = 'nodate';
$config->metric->dateType['count_of_closed_program'] = 'nodate';
$config->metric->dateType['count_of_suspended_program'] = 'nodate';
$config->metric->dateType['count_of_wait_program'] = 'nodate';
$config->metric->dateType['count_of_top_program'] = 'nodate';
$config->metric->dateType['count_of_closed_top_program'] = 'nodate';
$config->metric->dateType['count_of_unclosed_top_program'] = 'nodate';
$config->metric->dateType['count_of_annual_created_top_program'] = 'year';
$config->metric->dateType['count_of_annual_closed_top_program'] = 'year';
$config->metric->dateType['count_of_line'] = 'nodate';
$config->metric->dateType['count_of_product'] = 'nodate';
$config->metric->dateType['count_of_normal_product'] = 'nodate';
$config->metric->dateType['count_of_closed_product'] = 'nodate';
$config->metric->dateType['count_of_annual_created_product'] = 'year';
$config->metric->dateType['count_of_annual_closed_product'] = 'year';
$config->metric->dateType['count_of_project'] = 'nodate';
$config->metric->dateType['count_of_wait_project'] = 'nodate';
$config->metric->dateType['count_of_doing_project'] = 'nodate';
$config->metric->dateType['count_of_suspended_project'] = 'nodate';
$config->metric->dateType['count_of_closed_project'] = 'nodate';
$config->metric->dateType['count_of_unclosed_project'] = 'nodate';
$config->metric->dateType['count_of_undelayed_finished_project_which_finished'] = 'nodate';
$config->metric->dateType['count_of_delayed_finished_project_which_finished'] = 'nodate';
$config->metric->dateType['count_of_annual_created_project'] = 'year';
$config->metric->dateType['count_of_annual_closed_project'] = 'year';
$config->metric->dateType['count_of_undelayed_finished_project_which_annual_started'] = 'year';
@@ -39,49 +19,25 @@ $config->metric->dateType['consume_of_monthly_closed_project'] = 'month';
$config->metric->dateType['day_of_annual_closed_project'] = 'year';
$config->metric->dateType['rate_of_undelayed_finished_project_which_annual_finished'] = 'year';
$config->metric->dateType['rate_of_delayed_finished_project_which_annual_finished'] = 'year';
$config->metric->dateType['count_of_productplan'] = 'nodate';
$config->metric->dateType['count_of_annual_created_productplan'] = 'year';
$config->metric->dateType['count_of_annual_finished_productplan'] = 'year';
$config->metric->dateType['count_of_annual_closed_productplan'] = 'year';
$config->metric->dateType['count_of_finished_productplan'] = 'nodate';
$config->metric->dateType['count_of_unfinished_productplan'] = 'nodate';
$config->metric->dateType['count_of_execution'] = 'nodate';
$config->metric->dateType['count_of_wait_execution'] = 'nodate';
$config->metric->dateType['count_of_doing_execution'] = 'nodate';
$config->metric->dateType['count_of_suspended_execution'] = 'nodate';
$config->metric->dateType['count_of_closed_execution'] = 'nodate';
$config->metric->dateType['count_of_unclosed_execution'] = 'nodate';
$config->metric->dateType['count_of_annual_created_execution'] = 'year';
$config->metric->dateType['count_of_annual_closed_execution'] = 'year';
$config->metric->dateType['count_of_monthly_created_execution'] = 'month';
$config->metric->dateType['count_of_monthly_closed_execution'] = 'month';
$config->metric->dateType['count_of_undelayed_finished_execution_which_finished'] = 'nodate';
$config->metric->dateType['count_of_delayed_finished_execution_which_finished'] = 'nodate';
$config->metric->dateType['count_of_undelayed_finished_execution_which_annual_finished'] = 'year';
$config->metric->dateType['count_of_delayed_finished_execution_which_annual_finished'] = 'year';
$config->metric->dateType['rate_of_undelayed_closed_execution_which_annual_finished'] = 'year';
$config->metric->dateType['rate_of_delayed_closed_execution_which_annual_finished'] = 'year';
$config->metric->dateType['count_of_release'] = 'nodate';
$config->metric->dateType['count_of_marker_release'] = 'nodate';
$config->metric->dateType['count_of_annual_created_release'] = 'year';
$config->metric->dateType['count_of_monthly_created_release'] = 'month';
$config->metric->dateType['count_of_weekly_created_release'] = 'week';
$config->metric->dateType['count_of_story'] = 'nodate';
$config->metric->dateType['count_of_closed_story'] = 'nodate';
$config->metric->dateType['count_of_finished_story'] = 'nodate';
$config->metric->dateType['count_of_unclosed_story'] = 'nodate';
$config->metric->dateType['count_of_invalid_story'] = 'nodate';
$config->metric->dateType['count_of_valid_story'] = 'nodate';
$config->metric->dateType['count_of_delivered_story'] = 'nodate';
$config->metric->dateType['count_of_annual_created_story'] = 'year';
$config->metric->dateType['count_of_annual_finished_story'] = 'year';
$config->metric->dateType['count_of_monthly_created_story'] = 'month';
$config->metric->dateType['count_of_monthly_finished_story'] = 'month';
$config->metric->dateType['count_of_annual_delivered_story'] = 'year';
$config->metric->dateType['scale_of_story'] = 'nodate';
$config->metric->dateType['scale_of_finished_story'] = 'nodate';
$config->metric->dateType['scale_of_invalid_story'] = 'nodate';
$config->metric->dateType['scale_of_valid_story'] = 'nodate';
$config->metric->dateType['scale_of_annual_finished_story'] = 'year';
$config->metric->dateType['scale_of_annual_delivered_story'] = 'year';
$config->metric->dateType['scale_of_annual_closed_story'] = 'year';
@@ -91,101 +47,45 @@ $config->metric->dateType['scale_of_monthly_closed_story'] = 'month';
$config->metric->dateType['scale_of_weekly_finished_story'] = 'week';
$config->metric->dateType['count_of_weekly_finished_story'] = 'week';
$config->metric->dateType['count_of_daily_created_story'] = 'day';
$config->metric->dateType['rate_of_finished_story'] = 'nodate';
$config->metric->dateType['rate_of_delivered_story'] = 'nodate';
$config->metric->dateType['rate_of_annual_finished_story'] = 'year';
$config->metric->dateType['rate_of_annual_delivered_story'] = 'year';
$config->metric->dateType['count_of_task'] = 'nodate';
$config->metric->dateType['count_of_finished_task'] = 'nodate';
$config->metric->dateType['count_of_unfinished_task'] = 'nodate';
$config->metric->dateType['count_of_closed_task'] = 'nodate';
$config->metric->dateType['count_of_annual_created_task'] = 'year';
$config->metric->dateType['count_of_annual_finished_task'] = 'year';
$config->metric->dateType['count_of_monthly_created_task'] = 'month';
$config->metric->dateType['count_of_monthly_finished_task'] = 'month';
$config->metric->dateType['estimate_of_task'] = 'nodate';
$config->metric->dateType['consume_of_task'] = 'nodate';
$config->metric->dateType['left_of_task'] = 'nodate';
$config->metric->dateType['count_of_daily_finished_task'] = 'day';
$config->metric->dateType['count_of_bug'] = 'nodate';
$config->metric->dateType['count_of_activated_bug'] = 'nodate';
$config->metric->dateType['count_of_resolved_bug'] = 'nodate';
$config->metric->dateType['count_of_closed_bug'] = 'nodate';
$config->metric->dateType['count_of_unclosed_bug'] = 'nodate';
$config->metric->dateType['count_of_fixed_bug'] = 'nodate';
$config->metric->dateType['count_of_valid_bug'] = 'nodate';
$config->metric->dateType['count_of_annual_created_bug'] = 'year';
$config->metric->dateType['count_of_annual_fixed_bug'] = 'year';
$config->metric->dateType['count_of_monthly_created_bug'] = 'month';
$config->metric->dateType['count_of_monthly_fixed_bug'] = 'month';
$config->metric->dateType['count_of_daily_closed_bug'] = 'day';
$config->metric->dateType['rate_of_fixed_bug'] = 'nodate';
$config->metric->dateType['count_of_case'] = 'nodate';
$config->metric->dateType['count_of_annual_created_case'] = 'year';
$config->metric->dateType['count_of_daily_run_case'] = 'day';
$config->metric->dateType['count_of_user'] = 'nodate';
$config->metric->dateType['count_of_annual_created_user'] = 'year';
$config->metric->dateType['hour_of_annual_effort'] = 'year';
$config->metric->dateType['day_of_annual_effort'] = 'year';
$config->metric->dateType['day_of_daily_effort'] = 'day';
$config->metric->dateType['hour_of_daily_effort'] = 'day';
$config->metric->dateType['count_of_doc'] = 'nodate';
$config->metric->dateType['count_of_annual_created_doc'] = 'year';
$config->metric->dateType['count_of_feedback'] = 'nodate';
$config->metric->dateType['count_of_closed_feedback'] = 'nodate';
$config->metric->dateType['count_of_annual_created_feedback'] = 'year';
$config->metric->dateType['count_of_annual_closed_feedback'] = 'year';
$config->metric->dateType['count_of_codebase'] = 'nodate';
$config->metric->dateType['count_of_pipeline'] = 'nodate';
$config->metric->dateType['count_of_artifactrepo'] = 'nodate';
$config->metric->dateType['count_of_node'] = 'nodate';
$config->metric->dateType['count_of_application'] = 'nodate';
$config->metric->dateType['count_of_pending_issue'] = 'nodate';
$config->metric->dateType['count_of_pending_mergeRequest'] = 'nodate';
$config->metric->dateType['count_of_pending_deployment'] = 'nodate';
$config->metric->dateType['count_of_productplan_in_product'] = 'nodate';
$config->metric->dateType['count_of_annual_created_productplan_in_product'] = 'year';
$config->metric->dateType['count_of_annual_finished_productplan_in_product'] = 'year';
$config->metric->dateType['count_of_release_in_product'] = 'nodate';
$config->metric->dateType['count_of_annual_created_release_in_product'] = 'year';
$config->metric->dateType['count_of_monthly_created_release_in_product'] = 'month';
$config->metric->dateType['count_of_story_in_product'] = 'nodate';
$config->metric->dateType['count_of_finished_story_in_product'] = 'nodate';
$config->metric->dateType['count_of_closed_story_in_product'] = 'nodate';
$config->metric->dateType['count_of_unclosed_story_in_product'] = 'nodate';
$config->metric->dateType['count_of_delivered_story_in_product'] = 'nodate';
$config->metric->dateType['count_of_invalid_story_in_product'] = 'nodate';
$config->metric->dateType['count_of_valid_story_in_product'] = 'nodate';
$config->metric->dateType['count_of_developed_story_in_product'] = 'nodate';
$config->metric->dateType['case_coverage_of_projected_story_in_product'] = 'nodate';
$config->metric->dateType['count_of_annual_created_story_in_product'] = 'year';
$config->metric->dateType['count_of_annual_finished_story_in_product'] = 'year';
$config->metric->dateType['count_of_annual_delivered_story_in_product'] = 'year';
$config->metric->dateType['count_of_annual_closed_story_in_product'] = 'year';
$config->metric->dateType['count_of_monthly_finished_story_in_product'] = 'month';
$config->metric->dateType['count_of_projected_story_in_product'] = 'nodate';
$config->metric->dateType['count_of_monthly_delivered_story_in_product'] = 'month';
$config->metric->dateType['count_of_projected_story_with_case_in_product'] = 'nodate';
$config->metric->dateType['count_of_monthly_closed_story_in_product'] = 'month';
$config->metric->dateType['count_of_monthly_created_story_in_product'] = 'month';
$config->metric->dateType['scale_of_story_in_product'] = 'nodate';
$config->metric->dateType['scale_of_annual_finished_story_in_product'] = 'year';
$config->metric->dateType['scale_of_annual_delivered_story_in_product'] = 'year';
$config->metric->dateType['scale_of_annual_closed_story_in_product'] = 'year';
$config->metric->dateType['scale_of_monthly_finished_story_in_product'] = 'month';
$config->metric->dateType['rate_of_approved_story_in_product'] = 'nodate';
$config->metric->dateType['rate_of_finish_story_in_product'] = 'nodate';
$config->metric->dateType['rate_of_delivery_story_in_product'] = 'nodate';
$config->metric->dateType['count_of_requirement_in_product'] = 'nodate';
$config->metric->dateType['count_of_annual_created_requirement_in_product'] = 'year';
$config->metric->dateType['bug_concentration_of_developed_story_in_product'] = 'nodate';
$config->metric->dateType['count_of_bug_in_product'] = 'nodate';
$config->metric->dateType['count_of_activated_bug_in_product'] = 'nodate';
$config->metric->dateType['count_of_effective_bug_in_product'] = 'nodate';
$config->metric->dateType['count_of_fixed_bug_in_product'] = 'nodate';
$config->metric->dateType['count_of_severity_1_bug_in_product'] = 'nodate';
$config->metric->dateType['count_of_severity_2_bug_in_product'] = 'nodate';
$config->metric->dateType['count_of_severe_bug_in_product'] = 'nodate';
$config->metric->dateType['count_of_annual_created_bug_in_product'] = 'year';
$config->metric->dateType['count_of_annual_created_effective_bug_in_product'] = 'year';
$config->metric->dateType['count_of_annual_fixed_bug_in_product'] = 'year';
@@ -195,81 +95,15 @@ $config->metric->dateType['count_of_daily_closed_bug_in_product'] = 'day';
$config->metric->dateType['count_of_monthly_fixed_bug_in_product'] = 'month';
$config->metric->dateType['count_of_monthly_closed_bug_in_product'] = 'month';
$config->metric->dateType['count_of_monthly_created_bug_in_product'] = 'month';
$config->metric->dateType['rate_of_fixed_bug_in_product'] = 'nodate';
$config->metric->dateType['count_of_case_in_product'] = 'nodate';
$config->metric->dateType['count_of_annual_created_case_in_product'] = 'year';
$config->metric->dateType['count_of_feedback_in_product'] = 'year';
$config->metric->dateType['count_of_annual_created_feedback_in_product'] = 'year';
$config->metric->dateType['count_of_annual_closed_feedback_in_product'] = 'year';
$config->metric->dateType['planned_period_of_project'] = 'nodate';
$config->metric->dateType['left_period_of_project'] = 'nodate';
$config->metric->dateType['count_of_actual_time_in_project'] = 'nodate';
$config->metric->dateType['variance_of_time_in_project'] = 'nodate';
$config->metric->dateType['count_of_closed_execution_in_project'] = 'nodate';
$config->metric->dateType['count_of_suspended_execution_in_project'] = 'nodate';
$config->metric->dateType['count_of_doing_execution_in_project'] = 'nodate';
$config->metric->dateType['count_wait_execution_in_project'] = 'nodate';
$config->metric->dateType['count_annual_closed_execution_in_project'] = 'year';
$config->metric->dateType['count_of_execution_in_project'] = 'nodate';
$config->metric->dateType['count_of_story_in_project'] = 'nodate';
$config->metric->dateType['count_of_closed_story_in_project'] = 'nodate';
$config->metric->dateType['count_of_unclosed_story_in_project'] = 'nodate';
$config->metric->dateType['count_of_finished_story_in_project'] = 'nodate';
$config->metric->dateType['count_of_invalid_story_in_project'] = 'nodate';
$config->metric->dateType['count_of_valid_story_in_project'] = 'nodate';
$config->metric->dateType['scale_of_story_in_project'] = 'nodate';
$config->metric->dateType['count_of_annual_finished_story_in_project'] = 'year';
$config->metric->dateType['scale_of_annual_finished_story_in_project'] = 'year';
$config->metric->dateType['rate_of_finished_story_in_project'] = 'nodate';
$config->metric->dateType['count_of_task_in_project'] = 'nodate';
$config->metric->dateType['count_of_wait_task_in_project'] = 'nodate';
$config->metric->dateType['count_of_doing_task_in_project'] = 'nodate';
$config->metric->dateType['count_of_finished_task_in_project'] = 'nodate';
$config->metric->dateType['estimate_of_task_in_project'] = 'nodate';
$config->metric->dateType['consume_of_task_in_project'] = 'nodate';
$config->metric->dateType['left_of_task_in_project'] = 'nodate';
$config->metric->dateType['ev_of_finished_task_in_waterfall'] = 'nodate';
$config->metric->dateType['pv_of_task_in_waterfall'] = 'nodate';
$config->metric->dateType['progress_of_task_in_project'] = 'nodate';
$config->metric->dateType['sv_in_waterfall'] = 'nodate';
$config->metric->dateType['cv_in_waterfall'] = 'nodate';
$config->metric->dateType['count_of_bug_in_project'] = 'nodate';
$config->metric->dateType['count_of_activated_bug_in_project'] = 'nodate';
$config->metric->dateType['count_of_closed_bug_in_project'] = 'nodate';
$config->metric->dateType['count_of_user_in_project'] = 'nodate';
$config->metric->dateType['consume_of_all_in_project'] = 'nodate';
$config->metric->dateType['day_of_invested_in_project'] = 'nodate';
$config->metric->dateType['ac_of_all_in_waterfall'] = 'nodate';
$config->metric->dateType['count_of_opened_risk_in_project'] = 'nodate';
$config->metric->dateType['count_of_opened_issue_in_project'] = 'nodate';
$config->metric->dateType['count_of_story_in_execution'] = 'nodate';
$config->metric->dateType['count_of_finished_story_in_execution'] = 'nodate';
$config->metric->dateType['count_of_invalid_story_in_execution'] = 'nodate';
$config->metric->dateType['count_of_valid_story_in_execution'] = 'nodate';
$config->metric->dateType['count_of_developed_story_in_execution'] = 'nodate';
$config->metric->dateType['rate_of_finished_story_in_execution'] = 'nodate';
$config->metric->dateType['rate_of_developed_story_in_execution'] = 'nodate';
$config->metric->dateType['count_of_task_in_execution'] = 'nodate';
$config->metric->dateType['count_of_finished_task_in_execution'] = 'nodate';
$config->metric->dateType['count_of_unfinished_task_in_execution'] = 'nodate';
$config->metric->dateType['count_of_daily_finished_task_in_execution'] = 'day';
$config->metric->dateType['estimate_of_task_in_execution'] = 'nodate';
$config->metric->dateType['consume_of_task_in_execution'] = 'nodate';
$config->metric->dateType['left_of_task_in_execution'] = 'nodate';
$config->metric->dateType['progress_of_task_in_execution'] = 'nodate';
$config->metric->dateType['count_of_reviewing_story_in_user'] = 'nodate';
$config->metric->dateType['count_of_daily_review_story_in_user'] = 'day';
$config->metric->dateType['count_of_pending_story_in_user'] = 'nodate';
$config->metric->dateType['count_of_daily_finished_task_in_user'] = 'day';
$config->metric->dateType['count_of_assigned_task_in_user'] = 'nodate';
$config->metric->dateType['count_of_daily_fixed_bug_in_user'] = 'day';
$config->metric->dateType['count_of_assigned_bug_in_user'] = 'nodate';
$config->metric->dateType['count_of_assigned_case_in_user'] = 'nodate';
$config->metric->dateType['count_of_assigned_feedback_in_user'] = 'nodate';
$config->metric->dateType['count_of_reviewing_feedback_in_user'] = 'nodate';
$config->metric->dateType['count_of_daily_review_feedback_in_user'] = 'day';
$config->metric->dateType['count_of_submitted_code_issues_in_codebase'] = 'nodate';
$config->metric->dateType['count_of_resolved_code_issues_in_codebase'] = 'nodate';
$config->metric->dateType['count_of_pending_issues_in_codebase'] = 'nodate';
$config->metric->dateType['count_of_merged_pull_requests_in_codebase'] = 'nodate';
$config->metric->dateType['count_of_code_commits_in_codebase'] = 'nodate';
module/metric/model.php
+2 -3
View File
@@ -2128,9 +2128,8 @@ class metricModel extends model
/* Get dateType from config second. */
if(isset($this->config->metric->dateType[$code])) return $this->config->metric->dateType[$code];
/* At last, infer dateType by code. */
$dataFields = $this->getMetricRecordDateField($code);
return $this->getDateType($dataFields);
/* Return nodate if no matches. */
return 'nodate';
}
/**
module/upgrade/model.php
+17
View File
@@ -8469,6 +8469,23 @@ class upgradeModel extends model
return true;
}
/**
* Update metric datetype.
*
* @access public
* @return void
*/
public function updateMetricDateType()
{
$this->loadModel('metric');
foreach($this->config->metric->dateType as $code => $dateType)
{
$this->dao->update(TABLE_METRIC)->set('dateType')->eq($dateType)->where('code')->eq($code)->exec();
}
$this->dao->update(TABLE_METRIC)->set('dateType')->eq('nodate')->where('dateType')->eq('')->exec();
}
/**
* Migrate configured AI model (from pre 18.11) into table.
*