From 61bba8e299dcb95987f9b27843c2c69c2526b8c9 Mon Sep 17 00:00:00 2001
From: Christophe Marchal <toff63@gmail.com>
Date: Sun, 7 Sep 2014 01:50:10 -0300
Subject: [PATCH] Adding supply cap information

I have added a graphic showing the supply. I need to improve variable names in javascript and sperate the graphic for both player. For each player I still have to remove the engagement highlight and put one for supply block.
---
 app/assets/javascripts/angular/resources/match.js | 13 ++++++++++++-
 app/views/matches/show.html.erb                   |  3 +++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/angular/resources/match.js b/app/assets/javascripts/angular/resources/match.js
index 7d51600..2ae3c9f 100644
--- a/app/assets/javascripts/angular/resources/match.js
+++ b/app/assets/javascripts/angular/resources/match.js
@@ -518,6 +518,7 @@ gg.factory('Match', ['$ggResource', '$compile', 'Matchnote', function($ggResourc
       replayminerals: {teams: [], entities: []},
       replaygas: {teams: [], entities: []},
       replayworkers: {teams: [], entities: []},
+      replayworkerscap: {teams: [], entities: []},
     };
 
     // Generate army chart series from armies?
@@ -568,6 +569,14 @@ gg.factory('Match', ['$ggResource', '$compile', 'Matchnote', function($ggResourc
 //        console.log("statarray", result);
         return result;
     }
+    
+    supply = function(supplyusage){
+        var currentSupply = [];
+	for (var frame=0; frame<supplyusage.length; frame++) {
+	    currentSupply.push(supplyusage[frame][0]);
+	}
+        return currentSupply;
+    }
 
     //    console.log("in series getter, this.armies = ", this.armies);
     
@@ -602,6 +611,8 @@ gg.factory('Match', ['$ggResource', '$compile', 'Matchnote', function($ggResourc
               this._series.replayminerals.entities[_entity] = $.extend({data: statx(this.MineralsCurrent[entity.identity.id])}, base_series);
               this._series.replaygas.entities[_entity] = $.extend({data: statx(this.VespeneCurrent[entity.identity.id])}, base_series);
               this._series.replayworkers.entities[_entity] = $.extend({data: statx(this.WorkersActiveCount[entity.identity.id])}, base_series);
+              this._series.replayworkerscap.entities[_entity] = $.extend({data: statx(supply(this.SupplyUsage[entity.identity.id]))}, base_series);
+console.log(this._series.replayworkerscap.entities[_entity] );
 
               if (entity.identity.id in this.MineralsCollectionRate) {
                   zippedIncome = _.zip(this.MineralsCollectionRate[entity.identity.id], this.VespeneCollectionRate[entity.identity.id]);
@@ -681,7 +692,7 @@ gg.factory('Match', ['$ggResource', '$compile', 'Matchnote', function($ggResourc
     // Add the team series
     for(var _team in this.teams) {
 
-      _keys = ['summary_army', 'summary_income', 'summary_workersactive', 'summary_upgradespending', 'apm', 'wpm', 'creep_spread', 'replayincome', 'replaygasincome', 'replaylost', 'replayminerals', 'replaygas', 'replayworkers', 'replaytotalincome'];
+      _keys = ['summary_army', 'summary_income', 'summary_workersactive', 'summary_upgradespending', 'apm', 'wpm', 'creep_spread', 'replayincome', 'replaygasincome', 'replaylost', 'replayminerals', 'replaygas', 'replayworkers', 'replayworkerscap', 'replaytotalincome'];
       for(var _stype in _keys) {
         _stype = _keys[_stype];
 
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index 98c7154..10c2d17 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -241,6 +241,9 @@ completed to when 3x640 = 1920 minerals per minute income is achieved." data-gra
     <chart id="replayworkers" class="grid_1 djcloak" ng-show="$parent.match.MineralsCurrent" data-series="match.series.replayworkers.combined" data-condensed="condensed" data-replaystats="true">
       <span class="title">workers active</span>
      </chart>
+    <chart id="replaysupply" class="grid_1 djcloak" ng-show="$parent.match.MineralsCurrent" data-series="match.series.replayworkerscap.combined" data-condensed="condensed" data-replaystats="true">
+      <span class="title">Supply</span>
+     </chart>
 
     <% if @match.summaries? %>
       <chart id="income" class="grid_1" ng-hide="$parent.match.ended_at > '2013-05-06'" data-series="match.series.summary_income.combined" data-condensed="condensed">