lino.jorzick
/
greenlight
forked from External/greenlight
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #56 from erickadbay/dev-erick 

Fixed recording duration
This commit is contained in:
Zachary Chai 2016-11-29 17:43:44 -05:00 committed by GitHub
parent f400ca390e f4a7c35e35
commit f0128951f4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/recordings.coffee
View File

@ -140,8 +140,7 @@ class @Recordings
if !@owner if !@owner
table_api.column(-1).visible(false) table_api.column(-1).visible(false)
for recording in data.recordings for recording in data.recordings
totalMinutes = Math.round((new Date(recording.end_time) - new Date(recording.start_time)) / 1000 / 60) recording.duration = recording.length
recording.duration = totalMinutes
data.recordings.sort (a,b) -> data.recordings.sort (a,b) ->
return new Date(b.start_time) - new Date(a.start_time) return new Date(b.start_time) - new Date(a.start_time)
table_api.clear() table_api.clear()

2
app/lib/bbb_api.rb
View File

@ -113,7 +113,7 @@ module BbbApi
res[:recordings].each do |recording| res[:recordings].each do |recording|
pref_preview = {} pref_preview = {}
recording[:length] = recording[:playback][:format].is_a?(Hash) ? recording[:playback][:format][:length] : recording[:playback][:format].first[:length]
# create a playbacks attribute on recording for playback formats # create a playbacks attribute on recording for playback formats
recording[:playbacks] = if !recording[:playback] || !recording[:playback][:format] recording[:playbacks] = if !recording[:playback] || !recording[:playback][:format]
[] []

1
app/views/bbb/recordings.jbuilder
View File

@ -23,6 +23,7 @@ json.recordings do
json.start_time recording[:startTime] json.start_time recording[:startTime]
json.end_time recording[:endTime] json.end_time recording[:endTime]
json.published recording[:published] json.published recording[:published]
json.length recording[:length]
json.previews do json.previews do
json.array!(recording[:previews]) do |preview| json.array!(recording[:previews]) do |preview|
json.partial! 'preview', preview: preview json.partial! 'preview', preview: preview