treasurer 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 931217424d6cdc37f7c8dcc760fd08bc9d5d2a3d
-  data.tar.gz: a48e8e11f67f770600ff93f6506a4eed78eb2c8d
+  metadata.gz: b5eb9890a54a614720f287ec3cd65d77478b8225
+  data.tar.gz: 7341d4cb3c37507bdacf15b7d49b53d83de79749
 SHA512:
-  metadata.gz: abb2e38f758b4737b9084479661e274a2dcc5fb536b01327d032374991ab02da419fb33d412fdd26799da0ebe53b018bf73fe77cff90a361dfe3668384e232c1
-  data.tar.gz: 9abf97d6b4166d1e71b636d0486ab69369f7645644882b0d212541d19f37ae90e35cc4f8a823cdb3f39221ab9d99dd76ba9763c39b6cfa909d71082525f7edbe
+  metadata.gz: 3e86953149b37629f61297e90beeb3ebc7e41b70816f38c45f332a3f333fd40b5bd3b40a696c69b6dc33d2a103e590653ac13e9926280c5a95e3bdc6d9d0b252
+  data.tar.gz: c58e49206abb4f80e48a98af57659374aa14d38841c110ac1bc73bb1b6825b2961e82f978addf28273683e43310e4756e65c451d88d0554442f2784d8d47fa65

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/treasurer/accounts.rb

@@ -15,7 +15,7 @@ class Treasurer::Reporter
   end
   class Account
     attr_reader :name, :external, :runs, :currency
-    attr_accessor :projection, :average
+    attr_accessor :projection, :average, :original_currency
     def initialize(name, reporter, runner, runs, external, options={})
       @name = name
       @reporter = reporter
@@ -28,7 +28,7 @@ class Treasurer::Reporter
         #@external ? r.external_account : r.account) == name}
         if not @external
           r.account == name
-        elsif info and cur = info[:currencies] and cur.size > 1
+        elsif @currency and info and cur = info[:currencies] and cur.size > 1
           #p ['checking11', name, @currency, ACCOUNT_INFO[r.account]] if name == r.external_account and @currency
           r.external_account == name and acinfo = ACCOUNT_INFO[r.account] and acinfo[:currencies] == [@currency]
         else 
@@ -51,7 +51,12 @@ class Treasurer::Reporter
     end
     def red_line(date)
       if Treasurer::LocalCustomisations.instance_methods.include? :red_line
-        super(name, date)
+        val = super(name, date)
+        if rc = @report_currency
+          er = EXCHANGE_RATES[[@original_currency,rc]]
+          val *= er
+        end
+        val
       else 
         0.0
       end
@@ -75,9 +80,14 @@ class Treasurer::Reporter
       if @external or not has_balance?
         #p ['name is ', name, type]
         #
-        balance = (@runs.find_all{|r| r.date <= date and r.date >= opening_date }.map{|r| money_in_sign * (r.deposit - r.withdrawal) * (@external ? -1 : 1)}.sum || 0.0)
-        balance += info[:opening_balance] if info[:opening_balance]
-        balance
+        if type == :Expense
+          balance = (@runs.find_all{|r| r.date <= date and r.date >= @reporter.start_date }.map{|r| money_in_sign * (r.deposit - r.withdrawal) * (@external ? -1 : 1)}.sum || 0.0)
+
+        else
+          balance = (@runs.find_all{|r| r.date <= date and r.date >= opening_date }.map{|r| money_in_sign * (r.deposit - r.withdrawal) * (@external ? -1 : 1)}.sum || 0.0)
+          balance += info[:opening_balance] if info[:opening_balance]
+          balance
+        end
         #Temporary....
         #0.0
       else
@@ -87,20 +97,20 @@ class Treasurer::Reporter
       end
     end
     def deposited(today, days_before, &block)
-      #p ['name22 is ', name, type, @runs.size]
+      p ['name223344 is ', name_c, today, days_before]
       #@runs.find_all{|r| r.days_ago(today) < days_before and (!block or yield(r)) }.map{|r| (@external and not ([:Liability, :Income].include?(type))) ? r.withdrawal : r.deposit }.sum || 0
-      @runs.find_all{|r| r.days_ago(today) < days_before and (!block or yield(r)) }.map{|r| (@external) ? r.withdrawal : r.deposit }.sum || 0
+      @runs.find_all{|r| r.days_ago(today) < days_before and r.date <= today and (!block or yield(r)) }.map{|r| (@external) ? r.withdrawal : r.deposit }.sum || 0
     end
     def withdrawn(today, days_before)
       #@runs.find_all{|r| r.days_ago(today) < days_before }.map{|r| (@external and not ([:Liability, :Income].include?(type))) ? r.deposit : r.withdrawal }.sum || 0
