budgetcrmod 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 690a66a464147f4818488e427d9556a46a2f5352
-  data.tar.gz: 90406cb37a7885adf871b362c44e52049747fc66
+  metadata.gz: 2015715dae350f93b7931297fa1696a27ab988f3
+  data.tar.gz: 719be9cb86645aa5a7ecc46c4588fb6baa2b17d4
 SHA512:
-  metadata.gz: c12a9b4c4a0b764f3f3c003970dcb6a6bcb358fcfdb4d5c6da95c96aef192b00fe8539c259463ef9e74df93d50bcac6759ed0f85a8a25f8a29ae5a57cd74ddd7
-  data.tar.gz: 5c0b29941d7ae468b5eb6ccf51dcc89baeb8e6e0c454c4c1608a4e55144ffd635294c2c8f73ff7b6d95700eb9604e2c9112dd0fd462858226c109833d7af81ba
+  metadata.gz: 11dfb82752c234ca805a69b9abe16456201adf18adc849c29799ea927d0e317705f30dba08c9907f041a536da483980ee7fffc1d6c6664b9c876b5d01a9de432
+  data.tar.gz: 969c97060b903b1c2661823f3c4df19d05700a4724249b41e9a03f9219a7b2dc111d549b9cce62dc4597be274785b01a0aaded206b0d815a84c84ae8133a32fe

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/budgetcrmod.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: budgetcrmod 0.2.3 ruby lib
+# stub: budgetcrmod 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "budgetcrmod".freeze
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   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-04-09"
+  s.date = "2018-04-10"
   s.description = "A CodeRunner module to help you do your budget".freeze
   s.email = "edmundhighcock@users.sourceforge.net".freeze
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "budgetcrmod.gemspec",
     "lib/budgetcrmod.rb",
+    "lib/budgetcrmod/account_choices.rb",
     "lib/budgetcrmod/budget.rb",
     "lib/budgetcrmod/defaults_files/budget_defaults.rb",
     "test/helper.rb",

data/lib/budgetcrmod/account_choices.rb

