vfwcash 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5b7a58fa43c192b95fed4bf74681afd42feac1e
-  data.tar.gz: 2e231cdb176989b019e35a9fbc2c960a575e8fda
+  metadata.gz: ecad30a1ccdfcc984f964d88abacc8da6c818b21
+  data.tar.gz: c555f9198c15bf59c7999195fcbd66ea0dc254ec
 SHA512:
-  metadata.gz: 8f77bc7d021f09d39663a6165d67d654f036059cfa82e788044d50124cca4ef771df569e88e3cb21ab28497e1d1a19acc35b7a810424ad33daf5db695e4ea97e
-  data.tar.gz: 108570a5feafc5b98c888eab59bb39108c646e9a5557848e2329856bfb2abded84b7b3261ba0785771338c7307192415b6208d9c68dcf3d04b2a83b41e1f7ec0
+  metadata.gz: 305c258d3d8246f8f5cc1b759e1c7de817d16628f9d7acf90384c834baf536ae9c5a807a62c73218da7f63f866cdbf9b934dd55c01e30e0ee417ae8ef294486d
+  data.tar.gz: dfb5d6612774fef53fef0e73d7cbd888206921f7058aa2d96d3046ecdfe4bf97b43b8bfa7fce66ae7c4dd775b038b9b1e317454e0bb8fa35630a834a743147f1

data/lib/models/audit.rb

@@ -1,4 +1,3 @@
-module Pdf
 class Audit < Prawn::Document
   attr_accessor :cur, :config, :balances
   def initialize(date,cash)
@@ -225,4 +224,3 @@ class Audit < Prawn::Document
   end
 
 end
-end

data/lib/models/balance.rb

@@ -1,4 +1,4 @@
-class Pdf::Balance < Prawn::Document
+class Balance < Prawn::Document
   attr_accessor :cash, :date, :cwidths
 
   def initialize(date,cash)

data/lib/models/between.rb

@@ -1,4 +1,4 @@
-class Pdf::Between < Prawn::Document
+class Between < Prawn::Document
   attr_accessor :cash, :date, :cwidths
 
   def initialize(date,cash,from,to)

data/lib/models/cash_account.rb

@@ -11,7 +11,7 @@ class CashAccount < SqliteBase
   end
 
   def children
-    CashAccount.where(parent_guid:self.guid)
+    CashAccount.where(parent_guid:self.guid).order(:name)
   end
 
   def account_ledger

data/lib/models/gcash.rb

@@ -189,6 +189,39 @@ module Vfwcash
       lines
     end
 
+    def profit_loss(options)
+      today = Date.today
+      @from = options[:from].nil? ? today.beginning_of_month  : Vfwcash.set_date(options[:from])
+      @to = options[:to].nil? ? today.end_of_month  : Vfwcash.set_date(options[:to])
+      level = options[:lev]
+      i = CashAccount.find_by(name:'Income')
+      e = CashAccount.find_by(name:'Expenses')
+      report = {"Income" => {amount:period_splits(i),total:0,children:{}}, 
+      "Expense" =>  {amount:period_splits(e),total:0,children:{}},
+      "options" => {level:level,from:@from,to:@to}}
+      tree(i,report['Income'])
+      tree(e,report['Expense'])
+      return report
+    end
+
+
+    private
+
+    def tree(branch,hash)
+      branch.children.each do |c|
+        hash[:children][c.name] = {amount:period_splits(c),total:0,children: {}}
+        tree(c,hash[:children][c.name])
+        hash[:total] += (hash[:children][c.name][:amount] + hash[:children][c.name][:total])
+      end
+    end
+
+    def period_splits(acct)
+      flipper = acct.account_type == 'INCOME' ? -1 : 1
+      sp = acct.splits.joins(:tran).where('transactions.post_date between ? and ?',@from.strftime('%Y%m%d')+'00',@to.strftime('%Y%m%d')+'24')
+      sp.sum(:value_num) * flipper
+    end
+
+
   end
 
 end

data/lib/models/ledger.rb

@@ -1,4 +1,4 @@
-class Pdf::Ledger < Prawn::Document
+class Ledger < Prawn::Document
   attr_accessor :response, :date, :cwidths
 
   def initialize(date,cash)

data/lib/models/profit_loss.rb