-      @runs.find_all{|r| r.days_ago(today) < days_before }.map{|r| (@external) ? r.deposit : r.withdrawal }.sum || 0
+      @runs.find_all{|r| r.days_ago(today) < days_before and r.date <= today }.map{|r| (@external) ? r.deposit : r.withdrawal }.sum || 0
     end
     def currency
       @currency || (info[:currencies] && info[:currencies][0])
     end
     def currency_label
-      if @currency
-        " (#@currency)"
+      if currency
+        " (#{currency}#{@original_currency ? "<-#@original_currency" : ""})"
       else
         ''
       end
@@ -110,7 +120,7 @@ class Treasurer::Reporter
       name + currency_label
     end
     def name_c_file
-      name_c.to_s.gsub(/[: ()]/, '_')
+      name_c.to_s.gsub(/[: ()<-]/, '_')
     end
 
     def summary_table(today, days_before)
@@ -154,30 +164,49 @@ EOF
       #(discretionary ? @reporter.sum_regular({name => info}, date) : 0.0)
     end
     def linked_projected_account_info
-      Hash[@reporter.projected_accounts_info.find_all{|ext_ac,inf| inf[:linked_account] == name and ext_ac.currency == currency}]
+      #Hash[@reporter.projected_accounts_info.find_all{|ext_ac,inf| inf[:linked_accounts] == name and ext_ac.currency == currency}]
+      Hash[@reporter.projected_accounts_info.find_all{|ext_ac,inf| inf[:linked_accounts][original_currency] and inf[:linked_accounts][original_currency] == name and ext_ac.original_currency == original_currency}]
     end
     def cache
       @cache ||={}
     end
     def non_discretionary_projected_balance(date)
       #ep ['FUTURE_INCOME', FUTURE_INCOME, name] if FUTURE_INCOME.size > 0
+      if not (@futures and @regulars)
+        @futures = Marshal.load(Marshal.dump(FUTURE_TRANSFERS))
+        @regulars = Marshal.load(Marshal.dump(REGULAR_TRANSFERS))
+        [@regulars, @futures].each do |transfers|
+          @accounts_hash = @reporter.accounts_hash
+          transfers.each do |accs, trans|
+            next unless accs.include? name
+            trans.each do |item, details|
+              if  details[:currency] != currency
+                #p ['LAGT(O', details[:currency], currency, details, name_c, item]
+                details[:size] *= EXCHANGE_RATES[[details[:currency], currency]]
+              end
+            end
+          end
+        end
+      end
+           
+          
       cache[[:non_discretionary_projected_balance, date]] ||= 
         balance +
         #@reporter.sum_regular(REGULAR_EXPENDITURE[name], date) + 
         #@reporter.sum_regular(REGULAR_INCOME[name], date) -  
         #@reporter.sum_future(FUTURE_EXPENDITURE[name], date) + 
         #@reporter.sum_future(FUTURE_INCOME[name], date) + 
