tax_jp 1.1.11 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91b3e81185d352f8074e37587f4d614d4212d02ec3a0b8841beda2ac7648ba55
-  data.tar.gz: 7cffccbde3108a384809f05e016098d24ca86343fb0c73a80c22d608857e5891
+  metadata.gz: 2de95a917f1b68ba48d3452ab8b3228200c502fc8602ee31cd9565d60d0d34e1
+  data.tar.gz: 51c4f20eeac6175735b8790598c8df0bbad541dd44fa398a35173fa021f28869
 SHA512:
-  metadata.gz: c387eb573c8ee59d230cdc8c4ced099b9efa02972bafb96249738043cec7bbd2bf5050d83bf39ffaa997f2a2004afacb024cc438dd8396df615da6ee5330243d
-  data.tar.gz: 6f80fc2378b4ad9f79f94d3c4818f4fe609cb9bde2887f9b9889ca1b041a23c3f2855106b207a3ce3563df5214032b406a190dc772e26fb8d76ca09736acf240
+  metadata.gz: b7a28906f62ef2b6925a02f32c61c205f082167f7a6767c06d82ab227493a7c0407f49fbef03410230db40e3bc97023f03b2d9682538ef9d627a069bb1cdae3b
+  data.tar.gz: e2c63fdb23de8ef62bd6ebdaf13d32078f555874fb1be94e5bbbd6534338b134e592916d3847432a4ddb9d504c96a500040dc76277e706978ad2905df16b30dd

data/app/assets/stylesheets/tax_jp/layout,css.scss

@@ -1,5 +1,17 @@
+html {
+  font-size: 87.5%;
+}
+
 .taxjp {
   main {
     padding: 4rem 0;
   }
+
+  .table-hover tbody tr:hover td, .table-hover tbody tr:hover th {
+    background-color: #D7EEFF;
+  }
+  
+  .bootstrap-datetimepicker-widget {
+    margin-left: 48px;
+  }
 }

data/app/views/layouts/tax_jp/_nav.html.erb

@@ -1,6 +1,6 @@
-<nav class="navbar navbar-expand-sm navbar-light bg-light fixed-top">
+<nav class="navbar navbar-expand-sm navbar-light bg-light fixed-top px-2">
   <span class="navbar-brand">TaxJP</span>
-  <ul class="navbar-nav mr-auto">
+  <ul class="navbar-nav me-auto">
     <li class="nav-item <%= 'active' if controller_name == 'withheld_taxes' %>">
       <%= link_to '源泉徴収税', withheld_taxes_path, class: "nav-link" %>
     </li>

data/app/views/tax_jp/bonus_withheld_taxes/index.html.erb

@@ -1,18 +1,16 @@
 <div class="container">
-  <%= form_with model: @finder, url: {action: 'index'}, method: 'get', class: 'form form-vertical', local: true do |f| %>
-    <div class="row">
-      <div class="form-group m-2">
-        <%= f.t_date_field :from %>
-      </div>
-      <div class="m-2">
-        <%= f.submit '表示', class: 'btn btn-light' %>
-      </div>
+  <%= form_with model: @finder, url: {action: 'index'}, method: 'get', class: 'row', local: true do |f| %>
+    <div class="col-auto my-auto">
+      <%= f.t_date_field :from %>
+    </div>
+    <div class="col-auto my-auto">
+      <%= f.submit '表示', class: 'btn btn-outline-primary' %>
     </div>
   <% end %>
 </div>
 <div class="py-2 px-4">
   <table class="table table-striped table-bordered table-hover table-sm">
-    <thead class="thead-light">
+    <thead>
       <tr>
         <th rowspan="5" class="align-middle text-center">賞与の金額に乗ずべき率（％）</th>
         <th colspan="16" class="align-middle text-center">甲</th>
@@ -46,16 +44,16 @@
             to = wt.__send__("dependent_#{i}_salary_to")
             infinite = to == TaxJp::INTEGER_MAX 
             %>