@@ -0,0 +1,145 @@
+
+class CodeRunner::Budget
+  # All transactions occur between two accounts. 
+  # One of those accounts is always physical (e.g. bank account, loan, credit card)
+  # and the other can be either physical or a virtual account of the users choice,
+  # e.g. Food or Petrol or Energy, or maybe WeeklyBudget and LongTermBudget etc.
+  def external_account
+    return @external_account if @external_account
+    ext_account = false
+    Dir.chdir(@runner.root_folder) do
+      chosen = false
+      Hash.phoenix('account_choices.rb') do |choices_hash|
+        if choices_hash[data_line] 
+          #choices_hash[data_line][:external_account] = 
+          #choices_hash[data_line][:external_account].to_sym #fixes earlier bug
+          #choices_hash[data_line][:sub_account] = 
+          #choices_hash[data_line][:sub_account].to_sym #fixes earlier bug
+          chosen = choices_hash[data_line][:external_account]
+        end
+      end
+      return @external_account = chosen if chosen
+      chosen = false
+      sym = nil
+      while not chosen
+        Hash.phoenix('external_accounts.rb') do |account_hash|
+          #account_hash.each{|k,v| v[:name] = v[:name].to_sym} #Fixes an earlier bug
+          #choices = account_arr.size.times.map{|i| [i,account_arr[i][:name]]}
+          choices = account_hash.map{|k,v| [v[:sym], k]}.to_h
+          puts Terminal.default_colour
+          puts
+          puts "-" * data_line.size
+          puts data_line
+          puts "-" * data_line.size
+          puts
+          puts choices.inspect
+          puts
+          puts "Please choose from the above external accounts for this transaction."
+          puts "If you wish to add a new account type 0. To quit type q"
+          puts "To start again for this transaction, type z"
+          while not chosen
+            require 'io/console'
+            choice = STDIN.getch
+            if choice == "q"
+              throw :quit_data_entry
+            elsif choice == "0"
+              puts "Please type the name of the new account"
+              name = STDIN.gets.chomp.to_sym
+              puts "Please enter a symbol to represent this account (e.g. digit, letter, punctuation)."
+              sym = false
+              until sym
+                sym = STDIN.getch
+                if choices.keys.include? sym
+                  puts "This symbol is taken"
+                  sym = false
+                end
+              end
+              account_hash[name] = {name: name, sym: sym, sub_accounts: {}}
+              #choices_hash[@id] = name
+              chosen = name
+            elsif choice == "z"
+              chosen = false
+              break
+            elsif not choices.keys.include? choice
+              puts "Error: this symbol does not correspond to an account"
+            else
+              chosen = choices[choice] #account_hash[choice][:name]
+            end
+          end
+          #Hash.phoenix('account_choices.rb') do |choices_hash|
+          #choices_hash[data_line] = {external_account: chosen}
+          #end
+        end
+        ext_account = chosen
+        next if not chosen
+        chosen = false
+        Hash.phoenix('external_accounts.rb') do |account_hash|
+          #choices = account_arr.size.times.map{|i| [i,account_arr[i][:name]]}
+          sub_accounts = account_hash[ext_account][:sub_accounts]
+          sub_accounts.each{|k,v| v[:name] = v[:name].to_sym} #Fixes an earlier bug
+          choices = sub_accounts.map{|k,v| [v[:sym], k]}.to_h
+          puts "-" * data_line.size
+          puts
+          puts choices.inspect
+          puts
+          puts "Please choose from the above sub-accounts for this transaction."
+          puts "If you wish to add a new sub account, type 0. To quit, type q"
+          puts "To start again for this transaction, type z"
+          while not chosen
+            require 'io/console'
+            choice = STDIN.getch
+            if choice == "q"
+              throw :quit_data_entry
+            elsif choice == "0"
+              puts "Please type the name of the new sub account"
+              name = STDIN.gets.chomp.to_sym
+              puts "Please enter a symbol to represent this account (e.g. digit, letter, punctuation)."
+              sym = false
+              until sym
+                sym = STDIN.getch
+                if choices.keys.include? sym
+                  puts "This symbol is taken"
+                  sym = false
+                end
+              end
+              sub_accounts[name] = {name: name, sym: sym}
+              #choices_hash[@id] = name
+              chosen = name
+            elsif choice == "z"
+              chosen = false
+              break
+            elsif not choices.keys.include? choice
+              puts "Error: this symbol does not correspond to a sub-account"
+            else
+              chosen = choices[choice] #sub_accounts[choice][:name]
+            end
+          end
+        end
+        next if not chosen
+        Hash.phoenix('account_choices.rb') do |choices_hash|
+          choices_hash[data_line] = {external_account: ext_account, sub_account: chosen}
+        end
+      end #while not chosen
+
+    end
+    ext_account
+  end
+  # All transactions have a subaccount. For transactions between
+  # physical accounts this will almost always be just 'Transfer'
+  # or similar, but virtual accounts will have more meaningful
+  # sub_accounts, e.g. Food might have Groceries, EatingOut
+  # or WeeklyBudget might have Transport, Food, Clothes... depending
+  # on the users preferred way of organising things.
+  # The sub_accounts are primarily a labelling exercise, but done 
+  # well can be very helpful in showing a breakdown of expenditure.
+  def sub_account
+    return @sub_account if @sub_account
+    Dir.chdir(@runner.root_folder) do
+      external_account until (
+        choices = Hash.phoenix('account_choices.rb'){|choices_hash| choices_hash[data_line]}
+        p [choices, data_line]
+      ) and choices[:sub_account]
+      @sub_account = choices[:sub_account]
+    end
+  end
+end

data/lib/budgetcrmod/budget.rb

@@ -39,15 +39,6 @@ class CodeRunner
 
     @code_module_folder = File.dirname(File.expand_path(__FILE__)) # i.e. the directory this file is in
 
-    #		["05/07/2010",
-    #		   "DEB",
-    #		  "308760",
-    #		  "25387560",
-    #		  "ANGELSCD 0655",
-    #		  "",
-    #		  "11.50",
-    #			  "4506.80"]
-    #
     @component_results = [:date, :type, :sc, :ac, :description, :deposit, :withdrawal, :balance]	
     @results = [:date_i, :data, :data_line, :dataset] + @component_results
     def generate_input_file