@@ -1,30 +1,118 @@
-class ProfitLoss
-
-  attr_accessor :from, :to, :flipper, :report
-
-  def generate(from,to)
-    @from = Vfwcash.set_date(from)
-    @to = Vfwcash.set_date(to)
-    i = CashAccount.find_by(name:'Income')
-    e = CashAccount.find_by(name:'Expenses')
-    @report = {"Income" => {amount:period_splits(i),total:0,children:{}}, "Expense" =>  {amount:period_splits(e),total:0,children:{}}}
-    tree(i,report['Income'])
-    tree(e,report['Expense'])
-    return self
-  end
-
-  def tree(branch,hash)
-    branch.children.each do |c|
-      hash[:children][c.name] = {amount:period_splits(c),total:0,children: {}}
-      tree(c,hash[:children][c.name])
-      hash[:total] += (hash[:children][c.name][:amount] + hash[:children][c.name][:total])
+
+class ProfitLoss < Prawn::Document
+  attr_accessor :report, :level, :cur
+  COL = [140,210,280,350]
+  def initialize(report)
+    super(page_layout: :portrait, top_margin:32, left_margin:32, right_margin:32,bottom_margin:32)
+    level = 2 if level.nil?
+    @report = report
+    @level = @report['options'][:level]
+    from = @report['options'][:from]
+    to = @report['options'][:to]
+    font_size(14)
+    text "VFW Post 8600 Profit/Loss Report  #{from} to #{to}", style: :bold, align: :center
+    move_down 6
+    font_size(9)
+    @cur = cursor.to_i
+    generate_report
+  end
+
+  def generate_report
+    total_row("Income",'','Increase')
+    pad = 1
+    children(pad,@report["Income"][:children])
+    total_row("Total Income",@report["Income"][:total])
+    pad = 1
+    total_row("Expenses",'','Decrease')
+    children(pad,@report["Expense"][:children])
+    total_row("Total Expenses",@report["Expense"][:total])
+    total_row("Profit(+)/Loss(-)",@report["Income"][:total] - @report["Expense"][:total])
+  end
+
+  def children(pad,kids)
+    kids.each do |k,v|
+      if v[:children].blank?
+        send "pad#{pad}#{@level}_row", k,v[:amount] unless v[:amount].zero?
+      else
+        # if @level == 1
+        if pad == @level
+          unless v[:total].zero?
+            send "pad#{pad}#{@level}_row",k,v[:total]+v[:amount]
+          end
+        else
+          unless v[:total].zero?
+            send "pad#{pad}#{@level}_row", k,v[:amount] 
+            pad += 1
+            children(pad,v[:children])
+            pad -= 1
+            send "pad#{pad}#{@level}_row", "Total #{k}",v[:amount] + v[:total]
+          end
+        end
+      end
+    end
+  end
+
+  def total_row(name,amount,extra=nil)
+    text_box name, at: [0,@cur], width:140,align: :left, style: :bold 
+    unless extra.nil?
+      text_box extra, at: [COL[@level - 1],@cur], width:70,align: :right, style: :bold  
     end
+    text_box imoney(amount), at: [COL[@level],@cur], width:70,align: :right, style: :bold  
+    @cur -= 9 
+  end
+
+  def pad11_row(acct,amount)
+    text_box acct, at: [10,@cur], width:130,align: :left   
+    text_box imoney(amount), at: [140,@cur], width:70,align: :right   
+    @cur -= 9
+  end
+
+  def pad12_row(acct,amount)
+    text_box acct, at: [10,@cur], width:130,align: :left   
+    text_box imoney(amount), at: [210,@cur], width:70,align: :right   
+    @cur -= 9
   end
 
-  def period_splits(acct)
-    flipper = acct.account_type == 'INCOME' ? -1 : 1
-    sp = acct.splits.joins(:tran).where('transactions.post_date between ? and ?',from.strftime('%Y%m%d')+'00',to.strftime('%Y%m%d')+'24')
-    sp.sum(:value_num) * flipper
+  def pad22_row(acct,amount)
+    text_box acct, at: [20,@cur], width:120,align: :left   
+    text_box imoney(amount), at: [140,@cur], width:70,align: :right   
+    @cur -= 9
   end
 
