seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

VRFS-4060 - timezone finagling

This commit is contained in:
Seth Call 2016-05-17 22:11:20 -05:00
parent 9725667e2a
commit 5214f36fc9
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ruby/lib/jam_ruby/models/music_session.rb
View File

@ -990,11 +990,22 @@ SQL
end
end
if timezone_display == "Central Time (US & Canada)"
timezone_display = "US Central Time"
elsif timezone_display == "Pacific Time (US & Canada)"
timezone_display = "US Pacific Time"
elsif timezone_display == "Eastern Time (US & Canada)"
timezone_display = "US Eastern Time"
elsif timezone_display == "Mountain Time (US & Canada)"
timezone_display = "US Mountain Time"
end
duration = safe_scheduled_duration
end_time = start_time + duration
if with_timezone
if shorter
"#{start_time.strftime("%a, %b %e %Y")}, #{start_time.strftime("%l:%M").strip}-#{end_time.strftime("%l:%M %p").strip} (#{short_tz}#{utc_offset_display})"
#"#{start_time.strftime("%a, %b %e %Y")}, #{start_time.strftime("%l:%M").strip}-#{end_time.strftime("%l:%M %p").strip} (#{short_tz}#{utc_offset_display})"
"#{start_time.strftime("%a, %b %e %Y")}, #{start_time.strftime("%l:%M").strip}-#{end_time.strftime("%l:%M %p").strip} (#{timezone_display})"
else
"#{start_time.strftime("%A, %B %e")}, #{start_time.strftime("%l:%M").strip}-#{end_time.strftime("%l:%M %p").strip} #{timezone_display}"
end

7
ruby/spec/jam_ruby/models/music_session_spec.rb
View File

@ -113,6 +113,13 @@ describe MusicSession do
music_session.pretty_scheduled_start(true).should == 'Date and time TBD'
music_session.pretty_scheduled_start(false).should == 'Date and time TBD'
end
it "displays default correctly (shorter)" do
time = MusicSession.parse_scheduled_start("Thu Jul 10 2014 10:00 PM", "Central Time (US & Canada),America/Chicago")
music_session = FactoryGirl.create(:music_session, scheduled_start: time, timezone: "Central Time (US & Canada),America/Chicago")
puts music_session.pretty_scheduled_start(true, true)
puts music_session.pretty_scheduled_start(true, false)
end
end
describe "nindex" do