Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d27da27b
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d27da27b
编写于
11月 06, 2017
作者:
G
George Andrinopoulos
提交者:
Winnie Hellmann
11月 13, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Move total time spend calculation to milestoneish
上级
d2fe9f2b
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
24 addition
and
77 deletion
+24
-77
app/models/concerns/milestoneish.rb
app/models/concerns/milestoneish.rb
+8
-0
app/models/global_milestone.rb
app/models/global_milestone.rb
+0
-8
app/models/milestone.rb
app/models/milestone.rb
+0
-8
app/views/shared/milestones/_sidebar.html.haml
app/views/shared/milestones/_sidebar.html.haml
+5
-5
spec/models/concerns/milestoneish_spec.rb
spec/models/concerns/milestoneish_spec.rb
+11
-0
spec/models/global_milestone_spec.rb
spec/models/global_milestone_spec.rb
+0
-33
spec/models/milestone_spec.rb
spec/models/milestone_spec.rb
+0
-23
未找到文件。
app/models/concerns/milestoneish.rb
浏览文件 @
d27da27b
...
...
@@ -86,6 +86,14 @@ module Milestoneish
false
end
def
total_issue_time_spent
issues
.
joins
(
:timelogs
).
sum
(
:time_spent
)
end
def
human_total_issue_time_spent
Gitlab
::
TimeTrackingFormatter
.
output
(
total_issue_time_spent
)
end
private
def
count_issues_by_state
(
user
)
...
...
app/models/global_milestone.rb
浏览文件 @
d27da27b
...
...
@@ -152,12 +152,4 @@ class GlobalMilestone
@milestones
.
first
.
start_date
end
end
def
total_time_spent
issues
.
joins
(
:timelogs
).
sum
(
:time_spent
)
+
merge_requests
.
joins
(
:timelogs
).
sum
(
:time_spent
)
end
def
human_total_time_spent
Gitlab
::
TimeTrackingFormatter
.
output
(
total_time_spent
)
end
end
app/models/milestone.rb
浏览文件 @
d27da27b
...
...
@@ -213,14 +213,6 @@ class Milestone < ActiveRecord::Base
project_id
.
present?
end
def
total_time_spent
issues
.
joins
(
:timelogs
).
sum
(
:time_spent
)
+
merge_requests
.
joins
(
:timelogs
).
sum
(
:time_spent
)
end
def
human_total_time_spent
Gitlab
::
TimeTrackingFormatter
.
output
(
total_time_spent
)
end
private
# Milestone titles must be unique across project milestones and group milestones
...
...
app/views/shared/milestones/_sidebar.html.haml
浏览文件 @
d27da27b
...
...
@@ -89,15 +89,15 @@
.sidebar-collapsed-icon
=
custom_icon
(
'icon_hourglass'
)
%span
.collapsed-milestone-total-time-spent
-
if
milestone
.
human_total_time_spent
=
milestone
.
human_total_time_spent
-
if
milestone
.
human_total_
issue_
time_spent
=
milestone
.
human_total_
issue_
time_spent
-
else
None
.title.hide-collapsed
Total time spent
Total
issue
time spent
.value.hide-collapsed
-
if
milestone
.
human_total_time_spent
%span
.bold
=
milestone
.
human_total_time_spent
-
if
milestone
.
human_total_
issue_
time_spent
%span
.bold
=
milestone
.
human_total_
issue_
time_spent
-
else
%span
.no-value
No time spent
...
...
spec/models/concerns/milestoneish_spec.rb
浏览文件 @
d27da27b
...
...
@@ -186,4 +186,15 @@ describe Milestone, 'Milestoneish' do
expect
(
milestone
.
elapsed_days
).
to
eq
(
2
)
end
end
describe
'#total_issue_time_spent'
do
it
'calculates total issue time spent'
do
closed_issue_1
.
spend_time
(
duration:
300
,
user:
author
)
closed_issue_1
.
save!
closed_issue_2
.
spend_time
(
duration:
600
,
user:
assignee
)
closed_issue_2
.
save!
expect
(
milestone
.
total_issue_time_spent
).
to
eq
(
900
)
end
end
end
spec/models/global_milestone_spec.rb
浏览文件 @
d27da27b
...
...
@@ -190,37 +190,4 @@ describe GlobalMilestone do
end
end
end
describe
'#total_time_spent'
do
let
(
:milestone1_project1
)
{
create
(
:milestone
,
title:
"Milestone v1.2"
,
project:
project1
)
}
let
(
:milestone1_project2
)
{
create
(
:milestone
,
title:
"Milestone v1.2"
,
project:
project2
)
}
let
(
:issue1
)
{
create
(
:issue
,
milestone:
milestone1_project1
)
}
let
(
:issue2
)
{
create
(
:issue
,
milestone:
milestone1_project2
)
}
let
(
:merge_request1
)
{
create
(
:merge_request
,
milestone:
milestone1_project1
)
}
let
(
:merge_request2
)
{
create
(
:merge_request
,
milestone:
milestone1_project2
)
}
before
do
milestones
=
[
milestone1_project1
,
milestone1_project2
]
milestones_relation
=
Milestone
.
where
(
id:
milestones
.
map
(
&
:id
))
@global_milestone
=
described_class
.
new
(
milestone1_project1
.
title
,
milestones_relation
)
end
it
'calculates total time spent'
do
issue1
.
spend_time
(
duration:
300
,
user:
user
)
issue1
.
save!
issue2
.
spend_time
(
duration:
600
,
user:
user2
)
issue2
.
save!
merge_request1
.
spend_time
(
duration:
200
,
user:
user
)
merge_request1
.
save!
merge_request2
.
spend_time
(
duration:
100
,
user:
user2
)
merge_request2
.
save!
expect
(
@global_milestone
.
total_time_spent
).
to
eq
(
1200
)
end
end
end
spec/models/milestone_spec.rb
浏览文件 @
d27da27b
...
...
@@ -284,27 +284,4 @@ describe Milestone do
expect
(
milestone
.
participants
).
to
eq
[
user
]
end
end
describe
'#total_time_spent'
do
let
(
:user
)
{
build
(
:user
)
}
let
(
:project
)
{
build
(
:project
,
name:
'sample-project'
)
}
let
(
:milestone
)
{
build
(
:milestone
,
iid:
1
,
project:
project
)
}
let
(
:issue1
)
{
build
(
:issue
,
milestone:
milestone
)
}
let
(
:issue2
)
{
build
(
:issue
,
milestone:
milestone
)
}
let
(
:merge_request1
)
{
build
(
:merge_request
,
milestone:
milestone
)
}
let
(
:merge_request2
)
{
build
(
:merge_request
,
milestone:
milestone
)
}
it
'calculates total time spent'
do
issue1
.
spend_time
(
duration:
300
,
user:
user
)
issue1
.
save!
issue2
.
spend_time
(
duration:
600
,
user:
user
)
issue2
.
save!
merge_request1
.
spend_time
(
duration:
200
,
user:
user
)
merge_request1
.
save!
merge_request2
.
spend_time
(
duration:
100
,
user:
user
)
merge_request2
.
save!
expect
(
milestone
.
total_time_spent
).
to
eq
(
1200
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录