-        (FUTURE_TRANSFERS.keys.find_all{|from,to| to == name}.map{|key|
-          @reporter.sum_future(FUTURE_TRANSFERS[key], date) * money_in_sign
+        (@futures.keys.find_all{|from,to| to == name}.map{|key|
+          @reporter.sum_future(@futures[key], date) * money_in_sign
         }.sum||0) - 
-        (FUTURE_TRANSFERS.keys.find_all{|from,to| from == name}.map{|key|
-          @reporter.sum_future( FUTURE_TRANSFERS[key], date) * money_in_sign
+        (@futures.keys.find_all{|from,to| from == name}.map{|key|
+          @reporter.sum_future( @futures[key], date) * money_in_sign
         }.sum||0) +
-        (REGULAR_TRANSFERS.keys.find_all{|from,to| to == name}.map{|key|
-          @reporter.sum_regular(REGULAR_TRANSFERS[key], date) * money_in_sign
+        (@regulars.keys.find_all{|from,to| to == name}.map{|key|
+          @reporter.sum_regular(@regulars[key], date) * money_in_sign
         }.sum||0) - 
-        (REGULAR_TRANSFERS.keys.find_all{|from,to| from == name}.map{|key|
-          @reporter.sum_regular( REGULAR_TRANSFERS[key], date) * money_in_sign
+        (@regulars.keys.find_all{|from,to| from == name}.map{|key|
+          @reporter.sum_regular( @regulars[key], date) * money_in_sign
         }.sum||0)  
     end
     # Write an eps graph to disk of past and projected
@@ -203,9 +232,12 @@ EOF
       #ep ['projected_account_factor!!!!', @reporter.projected_account_factor]
       stable = futuredates.map{|date| projected_balance(date)}
       kit5 = GraphKit.quick_create([futuredates.map{|d| d.to_time.to_i}, stable])
+
+      [kit2,kit4,kit5].each{|k| k.data[0].y.data[0] = balance(today)}
       #exit
       @reporter.projected_account_factor = nil
-      kit += (kit2 + kit4 + kit5)
+      kit += ( kit4 + kit5 + kit2)
+      kit.yrange = [kit.data.map{|dk| dk.y.data.min}.min, kit.data.map{|dk| dk.y.data.max}.max]
       #kit += (kit2)
       kit = kit3 + kit
       kit.title = "Balance for #{name_c}"
@@ -216,11 +248,12 @@ EOF
 
       kit.data[0].gp.title = 'Limit'
       kit.data[1].gp.title = 'Previous'
-      kit.data[2].gp.title = '0 GBP Discretionary'
-      kit.data[2].gp.title = 'Projection'
-      kit.data[3].gp.title = 'Limit'
-      kit.data[4].gp.title = 'Stable'
+      #kit.data[2].gp.title = '0 GBP Discretionary'
+      kit.data[2].gp.title = 'Avoid Limit'
+      kit.data[3].gp.title = 'Stable'
+      kit.data[4].gp.title = 'Projection'
       kit.data.each{|dk| dk.gp.with = "l lw 5"}
+      kit.data[4].gp.with = "l lw 5 dt 2 lc rgb 'black' "
       kit.gp.key = ' bottom left '
       kit.gp.key = ' rmargin '
 
@@ -276,7 +309,7 @@ EOF
         else
           0.0
         end
-      }.sum
+      }.sum + sum_of_assets
     end
     def projected_balance(date=@reporter.today)
       @accounts.map{|acc|
@@ -288,7 +321,10 @@ EOF
         else
           0.0
         end
-      }.sum
+      }.sum + sum_of_assets
+    end
+    def sum_of_assets
+      ASSETS.find_all{|name,details| details[:currency] == currency}.map{|name,details| details[:size]}.sum or 0.0
     end
     def summary_table(today, days_before)
 

data/lib/treasurer/analysis.rb

@@ -1,4 +1,11 @@
-
+class Date
+  def days_in_month
+    self.class.new(year, month, -1).mday
+  end
+  def days_in_year
+    self.class.new(year, 12, -1).yday
+  end
+end
 class Treasurer::Reporter
 module Analysis
 	# Within the range of the report, return a list
@@ -7,38 +14,46 @@ module Analysis
 	# for each period and a list of the items within
 	# each period
 	def account_expenditure(account, options={})
-		dates = []
+    start_dates = []
+		end_dates = []
 		expenditures = []
 		account_items = []
 		date = account.info[:end]||@today
 		#start_date = [(account.info[:start]||@start_date), @start_date].max
 		expenditure = 0
 		items_temp = []
-    items = @runner.component_run_list.values.find_all{|r| r.external_account == account.name and r.in_date(account.info) and @accounts_hash[r.account].currency == account.currency}
+    items = @runner.component_run_list.values.find_all{|r| r.external_account == account.name and r.in_date(account.info) and @accounts_hash[r.account].original_currency == account.original_currency}
     #ep ['items', items.map{|i| i.date}]
     #ep ['account', account.name_c]
 		counter = 0
 		if not account.info[:period]
-			dates.push date
+      start_dates.push date
+			end_dates.push date
 			account_items.push items
 			expenditures.push (items.map{|r| (r.deposit - r.withdrawal) * (account.info[:external] ? -1 : 1)}+[0]).sum
 		else
-
+      end_date = nil
 			case account.info[:period][1]
 			when :month
+        crossed_boundary = false
 				while date > @start_date
-					items_temp += items.find_all{|r| r.date == date}
-					if date.mday == (account.info[:monthday] or 1)
+					if (date+1).mday == (account.info[:monthday] or 1)
 						counter +=1
 						if counter % account.info[:period][0] == 0
-							expenditure = (items_temp.map{|r| (r.deposit - r.withdrawal) * (account.info[:external] ? -1 : 1)}+[0]).sum
-							dates.push date
-							expenditures.push expenditure
-							account_items.push items_temp
-							items_temp = []
-							expenditure = 0
+              if crossed_boundary # We only calcate expenditures for whole periods.
+                expenditure = (items_temp.map{|r| (r.deposit - r.withdrawal) * (account.info[:external] ? -1 : 1)}+[0]).sum
+                end_dates.push end_date
+                start_dates.push date+1
+                expenditures.push expenditure
+                account_items.push items_temp
+              end
+              end_date = date
+              crossed_boundary = true
+              items_temp = []
+              expenditure = 0
 						end
 					end
+					items_temp += items.find_all{|r| r.date == date}
 					date-=1
 				end
 			when :day
@@ -48,7 +63,7 @@ module Analysis
 					counter +=1
 					if counter % account.info[:period][0] == 0
 						expenditure = (items_temp.map{|r| (r.deposit - r.withdrawal) * (account.info[:external] ? -1 : 1)}+[0]).sum
-						dates.push date
+						end_dates.push date
 						expenditures.push expenditure
 						account_items.push items_temp
 						items_temp = []
@@ -59,7 +74,7 @@ module Analysis
 			end
 		end
 
-		[dates, expenditures, account_items]
+		[start_dates, end_dates, expenditures, account_items]
 
 	end
 	# Work out the average spend from the account and include it in the account info
@@ -68,7 +83,8 @@ module Analysis
 	 projected_accounts_info.each{|key,v| projected_accounts_info[key]=projected_accounts_info[key].dup}
 	 projected_accounts_info.each do |account, account_info|
 		 #account_info = accounts[account]
-		 _dates, expenditures, _items = account_expenditure(account, account_info)
+		 #_dates, expenditures, _items = account_expenditure(account, account_info)
+		 _start_dates, _dates, expenditures, _items = account_expenditure(account)
      account.average = expenditures.mean rescue 0.0
 	 end
 	 projected_accounts_info
@@ -79,7 +95,7 @@ module Analysis
 	 #projected_accounts_info.each{|key,v| projected_accounts_info[key]=projected_accounts_info[key].dup}
 	 projected_accounts.each do |account|
 		 #account_info = accounts[account]
-		 _dates, expenditures, _items = account_expenditure(account)
+		 _start_dates, _dates, expenditures, _items = account_expenditure(account)
 		 account.projection = expenditures.mean rescue 0.0
 	 end
    projected_accounts.map{|acc| [acc, acc.info]}.to_h
@@ -106,18 +122,18 @@ module Analysis
 	# items that fall before end_date
 	def sum_future(future_items, end_date, options={})
 	  #end_date = @today + @days_ahead
-		sum = future_items.inject(0.0) do |sum, (name, item)| 
+		sum_out  = future_items.inject(0.0) do |sum, (_name, item)| 
 			item = [item] unless item.kind_of? Array
-			value = item.inject(0.0) do |value,info|
+			value_out = item.inject(0.0) do |value,info|
 				value += info[:size] unless ((@today||Date.today) > info[:date]) or (info[:date] > end_date) # add unless we have already passed that date
 				value
 				
 			end
 			#ep ['name2223', name, item, value, end_date, @today, (@today||Date.today > item[0][:date]), (item[0][:date] > end_date)]
-			sum + value
+			sum + value_out
 			#rcp.excluding.include?(name) ? sum : sum + value
 		end
-		sum
+		sum_out
 	end
 	# Sum every future occurence of the given 
 	# regular items that falls within the account period
@@ -130,46 +146,55 @@ module Analysis
 				finish = (info[:end] and info[:end] < end_date) ? info[:end] : end_date
 				#today = (Time.now.to_i / (24.0*3600.0)).round
 				 
-				nunits = 0
+        nunits = 0.0
 				counter = info[:period][0] == 1 ? 0 : nil
 				unless counter
 					date = @today
 					counter = 0
 					case info[:period][1]
 					when :month
-						while date >= (info[:start] or Date.today)
+						while date >= (info[:start] or @today)
 							counter +=1 if date.mday == (info[:monthday] or 1)
 							date -= 1
 						end
 					when :year
-						while date >= (info[:start] or Date.today) 
+						while date >= (info[:start] or @today) 
 							counter +=1 if date.yday == (info[:yearday] or 1)
 							date -= 1
 						end
 					when :day
-						while date > (info[:start] or Date.today)
+						while date > (info[:start] or @today)
 							counter +=1
 							date -= 1
 						end
 					end
 				end
+        delta_units = account.kind_of?(Account) &&  account.projection
 				date = @today
 				case info[:period][1]
 				when :month
 					#p date, info
 					while date <= finish 
-						if date.mday == (info[:monthday] or 1)
-							nunits += 1 if counter % info[:period][0] == 0
-							counter +=1 
-						end
+            if delta_units 
+              nunits += 1.0/date.days_in_month
+            else
+              if date.mday == (info[:monthday] or 1)
+                nunits += 1 if counter % info[:period][0] == 0
+                counter +=1 
+              end
+            end
 						date += 1
 					end
 				when :year
 					while date <= finish
-						if date.yday == (info[:yearday] or 1)
-							nunits += 1 if counter % info[:period][0] == 0
-							counter +=1
-						end
+            if delta_units
+              nunits += 1.0/date.days_in_year
+            else
+              if date.yday == (info[:yearday] or 1)
+                nunits += 1 if counter % info[:period][0] == 0
+                counter +=1
+              end
+            end
 						date += 1
 					end
 				when :day

data/lib/treasurer/commands.rb

@@ -24,7 +24,7 @@ class << self
 	end
 	def fetch_reporter(copts = {})
 		load_treasurer_folder(copts)
-		reporter = Reporter.new(CodeRunner.fetch_runner(h: :component, A: true), days_before: copts[:b]||360, days_ahead: copts[:a]||180, today: copts[:t])
+		reporter = Reporter.new(CodeRunner.fetch_runner(h: :component, A: true), days_before: copts[:b]||360, days_ahead: copts[:a]||180, today: copts[:t], report_currency: copts[:r])
 	end
   def status(copts={})
     load_treasurer_folder(copts)

data/lib/treasurer/report.rb

@@ -1,5 +1,11 @@
 require 'active_support/core_ext/integer/inflections'
 
+class Array
+  def median
+    self.sort[size/2 + size%2]
+  end
+end
+
 class Float
   def to_s
     sprintf("%.2f", self)
@@ -59,7 +65,7 @@ end
 class Treasurer
   class Reporter
     #include LocalCustomisations
-    attr_reader :today
+    attr_reader :today, :start_date, :end_date
     attr_reader :in_limit_discretionary_account_factors
     attr_reader :stable_discretionary_account_factors
     attr_accessor :projected_account_factor
@@ -67,6 +73,8 @@ class Treasurer
     attr_reader :equity
     attr_reader :projected_accounts_info
     attr_reader :days_before 
+    attr_reader :report_currency
+    attr_reader :accounts_hash
     def initialize(runner, options)
       @runner = runner
       @days_ahead = options[:days_ahead]||180
@@ -76,6 +84,7 @@ class Treasurer
       @end_date = @today + @days_ahead
       @runs = runner.component_run_list.values
       @currencies = ACCOUNT_INFO.map{|k,v| v[:currencies]}.flatten.uniq
+      @report_currency = options[:report_currency]
 
       if run = @runs.find{|r| not r.external_account}
         raise "External_account not specified for #{run.data_line}" 
@@ -89,22 +98,62 @@ class Treasurer
     def generate_accounts
       accounts = @runs.map{|r| r.account}.uniq.map{|acc| Account.new(acc, self, @runner, @runs, false)} 
       external_accounts = (@runs.map{|r| r.external_account}.uniq - accounts.map{|acc| acc.name}).map{|acc| Account.new(acc, self, @runner, @runs, true)} 
-      external_accounts = external_accounts.map do |acc|
-        if acc_inf = ACCOUNT_INFO[acc.name] and currencies = acc_inf[:currencies] and currencies.size > 1
-          raise "Only expense accounts can have multiple currencies: #{acc.name} has type #{acc.type}" unless acc.type == :Expense
-          new_accounts = currencies.map do |curr|
-            Account.new(acc.name, self, @runner, @runs, true, currency: curr)
+      #if not @report_currency
+        external_accounts = external_accounts.map do |acc|
+          if acc_inf = ACCOUNT_INFO[acc.name] and currencies = acc_inf[:currencies] and currencies.size > 1
+            raise "Only expense accounts can have multiple currencies: #{acc.name} has type #{acc.type}" unless acc.type == :Expense
+            new_accounts = currencies.map do |curr|
+              Account.new(acc.name, self, @runner, @runs, true, currency: curr)
+            end
+            new_accounts.delete_if{|a| a.runs.size == 0}
+            new_accounts
+          else
+            acc
           end
-          new_accounts.delete_if{|a| a.runs.size == 0}
-          new_accounts
-        else
-          acc
         end
-      end
+      #end
       external_accounts = external_accounts.flatten
       @accounts = accounts + external_accounts
       @expense_accounts = @accounts.find_all{|acc| acc.type == :Expense}
-      @accounts_hash = accounts.map{|acc| [acc.name, acc]}.to_h
+      @accounts_hash = @accounts.map{|acc| [acc.name, acc]}.to_h
+
+      if @report_currency
+        @runs.each do |r|
+          if (curr = @accounts_hash[r.account].currency) != @report_currency
+            er = EXCHANGE_RATES[[curr, @report_currency]]
+            r.deposit *= er
+            r.withdrawal *= er
+            r.balance *= er if r.has_balance?
+          end
+        end
+        ASSETS.each do |name, details|
+          details[:size] *= EXCHANGE_RATES[[details[:currency], @report_currency]] if details[:currency]!=@report_currency
+          details[:currency] = @report_currency
+        end
+        [REGULAR_TRANSFERS, FUTURE_TRANSFERS].each do |transfers|
+          transfers.each do |accs, trans|
+            #acc = accs.find{|a| p a, @accounts_hash.keys, @accounts.map{|ac| ac.name}; not @accounts_hash[a].external}
+            trans.each do |item, details|
+              if details[:currency] != @report_currency
+                #p item, acc, curr, @report_currency
+                details[:size] *= EXCHANGE_RATES[[details[:currency], @report_currency]]
+                details[:currency] = @report_currency
+              end
+            end
+          end
+        end
+        @accounts.each do |acc|
+          if acc.info[:opening_balance]
+            if acc.currency != @report_currency
+              acc.info[:opening_balance] *= EXCHANGE_RATES[[acc.currency, @report_currency]]
+            end
+          end
+          acc.instance_variable_set(:@original_currency, acc.currency)
+          acc.instance_variable_set(:@currency, @report_currency)
+          acc.info[:currencies] = [@report_currency]
+        end
+
+      end
       get_projected_accounts
       #p ['projected_accounts_info', @projected_accounts_info]
       #exit
@@ -115,6 +164,7 @@ class Treasurer
       end
       @equities = @equities.to_h
     end
+     
     def report
       generate_accounts
       #get_actual_accounts
@@ -149,12 +199,18 @@ class Treasurer
       <<EOF
 \\section{Summary of Accounts}
       #{[:Equity, :Asset, :Liability, :Income, :Expense].map{|type|
+      accs = @accounts.find_all{|acc| acc.type == type }
       "\\subsection{#{type}}
     \\begin{tabulary}{0.9\\textwidth}{ R | c | c | c}
     Account & Balance & Deposited & Withdrawn \\\\
     \\hline
     \\Tstrut
-      #{@accounts.find_all{|acc| acc.type == type }.map{|acc| acc.summary_line(@today, @days_before)}.join("\\\\\n")}
+      #{(accs.map{|acc| acc.summary_line(@today, @days_before)} + 
+      (type == :Asset ? ASSETS.map{|n,details| "#{n} (#{details[:currency]}) & #{details[:size]} & & "} : [])).join("\\\\\n")}
+      #{type!=:Equity&&false ? "
+      \\\\ \\hline
+      \\Tstrut
+      Totals & #{accs.map{|a| a.balance}.sum} & #{accs.map{|a| a.deposited(@today, @days_before)}.sum} & #{accs.map{|a| a.withdrawn(@today, @days_before)}.sum} \\\\ " : "\\\\"}
     \\end{tabulary}"
       }.join("\n\n")}
 EOF
@@ -175,21 +231,13 @@ EOF
     def expense_account_summary
       <<EOF
 \\section{Expense Account Summary}
-\\subsection{Budget Period}
+\\subsection{Totals for #@days_before-day Budget Period}
       #{expense_pie_charts_by_currency('accountperiod', @expense_accounts){|r| r.days_ago(@today) < @days_before}}
-\\subsection{Last Week}
-      #{expense_pie_charts_by_currency('lastweekexpenses', @expense_accounts){|r| 
-      #p ['r.daysago', r.days_ago(@today)]; 
-      r.days_ago(@today) < 7}}
-\\subsection{Last Month}
-      #{expense_pie_charts_by_currency('lastmonthexpenses', @expense_accounts){|r| r.days_ago(@today) < 30}}
-\\subsection{Last Year}
-      #{expense_pie_charts_by_currency('lastyearexpenses', @expense_accounts){|r| r.days_ago(@today) < 365}}
-\\section{Expense Account Breakdown}
+\\subsection{Expense Account Breakdown}
       #{@expense_accounts.map{|account|
       #ep ['sub_accounts2124', account.sub_accounts.map{|sa| sa.name}]
       "\\subsection{#{account.name_c}} 
