From 1dbc445cb52f52ccfbfeedb2f3d8b45bbb11275e Mon Sep 17 00:00:00 2001
From: Rhea Morrison <rhea.morrison@gmail.com>
Date: Thu, 21 Sep 2017 11:04:24 -0400
Subject: [PATCH] Fuse cash projection and cash flow legend icons

---
 .../accounts-cash-projection.directive.coffee          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/widgets/accounts-cash-projection/accounts-cash-projection.directive.coffee b/src/components/widgets/accounts-cash-projection/accounts-cash-projection.directive.coffee
index 6310eff2..47f84bc5 100644
--- a/src/components/widgets/accounts-cash-projection/accounts-cash-projection.directive.coffee
+++ b/src/components/widgets/accounts-cash-projection/accounts-cash-projection.directive.coffee
@@ -58,7 +58,6 @@ module.controller('WidgetAccountsCashProjectionCtrl', ($scope, $q, $filter, Impa
         $scope.trxList.totalRecords = response.data.meta.record_count
     )
 
-
   # Widget specific methods
   # --------------------------------------
   w.initContext = ->
@@ -77,6 +76,7 @@ module.controller('WidgetAccountsCashProjectionCtrl', ($scope, $q, $filter, Impa
       serie.name == "Cash flow"
     cashFlowSerie.data = []
     cashFlowSerie.type = 'area'
+    cashFlowSerie.showInLegend = false
 
     totalOffset = 0.0
     if w.metadata.offset && w.metadata.offset.current && w.metadata.offset.current.length > 0
@@ -118,10 +118,12 @@ module.controller('WidgetAccountsCashProjectionCtrl', ($scope, $q, $filter, Impa
     }
     $scope.trxList.fetch().finally(-> $scope.trxList.show())
 
+  imgSrc = (name) -> ImpacAssets.get(_.camelCase(name + 'LegendIcon'))
+  imgTemplate = (src, name) -> "<img src='#{src}'><br>#{name}"
   legendFormatter = ->
-    series = this
-    imgSrc = ImpacAssets.get(_.camelCase(series.name + 'LegendIcon'))
-    "<img src='#{imgSrc}'><br>  #{series.name}"
+    name = this.name
+    return imgTemplate(imgSrc(name), name) unless name == 'Projected cash'
+    imgTemplate(imgSrc(name), name) + '<br>' + imgTemplate(imgSrc('cashFlow'), 'Cash flow')
 
   w.format = ->
     # Chart basic options