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-2066 fixed some issues with session landing and feed

This commit is contained in:
Brian Smith 2014-09-14 19:17:16 -04:00
parent 03fe5e8a1e
commit 4ddd4e4c13
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -415,7 +415,7 @@ module JamRuby
end
def duration_minutes
end_time = self.session_removed_at || Time.now
end_time = self.session_removed_at || Time.now.utc
(end_time - self.created_at) / 60.0
end

4
web/app/assets/javascripts/tickDuration.js
View File

@ -8,8 +8,8 @@
$.each($(customSelector ? customSelector : '.inprogress .tick-duration'), function(index, item) {
var $duration = $(item);
var createdAt = new Date(Number($duration.attr('data-created-at')) * 1000)
var millisElapsed = (context.JK.nowUTC().getTime() - createdAt.getTime());
$duration.text(context.JK.prettyPrintSeconds( parseInt(millisElapsed / 1000)));
var millisElapsed = (new Date().getTime() - createdAt.getTime());
$duration.text(context.JK.prettyPrintSeconds(parseInt(millisElapsed / 1000)));
});
}, 333);
}

4
web/app/helpers/feeds_helper.rb
View File

@ -23,9 +23,9 @@ module FeedsHelper
def session_duration_value(music_session)
if music_session.session_removed_at.nil?
Time.now - music_session.created_at
Time.now.utc - music_session.started_at
else
music_session.session_removed_at - music_session.created_at
music_session.session_removed_at - music_session.started_at
end
end

6
web/app/views/api_feeds/show.rabl
View File

@ -7,7 +7,7 @@ glue :music_session do
'music_session'
end
attributes :id, :genres, :created_at, :session_removed_at, :comment_count, :like_count, :play_count, :fan_access, :is_over?, :has_mount?
attributes :id, :genres, :created_at, :started_at, :session_removed_at, :comment_count, :like_count, :play_count, :fan_access, :is_over?, :has_mount?
node do |history|
{
@ -17,12 +17,12 @@ glue :music_session do
artist_id: session_artist_id(history),
artist_datakey: session_artist_datakey(history),
artist_hoveraction: session_artist_hoveraction(history),
utc_created_at: history.created_at.getutc.iso8601,
utc_created_at: history.started_at.getutc.iso8601,
name: session_name(history, current_user),
description: session_description(history, current_user),
status: session_text(history),
duration: session_duration_value(history),
duration_secs: history.created_at.to_i,
duration_secs: history.started_at.to_i,
genre: session_genre(history)
}
}

4
web/app/views/users/_feed_music_session.html.haml
View File

@ -8,7 +8,7 @@
%a{:href => "/sessions/#{feed_item.id}", :target => "_blank"} SESSION
.artist
= session_artist_name(feed_item)
= timeago(feed_item.created_at, class: 'small created_at')
= timeago(feed_item.started_at, class: 'small created_at')
/ name and description
.left.ml20.w30
.name.dotdotdot
@ -28,7 +28,7 @@
%span.session-status
= session_text(feed_item)
/ current playback time
= session_duration(feed_item, class: 'session-duration tick-duration recording-current', 'data-created-at' => feed_item.created_at.to_i)
= session_duration(feed_item, class: 'session-duration tick-duration recording-current', 'data-created-at' => feed_item.started_at.to_i)
/ end recording play controls
/ genre and social
.left.small

2
web/app/views/users/_feed_music_session_ajax.html.haml
View File

@ -11,7 +11,7 @@
.artist
%a.artist{:hoveraction => '{{data.feed_item.helpers.artist_hoveraction}}', :profileaction => "{{data.feed_item.helpers.artist_hoveraction}}", :'{{data.feed_item.helpers.artist_datakey}}' => '{{data.feed_item.helpers.artist_id}}'}
= '{{data.feed_item.helpers.artist_name}}'
%time.small.created_at.timeago{datetime: '{{data.feed_item.helpers.utc_created_at}}'}= '{{data.feed_item.created_at}}'
%time.small.created_at.timeago{datetime: '{{data.feed_item.helpers.utc_created_at}}'}= '{{data.feed_item.started_at}}'
/ name and description
.left.ml20.w30
.name.dotdotdot