diff --git a/app/controllers/simulation_controller.rb b/app/controllers/simulation_controller.rb index 4ceb44e1821711b1a937c50a29c9d8273e9876e7..afc0c1c2e29756f009fc8d290c0bf66fad6bd7f3 100644 --- a/app/controllers/simulation_controller.rb +++ b/app/controllers/simulation_controller.rb @@ -2,7 +2,7 @@ class SimulationController < ApplicationController def simulate - @start_saldos = Saldo.find_by_sql( + all_saldos = Saldo.find_by_sql( "SELECT saldos.id, saldos.amount, saldos.date, saldos.account_id FROM" + " (SELECT account_id, MAX(date) AS maxdate" + " FROM saldos GROUP BY account_id) AS maxx, saldos" + @@ -12,10 +12,14 @@ class SimulationController < ApplicationController @start_amount = 0 @start_date = nil - for saldo in @start_saldos - @start_amount += saldo.amount - if @start_date.nil? or @start_date < saldo.date - @start_date = saldo.date + @start_saldos = [] + for saldo in all_saldos + if saldo.account.shortterm == true + @start_amount += saldo.amount + @start_saldos << saldo + if @start_date.nil? or @start_date < saldo.date + @start_date = saldo.date + end end end