lucaterm 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb1f374a09f0de19e379ea58a0d99d4dc7a0e5eb417bb98121c45a9b60b16043
-  data.tar.gz: 7fe2cf713fafcc830e1e43132385988073e9ea60b856916f19980f8e9bc8e7d1
+  metadata.gz: 2b89d7a16d5e1b11ec8bc4caccc299fff6dcaa7edceda8d3ae3e0ad8d24686bb
+  data.tar.gz: 448a0ed6d343ffd78a09f8f83e80cf729699f49db1f0c3cced73d7cb116cc595
 SHA512:
-  metadata.gz: db9a08c3a2014a9c35e51ec242ea1b1d1ab74fb211dddf6cf2baedc6a6ef7d1a615db33dc12ae6d1c06f1b275049e3da7f767c34e5f13aa89f2c770e9d76309a
-  data.tar.gz: 24da76ce1f12b9a55d974375274ce7c8a406502bd1e083760b1e22a565eb78bb6ccf0a9559105d84aaae0703a0d6cfc3a228f6bf732f221a16fe55ac9280e56d
+  metadata.gz: 9e50a20eb61aa70ac29caefedbb0316aaa578179eed5d5c5df340161e821ab5b02b65657a4b39e473bba547e356537153e405a0c508ecf48ec3b036238dffbce
+  data.tar.gz: 53fb5a7d452aaaf0a528e2785601a06d36d16f8790fa48981ab21d43d4f08dbdd43925db67a522f6911be7ff348cd911baa1a49447b199f8271a621f6b23cf53

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## LucaTerm 0.2.1
+
+* `luca book` Fix: proper account code selection
+
+## LucaTerm 0.2.0
+
+* `luca book`: Works without args. Show journals of the latest month.
+* `luca book`: Show categories on Account code selection
+* `luca book`: Show x-customer header on detail screen
+
+## LucaTerm 0.1.2
+
+* `luca book`: '<' for prev month, '>' for next month.
+* `luca book`: Refine 'm' command. Year is now optional. Cleanup dialog background.
+
 ## LucaTerm 0.1.1
 
 * `luca book`: handle cursor on journal detail

data/README.md

@@ -0,0 +1,13 @@
+# LucaTerm
+
+[![Gem Version](https://badge.fury.io/rb/lucaterm.svg)](https://badge.fury.io/rb/lucaterm)
+[![doc](https://img.shields.io/badge/doc-rubydoc-green.svg)](https://www.rubydoc.info/gems/lucaterm/index)
+![license](https://img.shields.io/github/license/chumaltd/luca)
+
+Terminal frontend app for LucaSuite.
+
+## Usage
+
+```bash
+$ luca book [yyyy m]
+```

data/exe/luca

@@ -3,19 +3,22 @@
 
 require 'optparse'
 require 'curses'
+require 'luca_book/journal'
 require 'luca_term'
 
 include Curses
 
-init_screen
-curs_set(0)
-noecho
 
 class LucaCmd
   def self.book(args, params = {})
+    init_screen
+    curs_set(0)
+    noecho
+
     begin
-      window = Curses::Window.new(0, 0, 0, 0)
-      LucaTerm::Book.journals(window, *ARGV)
+      window = Curses::Window.new(0, 0, 1, 0)
+      args = ARGV.empty? ? LucaBook::Journal.latest_month : ARGV
+      LucaTerm::Book.journals(window, *args)
     ensure
       close_screen
     end

data/lib/luca_term/book.rb

@@ -4,14 +4,17 @@ require 'curses'
 require "unicode/display_width/string_ext"
 require 'mb_string'
 require 'luca_book'
-
+require 'json'
 module LucaTerm
   class Book
     include Curses
-    attr_accessor :window
+    attr_accessor :window, :modeline
 
-    def initialize(window, data=nil)
+    def initialize(window, year, month, data=nil)
+      @modeline = Window.new(1, 0, 0, 0)
       @window = window
+      @year = year
+      @month = month
       @data = data
       @index = 0
       @active = 0  # active line in window
@@ -21,19 +24,25 @@ module LucaTerm
     end
 
     def self.journals(window, *args)
-      new(window, LucaSupport::Code.readable(LucaBook::List.term(*args).data))
+      new(window, args[0], args[1], LucaSupport::Code.readable(LucaBook::List.term(*args).data))
     end
 
+    # render monthly journal list
+    #
     def main_loop
       loop do
+        modeline.setpos(0, 0)
+        modeline << "#{Date::ABBR_MONTHNAMES[@month.to_i]} #{@year}"
+        modeline.clrtoeol
+        modeline.refresh
+
         window.setpos(0,0)
         @visible.each.with_index(0) do |dat, i|
           cursor = i == @active ? :full : nil
           draw_line(dat, cursor, true)
-          clrtoeol
           window << "\n"
         end
-        (window.maxy - window.cury).times { window.deleteln() }
+        (window.maxy - window.cury).times { window << "\n" }
         window.refresh
 
         window.keypad(true)
@@ -50,15 +59,32 @@ module LucaTerm
         when 'G'
           cursor_last @data
         when 'm'
-          ym = edit_dialog('Change month: yyyy m')&.split(/[\/\s]/)
+          ym = edit_dialog('Enter: [yyyy] m', title: 'Change Month')&.split(/[\/\s]/)
+          ym = [@year, ym[0]] if ym.length == 1
           @data = LucaSupport::Code.readable(LucaBook::List.term(*ym).data)
+          @year, @month = ym
+          @index = 0
+          @active = 0
+          @visible = set_visible(@data)
+        when '<'
+          target = Date.parse("#{@year}-#{@month}-1").prev_month
+          @data = LucaSupport::Code.readable(LucaBook::List.term(target.year, target.month).data)
+          @year, @month = target.year, target.month
+          @index = 0
+          @active = 0
+          @visible = set_visible(@data)
+        when '>'
+          target = Date.parse("#{@year}-#{@month}-1").next_month
+          @data = LucaSupport::Code.readable(LucaBook::List.term(target.year, target.month).data)
+          @year, @month = target.year, target.month
           @index = 0
           @active = 0
           @visible = set_visible(@data)
         when KEY_ENTER, KEY_CTRL_J
           show_detail(@data[@index])
+          @visible = set_visible(@data)
         when 'N'
-          newdate = edit_dialog "Enter date of new record: YYYY-m-d"
+          newdate = edit_dialog "Enter date of new record: YYYY-m-d", title: 'Create Journal'
           tmpl = {
             date: newdate,
             debit: [
@@ -75,16 +101,26 @@ module LucaTerm
       end
     end
 
+    # render each journal
+    #
     def show_detail(record)
       @d_v = 0
       @d_h = 0
       debit_length = Array(record[:debit]).length
       credit_length = Array(record[:credit]).length
       date, txid = LucaSupport::Code.decode_id(record[:id]) if record[:id]
+      fileid = record[:id].split('/').last if record[:id]
       date ||= record[:date]
+      modeline.setpos(0, 0)
+      modeline << "#{date} #{fileid} "
+      modeline.clrtoeol
+      modeline.refresh
+
       loop do
         window.setpos(0, 0)
-        window << "#{date}  "
+        if record.dig(:headers, 'x-customer')
+          window << format(" [%s] ", record.dig(:headers, 'x-customer'))
+        end
         window << record[:note]
         clrtoeol; window << "\n"
         [debit_length, credit_length].max.times do |i|
@@ -101,7 +137,7 @@ module LucaTerm
           clrtoeol
           window << "\n"
         end
-        (window.maxy - window.cury).times { window.deleteln() }
+        (window.maxy - window.cury).times { window << "\n" }
         window.refresh
 
         window.keypad(true)
@@ -155,14 +191,15 @@ module LucaTerm
           debit_length = Array(record[:debit]).length
           credit_length = Array(record[:credit]).length
         when KEY_CTRL_J
-          position = [0,1].include?(@d_h) ? :debit : :credit
+          position, counter = [0,1].include?(@d_h) ? [:debit, :credit] : [:credit, :debit]
           if [0, 2].include? @d_h
             new_code = select_code
             next if new_code.nil?
 
             record[position][@d_v][:code] = new_code
           else
-            new_amount = edit_amount(record[position][@d_v][:amount])
+            diff = record[counter].map { |c| c[:amount] }.sum - record[position].map { |p| p[:amount] }.sum + record[position][@d_v][:amount]
+            new_amount = edit_amount(record[position][@d_v][:amount], diff)
             next if new_amount.nil?
 
             record[position][@d_v][:amount] = new_amount
@@ -180,9 +217,12 @@ module LucaTerm
       end
     end
 
-    def edit_amount(current = nil)
+    # returns amount after edit
+    #
+    def edit_amount(current = nil, diff = nil)
+      diff_msg = diff.nil? ? '' : "#{diff} meets balance."
       begin
-        scmd = edit_dialog "Current: #{current&.to_s}"
+        scmd = edit_dialog "Current: #{current&.to_s}", diff_msg, title: 'Edit Amount'
         return nil if scmd.length == 0
         # TODO: guard from not number
         return scmd.to_i
@@ -191,15 +231,22 @@ module LucaTerm
       end
     end
 
-    def edit_dialog(message = '')
-      sub = window.subwin(4, 30, (window.maxy-4)/2, (window.maxx - 30)/2)
-      sub.box(?|, ?-)
-      sub.setpos(1, 3)
-      sub << message
-      clrtoeol
+    def edit_dialog(message = '', submessage = '', title: '')
+      sub = window.subwin(5, 30, (window.maxy-5)/2, (window.maxx - 30)/2)
+      sub.setpos(1, 1)
+      sub << "  #{message}"
+      sub.clrtoeol
+      sub.setpos(2, 1)
+      sub.clrtoeol
       sub.setpos(2, 3)
-      sub << "> "
-      clrtoeol
+      sub.attron(A_REVERSE) { sub << "  > #{' ' * (30 - 9)}" }
+      sub.setpos(3, 1)
+      sub << "  #{submessage}"
+      sub.clrtoeol
+      sub.box(?|, ?-)
+      sub.setpos(0, 2)
+      sub << "[ #{title} ]"
+      sub.setpos(2, 7)
       sub.refresh
       loop do
         echo
@@ -210,57 +257,76 @@ module LucaTerm
       end
     end
 
+    # returns Account code after selection from list dialog
+    #
     def select_code
-      list = @dict.map{ |code, entry| { code: code, label: entry[:label] } }
-               .select{ |d| d[:code].length >= 3 }
+      top = window.maxy >= 25 ? 5 : 2
+      sub = window.subwin(window.maxy - top, window.maxx - 4, top, 2)
+      padding = ' ' * account_index(sub.maxx)[0].length
+      list = @dict.reject{ |code, _e| code.length < 3 || /^[15]0XX/.match(code) || /^[89]ZZ/.match(code) }
+               .map{ |code, entry| { code: code, label: entry[:label], category: padding } }
+      tabstop = ['1', '5', '9', 'A', 'C'].map { |cap| list.index { |ac| /^#{cap}/.match(ac[:code]) } }.compact
+      account_index(sub.maxx).each.with_index do |cat, i|
+        list[tabstop[i]][:category] = cat
+      end
       visible_dup = @visible
       index_dup = @index
       active_dup = @active
       @index = 0
       @active = 0
       @visible = nil
-      @visible = set_visible(list)
+      @visible = set_visible(list, sub.maxy - 2)
       loop do
-        window.setpos(0,0)
         @visible.each.with_index(0) do |entry, i|
-          line = format("%s %s", entry[:code], entry[:label])
+          sub.setpos(i+1, 1)
+          head = entry[:code].length == 3 ? '' : '  '
+          line = format("%s %s %s %s", head, entry[:category], entry[:code], entry[:label])
           if i == @active
-            window.attron(A_REVERSE) { window << line }
+            sub.attron(A_REVERSE) { sub << line }
           else
-            window << line
+            sub << line
           end
-          clrtoeol
-          window << "\n"
+          sub.clrtoeol
+          #sub << "\n"
         end
-        (window.maxy - window.cury).times { window.deleteln() }
-        window.refresh
+        (window.maxy - window.cury).times { window << "\n" }
+        sub.box(?|, ?-)
+        sub.setpos(0, 2)
+        sub << "[ Select Account ]"
+        sub.refresh
 
         cmd = window.getch
         case cmd
         when KEY_DOWN, 'j', KEY_CTRL_N
           next if @index >= list.length - 1
 
-          cursor_down list
+          cursor_down list, sub.maxy - 2
         when KEY_NPAGE
-          cursor_pagedown list
+          cursor_pagedown list, sub.maxy - 2
         when KEY_UP, 'k', KEY_CTRL_P
           next if @index <= 0
 
           cursor_up list
         when KEY_PPAGE
-          cursor_pageup list
+          cursor_pageup list, sub.maxy - 2
+        when KEY_LEFT
+          cursor_jump tabstop, list, rev: true
+        when KEY_RIGHT
+          cursor_jump tabstop, list
         when 'G'
-          cursor_last list
+          cursor_last list, sub.maxy - 2
         when KEY_CTRL_J
-          code = list[@index][:code]
+          selected = list[@index][:code]
           @visible = visible_dup
           @index = index_dup
           @active = active_dup
-          return code
+          sub.close
+          return selected
         when 'q'
           @visible = visible_dup
           @index = index_dup
           @active = active_dup
+          sub.close
           return nil
         end
       end
@@ -268,17 +334,36 @@ module LucaTerm
 
     private
 
+    def account_index(maxx = 50)
+      term = if maxx >= 45
+               ['Assets', 'Liabilities', 'Net Assets', 'Sales', 'Expenses']
+             elsif maxx >= 40
+               ['Assets', 'LIAB', 'NetAsset', 'Sales', 'EXP']
+             else
+               ['', '', '', '', '']
+             end
+      len = term.map { |str| str.length }.max
+      term.map { |str| str += ' ' * (len - str.length) }
+    end
+
     def draw_line(dat, cursor = nil, note = false)
       date, txid = LucaSupport::Code.decode_id(dat[:id]) if dat[:id]
+      date_str = date.nil? ? '' : date.split('-')[1, 2].join('/')&.mb_rjust(5, ' ')
       debit_cd = fmt_code(dat[:debit])
       debit_amount = fmt_amount(dat[:debit])
       credit_cd = fmt_code(dat[:credit])
       credit_amount = fmt_amount(dat[:credit])
       lines = [Array(dat[:debit]).length, Array(dat[:credit]).length].max
-      window << sprintf("%s %s |%s| ",
-                        date&.mb_rjust(10, ' ') || '',
-                        txid || '',
-                        lines > 1 ? lines.to_s : ' ',
+      lines = if lines == 1
+                ' '
+              elsif lines > 9
+                '+'
+              else
+                lines
+              end
+      window << sprintf("%s |%s| ",
+                        date_str,
+                        lines,
                        )
       case cursor
       when 0
@@ -297,8 +382,8 @@ module LucaTerm
         window.attron(A_REVERSE) { window << credit_amount }
       else
         rest = format("%s %s | %s %s", debit_cd, debit_amount, credit_cd, credit_amount)
-        if note && window.maxx > 80
-          rest += " | #{dat[:note].mb_truncate(window.maxx - 80)}"
+        if note && window.maxx > 70
+          rest += " | #{dat[:note]&.mb_truncate(window.maxx - 70)}"
         end
         if cursor == :full
           window.attron(A_REVERSE) { window << rest }
@@ -334,46 +419,62 @@ module LucaTerm
       @visible = set_visible(data)
     end
 
-    def cursor_pageup(data)
-      n_idx = @index - window.maxy
+    def cursor_pageup(data, maxy = nil)
+      maxy ||= window.maxy
+      n_idx = @index - maxy
       return if n_idx <= 0
 
       @index = n_idx
       @active = 0
-      @visible = set_visible(data)
+      @visible = set_visible(data, maxy)
     end
 
-    def cursor_down(data)
+    def cursor_down(data, maxy = nil)
+      maxy ||= window.maxy
       @index += 1
-      @active = @active >= window.maxy - 1 ? window.maxy - 1 : @active + 1
-      @visible = set_visible(data)
+      @active = @active >= maxy - 1 ? @active : @active + 1
+      @visible = set_visible(data, maxy)
     end
 
-    def cursor_pagedown(data)
-      n_idx = @index + window.maxy
+    def cursor_pagedown(data, maxy = nil)
+      maxy ||= window.maxy
+      n_idx = @index + maxy
       return if n_idx >= data.length - 1
 
       @index = n_idx
+      @active = 0
+      @visible = set_visible(data, maxy)
+    end
+
+    def cursor_jump(tabstop, data, rev: false)
+      @index = if rev
+                 tabstop.filter{ |t| t < @index ? t : nil }.max || @index
+               else
+                 tabstop.filter{ |t| t > @index ? t : nil }.min || @index
+               end
+
       @active = 0
       @visible = set_visible(data)
     end
 
-    def cursor_last(data)
+    def cursor_last(data, maxy = nil)
+      maxy ||= window.maxy
       @index = data.length - 1
-      @active = window.maxy - 1
-      @visible = set_visible(data)
+      @active = maxy - 1
+      @visible = set_visible(data, maxy)
     end
 
-    def set_visible(data)
-      return data if data.nil? || data.length <= window.maxy
+    def set_visible(data, maxy = nil)
+      maxy ||= window.maxy
+      return data if data.nil? || data.length <= maxy
 
       if @visible.nil?
-        data.slice(0, window.maxy)
+        data.slice(0, maxy)
       else
-        if @active == (window.maxy - 1)
-          data.slice(@index - window.maxy + 1, window.maxy)
+        if @active == (maxy - 1)
+          data.slice(@index - maxy + 1, maxy)
         elsif @active == 0
-          data.slice(@index, window.maxy)
+          data.slice(@index, maxy)
         else
           @visible
         end

data/lib/luca_term/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucaTerm
-  VERSION = '0.1.1'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucaterm
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Chuma Takahiro
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-13 00:00:00.000000000 Z
+date: 2022-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: lucarecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +110,7 @@ dependencies:
         version: 12.3.3
 description: 'Terminal frontend for Luca Suite
 
-'
+  '
 email:
 - co.chuma@gmail.com
 executables:
@@ -105,6 +119,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
+- README.md
 - exe/luca
 - lib/luca_term.rb
 - lib/luca_term/book.rb
@@ -116,7 +131,7 @@ metadata:
   homepage_uri: https://github.com/chumaltd/luca/tree/master/lucaterm
   source_code_uri: https://github.com/chumaltd/luca/tree/master/lucaterm
   changelog_uri: https://github.com/chumaltd/luca/tree/master/lucaterm/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -131,8 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.2.5
+signing_key:
 specification_version: 4
 summary: Terminal frontend for Luca Suite
 test_files: []