kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Contribution calendar will use events instead of commits to count contributions

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2015-03-22 14:35:27 -07:00
parent 43afe46bbd
commit 54aca18cf8
3 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/views/users/calendar.html.haml
View file

@ -1,4 +1,7 @@
%h4 Contributions calendar
%h4
Contributions calendar
.pull-right
%small Issues, merge requests and push events
#cal-heatmap.calendar
:javascript
new calendar(

2
features/steps/user.rb
View file

@ -35,7 +35,7 @@ class Spinach::Features::User < Spinach::FeatureSteps
step 'I should see contributions calendar' do
within '.calendar' do
page.should have_css('.graph-rect.r2.q2')
page.should have_css('.graph-rect.r3.q3')
end
end

19
lib/gitlab/contributions_calendar.rb
View file

@ -15,25 +15,20 @@ module Gitlab
date_to = Date.today
events = Event.contributions.where(author_id: user.id).
where("created_at > ?", date_from).where(project_id: projects)
where("created_at > ?", date_from).where(project_id: projects).
group('date(created_at)').
select('date(created_at), count(id) as total_amount').
reorder(nil).map(&:attributes)
grouped_events = events.to_a.group_by { |event| event.created_at.to_date.to_s }
dates = (1.year.ago.to_date..(Date.today + 1.day)).to_a
dates.each do |date|
date_id = date.to_time.to_i.to_s
@timestamps[date_id] = 0
day_events = events.find { |day_events| day_events["date"] == date }
if grouped_events.has_key?(date.to_s)
grouped_events[date.to_s].each do |event|
if event.created_at.to_date == date
if event.issue? || event.merge_request?
@timestamps[date_id] += 1
elsif event.push?
@timestamps[date_id] += event.commits_count
end
end
end
if day_events
@timestamps[date_id] = day_events["total_amount"]
end
end