Download as
Browse Code »

Commit 73a643cec597b52c0f0e2f70fb48e57f7fecbb7d

Authored by Antonio Terceiro
2 parents 0bd3c635 7f19dfe8
Exists in master and in 20 other branches add_member_task_reject_details, admin_visible_profile, community_notifications, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, organization_ratings_improvements, profile_api_improvements, ratings_minor_fixes, send_email_to_admins, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'event_duration' into 'master' 

Fix how the duration of events are calculated



See merge request !733
Showing 2 changed files with 11 additions and 1 deletions   Show diff stats
app/models/event.rb
  Diff comments   View file @73a643c
@@ -110,7 +110,7 @@ class Event < Article @@ -110,7 +110,7 @@ class Event < Article
110 end 110 end
111 111
112 def duration 112 def duration
113 - (((self.end_date || self.start_date) - self.start_date).to_i/60/60/24) 113 + (((self.end_date || self.start_date) - self.start_date).to_i/60/60/24) + 1
114 end 114 end
115 115
116 alias_method :article_lead, :lead 116 alias_method :article_lead, :lead
test/unit/event_test.rb
  Diff comments   View file @73a643c
@@ -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