-      #{expense_pie_chart(account.name_c_file + 'breakdown', account.sub_accounts){|r|r.days_ago(@today) < @days_before }}"
+      #{expense_pie_chart(account.name_c_file + 'breakdown', account.sub_accounts, account){|r|r.days_ago(@today) < @days_before }}"
       }.join("\n\n")}
 EOF
 
@@ -215,13 +263,33 @@ EOF
         end
       ).join("\n\n")
     end
-    def expense_pie_chart(name, accounts, &block)
+    def expense_pie_chart(name, accounts, subacc=nil, &block)
       #expaccs = accounts.find_all{|acc| acc.type == :Expense}
       labels = accounts.map{|acc| acc.name}
-      exps = accounts.map{|acc| acc.deposited(@today, 50000, &block)}
-      labels, exps = [labels, exps].transpose.find_all{|l, e| e != 0.0}.transpose
       #ep ['labels22539', name, labels, exps]
-      return "No expenditure in account period." if labels == nil
+
+      kit = if subacc
+        start_dates, end_dates, _exps, _items = account_expenditure(subacc)
+        end_dates = end_dates.reverse #Now from earliest to latest
+        start_dates = start_dates.reverse
+        pp ['DATES', start_dates, end_dates, subacc.name]
+        return "No expenditure in account period." if end_dates.size==0
+        k = (
+          end_dates.size.times.map do |i|
+            exps = accounts.map{|acc| acc.deposited(end_dates[i], end_dates[i] - start_dates[i], &block)}
+            kt = GraphKit.quick_create([labels.size.times.to_a.map{|l| l.to_f + i.to_f/end_dates.size.to_f}, exps])
+            kt.data[0].gp.title = "Ending #{end_dates[i].strftime("#{end_dates[i].mday.ordinalize} %B")}; total = #{exps.sum}"
+            kt.gp.key = "tmargin"
+            kt
+          end
+        ).sum
+        k
+      else
+        exps = accounts.map{|acc| acc.deposited(@today, 50000, &block)}
+        labels, exps = [labels, exps].transpose.find_all{|l, e| e != 0.0}.transpose
+        return "No expenditure in account period." if not labels #<F8> labels.size==0
+        GraphKit.quick_create([labels.size.times.to_a, exps])
+      end
 
 
       #sum = exps.sum