@@ -241,10 +232,6 @@ class CodeRunner
       end
     end
     def days_ago(today = Date.today)
-      #ep ['today', today, date]
-      #			sprintf("%04d%02d%02d", date.year, date.month, date.day).to_i
-      #cache[:days_ago] ||= {}
-      #cache[:days_ago][today.to_s] ||=
       - ((date.to_datetime.to_time.to_i - today.to_datetime.to_time.to_i) / 24 / 3600).to_i
     end
     def idate
@@ -255,164 +242,7 @@ class CodeRunner
     end
 
 
-    #def self.sum_future(future_items, end_date, options={})
-    #sum = future_items.inject(0) do |sum, (name, item)| 
-    #item = [item] unless item.kind_of? Array
-    #value = item.inject(0) do |value,info|
-    #value += info[:size] unless (options[:today]||Date.today > info[:date]) or (info[:date] > end_date) # add unless we have already passed that date
-    #value
-    #end
-    #rcp.excluding.include?(name) ? sum : sum + value
-    #end
-    #sum
-    #end
-
-    #def self.budget_expenditure(runner, budget, budget_info, start_date, options={})
-    #dates = []
-    #expenditures = []
-    #budget_items = []
-    #date = budget_info[:end]||options[:today]||Date.today
-    #start_date = [(budget_info[:start]||start_date), start_date].max
-    #expenditure = 0
-    #items_temp = []
-    #items = runner.component_run_list.values.find_all{|r| r.budget == budget and r.in_date(budget_info)}
-    ##ep ['items', items]
-    ##ep ['budget', budget]
-    #counter = 0
-    #if not budget_info[:period]
-    #dates.push date
-    #budget_items.push items
-    #expenditures.push (items.map{|r| r.debit - r.credit}+[0]).sum
-    #else
-
-    #case budget_info[:period][1]
-    #when :month
-    #while date > start_date
-    #items_temp += items.find_all{|r| r.date == date}
-    #if date.mday == (budget_info[:monthday] or 1)
-    #counter +=1
-    #if counter % budget_info[:period][0] == 0
-    #expenditure = (items_temp.map{|r| r.debit - r.credit}+[0]).sum
-    #dates.push date
-    #expenditures.push expenditure
-    #budget_items.push items_temp
-    #items_temp = []
-    #expenditure = 0
-    #end
-    #end
-    #date-=1
-    #end
-    #when :day
-    #while date > start_date
-    #items_temp += items.find_all{|r| r.date == date}
-    ##expenditure += (budget_items[-1].map{|r| r.debit}+[0]).sum
-    #counter +=1
-    #if counter % budget_info[:period][0] == 0
-    #expenditure = (items_temp.map{|r| r.debit - r.credit}+[0]).sum
-    #dates.push date
-    #expenditures.push expenditure
-    #budget_items.push items_temp
-    #items_temp = []
-    #expenditure = 0
-    #end
-    #date-=1
-    #end
-    #end
-    #end
-
-    #[dates, expenditures, budget_items]
-
-    #end
-
-    #def self.sum_regular(regular_items, end_date, options={})
-    #today = options[:today]||Date.today
-    #sum = regular_items.inject(0) do |sum, (name, item)|	
-    #item = [item] unless item.kind_of? Array
-    ##			  ep item
-    #value = item.inject(0) do |value,info|
-    #finish = (info[:end] and info[:end] < end_date) ? info[:end] : end_date
-    ##today = (Time.now.to_i / (24.0*3600.0)).round
-
-    #nunits = 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)
-    #####################counter +=1 if date.mday == (info[:monthday] or 1)
-    #####################date -= 1
-    #####################end
-    #####################when :year
-    #####################while date >= (info[:start] or Date.today) 
-    #####################counter +=1 if date.yday == (info[:yearday] or 1)
-    #####################date -= 1
-    #####################end
-    #####################when :day
-    #####################while date > (info[:start] or Date.today)
-    #####################counter +=1
-    #####################date -= 1
-    #####################end
-    #####################end
-    #####################end
-    #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
-    #########################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
-    #########################date += 1
-    #########################end
-    #########################when :day
-    #########################while date <= finish
-    #########################nunits += 1 if counter % info[:period][0] == 0
-    #########################counter +=1
-    #########################date += 1
-    #########################end
-    #########################end
-
-
-
-
-
-    ##nyears = (finish.year - today.year)
-    ##nmonths = nyears * 12 + (finish.month - today.month)
-    ##(puts "Number of Months: #{nmonths}"; @pnmonths=true) unless @pnmonths
-    ##ndays = nyears * 12 + (finish.yday - today.yday)
-    ##number = case info[:period][1]
-    ##when :month
-    ##(nmonths / info[:period][0]).ceil
-    ##when :day
-    ##(ndays / info[:period][0]).ceil
-    ##end
-    ##value + number * info[:size]
-    ##eputs "Regular Expenditure Item: #{sprintf("%10s", name)} -- #{nunits} payments, total #{nunits * info[:size]}"
-    #value + nunits * info[:size]
-
-    #end
-    #(rcp.excluding? and rcp.excluding.include?(name)) ? sum : sum + value
-    #end
-    #sum
-    #end
     def self.predictable_component_ids(runner)