-            <td class="text-right"><%= from == TaxJp::INTEGER_MAX ? '-' : from.to_s(:delimited) %></td>
-            <td class="<%= infinite ? 'text-center' : 'text-right' %>"><%= infinite ? '-' : to.to_s(:delimited) %></td>
+            <td class="text-end"><%= from == TaxJp::INTEGER_MAX ? '-' : from.to_s(:delimited) %></td>
+            <td class="<%= infinite ? 'text-center' : 'text-end' %>"><%= infinite ? '-' : to.to_s(:delimited) %></td>
           <% end %>
             <%
             from = wt.sub_salary_from
             to = wt.sub_salary_to
             infinite = to == TaxJp::INTEGER_MAX 
             %>
-          <td class="text-right"><%= from.to_s(:delimited) unless from == 0 && to == 0 %></td>
-          <td class="<%= infinite ? 'text-center' : 'text-right' %>"><%= infinite ? '-' : to.to_s(:delimited) unless from == 0 && to == 0 %></td>
+          <td class="text-end"><%= from.to_s(:delimited) unless from == 0 && to == 0 %></td>
+          <td class="<%= infinite ? 'text-center' : 'text-end' %>"><%= infinite ? '-' : to.to_s(:delimited) unless from == 0 && to == 0 %></td>
         </tr>
       <% end %>
     </tbody>  

data/app/views/tax_jp/common/_date_field.html.erb

@@ -1,8 +1,8 @@
 <div class="input-group date" id="datetimepicker4" data-target-input="nearest">
