diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-26 10:58:04 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-02-02 17:45:42 -0500 |
| commit | 1162f8d77eda707269ce3214ade25bf1c64d304b (patch) | |
| tree | 08b3dc73db9aefe5c1eb85ac1be7702c0b24070c | |
| parent | 4e8266e8df3a5a66a2622e4c5e1ee902cf3a66b5 (diff) | |
| download | gitlab-ce-1162f8d77eda707269ce3214ade25bf1c64d304b.tar.gz | |
Add elpased time.
| -rw-r--r-- | app/assets/stylesheets/pages/milestone.scss | 4 | ||||
| -rw-r--r-- | app/models/milestone.rb | 9 | ||||
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 3 |
3 files changed, 16 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss index e80dc9e84a1..8772de5f1fe 100644 --- a/app/assets/stylesheets/pages/milestone.scss +++ b/app/assets/stylesheets/pages/milestone.scss @@ -11,3 +11,7 @@ li.milestone { height: 6px; } } + +.time-elapsed { + color: #F14539; +} diff --git a/app/models/milestone.rb b/app/models/milestone.rb index 7dba17726c0..21a3ab5227f 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -110,6 +110,15 @@ class Milestone < ActiveRecord::Base 0 end + def percent_time_used + return 100 if expired? + + duration = ((created_at - due_date.to_datetime) / 1.day) + days_elapsed = ((created_at - Time.now) / 1.day) + + ((days_elapsed.to_f / duration) * 100).floor + end + def expires_at if due_date if due_date.past? diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 72a4164d2d4..17429cf3ddd 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -57,6 +57,9 @@ closed %strong== #{@milestone.percent_complete}% complete + %span.time-elapsed + %strong== #{@milestone.percent_time_used}% + time elapsed %span.pull-right= @milestone.expires_at = milestone_progress_bar(@milestone) |