@@ -231,21 +299,20 @@ EOF
       #end_angles = angles.inject(-angles[0]){|o,n| o+n}
 
 
-      kit = GraphKit.quick_create([labels.size.times.to_a, exps])
-      kit.data[0].gp.with = 'boxes'
-      kit.gp.boxwidth = "#{0.8} absolute"
+      kit.data.each{|dk| dk.gp.with = 'boxes'}
+      kit.gp.boxwidth = "#{0.8/kit.data.size} absolute"
       kit.gp.style = "fill solid"
-      kit.gp.yrange = "[#{[kit.data[0].x.data.min,0].min}:]"
+      kit.gp.yrange = "[#{[kit.data[0].y.data.min,0].min}:]"
       #kit.gp.xrange = "[-1:#{labels.size+1}]"
       kit.gp.xrange = "[-1:1]" if labels.size==1
       kit.gp.grid = "ytics"
       kit.xlabel = nil
       kit.ylabel = nil
-      #pp ['kit222', kit, labels]
       i = -1
       kit.gp.xtics = "(#{labels.map{|l| %["#{l}" #{i+=1}]}.join(', ')}) rotate by 315"
+      pp ['kit222', kit, labels]
       fork do 
-        kit.gnuplot_write("#{name}.eps", size: "4.0in,1.8in")
+        kit.gnuplot_write("#{name}.eps", size: "4.0in,2.0in")
         %x[epspdf #{name}.eps]
       end
 
@@ -285,10 +352,11 @@ EOF
           #ep ['projected_account_factor', date, balances.mean, @projected_account_factor,  @equities[currency].balance(@today), ok]
         end
         ok = false if balances.mean < @equities[currency].balance(@today) - 0.001
+        #ok = false if balances.median < @equities[currency].balance(@today) - 0.001
         @stable_discretionary_account_factors[currency] = @projected_account_factor
         break if (@projected_account_factor <= 0.0 or ok == true)
         @projected_account_factor -= 0.01
-        @projected_account_factor -= 0.1
+        #@projected_account_factor -= 0.1
       end
       @projected_account_factor = nil
       #exit
@@ -324,20 +392,23 @@ EOF
       "#{accounts.map{|account| 
         account_info = account.info
         #ep ['accountbadf', account, account_info]
-        dates, expenditures, _items = account_expenditure(account)
+        start_dates, dates, expenditures, _items = account_expenditure(account)
         ep ['accountbadf', account.name_c, account_info, expenditures]
         if dates.size == 0
           ""
         else
           #ep ['account', account, dates, expenditures]
-          kit = GraphKit.quick_create([dates.map{|d| d.to_time.to_i}, expenditures])
+          plotdates = dates.zip(start_dates).map{|d, s| (d.to_time.to_i + s.to_time.to_i)/2.0}
+          kit = GraphKit.quick_create([plotdates, expenditures])
           kit.data.each{|dk| dk.gp.with="boxes"}
           kit.gp.style = "fill solid"
           kit.xlabel = nil
           kit.ylabel = "Expenditure"
           kit.data[0].gp.with = 'boxes'
           dat = kit.data[0].x.data
-          kit.gp.boxwidth = "#{(dat.max.to_f  - dat.min.to_f)/dat.size * 0.8} absolute"
+          barsize = (dat.max.to_f  - dat.min.to_f)/dat.size * 0.8
+          kit.gp.boxwidth = "#{barsize} absolute"
+          dat.map!{|d| d - barsize*1.1}
           kit.gp.yrange = "[#{[kit.data[0].y.data.min,0].min}:]"
           #kit.gp.xrange = "[-1:#{labels.size+1}]"
           #kit.gp.xrange = "[-1:1]" if labels.size==1
@@ -348,7 +419,7 @@ EOF
             kits = accounts_with_averages({account => account_info}).map{|account, account_info| 
               #ep 'Budget is ', account
               kit2 = GraphKit.quick_create([
-                [dates[0], dates[-1]].map{|d| d.to_time.to_i}, 
+                [dates[0], dates[-1]].map{|d| d.to_time.to_i - barsize}, 
                 [account.average, account.average]
               ])
               kit2.data[0].gp.with = 'l lw 5'
@@ -447,7 +518,7 @@ EOF
       <<EOF
 \\section{SubAccount Breakdown}
       #{(@actual_accounts).map{|account, account_info| 
-      dates, expenditures, account_items = account_expenditure(account, account_info)
+      _start_dates, dates, expenditures, account_items = account_expenditure(account, account_info)
       #pp account, account_items.map{|items| items.map{|i| i.date.to_s}}
       "\\subsection{#{account}}" + 
         account_items.zip(dates, expenditures).map{|items, date, expenditure|
@@ -549,7 +620,9 @@ stringstyle=\\color{orange}}
 \\setlength{\\topsep}{0pt}
 \\setlength{\\partopsep}{0pt}
 \\begin{document}
-\\title{Budget Report from #{@start_date.strftime("%A #{@start_date.day.ordinalize} of %B %Y")} to #{@end_date.strftime("%A #{@end_date.day.ordinalize} of %B %Y")}}
+\\title{Budget Report from #{@start_date.strftime("%A #{@start_date.day.ordinalize} of %B %Y")} to #{@today.strftime("%A #{@today.day.ordinalize} of %B %Y")}}
+\\author{With projections to #{@end_date.strftime("%A #{@end_date.day.ordinalize} of %B %Y")}}
+\\date{\\today}
 \\maketitle
 \\tableofcontents
 EOF
@@ -562,3 +635,11 @@ EOF
 
   end
 end
+#\\subsection{Last Week}
+      ##{expense_pie_charts_by_currency('lastweekexpenses', @expense_accounts){|r| 
+      ##p ['r.daysago', r.days_ago(@today)]; 
+      #r.days_ago(@today) < 7}}
+#\\subsection{Last Month}
+      ##{expense_pie_charts_by_currency('lastmonthexpenses', @expense_accounts){|r| r.days_ago(@today) < 30}}
+#\\subsection{Last Year}
+      ##{expense_pie_charts_by_currency('lastyearexpenses', @expense_accounts){|r| r.days_ago(@today) < 365}}

data/lib/treasurer.rb

@@ -59,6 +59,7 @@ EOF
 		['--today', '-t', GetoptLong::REQUIRED_ARGUMENT, "Specify today's date, i.e. change the date on which the report is generated."],		
 		['--coderunner', '-C', GetoptLong::REQUIRED_ARGUMENT, "Options to pass to CodeRunner, the engine which manages the transaction data."],		
 		['--month', '-m', GetoptLong::REQUIRED_ARGUMENT, "Overrides -a, -b and -t and produces a report for a given month"],		
+    ['--report-currency', '-r', GetoptLong::REQUIRED_ARGUMENT, "Convert all amounts to the given currency (e.g. GBP) and amalgamate different currency data to form a unified overview."],		
 		#['--formats', '-f', GetoptLong::REQUIRED_ARGUMENT, "A list of formats pertaining to the various input and output files (in the order which they appear), separated by commas. If they are all the same, only one value may be given. If a value is left empty (i.e. there are two commas in a row) then the previous value will be used. Currently supported formats are #{SUPPORTED_FORMATS.inspect}. "],		
 
 		]
@@ -94,8 +95,8 @@ class Treasurer
 		# options (copts) hash
 		def setup(copts)
 			# None neededed
-			copts[:b] = copts[:b].to_i
-			copts[:a] = copts[:a].to_i
+			copts[:b] = copts[:b].to_i if copts[:b]
+			copts[:a] = copts[:a].to_i if copts[:a]
 			copts[:t] = Date.parse(copts[:t]) if copts[:t]
 	  end
 		def verbosity

data/treasurer.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: treasurer 0.5.0 ruby lib
+# stub: treasurer 0.5.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "treasurer".freeze
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Edmund Highcock".freeze]
-  s.date = "2018-03-04"
+  s.date = "2018-03-07"
   s.description = "A simple command line tool for managing accounts and finances. Easily import internet banking spreadsheets and generate sophisticated reports and projections.".freeze
   s.email = "edmundhighcock@users.sourceforge.net".freeze
   s.executables = ["treasurer".freeze]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: treasurer
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport