Download as
Browse Code »

Commit 9c951c50f1ecea130a344c96fe52383b6579dcf5

Authored by Daniela Feitosa
Committed by Antonio Terceiro
1 parent ea3ea3a8
Exists in stable-spb-1.4 and in 9 other branches article-list-template, contact_admin_translation, event_fixes, noosfero_spb_ci, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, remote_user_fix, stable-spb-1.3, stable-spb-1.3-fixes

Fix how the duration of events are calculated 

(cherry picked from commit 7f19dfe82f9ec7ce00daa20fc2c728a351f8c629)
Showing 2 changed files with 11 additions and 1 deletions   Show diff stats
app/models/event.rb
  Diff comments   View file @9c951c5
@@ -114,7 +114,7 @@ class Event < Article @@ -114,7 +114,7 @@ class Event < Article
114 end 114 end
115 115
116 def duration 116 def duration
117 - (((self.end_date || self.start_date) - self.start_date).to_i/60/60/24) 117 + (((self.end_date || self.start_date) - self.start_date).to_i/60/60/24) + 1
118 end 118 end
119 119
120 alias_method :article_lead, :lead 120 alias_method :article_lead, :lead
test/unit/event_test.rb
  Diff comments   View file @9c951c5
@@ -323,4 +323,14 @@ class EventTest < ActiveSupport::TestCase @@ -323,4 +323,14 @@ class EventTest < ActiveSupport::TestCase
323 assert a.can_display_media_panel? 323 assert a.can_display_media_panel?
324 end 324 end
325 325
  326 + should 'calculate duration of events with start and end date' do
  327 + e = build(Event, :start_date => DateTime.new(2015, 1, 1), :end_date => DateTime.new(2015, 1, 5))
  328 + assert_equal 5, e.duration
  329 + end
  330 +
  331 + should 'calculate duration of event with only start_date' do
  332 + e = build(Event, :start_date => DateTime.new(2015, 1, 1))
  333 + assert_equal 1, e.duration
  334 + end
  335 +
326 end 336 end