From e53b9b3df890800077cc0fdd56202e2efaad10fe Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Fri, 5 Dec 2014 08:16:49 +0000
Subject: [PATCH] VRFS-2424 added user genres

---
 web/app/assets/javascripts/hoverMusician.js   | 6 ++++++
 web/app/assets/javascripts/profile.js         | 4 ++++
 web/app/views/clients/_hoverMusician.html.erb | 3 ++-
 web/app/views/clients/_profile.html.erb       | 2 ++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/web/app/assets/javascripts/hoverMusician.js b/web/app/assets/javascripts/hoverMusician.js
index 56042effd..5377ceb31 100644
--- a/web/app/assets/javascripts/hoverMusician.js
+++ b/web/app/assets/javascripts/hoverMusician.js
@@ -23,6 +23,11 @@
             instrumentHtml += '<div class="left mr10 mb"><img src="' + context.JK.getInstrumentIcon24(val.instrument_id) + '" title="' + context.JK.getInstrumentId(val.instrument_id) + '" width="24" height="24" /></div>';
           });
 
+          var genreHtml = '';
+          $.each(response.genres, function(index, val) {
+            genreHtml += val.description + ' ';
+          });
+
           // followings
           var followingHtml = '';
           $.each(response.followings, function(index, val) {
@@ -99,6 +104,7 @@
               first_name: response.first_name,
               location: response.location,
               instruments: instrumentHtml,
+              genres: genreHtml,
               friend_count: response.friend_count,
               follower_count: response.follower_count,
               recording_count: response.recording_count,
diff --git a/web/app/assets/javascripts/profile.js b/web/app/assets/javascripts/profile.js
index edd6187d2..49543492d 100644
--- a/web/app/assets/javascripts/profile.js
+++ b/web/app/assets/javascripts/profile.js
@@ -354,6 +354,10 @@
           $('#profile-instruments').append(instrumentHtml);
         }
       }
+      $('#profile-genres').empty();
+      for (var i=0; i< user.genres.length; i++) {
+          $('#profile-genres').append(user.genres[i].description + '<br />');
+      }
 
       // location
       $('#profile-location').html(user.location);
diff --git a/web/app/views/clients/_hoverMusician.html.erb b/web/app/views/clients/_hoverMusician.html.erb
index c92db5704..bc88742b8 100644
--- a/web/app/views/clients/_hoverMusician.html.erb
+++ b/web/app/views/clients/_hoverMusician.html.erb
@@ -101,6 +101,7 @@
       <h3>{name}</h3>
       <small>{location}</small><br /><br />
       {instruments}
+      {genres}
       <br clear="all" />
       <span class="friend-count" title="friends">{friend_count} <img src="/assets/content/icon_friend.png" align="absmiddle" style="margin-right:4px;" /></span>
       <span class="follower-count" title="followers"><span id="spnFollowCount">{follower_count}</span> <img src="/assets/content/icon_followers.png" width="22" height="12" align="absmiddle" style="margin-right:4px;" /></span>
@@ -134,4 +135,4 @@
     </div>
     <br /><br />
   </div>
-</script>
\ No newline at end of file
+</script>
diff --git a/web/app/views/clients/_profile.html.erb b/web/app/views/clients/_profile.html.erb
index 1d11fdf35..2316b7730 100644
--- a/web/app/views/clients/_profile.html.erb
+++ b/web/app/views/clients/_profile.html.erb
@@ -83,6 +83,8 @@
                               </div>
                               <br />
                               <div id="profile-instruments"></div>
+                              <br />
+                              <div id="profile-genres"></div>
                             </div>
                             <br clear="all" />
                         </div>