-      #runner.instance_variable_set(:@component_run_list, {})
-      #runner.instance_variable_set(:@component_ids, [])
-      #runner.instance_variable_set(:@component_id, -1)
-      #runner.run_list.each{|r| r.instance_variable_set(:@component_runs, [])}
-      #runner.run_list.values.sort_by{|r| r.id}.each{|r| r.generate_component_runs}
-      #runner.save_large_cache
     end
     def self.kit_time_format_x(kit)
       kit.gp.timefmt = %["%s"]
@@ -425,289 +255,8 @@ class CodeRunner
       kit.gp.xtics = "rotate by 340 offset 0,-0.5 2629746"
     end
 
-    def self.print_budget(options={})
-      @excluding = (options[:excluding] or [])
-      runner = CodeRunner.fetch_runner(Y: Dir.pwd)
-      puts "------------------------------"
-      puts "        Budget Report"
-      puts "------------------------------"
-      balance = runner.component_run_list.values.sort_by{|r| [r.date, r.id]}.map{|r| r.balance}[-1]
-      puts "Balance: #{balance}"
-      end_date = Date.parse("01/10/2011")
-      puts "Regular Expenditure: #{total_regular = 	sum_regular(REGULAR_EXPENDITURE, end_date)}"
-      puts "Future Expenditure: #{total_future =  sum_future(FUTURE_EXPENDITURE, end_date)}"
-      puts "Total Expenditure:  #{total_expenditure = total_future + total_regular}"
-      puts "Total Income:  #{total_incoming = sum_future(FUTURE_INCOME, end_date)}"
-      total = balance + total_incoming - total_expenditure
-      puts "Weekly Budget:  #{total/((end_date.to_datetime.to_time.to_i - Time.now.to_i) / 3600 / 24 / 7)}"
-    end
-
-    #def self.budgets_with_averages(runner, budgets, start_date, options={})
-    #projected_budgets = budgets.dup
-    #projected_budgets.each{|key,v| projected_budgets[key]=projected_budgets[key].dup}
-    #projected_budgets.each do |budget, budget_info|
-    ##budget_info = budgets[budget]
-    #dates, expenditures, items = budget_expenditure(runner, budget, budget_info, start_date, today: options[:today])
-    #budget_info[:size] = expenditures.mean rescue 0.0
-    #end
-    #projected_budgets
-    #end
-
-    #def self.latex_budget_transfers(runner, budgets, options)
-    #numdays = options[:days]
-    #today = options[:today]||Date.today
-    #"#{budgets.map{|budget, budget_info| 
-    #dates, expenditures, items = budget_expenditure(runner, budget, budget_info, today - numdays, today: options[:today])
-    ##ep ['budget', budget, dates, expenditures]
-    #kit = GraphKit.quick_create([dates.map{|d| d.to_time.to_i}, expenditures])
-    #kit.data.each{|dk| dk.gp.with="boxes"}
-    #kit.gp.style = "fill solid"
-    #kit.xlabel = nil
-    #kit.ylabel = "Expenditure"
-    #unless options[:transfers]
-    #kits = budgets_with_averages(runner, {budget => budget_info}, today - numdays, today: today).map{|budget, budget_info| 
-    ##ep 'Budget is ', budget
-    #kit2 = GraphKit.quick_create([
-    #[dates[0], dates[-1]].map{|d| d.to_time.to_i}, 
-    #[budget_info[:size], budget_info[:size]]
-    #])
-    #kit2.data[0].gp.with = 'lp lw 4'
-    #kit2
-    #}
-    ##$debug_gnuplot = true
-    ##kits.sum.gnuplot
-    #kit += kits.sum
-
-    #else
-    #kit.data[0].y.data.map!{|expen| expen*-1.0}
-    #end
-    #kit.title = "#{budget} Expenditure with average (Total = #{kit.data[0].y.data.sum})"
-    #kit_time_format_x(kit)
-    ##kit.gnuplot
-    #kit.gnuplot_write("#{budget}.eps")
-    #"\\begin{center}\\includegraphics[width=4.0in]{#{budget}.eps}\\vspace{1em}\\end{center}"
-    #}.join("\n\n")
-    #}"
-    #end
-
-    #def self.latex_report(options={})
-    #runner = CodeRunner.fetch_runner(Y: Dir.pwd, h: :component)
-    #numdays = options[:days]
-    #today = options[:today] || Date.today
-    ## Delete budgets that contain no items
-    #actual_budgets = BUDGETS.dup
-    #BUDGETS.keys.each do |budget|
-    #actual_budgets.delete(budget) if budget_expenditure(runner, budget, BUDGETS[budget], today - numdays, today: today)[0].size == 0
-    #end
-    ##predictable_component_ids(runner)
-    #days_ahead = options[:days_ahead]
-    #runs = runner.component_run_list.values
-    #indateruns = runs.find_all{|r| r.days_ago < numdays}
-    #accounts = runs.map{|r| r.account}.uniq
-    #ep 'Accounts', accounts
-    #projected_budgets = Hash[actual_budgets.dup.find_all{|k,v| v[:discretionary]}]
-    #projected_budgets = budgets_with_averages(runner,projected_budgets, today - numdays, today: today)
-    ##projected_budgets.each{|key,v| projected_budgets[key]=projected_budgets[key].dup}
-    ##projected_budgets.each do |budget, budget_info|
-    ###budget_info = budgets[budget]
-    ##dates, expenditures, items = budget_expenditure(runner, budget, budget_info, today - numdays)
-    ##budget_info[:size] = expenditures.mean
-    ##end
-    #ep 'projected_budgets', projected_budgets
-    #File.open('report.tex', 'w') do |file|
-    #file.puts <<EOF
-    #\\documentclass{article}
-    #\\usepackage[cm]{fullpage}
-    #\\usepackage{tabulary}
-    #\\usepackage{graphicx}
-    #%\\usepackage{hyperlink}
-    #\\newcommand\\Tstrut{\\rule{0pt}{2.8ex}}
-    #\\begin{document}
-    #\\title{#{numdays}-day Budget Report}
-    #\\maketitle
-    #\\tableofcontents
-
-    #\\section{Summary of Accounts}
-    ##{accounts.map{|acc|
-    #"\\subsection{#{acc}}
-    #\\begin{tabulary}{0.8\\textwidth}{ r l}
-    ###Balance & #{runs.find_all{|r| r.account==acc}.sort_by{|r| 
-    ###r.date
-    ###}[-1].balance} \\\\
-    #####Expenditure & #{runs.find_all{|r| r.account==acc && 
-    #####r.days_ago < numdays
-    #####}.map{|r| 
-    #####r.debit
-    #####}.sum} \\\\
-    ###Income & #{runs.find_all{|r| r.account==acc && 
-    ###r.days_ago < numdays
-    ###}.map{|r| r.credit}.sum} \\\\
-    #\\end{tabulary}"}.join("\n\n")
-    #}
-
-    #\\section{Graphs of Recent Balances}
-    ##{accounts.map{|acc|
-    #balance = runs.find_all{|r| r.account==acc}.sort_by{|r| r.date }[-1].balance
-    #accshort = acc.gsub(/\s/, '')
-    #kit = runner.graphkit(['date.to_time.to_i', 'balance'], {conditions: "account == #{acc.inspect} and days_ago < #{numdays}", sort: 'date'})
-    #futuredates = (today..today+days_ahead).to_a
-    ##p ["Regtrans", REGULAR_TRANSFERS.values_at(*REGULAR_TRANSFERS.keys.find_all{|from,to| to == acc})]
-
-    #budgets = Hash[projected_budgets.find_all{|k,v| v[:account] == acc}]
-    #ep ['budgets', budgets]
-    #projection = futuredates.map{|date| balance - 
-    #sum_regular(REGULAR_EXPENDITURE[acc], date, today: today) + 
-    #sum_regular(REGULAR_INCOME[acc], date, today: today) -  
-    #sum_regular(budgets, date, today: today) -  
-    #sum_future(FUTURE_EXPENDITURE[acc], date, today: today) + 
-    #sum_future(FUTURE_INCOME[acc], date, today: today) + 
-    #(REGULAR_TRANSFERS.keys.find_all{|from,to| to == acc}.map{|key|
-    ##p [acc, 'to', "key", key]
-    #sum_regular( REGULAR_TRANSFERS[key], date, today: today)
-    #}.sum||0) - 
-    #(REGULAR_TRANSFERS.keys.find_all{|from,to| from == acc}.map{|key|
-    ##p [acc, 'from',"key", key]
-    #sum_regular( REGULAR_TRANSFERS[key], date, today: today)
-    #}.sum||0)  
-    #}
-    #kit2 = GraphKit.quick_create([futuredates.map{|d| d.to_time.to_i}, projection])
-    #kit += kit2
-    #kit.title = "Balance for #{acc}"
-    #kit.xlabel = %['Date' offset 0,-2]
-    #kit.xlabel = nil
-    #kit.ylabel = "Balance"
-
-    #kit.data[0].gp.title = 'Previous'
-    #kit.data[1].gp.title = '0 GBP Discretionary'
-    #kit.data[1].gp.title = 'Projection'
-    #kit.data.each{|dk| dk.gp.with = "lp"}
-
-    #kit_time_format_x(kit)
-
-    #(kit).gnuplot_write("#{accshort}_balance.eps", size: "4.0in,3.0in")
-    #"\\begin{center}\\includegraphics[width=4.0in]{#{accshort}_balance.eps}\\end{center}"
-    #}.join("\n\n")
-    #}
-
-
-    #\\section{Budget Expenditure}
-    ##{latex_budget_transfers(runner,actual_budgets, options)}
-
-    #\\section{Transfers}
-    ##{latex_budget_transfers(runner, TRANSFERS, options.dup.absorb({transfers: true}))}
-
-
-
-    #\\section{Budget Resolutions}
+    require 'budgetcrmod/account_choices.rb'
 
-    #This section sums items from budgets drawn from an alternate account, i.e. it determines how much should be transferred from one account to another as a result of expenditure from a given budget.
-
-    ##{actual_budgets.map{|budget, budget_info|
-
-    ########################################"\\subsection{#{budget} }
-    ########################################\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{r l}
-    ########################################%\\hline
-    ########################################Account Owed & Amount  \\\\
-    ########################################\\hline
-    ########################################\\Tstrut
-    #########################################{budget_items = indateruns.find_all{|r| r.budget == budget}
-    ########################################alternate_accounts = budget_items.map{|r| r.account}.uniq - [budget_info[:account]]
-    ########################################alternate_accounts.map{|acc|
-    ########################################alternate_items = budget_items.find_all{|r| r.account == acc}
-    ########################################total = alternate_items.map{|r| r.debit - r.credit}.sum
-    ########################################"#{acc} & #{total} \\\\"
-    ########################################}.join("\n\n")
-    ########################################}
-
-    ########################################\\\\
-    ########################################\\hline
-    ########################################\\end{tabulary}
-    ########################################\\normalsize
-    ########################################\\vspace{1em}\n\n
-
-    #########################################{	alternate_accounts.map{|acc|
-    ########################################alternate_items = budget_items.find_all{|r| r.account == acc}
-    ########################################alternate_items.pieces((alternate_items.size.to_f/50.to_f).ceil).map{|piece|
-    ########################################"\\footnotesize\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{ #{"c " * 4 + " L " + " r " * 3 }}
-    #########################################{budget}: & #{budget_info[:account]} & owes & #{acc} &&&&\\\\
-    ########################################\\hline
-
-    ########################################\\Tstrut
-
-    #########################################{piece.map{|r| 
-    ########################################([:id] + rcp.component_results - [:sc]).map{|res| 
-    ########################################r.send(res).to_s.latex_escape
-    #########################################rcp.component_results.map{|res| r.send(res).to_s.gsub(/(.{20})/, '\1\\\\\\\\').latex_escape
-    ########################################}.join(" & ")
-    ########################################}.join("\\\\\n")
-    ########################################}
-    ########################################\\end{tabulary}\\normalsize"}.join("\n\n")
-    ########################################}.join("\n\n")}
-    ########################################"
-    #}.join("\n\n")
-    #}
-
-
-
-    #\\section{Budget and Transfer Breakdown}
-    ##{(TRANSFERS + actual_budgets).map{|budget, budget_info| 
-    #dates, expenditures, budget_items = budget_expenditure(runner, budget, budget_info, today - numdays, today: today)
-    #pp budget, budget_items.map{|items| items.map{|i| i.date.to_s}}
-    #"\\subsection{#{budget}}" + 
-    ########################budget_items.zip(dates, expenditures).map{|items, date, expenditure|
-    ########################if items.size > 0
-    ########################"
-    ########################\\footnotesize
-    ########################\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{ #{"c " * 4 + " L " + " r " * 2 }}
-    ########################%\\hline
-    ########################& #{date.to_s.latex_escape} & & & Total & #{expenditure} &  \\\\
-    ########################\\hline
-    ########################\\Tstrut
-    #########################{items.map{|r| 
-    ########################([:id] + rcp.component_results - [:sc, :balance]).map{|res| 
-    ########################r.send(res).to_s.latex_escape
-    ########################}.join(" & ")
-    ########################}.join("\\\\\n")
-    ########################}
-    ########################\\\\
-    ########################\\hline
-    ########################\\end{tabulary}
-    ########################\\normalsize
-    ########################\\vspace{1em}\n\n"
-    ########################else 
-    ########################""
-    ########################end
-    ########################}.join("\n\n")
-    #}.join("\n\n")
-    #}
-
-
-
-    #\\section{Recent Transactions}
-    ##{accounts.map{|acc| 
-    #"\\subsection{#{acc}}
-    #\\footnotesize
-    ##{all = runs.find_all{|r|  r.account == acc and r.days_ago < numdays}.sort_by{|r| [r.date, r.id]}.reverse
-    #ep ['acc', acc, 'ids', all.map{|r| r.id}, 'size', all.size]
-    ########all.pieces((all.size.to_f/50.to_f).ceil).map{|piece|
-    ########"\\setlength{\\parindent}{0cm}\n\n\\begin{tabulary}{0.99\\textwidth}{ #{"c " * 4 + " L " + " r " * 3 + "l"}}
-    #########{piece.map{|r| 
-    ########([:id] + rcp.component_results - [:sc] + [:budget]).map{|res| r.send(res).to_s.latex_escape
-    #########rcp.component_results.map{|res| r.send(res).to_s.gsub(/(.{20})/, '\1\\\\\\\\').latex_escape
-    ########}.join(" & ")
-    ########}.join("\\\\\n")}
-    ########\\end{tabulary}"}.join("\n\n")}"
-    #}.join("\n\n")}
-    #\\end{document}
-    #EOF
-
-
-    #end
-    #system "latex report.tex && latex report.tex"
-    #end
-    #require 'treasurer'
-    #require 'local_customisations.rb'
-    #include Treasurer::LocalCustomisations
 
   end # class Budget
 end #class CodeRunner

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: budgetcrmod
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Edmund Highcock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderunner
@@ -96,6 +96,7 @@ files:
 - VERSION
 - budgetcrmod.gemspec
 - lib/budgetcrmod.rb
+- lib/budgetcrmod/account_choices.rb
 - lib/budgetcrmod/budget.rb
 - lib/budgetcrmod/defaults_files/budget_defaults.rb
 - test/helper.rb