+  # def pad32_row(acct,amount)
+  #   text_box acct, at: [30,@cur], width:110,align: :left   
+  #   text_box imoney(amount), at: [140,@cur], width:70,align: :right   
+  #   @cur -= 9
+  # end
+
+
+  def pad13_row(acct,amount)
+    text_box acct, at: [10,@cur], width:130,align: :left   
+    text_box imoney(amount), at: [280,@cur], width:70,align: :right   
+    @cur -= 9
+  end
+
+  def pad23_row(acct,amount)
+    text_box acct, at: [20,@cur], width:120,align: :left   
+    text_box imoney(amount), at: [210,@cur], width:70,align: :right   
+    @cur -= 9
+  end
+
+  def pad33_row(acct,amount)
+    text_box acct, at: [30,@cur], width:100,align: :left   
+    text_box imoney(amount), at: [140,@cur], width:70,align: :right   
+    @cur -= 9
+  end
+
+  def imoney(int,dollar="$")
+    return '' if int.to_i.zero?
+    dollars = int / 100
+    cents = (int % 100) / 100.0
+    amt = dollars + cents
+    set_zero = sprintf('%.2f',amt) # now have a string to 2 decimals
+    '$'+set_zero.gsub(/(\d)(?=(\d{3})+(?!\d))/, "\\1,") # add commas
+  end
+ 
 end
+
+

data/lib/models/register.rb

@@ -1,4 +1,4 @@
-class Pdf::Register < Prawn::Document
+class Register < Prawn::Document
   attr_accessor :response, :date
 
   def initialize(date,cash)

data/lib/models/split_ledger.rb

@@ -1,4 +1,4 @@
-class Pdf::SplitLedger < Prawn::Document
+class SplitLedger < Prawn::Document
   attr_accessor :response, :date
 
   def initialize(date,cash)

data/lib/models/summary.rb

@@ -1,4 +1,4 @@
-class Pdf::Summary < Prawn::Document
+class Summary < Prawn::Document
   attr_accessor :cash, :date, :cwidths
 
   def initialize(cash)

data/lib/vfwcash.rb

@@ -13,6 +13,7 @@ module Vfwcash
       config = YAML.load_file(ENV['VFWCASHCONFIG'])
     else
       config = YAML.load_file("#{PWD}/config/vfwcash.yml")
+      
     end
     ENV['VFWCASHDATABASE'] = config[:database]
     return config

data/lib/vfwcash/api.rb

@@ -16,35 +16,39 @@ module Vfwcash
     end
 
     def between(from,to)
-      pdf = Pdf::Between.new(@date,@cash,from,to)
+      pdf = Between.new(@date,@cash,from,to)
     end
 
     def profit_loss(from,to)
       pl = ProfitLoss.new.generate(from,to)
     end
 
+    def profit_loss_new(options)
+      @cash.profit_loss(options)
+    end
+
     def ledger
-      pdf = Pdf::Ledger.new(@date,@cash)
+      pdf = Ledger.new(@date,@cash)
     end
 
     def summary
-      pdf = Pdf::Summary.new(@cash)
+      pdf = Summary.new(@cash)
     end
 
     def register
-      pdf = Pdf::Register.new(@date,@cash)
+      pdf = Register.new(@date,@cash)
     end
 
     def split
-      pdf = Pdf::SplitLedger.new(@date,@cash)
+      pdf = SplitLedger.new(@date,@cash)
     end
 
     def audit
-      pdf = Pdf::Audit.new(@date,@cash)
+      pdf = Audit.new(@date,@cash)
     end
 
     def balance
-      pdf = Pdf::Balance.new(@date,@cash)
+      pdf = Balance.new(@date,@cash)
     end
 
   end

data/lib/vfwcash/cli.rb

@@ -2,6 +2,8 @@ require 'thor'
 # require 'vfwcash/cli/register'
 require 'chronic'
 require 'active_support'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/date/calculations'
 
 
 module Vfwcash
@@ -14,7 +16,7 @@ module Vfwcash
       puts <<-DATE_HELP
         The DATE parameter is optional on all reports requiring a date and will default to the current date if not present.
 