-  <label for="datetimepicker1" class="pt-2 pr-2">年月日:</label>
-  <%= f.text_field method, class: 'form-control datetimepicker-input', style: 'width: 7em;', data: {target: '#datetimepicker4'} %>
-  <div class="input-group-append" data-target="#datetimepicker4" data-toggle="datetimepicker">
-    <div class="input-group-text"><i class="fa fa-calendar"></i></div>
+  <label for="finder_from" class="col-form-label me-2">年月日</label>
+  <%= f.text_field method, class: 'form-control datetimepicker-input', data: {target: '#datetimepicker4'} %>
+  <div class="input-group-text" data-target="#datetimepicker4" data-toggle="datetimepicker">
+    <i class="fa fa-calendar"></i>
   </div>
   <script>
         $(function () {

data/app/views/tax_jp/depreciation_rates/index.html.erb

@@ -2,7 +2,7 @@
   <table class="table table-striped table-bordered table-hover table-sm">
     <thead class="thead-light">
       <tr>
-        <th rowspan="2" class="align-middle">耐用年数</th>
+        <th rowspan="2" class="text-center align-middle">耐用年数</th>
         <th rowspan="2" class="align-middle">定額法償却率</th>
         <th colspan="3">定率法</th>
       </tr>
@@ -15,7 +15,7 @@
     <tbody>
       <% @depreciation_rates.each do |rate| %>
         <tr>
-          <th><%= rate.durable_years %></th>
+          <th class="text-center"><%= rate.durable_years %></th>
           <td><%= rate.fixed_amount_rate %></td>
           <td><%= rate.rate %></td>
           <td><%= rate.revised_rate %></td>

data/app/views/tax_jp/social_insurances/index.html.erb

@@ -1,21 +1,23 @@
 <div class="container">
-  <%= form_with model: @finder, url: {action: 'index'}, method: 'get', class: 'form form-vertical', local: true do |f| %>
-    <div class="row">
-      <div class="form-group m-2">
-        <%= f.t_date_field :from %>
-      </div>
-      <div class="form-group form-inline m-2">
-        <label for="finder_prefecture_code" class="pr-2">都道府県:</label>
-        <%= f.collection_select :prefecture_code, TaxJp::Prefecture.all, :code, :name, {}, class: 'form-control' %>
-      </div>
-      <div class="m-2">
-        <%= f.submit '表示', class: 'btn btn-light' %>
+  <%= form_with model: @finder, url: {action: 'index'}, method: 'get', class: 'row', local: true do |f| %>
+    <div class="col-auto my-auto">
+      <%= f.t_date_field :from %>
+    </div>
+    <div class="col-auto my-auto">
+      <div class="input-group">
+        <div class="col-auto my-auto">
+          <label for="finder_prefecture_code" class="col-form-label me-2">都道府県</label>
+        </div>
+        <%= f.collection_select :prefecture_code, TaxJp::Prefecture.all, :code, :name, {}, class: 'form-select' %>
       </div>
     </div>
+    <div class="col-auto my-auto">
+      <%= f.submit '表示', class: 'btn btn-outline-primary' %>
+    </div>
   <% end %>
 </div>
 <% if @social_insurances %>
-  <div class="pl-4 pr-4">
+  <div class="py-2 px-4">
     <div>
       <span><%= @social_insurances.first.valid_from %></span>
       <span>～</span>
@@ -54,20 +56,20 @@
               <td class="text-center"><%= si.grade.grade %></td>
             <% end %>
 
-            <td class="text-right"><%= si.grade.monthly_standard.to_s(:delimited) %></td>
-            <td class="text-right"><%= si.grade.daily_standard.to_s(:delimited) %></td>
-            <td class="text-right"><%= si.grade.salary_from.to_s(:delimited) %></td>
-            <td class="text-right"><%= si.grade.salary_to.to_s(:delimited) if si.grade.salary_to < TaxJp::INTEGER_MAX %></td>
-            <td class="text-right"><%= si.health_insurance.general_amount.to_s(:delimited) %></td>
-            <td class="text-right"><%= si.health_insurance.general_amount_half.to_s(:delimited) %></td>
-            <td class="text-right"><%= si.health_insurance.general_amount_care.to_s(:delimited) %></td>
-            <td class="text-right"><%= si.health_insurance.general_amount_care_half.to_s(:delimited) %></td>
+            <td class="text-end"><%= si.grade.monthly_standard.to_s(:delimited) %></td>
+            <td class="text-end"><%= si.grade.daily_standard.to_s(:delimited) %></td>
+            <td class="text-end"><%= si.grade.salary_from.to_s(:delimited) %></td>
+            <td class="text-end"><%= si.grade.salary_to.to_s(:delimited) if si.grade.salary_to < TaxJp::INTEGER_MAX %></td>
+            <td class="text-end"><%= si.health_insurance.general_amount.to_s(:delimited) %></td>
+            <td class="text-end"><%= si.health_insurance.general_amount_half.to_s(:delimited) %></td>
+            <td class="text-end"><%= si.health_insurance.general_amount_care.to_s(:delimited) %></td>
+            <td class="text-end"><%= si.health_insurance.general_amount_care_half.to_s(:delimited) %></td>
 
             <% if [0, TaxJp::INTEGER_MAX].exclude?(si.grade.pension_grade) %>
-              <td class="text-right"><%= number_to_currency(si.welfare_pension.general_amount, unit: '', precision: 2) if si.welfare_pension.general_amount > 0 %></td>
-              <td class="text-right"><%= number_to_currency(si.welfare_pension.general_amount_half, unit: '', precision: 2) if si.welfare_pension.general_amount_half > 0 %></td>
-              <td class="text-right"><%= number_to_currency(si.welfare_pension.particular_amount, unit: '', precision: 2) if si.welfare_pension.particular_amount > 0 %></td>
-              <td class="text-right"><%= number_to_currency(si.welfare_pension.particular_amount_half, unit: '', precision: 2) if si.welfare_pension.particular_amount_half > 0 %></td>
+              <td class="text-end"><%= number_to_currency(si.welfare_pension.general_amount, unit: '', precision: 2) if si.welfare_pension.general_amount > 0 %></td>
+              <td class="text-end"><%= number_to_currency(si.welfare_pension.general_amount_half, unit: '', precision: 2) if si.welfare_pension.general_amount_half > 0 %></td>
+              <td class="text-end"><%= number_to_currency(si.welfare_pension.particular_amount, unit: '', precision: 2) if si.welfare_pension.particular_amount > 0 %></td>
+              <td class="text-end"><%= number_to_currency(si.welfare_pension.particular_amount_half, unit: '', precision: 2) if si.welfare_pension.particular_amount_half > 0 %></td>
             <% else %>
               <td></td>
               <td></td>

data/app/views/tax_jp/withheld_taxes/index.html.erb

@@ -1,12 +1,10 @@
 <div class="container">
-  <%= form_with model: @finder, url: {action: 'index'}, method: 'get', class: 'form form-vertical', local: true do |f| %>
-    <div class="row">
-      <div class="form-group m-2">
-        <%= f.t_date_field :from %>
-      </div>
-      <div class="m-2">
-        <%= f.submit '表示', class: 'btn btn-light' %>
-      </div>
+  <%= form_with model: @finder, url: {action: 'index'}, method: 'get', class: 'row', local: true do |f| %>
+    <div class="col-auto my-auto">
+      <%= f.t_date_field :from %>
+    </div>
+    <div class="col-auto my-auto">
+      <%= f.submit '表示', class: 'btn btn-outline-primary' %>
     </div>
   <% end %>
 </div>
@@ -33,9 +31,9 @@
           <td class="text-center"><%= wt.salary_range_from.to_s(:delimited) %></td>
           <td class="text-center"><%= wt.salary_range_to.to_s(:delimited) %></td>
           <% 8.times do |i| %>
-            <td class="text-right"><%= wt.__send__("dependent_#{i}").to_s(:delimited) %></td>
+            <td class="text-end"><%= wt.__send__("dependent_#{i}").to_s(:delimited) %></td>
           <% end %>
-          <td class="text-right"><%= wt.sub_salary.to_s(:delimited) %></td>
+          <td class="text-end"><%= wt.sub_salary.to_s(:delimited) %></td>
         </tr>
       <% end %>
     </tbody>

data/data//345/212/264/345/203/215/344/277/235/351/231/272//351/233/207/347/224/250/344/277/235/351/231/272.tsv

@@ -4,4 +4,4 @@
 2010-04-01	2012-03-31	0.006	0.0095	0.007	0.0105	0.007	0.0115
 2012-04-01	2016-03-31	0.005	0.0085	0.006	0.0095	0.006	0.0105
 2016-04-01	2017-03-31	0.004	0.007	0.005	0.008	0.005	0.009
-2017-04-01	2021-03-31	0.003	0.006	0.004	0.007	0.004	0.008
+2017-04-01	2022-03-31	0.003	0.006	0.004	0.007	0.004	0.008

data/lib/tax_jp/version.rb

@@ -1,3 +1,3 @@
 module TaxJp
-  VERSION = '1.1.11'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tax_jp
 version: !ruby/object:Gem::Version
-  version: 1.1.11
+  version: 1.2.2
 platform: ruby
 authors:
 - ichylinux
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap
@@ -17,20 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bootstrap4-datetime-picker-rails
   requirement: !ruby/object:Gem::Requirement
@@ -161,9 +155,9 @@ files:
 - data/源泉徴収税/源泉徴収税月額-20130101-20151231.tsv
 - data/源泉徴収税/源泉徴収税月額-20160101-20161231.tsv
 - data/源泉徴収税/源泉徴収税月額-20170101-20191231.tsv
-- data/源泉徴収税/源泉徴収税月額-20200101-20211231.tsv
+- data/源泉徴収税/源泉徴収税月額-20200101-20221231.tsv
 - data/源泉徴収税/源泉徴収税賞与-20180101-20191231.tsv
-- data/源泉徴収税/源泉徴収税賞与-20200101-20211231.tsv
+- data/源泉徴収税/源泉徴収税賞与-20200101-20221231.tsv
 - data/源泉徴収税月額.db
 - data/源泉徴収税賞与.db
 - data/社会保険料.db
@@ -242,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.16
 signing_key: 
 specification_version: 4
 summary: 税金計算ライブラリ