lucasalary 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1eaada7633a6968784a6421f92f6393aebb762d67725f7df7237a429e4dd0f5
-  data.tar.gz: 7168896dd1c49cd1a4f44e35ab5dc232426c304964fb878bff67d899db9f8753
+  metadata.gz: 37e8c1758e8ea780f6f124747241c5c43b4047f96e6a72ebe28d3ae546034843
+  data.tar.gz: b9d761bbedb5f77d222ac7e2d16cd5258ee60d52d7e2cc75ac941f1faae2b5f2
 SHA512:
-  metadata.gz: b959970ee8cec2debca73f672c2f16d6365d3bd29b5c53fc4814369ecf08e9312f137c824371c799e3a2bf4cda2f27f3b200a3d7a46e5c66a599a78702fb3175
-  data.tar.gz: fa89846e020e818a8e9367312292a9256757ebed278bc1d7afbbe785a525d28929a7f04d4801490164e749dcbdee65da051108546cbae7a364fc32bd8cfc392c
+  metadata.gz: de2e967a7585233f87b4f3eeac7729b9d183563fc71610f355ca4329e2ff521d23473514d62e514da8e3735fe7bde4d8bc7f5dd58afd3e3bad2add31bb98630d
+  data.tar.gz: b7fa56bbc2a8e15e20b6db16a7e1e4c4f6f555f0f19da175fe41e67785af84a809e7f3ee16ba1c7d5394e86038e18f0ac756f68ea26140169a1b9bb9bb8eb9dc

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## LucaSalary 0.1.18
+
+* Add summary to payslip. Refactor monthly payment.
+
 ## LucaSalary 0.1.17
 
 * Breaking change: restructure CLI in sub-sub command format.

data/exe/luca-salary

@@ -16,9 +16,9 @@ module LucaCmd
     def self.create(args = nil, _params = nil)
       if args
         args << 28 if args.length == 2 # specify safe last day
-        LucaSalary::Base.new(args.join('-')).calc
+        LucaSalary::Monthly.new(args.join('-')).calc
       else
-        LucaSalary::Base.new.calc
+        LucaSalary::Monthly.new.calc
       end
     end
 
@@ -56,6 +56,11 @@ when /profiles?/
       args = opt.parse(ARGV)
       LucaCmd::Profile.create(args)
     end
+  else
+    puts 'Proper subcommand needed.'
+    puts
+    puts 'Usage: luca-salary profile[s] create Name'
+    exit 1
   end
 when 'export'
   LucaCmd::Payment.export(ARGV)
@@ -75,7 +80,18 @@ when /payments?/
       args = opt.parse(ARGV)
       LucaCmd::Payment.list(args, params)
     end
+  else
+    puts 'Proper subcommand needed.'
+    puts
+    puts 'Usage: luca-salary payment[s] (create|list) [--help|options]'
+    exit 1
   end
 else
-  puts 'Invalid subcommand'
+  puts 'Proper subcommand needed.'
+  puts
+  puts 'Usage: luca-salary subcommand [options]'
+  puts '        profiles'
+  puts '        payments'
+  puts '        export: puts payment data for LucaBook import'
+  exit 1
 end

data/lib/luca_salary/base.rb

@@ -9,30 +9,16 @@ require 'luca_record'
 
 module LucaSalary
   class Base < LucaRecord::Base
-    attr_reader :driver, :dict, :config, :pjdir
+    attr_reader :dict, :config, :pjdir
     @dirname = 'payments'
 
     def initialize(date = nil)
       @date = date.nil? ? Date.today : Date.parse(date)
       @pjdir = Pathname(LucaSupport::Config::Pjdir)
       @config = load_config(@pjdir / 'config.yml')
-      @driver = set_driver
       @dict = load_dict
     end
 
-    #
-    # call country specific calculation
-    #
-    def calc
-      self.class.prepare_dir!(datadir / 'payments', @date)
-      country = @driver.new(@pjdir, @config, @date)
-      LucaSalary::Profile.all do |profile|
-        current_profile = parse_current(profile)
-        h = country.calc_payment(current_profile)
-        LucaSalary::Payment.new(@date.to_s).create(current_profile, h)
-      end
-    end
-
     def gen_aggregation!
       LucaSalary::Profile.all do |profile|
         id = profile.dig('id')
@@ -60,7 +46,6 @@ module LucaSalary
       dat.filter { |k, _v| /^#{code}[0-9A-Fa-f]{,3}$/.match(k.to_s) }
     end
 
-    #
     # Subtotal each items.
     # 1::
     #    Base salary or wages.

data/lib/luca_salary/monthly.rb

@@ -9,14 +9,33 @@ require 'luca_salary'
 require 'luca_record'
 
 module LucaSalary
-  class Monthly < LucaRecord::Base
+  class Monthly < LucaSalary::Base
+    @dirname = 'payments'
+
     def initialize(date = nil)
-      @date = parse_date(date)
+      @date = date.nil? ? Date.today : Date.parse(date)
       @pjdir = Pathname(LucaSupport::Config::Pjdir)
       @config = load_config(@pjdir + 'config.yml')
+      @driver = set_driver
     end
 
+    # call country specific calculation
     #
+    def calc
+      country = @driver.new(@pjdir, @config, @date)
+      # TODO: handle retirement
+      LucaSalary::Profile.all do |profile|
+        current_profile = parse_current(profile)
+        if self.class.search(@date.year, @date.month, @date.day, current_profile['id']).count > 0
+          puts "payment record already exists: #{current_profile['id']}"
+          return nil
+        end
+        h = country.calc_payment(current_profile)
+        h['profile_id'] = current_profile['id']
+        self.class.create(h, date: @date, codes: Array(current_profile['id']))
+      end
+    end
+
     # output payslips via mail or console
     #
     def report(mode = nil)

data/lib/luca_salary/payment.rb

@@ -17,31 +17,28 @@ module LucaSalary
       @dict = LucaRecord::Dict.load_tsv_dict(@pjdir / 'dict' / 'code.tsv')
     end
 
-    # create record with LucaSalary::Profile instance and apyment data
-    #
-    def create(profile, payment)
-      id = profile.dig('id')
-      if self.class.search(@date.year, @date.month, @date.day, id).first
-        puts "payment record already exists: #{id}"
-        return nil
-      end
-
-      self.class.create(payment, date: @date, codes: Array(id))
-    end
-
     def payslip
       {}.tap do |report|
         report['asof'] = "#{@date.year}/#{@date.month}"
+        report['payments'] = []
         report['records'] = []
 
         self.class.asof(@date.year, @date.month) do |payment|
+          profile = LucaSalary::Profile.find(payment['profile_id'])
+          summary = {
+            'name' => profile['name'],
+            "#{@dict.dig('5', :label) || '5'}" => payment['5']
+          }
+
           slip = {}.tap do |line|
+            line['name'] = profile['name']
             payment.each do |k, v|
               next if k == 'id'
 
               line["#{@dict.dig(k, :label) || k}"] = v
             end
           end
+          report['payments'] << summary
           report['records'] << slip
         end
       end

data/lib/luca_salary/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucaSalary
-  VERSION = '0.1.17'
+  VERSION = '0.1.18'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucasalary
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord