Commit 84941705 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve contribution calendar per day info

parent 7d84252e
......@@ -27,7 +27,6 @@ class @calendar
legendCellPadding: 3
onClick: (date, count) ->
formated_date = date.getFullYear() + "-" + (date.getMonth()+1) + "-" + date.getDate()
$(".calendar_commit_activity").fadeOut 400
$.ajax
url: calendar_activities_path
data:
......@@ -36,6 +35,4 @@ class @calendar
dataType: "html"
success: (data) ->
$(".user-calendar-activities").html data
$(".calendar_commit_activity").find(".js-toggle-content").hide()
$(".calendar_commit_activity").fadeIn 400
.user-calendar-activities {
.calendar_commit_activity {
padding: 5px 0 0;
}
.calendar_onclick_hr {
padding: 0;
margin: 10px 0;
}
.calendar_commit_date {
color: #999;
}
.calendar_activity_summary {
font-size: 14px;
}
.str-truncated {
max-width: 70%;
......@@ -31,14 +18,6 @@
background-color: #ddd;
}
}
.commit-row-message {
color: #333;
&:hover {
color: #444;
text-decoration: underline;
}
}
}
/**
* This overwrites the default values of the cal-heatmap gem
......
.calendar_commit_activity
%h4.prepend-top-20
%span.light Contributions for
%strong #{@calendar_date.to_s(:short)}
......@@ -9,14 +8,14 @@
%span.light
%i.fa.fa-clock-o
= event.created_at.to_s(:time)
- if event.push? && event.commits_count > 0
pushed #{event.commits_count} commits to
- if event.push?
#{event.action_name} #{event.ref_type} #{event.ref_name}
- else
= event_action_name(event)
- if event.target
%strong= link_to "##{event.target_iid}", [event.project.namespace.becomes(Namespace), event.project, event.target]
at
at
%strong
- if event.project
= link_to_project event.project
......
......@@ -14,11 +14,11 @@ module Gitlab
date_from = 1.year.ago
date_to = Date.today
events = Event.contributions.where(author_id: user.id).
events = Event.reorder(nil).contributions.where(author_id: user.id).
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)
map(&:attributes)
dates = (1.year.ago.to_date..(Date.today + 1.day)).to_a
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment