Skip to content

Commit

Permalink
1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Windmolders
Windmolders committed Feb 11, 2015
1 parent 5b29261 commit 7b9aea5
Show file tree
Hide file tree
Showing 45 changed files with 1,302 additions and 219 deletions.
355 changes: 215 additions & 140 deletions .idea/workspace.xml
View file

Large diffs are not rendered by default.

Empty file added .tmp/concat/scripts/oldieshim.js
View file
Empty file.
854 changes: 854 additions & 0 deletions .tmp/concat/scripts/scripts.js
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion Gruntfile.js
View file
Expand Up @@ -398,7 +398,6 @@ module.exports = function (grunt) {
'concat',
'ngAnnotate',
'copy:dist',
'cdnify',
'cssmin',
'uglify',
'filerev',
Expand Down
7 changes: 1 addition & 6 deletions app/index.html
View file
Expand Up @@ -75,7 +75,7 @@
<!-- end sidebar user -->
<!-- begin sidebar nav -->
<ul class="nav">
<li class="nav-header">NoobsPlayGround</li>
<li class="nav-header">{{communnity}}</li>

<li id="servers"><a href="#/"><i class="fa fa-database"></i> <span>Servers</span></a></li>

Expand Down Expand Up @@ -116,18 +116,13 @@
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
<script src="bower_components/angular-touch/angular-touch.js"></script>
<script src="bower_components/angularLocalStorage/src/angularLocalStorage.js"></script>

<script src="bower_components/switchery/dist/switchery.min.js"></script>
<script src="bower_components/ng-switchery/src/ng-switchery.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap.min.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
<script src="bower_components/angular-utils-pagination/dirPagination.js"></script>

<script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/md5.js"></script>
<script src="bower_components/toaster/toaster.js"></script>
<script src="bower_components/Chart.js/Chart.js"></script>
<script src="bower_components/tc-angular-chartjs/dist/tc-angular-chartjs.min.js"></script>

<!-- build:js({.tmp,app}) scripts/scripts.js -->
<script src="scripts/app.js"></script>
<script src="scripts/controllers/main.js"></script>
Expand Down
121 changes: 102 additions & 19 deletions app/scripts/app.js
View file
Expand Up @@ -7,7 +7,7 @@
*
* Main module of the application.
*/
var ERDBM = angular
var ZupaStats = angular
.module('ZupaStats', [
'ngAnimate',
'ngCookies',
Expand All @@ -16,13 +16,12 @@ var ERDBM = angular
'ngSanitize',
'ngTouch',
'angularLocalStorage',
'NgSwitchery',
'ui.bootstrap',
'angularUtils.directives.dirPagination',
'toaster',
'tc.chartjs'
]);
ERDBM.config(["$routeProvider",function ($routeProvider) {
ZupaStats.config(["$routeProvider",function ($routeProvider) {
$routeProvider
.when('/', {
templateUrl: 'views/main.html',
Expand Down Expand Up @@ -57,7 +56,7 @@ ERDBM.config(["$routeProvider",function ($routeProvider) {
});
}]);

ERDBM.run(["$rootScope","storage","$location","$http","Data",
ZupaStats.run(["$rootScope","storage","$location","$http","Data",
function($rootScope,storage,$location,$http,Data) {
var globalScope = $rootScope;
$http.defaults.headers.post["Content-Type"] = "application/x-www-form-urlencoded";
Expand All @@ -69,15 +68,27 @@ ERDBM.run(["$rootScope","storage","$location","$http","Data",
globalScope.players3 = [];
globalScope.players4 = [];
globalScope.players2 = [];
globalScope.players5 = [];
globalScope.players6 = [];
globalScope.data = [];
globalScope.serverURL = "http://37.187.135.190/uk431/ZupaStats/server/getNoLogDeathLogs.php";
globalScope.servers = [
{name: "Chernarus 1", dbi: "1", map:"chernarus",descr: "Chernarus Epoch Overpoch: Scripted by Zupa. "},
{name: "Panthera 3", dbi: "5",map:"panthera",descr: "Panthera Epoch Overpoch: Scripted by Zupa. "}
];
globalScope.serverURL = "server/";
globalScope.servers = [];
globalScope.angular = "Zupa";
globalScope.version = "0.1";
globalScope.selectedServer = globalScope.servers[0];
globalScope.version = "1.0";
globalScope.communnity = "";
globalScope.selectedServer = {};

$http.post(globalScope.serverURL + 'getServers.php?date='+ new Date().getTime(),{"db" : globalScope.selectedServer.dbi }).
success(function(data, status, headers, config) {
globalScope.servers = data;
globalScope.selectedServer = globalScope.servers[0];
globalScope.communnity = globalScope.selectedServer.community;
unEpochorize(data);
}).error(function(error){
alert("No server connection or misformed config file");
});


globalScope.getRandomColor = getRandomColor;
globalScope.getData = getData;
function getRandomColor() {
Expand All @@ -90,7 +101,7 @@ ERDBM.run(["$rootScope","storage","$location","$http","Data",
}
function getData(){
globalScope.loadingData = true;
$http.post(globalScope.serverURL + '?date='+ new Date().getTime(),{"db" : globalScope.selectedServer.dbi }).
$http.post(globalScope.serverURL + 'getNoLogDeathLogs.php?date='+ new Date().getTime(),{"db" : globalScope.selectedServer.dbi }).
success(function(data, status, headers, config) {
globalScope.data = data;
unEpochorize(data);
Expand All @@ -105,6 +116,9 @@ ERDBM.run(["$rootScope","storage","$location","$http","Data",
globalScope.players = {};
globalScope.weapons = {};

var now = new Date();


angular.forEach(data, function (value, key) {
if(value.killerpuid != undefined && value.killerpuid != ""){
if(!(value.killerpuid in globalScope.players)){
Expand All @@ -113,13 +127,27 @@ ERDBM.run(["$rootScope","storage","$location","$http","Data",
globalScope.players[value.killerpuid].puid = value.killerpuid;
globalScope.players[value.killerpuid].killsData = [];
globalScope.players[value.killerpuid].killedData = [];
globalScope.players[value.killerpuid].bots = 0;
globalScope.players[value.killerpuid].killsData7Days = [];
globalScope.players[value.killerpuid].killedData7Days = [];
globalScope.players[value.killerpuid].weapons = {};
}
if($.inArray(value.killername, globalScope.players[value.killerpuid].names) == -1){
globalScope.players[value.killerpuid].names.push(value.killername);
}
globalScope.players[value.killerpuid].killsData.push(value);


if(value.killedpuid != undefined && value.killedpuid != "" && value.killedpuid != " "){
globalScope.players[value.killerpuid].killsData.push(value);

var date = new Date(value.time);
var timeDiff = Math.abs(now.getTime() - date.getTime());
var diffDays = Math.ceil(timeDiff / (1000 * 3600 * 24));
if(diffDays < 8){
globalScope.players[value.killerpuid].killsData7Days.push(value);
}


}
}
if(value.killedpuid != undefined && value.killedpuid != ""){
if(!(value.killedpuid in globalScope.players)){
Expand All @@ -128,15 +156,24 @@ ERDBM.run(["$rootScope","storage","$location","$http","Data",
globalScope.players[value.killedpuid].killsData = [];
globalScope.players[value.killedpuid].puid = value.killedpuid;
globalScope.players[value.killedpuid].killedData = [];
globalScope.players[value.killedpuid].bots = 0;
globalScope.players[value.killedpuid].killsData7Days = [];
globalScope.players[value.killedpuid].killedData7Days = [];
globalScope.players[value.killedpuid].weapons = {};
}
if($.inArray(value.killedname, globalScope.players[value.killedpuid].names) == -1){
globalScope.players[value.killedpuid].names.push(value.killedname);
}
globalScope.players[value.killedpuid].killedData.push(value);

var date = new Date(value.time);
var timeDiff = Math.abs(now.getTime() - date.getTime());
var diffDays = Math.ceil(timeDiff / (1000 * 3600 * 24));
if(diffDays < 8){
globalScope.players[value.killedpuid].killedData7Days.push(value);
}

}else{
globalScope.players[value.killerpuid].bots++;

}
if(value.weapon != undefined && value.weapon != "" && value.weapon != " "){
if(!(value.weapon.trim() in globalScope.weapons)){
Expand Down Expand Up @@ -171,9 +208,26 @@ ERDBM.run(["$rootScope","storage","$location","$http","Data",
value.kd = value.killsData.length ;
else
value.kd = value.killsData.length / value.killedData.length;

if(value.killedData7Days.length == 0)
value.kd7 = value.killsData7Days.length ;
else
value.kd7 = value.killsData7Days.length / value.killedData7Days.length;


globalScope.players2.push(value);
});

globalScope.players2.sort(compareKills7);

angular.forEach(globalScope.players2, function (value, key) {
globalScope.players6.push(value);
});





globalScope.players2.sort(compareKills);

globalScope.weapons3 = [];
Expand Down Expand Up @@ -205,6 +259,19 @@ ERDBM.run(["$rootScope","storage","$location","$http","Data",
}
});

globalScope.players2.sort(compareKD7);

counter = 1;
globalScope.players5 = [];
angular.forEach(globalScope.players2, function (value, key) {
value.kdrank = counter;

if(value.killsData.length > 9){
globalScope.players5.push(value);
counter++;
}
});

globalScope.loadingData = false;

}
Expand All @@ -226,6 +293,14 @@ ERDBM.run(["$rootScope","storage","$location","$http","Data",
return 0;
}

function compareKills7(a,b) {
if (a.killsData7Days.length < b.killsData7Days.length)
return 1;
if (a.killsData7Days.length > b.killsData7Days.length)
return -1;
return 0;
}


function compareKD(a,b) {
if (a.kd < b.kd)
Expand All @@ -235,10 +310,18 @@ ERDBM.run(["$rootScope","storage","$location","$http","Data",
return 0;
}

function compareKD7(a,b) {
if (a.kd7 < b.kd7)
return 1;
if (a.kd7 > b.kd7)
return -1;
return 0;
}


}]);

ERDBM.factory("Data", ['$http', 'toaster',
ZupaStats.factory("Data", ['$http', 'toaster',
function ($http, toaster) { // This service connects to our REST API

var serviceBase = 'server/';
Expand Down Expand Up @@ -279,13 +362,13 @@ ERDBM.factory("Data", ['$http', 'toaster',
return obj;
}]);

ERDBM.directive('focus', function() {
ZupaStats.directive('focus', function() {
return function(scope, element) {
element[0].focus();
}
});

ERDBM.directive('passwordMatch', [function () {
ZupaStats.directive('passwordMatch', [function () {
return {
restrict: 'A',
scope:true,
Expand Down
25 changes: 3 additions & 22 deletions app/scripts/controllers/kills.js
View file
Expand Up @@ -7,35 +7,16 @@
* # MainCtrl
* Controller of the zepochRedisApp
*/
ERDBM
ZupaStats
.controller('KillsCtrl',["$scope","$rootScope","$location","$http", function ($scope,$rootScope,$location,$http) {
$(".nav li").removeClass("active");
$("#kills").addClass("active");
$http.defaults.headers.post["Content-Type"] = "application/x-www-form-urlencoded";

var MC = $scope;
var RS = $rootScope;
MC.loadingData = true;

MC.currentPage = 1;
MC.pageSize = 20;
$http.post(RS.serverURL + '?date='+ new Date().getTime(),{"db" : RS.selectedServer.dbi }).
success(function(data, status, headers, config) {
RS.data = data;
MC.unEpochorize(data);
MC.loadingData = false;
}).error(function(error){
});
MC.loadingData = false;
MC.unEpochorize = unEpochorize;
function unEpochorize(data){
RS.players = [];
RS.weapons = [];
angular.forEach(data, function (value, key) {




});
}

MC.changeLoc = changeLoc;
MC.view = view;
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/controllers/main.js
View file
Expand Up @@ -7,7 +7,7 @@
* # MainCtrl
* Controller of the zepochRedisApp
*/
ERDBM
ZupaStats
.controller('MainCtrl',["$scope","$rootScope","$location","$http", function ($scope,$rootScope,$location,$http) {
$(".nav li").removeClass("active");
$("#servers").addClass("active");
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/controllers/player.js
View file
Expand Up @@ -7,7 +7,7 @@
* # MainCtrl
* Controller of the zepochRedisApp
*/
ERDBM
ZupaStats
.controller('PlayerCtrl',["$scope","$rootScope","$location","$routeParams", function ($scope,$rootScope,$location,$routeParams) {
$(".nav li").removeClass("active");
$("#players").addClass("active");
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/controllers/players.js
View file
Expand Up @@ -7,7 +7,7 @@
* # MainCtrl
* Controller of the zepochRedisApp
*/
ERDBM
ZupaStats
.controller('PlayersCtrl',["$scope","$rootScope","$location","$http", function ($scope,$rootScope,$location,$http) {
$(".nav li").removeClass("active");
$("#players").addClass("active");
Expand Down

0 comments on commit 7b9aea5

Please sign in to comment.