-        All dates will be converted to the first of the month requardless of the date entered.
+        Most dates will be converted to the first of the month requardless of the date entered.
 
         Entered dates are parsed using Chronic (https://github.com/mojombo/chronic).
         Chronic provide a wide range options.
@@ -49,6 +51,28 @@ module Vfwcash
        puts "Version: #{Vfwcash::VERSION}"
      end
 
+  ##### profit_loss
+    desc "profit_loss [--lev --from --to]","Generate profit/loss pdf with depth of --lev beteween dates --from and --to"
+    method_option :lev, type: :numeric,
+                           desc: "Depth of account hiearchy",
+                           required: false,
+                           default: 2
+    method_option :from, type: :string,
+                           required: false,
+                           desc: "From date, defaults to first of current month"
+    method_option :to, type: :string,
+                           required: false,
+                           desc: "To date, defaults to end of current month"
+
+    def profit_loss
+      # puts "Generate profit_loss report with options  #{options.inspect}"
+      Controller.new(Date.today).profit_loss(options)
+
+      # api = Api.new(Date.today.beginning_of_month)
+      # pl = api.cash.profit_loss(options)
+      # puts api.cash.profit_loss(options).inspect
+    end
+
   ######### INSTALL
     desc "install [--dir --db]", "Install config files and optional test DB in pwd or pwd/--dir"
     long_desc <<-HELLO_WORLD

data/lib/vfwcash/controller.rb

@@ -21,22 +21,30 @@ module Vfwcash
       end
     end
 
+    def profit_loss(options)
+      report =  @cash.profit_loss(options)
+      pdf = ProfitLoss.new(report)
+      filename = "#{PWD}/pdf/pl_#{report['options'][:from]}_#{report['options'][:to]}.pdf"
+      pdf.render_file(filename)
+      open_pdf(filename)
+    end
+
     def between(from,to)
-      pdf = Pdf::Between.new(@date,@cash,from,to)
+      pdf = Between.new(@date,@cash,from,to)
       filename = "#{PWD}/pdf/between_#{from}_#{to}.pdf"
       pdf.render_file(filename)
       open_pdf(filename)
     end
 
     def ledger
-      pdf = Pdf::Ledger.new(@date,@cash)
+      pdf = Ledger.new(@date,@cash)
       filename = "#{PWD}/pdf/ledger_#{Vfwcash.yyyymm(@date)}.pdf"
       pdf.render_file(filename)
       open_pdf(filename)
     end
 
     def summary
-      pdf = Pdf::Summary.new(@cash)
+      pdf = Summary.new(@cash)
       filename = "#{PWD}/pdf/ledger_summary.pdf"
       pdf.render_file(filename)
       open_pdf(filename)
@@ -44,28 +52,28 @@ module Vfwcash
 
 
     def register
-      pdf = Pdf::Register.new(@date,@cash)
+      pdf = Register.new(@date,@cash)
       filename = "#{PWD}/pdf/register_#{Vfwcash.yyyymm(@date)}.pdf"
       pdf.render_file(filename)
       open_pdf(filename)
     end
 
     def split
-      pdf = Pdf::SplitLedger.new(@date,@cash)
+      pdf = SplitLedger.new(@date,@cash)
       filename = "#{PWD}/pdf/split_#{Vfwcash.yyyymm(@date)}.pdf"
       pdf.render_file(filename)
       open_pdf(filename)
     end
 
     def audit
-      pdf = Pdf::Audit.new(@date,@cash)
+      pdf = Audit.new(@date,@cash)
       filename = "#{PWD}/pdf/audit_#{Vfwcash.yyyymm(@date.beginning_of_quarter)}.pdf"
       pdf.render_file(filename)
       open_pdf(filename)
     end
 
     def balance
-      pdf = Pdf::Balance.new(@date,@cash)
+      pdf = Balance.new(@date,@cash)
       filename = "#{PWD}/pdf/balance_#{Vfwcash.yyyymm(@date)}.pdf"
       pdf.render_file(filename)
       open_pdf(filename)

data/lib/vfwcash/version.rb

@@ -1,3 +1,3 @@
 module Vfwcash
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vfwcash
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Steve Alex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-06 00:00:00.000000000 Z
+date: 2017-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -172,6 +172,7 @@ files:
 - pdf_examples/views/checkbooks/split.html.slim
 - pdf_examples/views/checkbooks/summary.html.slim
 - vfwcash-0.5.0.gem
+- vfwcash-0.5.1.gem
 - vfwcash.gemspec
 homepage: ''
 licenses: