Skip to content

[IMPAC-669] Fuse cash projection and cash flow legend icons #412

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
xaun merged 1 commit into from
Sep 21, 2017
Merged

[IMPAC-669] Fuse cash projection and cash flow legend icons #412

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions src/components/widgets/accounts-cash-projection/accounts-cash-projection.directive.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ module.controller('WidgetAccountsCashProjectionCtrl', ($scope, $q, $filter, Impa
$scope.trxList.totalRecords = response.data.meta.record_count
)


# Widget specific methods
# --------------------------------------
w.initContext = ->
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down