Skip to content

Commit

Permalink
Merge pull request #166 from DFID/bug-fix-mixed-currency-on-transacti…
Browse files Browse the repository at this point in the history 
…on-page

The transaction template page is updated to hide summed up amounts if…
  • Loading branch information
@g-shafiullah
g-shafiullah committed May 12, 2016
2 parents 951e45b + 0a8676e commit 5044cd7
Showing 1 changed file with 18 additions and 6 deletions.
24 changes: 18 additions & 6 deletions views/projects/transactions.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,11 @@ title: Development Tracker
</div>

<div class="trans-header-right">
<div class="<%= project['aggregations']['activity_children']['incoming_funds_value'].to_f.round(0) < 0 ? 'negative' : ''%> float-right trans-type-value"><%= Money.new(project['aggregations']['activity_children']['incoming_funds_value'].to_f.round(0)*100, project['aggregations']['activity_children']['incoming_funds_currency']).format(:no_cents_if_whole => true,:sign_before_symbol => false)%>
</div>
<%mixedCurrencyExists = transactions.select {|group| group['transaction_type']['code'] == '1' }.sort{ |a,b| b['transaction_date'] <=> a['transaction_date'] } %>
<% if mixedCurrencyExists.uniq{|m| m['currency']['code']}.count == 1%>
<div class="<%= project['aggregations']['activity_children']['incoming_funds_value'].to_f.round(0) < 0 ? 'negative' : ''%> float-right trans-type-value"><%= Money.new(project['aggregations']['activity_children']['incoming_funds_value'].to_f.round(0)*100, project['aggregations']['activity_children']['incoming_funds_currency']).format(:no_cents_if_whole => true,:sign_before_symbol => false)%>
</div>
<%end%>
</div>
</div>
<table class="transactions-table" style="width:100%">
Expand Down Expand Up @@ -122,8 +125,11 @@ title: Development Tracker
</div>

<div class="trans-header-right">
<div class="<%= project['aggregations']['activity_children']['commitment_value'].to_f.round(0) < 0 ? 'negative' : ''%> float-right trans-type-value"><%= Money.new(project['aggregations']['activity_children']['commitment_value'].to_f.round(0)*100, project['aggregations']['activity_children']['commitment_currency']).format(:no_cents_if_whole => true,:sign_before_symbol => false)%>
<%mixedCurrencyExists = transactions.select {|group| group['transaction_type']['code'] == '2' }.sort{ |a,b| b['transaction_date'] <=> a['transaction_date'] } %>
<% if mixedCurrencyExists.uniq{|m| m['currency']['code']}.count == 1%>
<div class="<%= project['aggregations']['activity_children']['commitment_value'].to_f.round(0) < 0 ? 'negative' : ''%> float-right trans-type-value"><%= Money.new(project['aggregations']['activity_children']['commitment_value'].to_f.round(0)*100, project['aggregations']['activity_children']['commitment_currency']).format(:no_cents_if_whole => true,:sign_before_symbol => false)%>
</div>
<%end%>
</div>
</div>
<table class="transactions-table" style="width:100%">
Expand Down Expand Up @@ -171,8 +177,11 @@ title: Development Tracker
</div>

<div class="trans-header-right">
<div class="<%= project['aggregations']['activity_children']['disbursement_value'].to_f.round(0) < 0 ? 'negative' : ''%> float-right trans-type-value"><%= Money.new(project['aggregations']['activity_children']['disbursement_value'].to_f.round(0)*100, project['aggregations']['activity_children']['disbursement_currency']).format(:no_cents_if_whole => true,:sign_before_symbol => false)%>
<%mixedCurrencyExists = transactions.select {|group| group['transaction_type']['code'] == '3' }.sort{ |a,b| b['transaction_date'] <=> a['transaction_date'] } %>
<% if mixedCurrencyExists.uniq{|m| m['currency']['code']}.count == 1%>
<div class="<%= project['aggregations']['activity_children']['disbursement_value'].to_f.round(0) < 0 ? 'negative' : ''%> float-right trans-type-value"><%= Money.new(project['aggregations']['activity_children']['disbursement_value'].to_f.round(0)*100, project['aggregations']['activity_children']['disbursement_currency']).format(:no_cents_if_whole => true,:sign_before_symbol => false)%>
</div>
<%end%>
</div>
</div>
<table class="transactions-table" style="width:100%">
Expand Down Expand Up @@ -223,8 +232,11 @@ title: Development Tracker
</div>

<div class="trans-header-right">
<div class="<%= project['aggregations']['activity_children']['expenditure_value'].to_f.round(0) < 0 ? 'negative' : ''%> float-right trans-type-value"><%= Money.new(project['aggregations']['activity_children']['expenditure_value'].to_f.round(0)*100, project['aggregations']['activity_children']['expenditure_currency']).format(:no_cents_if_whole => true,:sign_before_symbol => false)%>
</div>
<%mixedCurrencyExists = transactions.select {|group| group['transaction_type']['code'] == '4' }.sort{ |a,b| b['transaction_date'] <=> a['transaction_date'] } %>
<% if mixedCurrencyExists.uniq{|m| m['currency']['code']}.count == 1%>
<div class="<%= project['aggregations']['activity_children']['expenditure_value'].to_f.round(0) < 0 ? 'negative' : ''%> float-right trans-type-value"><%= Money.new(project['aggregations']['activity_children']['expenditure_value'].to_f.round(0)*100, project['aggregations']['activity_children']['expenditure_currency']).format(:no_cents_if_whole => true,:sign_before_symbol => false)%>
</div>
<%end%>
</div>
</div>
<table class="transactions-table" style="width:100%">
Expand Down

0 comments on commit 5044cd7

Please sign in to comment.