Skip to content

get event names from server #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexbeletsky merged 3 commits into from
Aug 30, 2014
Merged

get event names from server #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1aba62b
get event names from server
jincod Aug 15, 2014
73b4d0e
fix
jincod Aug 15, 2014
8a8cb28
can filter events
jincod Aug 29, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<!-- endbuild -->

<link rel="stylesheet" href="http://yui.yahooapis.com/pure/0.3.0/pure-min.css">
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css">
</head>
<body ng-app="dashboardApp">
<!--[if lt IE 7]>
Expand Down Expand Up @@ -56,6 +57,7 @@ <h1>Likeastore. Analytics</h1>

<script src="scripts/services/api.js"></script>
<script src="scripts/services/analytics.js"></script>
<script src="scripts/services/filter-events.js"></script>

<script src="scripts/infrastructure/authorization.js"></script>
<script src="scripts/infrastructure/config.js"></script>
Expand Down
18 changes: 16 additions & 2 deletions app/scripts/controllers/dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
'use strict';

angular.module('dashboardApp').controller('dashboard', function () {
// do nothing
angular.module('dashboardApp').controller('dashboard', function ($scope, analytics, filterEvents) {
$scope.filtredEvents = [];
analytics.events(function(events) {
$scope.filtredEvents = filterEvents.filter(events);
});

$scope.apply = function() {
filterEvents.setEvents($scope.filtredEvents);
$scope.$broadcast('eventsUpdated');
};

$scope.checkAll = function() {
angular.forEach($scope.filtredEvents, function(item) {
item.value = true;
});
};
});
76 changes: 24 additions & 52 deletions app/scripts/directives/report.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

angular.module('dashboardApp').directive('report', function (analytics) {
angular.module('dashboardApp').directive('report', function (analytics, filterEvents) {
var dates = {
today: moment(),
yesterday: moment().subtract('days', 1),
Expand All @@ -16,57 +16,29 @@ angular.module('dashboardApp').directive('report', function (analytics) {
$scope.heading = attrs.periodHeading;
$scope.datePeriod = dates[attrs.date].format('DD/MM/YYYY');

analytics.report(attrs.report, dates[attrs.date], 'user-registered', function (data) {
$scope.registered = data;
});

analytics.report(attrs.report, dates[attrs.date], 'user-verified', function (data) {
$scope.verified = data;
});

analytics.report(attrs.report, dates[attrs.date], 'user-logged-on', function (data) {
$scope.loggedOn = data;
});

analytics.report(attrs.report, dates[attrs.date], 'network-created', function (data) {
$scope.networksCreated = data;
});

analytics.report(attrs.report, dates[attrs.date], 'search', function (data) {
$scope.searches = data;
});

analytics.report(attrs.report, dates[attrs.date], 'share-like', function (data) {
$scope.shares = data;
});

analytics.report(attrs.report, dates[attrs.date], 'share-with-friend', function (data) {
$scope.sends = data;
});

analytics.report(attrs.report, dates[attrs.date], 'account-deactivated', function (data) {
$scope.deactivated = data;
});

analytics.report(attrs.report, dates[attrs.date], 'collection-created', function (data) {
$scope.collectionsCreated = data;
});

analytics.report(attrs.report, dates[attrs.date], 'collection-shared', function (data) {
$scope.collectionsShared = data;
});

analytics.report(attrs.report, dates[attrs.date], 'collection-followed', function (data) {
$scope.collectionsFollowed = data;
});

analytics.report(attrs.report, dates[attrs.date], 'collection-unfollowed', function (data) {
$scope.collectionsUnfollowed = data;
});

analytics.report(attrs.report, dates[attrs.date], 'collection-item-added', function (data) {
$scope.collectionsItemsAdded = data;
});
function updateEvents() {
$scope.events = [];
var neededEvents = filterEvents.getEvents();
if(neededEvents) {
getData(neededEvents);
} else {
analytics.events(function(events) {
getData(events);
});
}
}

function getData(events) {
for(var i = 0; i < events.length; i++) {
var name = events[i];
analytics.report(attrs.report, dates[attrs.date], name, function (data) {
$scope.events.push({key: data.id, value: data});
});
}
}

updateEvents();
$scope.$on('eventsUpdated', updateEvents);
}
};
});
8 changes: 8 additions & 0 deletions app/scripts/services/analytics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,14 @@ angular.module('dashboardApp').factory('analytics', function ($http, config) {
report: function (report, date, id, callback) {
var query = url + '/api/reports/' + report + '/' + app + '?id=' + id + '&date=' + date.format('YYYY-MM-DD');
return $http({method: 'GET', url: query}).success(callback);
},
events: function (callback) {
var query = url + '/api/events/events/' + app;
return $http({method: 'GET', url: query}).success(callback);
},
ids: function (callback) {
var query = url + '/api/events/ids/' + app;
return $http({method: 'GET', url: query}).success(callback);
}
};
});
37 changes: 37 additions & 0 deletions app/scripts/services/filter-events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
'use strict';

angular.module('dashboardApp').service('filterEvents', function() {
this.getEvents = function() {
return localStorage.neededEvents && JSON.parse(localStorage.neededEvents);
};

this.filter = function(events) {
var result = [],
neededEvents = localStorage.neededEvents && JSON.parse(localStorage.neededEvents);
if(!neededEvents) {
result = events.map(function(event) {
return {
key: event,
value: true
}
});
} else {
for(var i = 0; i < events.length; i++) {
var value = neededEvents.indexOf(events[i]) != -1 || false;
result.push({key: events[i], value: value});
}
}
this.setEvents(result);
return result;
};

this.setEvents = function(events) {
var result = events
.filter(function(item) {
return item.value;
}).map(function(item) {
return item.key;
});
localStorage.neededEvents = JSON.stringify(result);
};
});
4 changes: 4 additions & 0 deletions app/styles/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,7 @@ input {
.login-panel form {
padding: 16px 0;
}

.filter {
padding: 10px 0 0 180px;
}
18 changes: 18 additions & 0 deletions app/views/dashboard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
<div class="reports">
<div class="filter">
<button class="pure-button" ng-model="isShow" ng-click="isShow=!isShow">
<i class="fa fa-filter"></i>
Filter Events
</button>
<div ng-show="isShow">
<form class="pure-form" ng-submit="apply()">
<label for="option-one-{{event.key}}" class="pure-checkbox" ng-repeat="event in filtredEvents">
<input id="option-one-{{event.key}}" type="checkbox" ng-model="event.value">
{{event.key}}
</label>
<div class="pure-button" ng-click="checkAll()">
All
</div>
<input type="submit" class="pure-button pure-button-primary" value="Apply">
</form>
</div>
</div>
<report data-period-heading="Today" data-report="day" data-date="today"></report>
<report data-period-heading="Yesterday" data-report="day" data-date="yesterday"></report>
<report data-period-heading="Week" data-report="week" data-date="today"></report>
Expand Down
67 changes: 4 additions & 63 deletions app/views/report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,68 +5,9 @@
</div>
</div>
<div class="pure-g-r">

<div class="pure-u-1-6 report">
<span class="total">{{registered.total}}</span>
<p>users registered</p>
</div>

<div class="pure-u-1-6 report">
<span class="total">{{verified.total}}</span>
<p>users verified</p>
</div>

<div class="pure-u-1-6 report">
<span class="total">{{deactivated.total}}</span>
<p>accounts deleted</p>
</div>

<div class="pure-u-1-6 report">
<span class="total">{{shares.total}}</span>
<p>likes shared</p>
</div>

<div class="pure-u-1-6 report">
<span class="total">{{networksCreated.total}}</span>
<p>networks enabled</p>
</div>

<div class="pure-u-1-6 report">
<span class="total">{{searches.total}}</span>
<p>searches performed</p>
</div>

</div>
<div class="pure-g-r">

<div class="pure-u-1-6 report">
<span class="total">{{collectionsCreated.total}}</span>
<p>collections created</p>
</div>

<div class="pure-u-1-6 report">
<span class="total">{{collectionsShared.total}}</span>
<p>collections shared</p>
</div>

<div class="pure-u-1-6 report">
<span class="total">{{collectionsFollowed.total}}</span>
<p>collections followed</p>
</div>

<div class="pure-u-1-6 report">
<span class="total">{{collectionsUnfollowed.total}}</span>
<p>collections unfollowed</p>
</div>

<div class="pure-u-1-6 report">
<span class="total">{{collectionsItemsAdded.total}}</span>
<p>collections item added</p>
</div>

<div class="pure-u-1-6 report">
<span class="total">{{sends.total}}</span>
<p>send to friends</p>
<div class="pure-u-1-6 report" ng-repeat="event in events">
<span class="total">{{event.value.total}}</span>
<p>{{event.key}}</p>
</div>
</div>
</div>
</div>