diff --git a/web/app/assets/javascripts/accounts.js b/web/app/assets/javascripts/accounts.js index c01cb12ed..2cc32f091 100644 --- a/web/app/assets/javascripts/accounts.js +++ b/web/app/assets/javascripts/accounts.js @@ -28,15 +28,28 @@ var audioProfiles = prettyPrintAudioProfiles(context.jamClient.TrackGetDevices()); + var badAudioConfigs = []; + var allAudioConfigs = context.jamClient.FTUEGetAllAudioConfigurations(); + var goodAudioConfigs = context.jamClient.FTUEGetGoodAudioConfigurations(); + + for (var i=0; i < allAudioConfigs.length; i++) { + if ($.inArray(allAudioConfigs[i], goodAudioConfigs) === -1) { + badAudioConfigs.push(allAudioConfigs[i]); + } + } + var template = context.JK.fillTemplate($('#template-account-main').html(), { email: userDetail.email, name: userDetail.name, location : userDetail.location, instruments : prettyPrintInstruments(userDetail.instruments), photoUrl : context.JK.resolveAvatarUrl(userDetail.photo_url), - profiles : audioProfiles + validProfiles : audioProfiles, + invalidProfiles : badAudioConfigs.length > 0 ? badAudioConfigs.join(", ") : "N/A" }); - $('#account-content-scroller').html(template ); + $('#account-content-scroller').html(template); + + badAudioConfigs.join(", ") } function prettyPrintAudioProfiles(devices) { diff --git a/web/app/assets/javascripts/accounts_audio_profile.js b/web/app/assets/javascripts/accounts_audio_profile.js index 868452660..086d0cc18 100644 --- a/web/app/assets/javascripts/accounts_audio_profile.js +++ b/web/app/assets/javascripts/accounts_audio_profile.js @@ -13,8 +13,6 @@ userId = data.id; registerFtueSuccess(); - - $('#account-audio-content-scroller table tbody').html(''); } function afterShow(data) { @@ -32,6 +30,8 @@ function populateAccountAudio() { + $('#account-audio-content-scroller table tbody').html(''); + var badAudioConfigs = []; var allAudioConfigs = context.jamClient.FTUEGetAllAudioConfigurations(); var goodAudioConfigs = context.jamClient.FTUEGetGoodAudioConfigurations(); diff --git a/web/app/views/clients/_account.html.erb b/web/app/views/clients/_account.html.erb index 8409ae2ae..b9baa122f 100644 --- a/web/app/views/clients/_account.html.erb +++ b/web/app/views/clients/_account.html.erb @@ -106,7 +106,8 @@
- Approved Profiles: {profiles} + Approved Profiles: {validProfiles}
+ Invalid Profiles: {invalidProfiles}