diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index 70eb50e7f..088b5c1e6 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -206,7 +206,7 @@ module JamRuby locidispid = connection.locidispid query = MusicSession - .select("music_sessions.*, max(coalesce(current_scores.score, 99)) as max_score") + .select("music_sessions.*, max(coalesce(current_scores.score, 1000)) as max_score") # 1000 is higher than the allowed max of 999 .joins( %Q{ INNER JOIN diff --git a/web/app/assets/javascripts/sessionList.js b/web/app/assets/javascripts/sessionList.js index cc857545a..81dfc77b3 100644 --- a/web/app/assets/javascripts/sessionList.js +++ b/web/app/assets/javascripts/sessionList.js @@ -11,7 +11,8 @@ GOOD : {description: "GOOD", style: "latency-green", min: 0.0, max: 20.0}, MEDIUM : {description: "MEDIUM", style: "latency-yellow", min: 20.0, max: 40.0}, POOR : {description: "POOR", style: "latency-red", min: 40.0, max: 10000000000.0}, - UNREACHABLE: {description: "UNREACHABLE", style: "latency-grey", min: -1, max: -1} + UNREACHABLE: {description: "UNREACHABLE", style: "latency-grey", min: -1, max: -1}, + UNKNOWN: {description: "UNKNOWN", style: "latency-grey", min: -2, max: -2} }; var AUDIENCE = { @@ -49,6 +50,11 @@ latencyStyle = LATENCY.UNREACHABLE.style; showJoinLink = false; } + else if(latencyInfo.averageLatency === 1000) { + // 1000 is a magical number returned by new scoring API to indicate one or more people in the session have an unknown score + latencyDescription = LATENCY.UNKNOWN.description; + latencyStyle = LATENCY.UNKNOWN.style; + } else { if (totalLatency <= LATENCY.GOOD.max) { latencyDescription = LATENCY.GOOD.description; @@ -61,7 +67,7 @@ else { latencyDescription = LATENCY.POOR.description; latencyStyle = LATENCY.POOR.style; - //showJoinLink = false; + //showJoinLink = false; # let people join any scored session is the current thinking } }