new datepicker and some new charts stuff

dbsmash · Aug 8, 2014 · 1756b9b · 1756b9b
1 parent db8e2d3
commit 1756b9b
Show file tree

Hide file tree

Showing 31 changed files with 13,916 additions and 10 deletions.
diff --git a/app.yaml b/app.yaml
@@ -1,5 +1,5 @@
 application: field-promotion
-version: 9
+version: 10
 runtime: python27
 threadsafe: true
 api_version: 1

diff --git a/app/css/app.css b/app/css/app.css
@@ -123,5 +123,11 @@ h2{
   font: 13px sans-serif;
 }
 
-.text-header {
+.win-stats {
+  float: left;
+}
+
+.win-per {
+  float: left;
+  padding-left: 100px;
 }
diff --git a/app/index.html b/app/index.html
@@ -5,6 +5,7 @@
   <title>Field Promotion</title>
   <link rel="stylesheet" href="css/app.css"/>
   <link rel="stylesheet" href="css/bootstrap.css"/>
+  <link rel="stylesheet" href="lib/jquery-ui-1.11.0.custom/jquery-ui.min.css"/>
 </head>
 <body>
   <form>
@@ -35,7 +36,7 @@
   <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.0.7/angular.min.js"></script>
   -->
   <script src="lib/jquery-2.1.0.min.js"></script>
-  <script src="lib/jquery-ui-1.10.4.min.js"></script>
+  <script src="lib/jquery-ui-1.11.0.custom/jquery-ui.min.js"></script>
   <script src="lib/angular/angular.js"></script>
   <script src="lib/angular/angular-route.js"></script>
   <script src="lib/chart.js"></script>

diff --git a/app/js/controllers.js b/app/js/controllers.js
@@ -26,12 +26,21 @@ var iconMap = {
 };
 
 var RecordController = function($scope, GameService, FactionService) {
+	var self = this;
 	GameService.getGames($scope);
 	$scope.results = FactionService.getResults();
 	$scope.playerFactions = FactionService.getFactions();
 	$scope.opponentFactions = FactionService.getFactions();
 	$scope.gameTypes = FactionService.getGameTypes();
 	resetValues();
+	$("#record-date").datepicker({
+		dateFormat:'yy-mm-dd',
+        onSelect:function (date) {
+            $scope.$apply(function () {
+                $scope.newGame.date = date;
+            });
+        }
+	});
 
 	function resetValues() {
 		var newGame = {
@@ -208,7 +217,7 @@ var SearchController = function($scope, FactionService, GameService) {
 };
 
 var AnalyzeController = function($scope, StatsService) {
-	var loadChart = function(response) {
+	var loadFactionNumberChart = function(response) {
 		var names = [];
 		var wins = [];
 		var key;
@@ -235,7 +244,40 @@ var AnalyzeController = function($scope, StatsService) {
 		var ctx = document.getElementById("myChart").getContext("2d");
 		var myBarChart = new Chart(ctx).Bar(data);
 	};
-	var data = StatsService.getStats($scope, loadChart);
+
+	var loadFactionWinChart = function(response) {
+		var data = [];
+		var key;
+
+		for (key in response) {
+			if (response.hasOwnProperty(key)) {
+				var win_per = parseFloat(response[key].wins / response[key].nt_count * 100).toFixed(2);
+				data.push({
+					label: key,
+					value: win_per,
+					color: StatsService.getColorForFaction(key),
+					highlight: StatsService.getColorForFaction(key)
+				});
+			}
+		}
+
+		var options = {
+			scaleOverride: true,
+			scaleSteps: 10,
+			scaleStepWidth: 10,
+			scaleStartValue: 0,
+		};
+
+		var ctx = document.getElementById("myChart2").getContext("2d");
+		var myBarChart = new Chart(ctx).PolarArea(data, options);
+	};
+
+	var loadCharts = function(response) {
+		loadFactionNumberChart(response);
+		loadFactionWinChart(response);
+	}
+
+	var data = StatsService.getStats($scope, loadCharts);
 
 };
 

diff --git a/app/js/services.js b/app/js/services.js
@@ -13,8 +13,13 @@ var StatsService = function($http) {
         });
 	};
 
+	var getColorForFaction = function(faction) {
+		return colormap[faction];
+	};
+
 	return {
-		getStats: getStats
+		getStats: getStats,
+		getColorForFaction: getColorForFaction
     };
 };
 
@@ -122,6 +127,7 @@ var factions = [
 ];
 
 var gameTypes = [
+	'',
 	'Casual',
 	'Tournament',
 	'Convention',
@@ -300,6 +306,21 @@ var factionData = {
 	]
 };
 
+var colormap = {
+	"Khador":"#FE3116",
+	"Cygnar":"#2B4FD0",
+	"Protectorate of Menoth":"#EAECB1",
+	"Retribution of Scyrah":"#C5F9FB",
+	"Cryx":"#A8D734",
+	"Mercenaries":"#8E5C2E",
+	"Legion of Everblight":"#622491",
+	"Skorne":"#E02211",
+	"Circle Orboros":"#B1CE2A",
+	"Trollbloods":"#589FC8",
+	"Convergence of Cyriss":"#CAB9BC",
+	"Minions":"#23501B"
+};
+
 var results = [{"name":"Assassination Victory",
   "won":true,
   "teaching":false,