diff --git a/app/Http/Controllers/Api/Web/StatsController.php b/app/Http/Controllers/Api/Web/StatsController.php index 07678875..f90d1cb1 100644 --- a/app/Http/Controllers/Api/Web/StatsController.php +++ b/app/Http/Controllers/Api/Web/StatsController.php @@ -61,7 +61,7 @@ class StatsController extends ApiControllerBase array_push($output, $set); } - return Response::json(['playStats' => $output], 200); + return Response::json(['playStats' => $output, 'type' => 'Hourly'], 200); } public function getTrackStatsDaily($id) @@ -96,7 +96,7 @@ class StatsController extends ApiControllerBase array_push($output, $set); } - return Response::json(['playStats' => $output], 200); + return Response::json(['playStats' => $output, 'type' => 'Daily'], 200); } public function getTrackStats($id) { diff --git a/public/templates/tracks/stats.html b/public/templates/tracks/stats.html index 508a87d7..00e39b7f 100644 --- a/public/templates/tracks/stats.html +++ b/public/templates/tracks/stats.html @@ -5,4 +5,5 @@ + diff --git a/resources/assets/scripts/app/controllers/track-stats.coffee b/resources/assets/scripts/app/controllers/track-stats.coffee index 7c0def15..a350b189 100644 --- a/resources/assets/scripts/app/controllers/track-stats.coffee +++ b/resources/assets/scripts/app/controllers/track-stats.coffee @@ -15,24 +15,44 @@ # along with this program. If not, see . -module.exports = angular.module('ponyfm').controller "track-stats", [ +module.exports = angular.module('ponyfm').controller 'track-stats', [ '$scope', '$state', 'track-stats' ($scope, $state, statsService) -> $scope.trackId = parseInt($state.params.id) + labelArray = [] + dataArray = [] + cumArray = [] + statsLoaded = (stats) -> console.log(stats) - labelArray = [] - dataArray = [] - for key, value of stats.playStats labelArray.push value.hour || value.days dataArray.push value.plays + i = 0 + while i < dataArray.length + if i == 0 + cumArray[i] = dataArray[0] + else + cumArray[i] = cumArray[i - 1] + dataArray[i] + i++ + $scope.playsLabels = labelArray $scope.playsData = dataArray $scope.series = ['Plays'] + $scope.totalSelected = false + + $scope.dailyText = stats.type + + $scope.totalClick = () -> + $scope.playsData = cumArray + $scope.totalSelected = true + + $scope.dailyClick = () -> + $scope.playsData = dataArray + $scope.totalSelected = false statsService.loadStats($scope.trackId).done statsLoaded ] diff --git a/resources/assets/styles/components/components.less b/resources/assets/styles/components/components.less index 4976e753..749651a7 100644 --- a/resources/assets/styles/components/components.less +++ b/resources/assets/styles/components/components.less @@ -212,6 +212,10 @@ html body { color: #eee; } + .btn.selected { + background: #7A4F7D; + } + .ui-datepicker { .border-radius(0px);