From e30400cab00fb5a2f5a8ec9f4bc597876eaad176 Mon Sep 17 00:00:00 2001
From: Josef Citrine <josefcitrine@gmail.com>
Date: Thu, 29 Dec 2016 00:14:52 +0000
Subject: [PATCH] Fix for broken track formatting in HWC announcement

---
 .../partials/announcements/hwc/winners.html   |  2 +-
 .../scripts/app/controllers/dashboard.coffee  | 23 ++++++++++++++++---
 resources/assets/styles/dashboard.less        |  4 ++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/public/templates/partials/announcements/hwc/winners.html b/public/templates/partials/announcements/hwc/winners.html
index 2869dc41..f2073201 100644
--- a/public/templates/partials/announcements/hwc/winners.html
+++ b/public/templates/partials/announcements/hwc/winners.html
@@ -4,7 +4,7 @@
 </div>
 <div class="announce-tracks">
     <ul class="tracks-listing">
-        <li ng-repeat="track in announcement.parsedTracks track by track.id" ng-class="{'can-favourite': auth.isLogged, 'is-favourited': auth.isLogged && track.user_data.is_favourited, 'is-playing': track.isPlaying, 'has-played': auth.isLogged && track.user_data.views}">
+        <li ng-repeat="track in announcement.parsedTracks track by track.place" ng-class="{'can-favourite': auth.isLogged, 'is-favourited': auth.isLogged && track.user_data.is_favourited, 'is-playing': track.isPlaying, 'has-played': auth.isLogged && track.user_data.views}">
             <div class="image">
                 <a href="#" class="play-button" pfm-eat-click ng-click="play(track)">
                     <i class="fa fa-play" ng-if="!track.isPlaying"></i>
diff --git a/resources/assets/scripts/app/controllers/dashboard.coffee b/resources/assets/scripts/app/controllers/dashboard.coffee
index 12db31fa..54e0badc 100644
--- a/resources/assets/scripts/app/controllers/dashboard.coffee
+++ b/resources/assets/scripts/app/controllers/dashboard.coffee
@@ -39,10 +39,27 @@ module.exports = angular.module('ponyfm').controller "dashboard", [
                 if $scope.announcement.tracks.length > 0
                     console.log($scope.announcement.tracks)
                     $scope.announcement.parsedTracks = []
-                    for track in $scope.announcement.tracks
+                    tempTracks = []
+
+                    # Not the greatest, but sod it
+                    for track, i in $scope.announcement.tracks
+                        console.log(i)
                         tracks.fetch(track, false).done (trackResponse) ->
-                            $scope.announcement.parsedTracks.push(trackResponse.track)
-                            console.log(trackResponse)
+                            theTrack = trackResponse.track
+                            $scope.announcement.tracks.map((obj, index) ->
+                                if obj == theTrack.id
+                                    theTrack.place = index
+                            )
+                            tempTracks.push(theTrack)
+
+                            console.log(tempTracks)
+                            if tempTracks.length == $scope.announcement.tracks.length
+                                tempTracks.sort((a,b) ->
+                                    return a.place - b.place
+                                )
+                                $scope.announcement.parsedTracks = tempTracks
+
+
 
         dashboard.refresh().done (res) ->
             $scope.recentTracks = res.recent_tracks
diff --git a/resources/assets/styles/dashboard.less b/resources/assets/styles/dashboard.less
index 6fa3acc7..deb06bb4 100644
--- a/resources/assets/styles/dashboard.less
+++ b/resources/assets/styles/dashboard.less
@@ -238,11 +238,11 @@
             }
 
             &:hover {
-              background: rgba(0,0,0,0.2);
+              background: rgba(0, 0, 0, 0.2);
             }
 
             &.is-playing {
-              background: rgba(0,0,0,0.1);
+              background: rgba(0, 0, 0, 0.1);
             }
           }
         }