From b79886bcc3f9cd85a2b19c289fde3d0c89035a22 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 8 Aug 2024 16:42:05 +0800 Subject: [PATCH] * [task#125038,doing,0.3h] adjust commits time filter. --- ...nt_of_monthly_code_commits_in_codebase.php | 4 ++-- ...unt_of_weekly_code_commits_in_codebase.php | 19 +++++++++---------- ...unt_of_yearly_code_commits_in_codebase.php | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/module/metric/calc/system/scale/count_of_monthly_code_commits_in_codebase.php b/module/metric/calc/system/scale/count_of_monthly_code_commits_in_codebase.php index 5376ca830f..ad0e1b08f4 100755 --- a/module/metric/calc/system/scale/count_of_monthly_code_commits_in_codebase.php +++ b/module/metric/calc/system/scale/count_of_monthly_code_commits_in_codebase.php @@ -80,7 +80,7 @@ class count_of_monthly_code_commits_in_codebase extends baseCalc if(!isset($this->result[$row->id])) $this->result[$row->id] = array(); if(!isset($this->result[$row->id][$year])) $this->result[$row->id][$year] = array(); - if(!isset($this->result[$row->id][$year][$month])) $this->result[$row->id][$year][$month] = array(); + if(!isset($this->result[$row->id][$year][$month])) $this->result[$row->id][$year][$month] = 0; $this->result[$row->id][$year][$month] ++; } @@ -112,7 +112,7 @@ class count_of_monthly_code_commits_in_codebase extends baseCalc $month = (int)$options['month']; $begin = "{$year}-{$month}-01"; - $end = date('Y-m-d', strtotime("$begin +1 month")); + $end = date('Y-m-d', strtotime("$begin +1 month -1 day")); foreach($this->rows as $row) { diff --git a/module/metric/calc/system/scale/count_of_weekly_code_commits_in_codebase.php b/module/metric/calc/system/scale/count_of_weekly_code_commits_in_codebase.php index 7fd285f72c..6c43a2bba6 100755 --- a/module/metric/calc/system/scale/count_of_weekly_code_commits_in_codebase.php +++ b/module/metric/calc/system/scale/count_of_weekly_code_commits_in_codebase.php @@ -79,12 +79,11 @@ class count_of_weekly_code_commits_in_codebase extends baseCalc list($year, $month, $day) = explode('-', $date); $week = date('W', strtotime($date)); - if(!isset($this->result[$row->id])) $this->result[$row->id] = array(); - if(!isset($this->result[$row->id][$year])) $this->result[$row->id][$year] = array(); - if(!isset($this->result[$row->id][$year][$month])) $this->result[$row->id][$year][$month] = array(); - if(!isset($this->result[$row->id][$year][$month][$week])) $this->result[$row->id][$year][$month][$week] = 0; + if(!isset($this->result[$row->id])) $this->result[$row->id] = array(); + if(!isset($this->result[$row->id][$year])) $this->result[$row->id][$year] = array(); + if(!isset($this->result[$row->id][$year][$week])) $this->result[$row->id][$year][$week] = 0; - $this->result[$row->id][$year][$month][$week] ++; + $this->result[$row->id][$year][$week] ++; } /** @@ -112,11 +111,11 @@ class count_of_weekly_code_commits_in_codebase extends baseCalc { $year = (int)$options['year']; $month = (int)$options['month']; - $day = $options['day']; + $day = (int)$options['day']; - list($begin, $end) = explode(',', $day); - $begin = "{$year}-{$month}-{$begin}"; - $end = "{$year}-{$month}-{$end} 23:59:59"; + $date = strtotime("{$year}-{$month}-{$day}"); + $begin = date('Y-m-d', strtotime('this week monday', $date)); + $end = date('Y-m-d 23:59:59', strtotime('this week sunday', $date)); foreach($this->rows as $row) { @@ -130,6 +129,6 @@ class count_of_weekly_code_commits_in_codebase extends baseCalc $this->setResult($row); } - return $this->getRecords(array('repo', 'year', 'month', 'week')); + return $this->getRecords(array('repo', 'year', 'week')); } } diff --git a/module/metric/calc/system/scale/count_of_yearly_code_commits_in_codebase.php b/module/metric/calc/system/scale/count_of_yearly_code_commits_in_codebase.php index 0bd4a418ec..5a9dc677fb 100755 --- a/module/metric/calc/system/scale/count_of_yearly_code_commits_in_codebase.php +++ b/module/metric/calc/system/scale/count_of_yearly_code_commits_in_codebase.php @@ -79,7 +79,7 @@ class count_of_yearly_code_commits_in_codebase extends baseCalc list($year, $month, $day) = explode('-', $date); if(!isset($this->result[$row->id])) $this->result[$row->id] = array(); - if(!isset($this->result[$row->id][$year])) $this->result[$row->id][$year] = array(); + if(!isset($this->result[$row->id][$year])) $this->result[$row->id][$year] = 0; $this->result[$row->id][$year] ++; }