tax_jp 1.1.10 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7d42c0d30f8962046150ff590931aca2efc51f486a5dc608e9cb37739e199f0
-  data.tar.gz: 0b6bb0e88bf75b4d88c74a0402e5be240e45742aefd46b36e975f8716976747d
+  metadata.gz: e43736cd006e8cf32acb83a24d839833efae297402ac4e85d98712acdc83d8b8
+  data.tar.gz: f177be4708f0197f7d09327a6ab93a37b789a8ae04b7728d71e691dc0012d4b8
 SHA512:
-  metadata.gz: '0945a23e7ec872e809385e732097ed82a944a883d3b0b523c82df2eeb01357d2f079e56d0f3d8d84f0ed99f1d8cd44b9b18f9acb0072baf49ab73ee082d4977b'
-  data.tar.gz: 5cac757e1b2bb9061df31cfe4f5aa9b32c2783a16a83498682dec99b9dabb282a119bd8be4b37bc45c64ca0774c95a0ea5d765e053851c97c8f2d49b8957f105
+  metadata.gz: 72b22896b21b57cb30b6dd655e2e02ed57fe798216f0f67e7f2ef0bfe9de8635cc16ba2f6cb72be46d93634cacb1eb8704637649bb03d55522c9f2402a45dda8
+  data.tar.gz: 9cd316115f2dc2dca60480411d97c140b07ea1c127aba7ad0dfda9fcca6c22838bebde12066dbc8ca995648e27032334a35b9e7d9d3054f3f9d2967a7993fad5

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/data//347/244/276/344/274/232/344/277/235/351/231/272/346/226/231//345/201/245/345/272/267/344/277/235/351/231/272-20210301-20220228.tsv

@@ -0,0 +1,48 @@
+都道府県	一般保険料率（％）	介護保険料率（％）	特定保険料率（％）	基本保険料率（％）
+北海道	10.45	1.8	3.53	6.92
+青森県	9.96	1.8	3.53	6.43
+岩手県	9.74	1.8	3.53	6.21
+宮城県	10.01	1.8	3.53	6.48
+秋田県	10.16	1.8	3.53	6.63
+山形県	10.03	1.8	3.53	6.5
+福島県	9.64	1.8	3.53	6.11
+茨城県	9.74	1.8	3.53	6.21
+栃木県	9.87	1.8	3.53	6.34
+群馬県	9.66	1.8	3.53	6.13
+埼玉県	9.8	1.8	3.53	6.27
+千葉県	9.79	1.8	3.53	6.26
+東京都	9.84	1.8	3.53	6.31
+神奈川県	9.99	1.8	3.53	6.46
+新潟県	9.5	1.8	3.53	5.97
+富山県	9.59	1.8	3.53	6.06
+石川県	10.11	1.8	3.53	6.58
+福井県	9.98	1.8	3.53	6.45
+山梨県	9.79	1.8	3.53	6.26
+長野県	9.71	1.8	3.53	6.18
+岐阜県	9.83	1.8	3.53	6.3
+静岡県	9.72	1.8	3.53	6.19
+愛知県	9.91	1.8	3.53	6.38
+三重県	9.81	1.8	3.53	6.28
+滋賀県	9.78	1.8	3.53	6.25
+京都府	10.06	1.8	3.53	6.53
+大阪府	10.29	1.8	3.53	6.76
+兵庫県	10.24	1.8	3.53	6.71
+奈良県	10	1.8	3.53	6.47
+和歌山県	10.11	1.8	3.53	6.58
+鳥取県	9.97	1.8	3.53	6.44
+島根県	10.03	1.8	3.53	6.5
+岡山県	10.18	1.8	3.53	6.65
+広島県	10.04	1.8	3.53	6.51
+山口県	10.22	1.8	3.53	6.69
+徳島県	10.29	1.8	3.53	6.76
+香川県	10.28	1.8	3.53	6.75
+愛媛県	10.22	1.8	3.53	6.69
+高知県	10.17	1.8	3.53	6.64
+福岡県	10.22	1.8	3.53	6.69
+佐賀県	10.68	1.8	3.53	7.15
+長崎県	10.26	1.8	3.53	6.73
+熊本県	10.29	1.8	3.53	6.76
+大分県	10.3	1.8	3.53	6.77
+宮崎県	9.83	1.8	3.53	6.3
+鹿児島県	10.36	1.8	3.53	6.83
+沖縄県	9.95	1.8	3.53	6.42

data/lib/tax_jp/version.rb

@@ -1,3 +1,3 @@
 module TaxJp
-  VERSION = '1.1.10'
+  VERSION = '1.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tax_jp
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.2.1
 platform: ruby
 authors:
 - ichylinux
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-10 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
@@ -163,7 +157,7 @@ files:
 - data/源泉徴収税/源泉徴収税月額-20170101-20191231.tsv
 - data/源泉徴収税/源泉徴収税月額-20200101-20211231.tsv
 - data/源泉徴収税/源泉徴収税賞与-20180101-20191231.tsv
-- data/源泉徴収税/源泉徴収税賞与-20200101-20211231.tsv
+- data/源泉徴収税/源泉徴収税賞与-20200101-20221231.tsv
 - data/源泉徴収税月額.db
 - data/源泉徴収税賞与.db
 - data/社会保険料.db
@@ -182,6 +176,7 @@ files:
 - data/社会保険料/健康保険-20180301-20190228.tsv
 - data/社会保険料/健康保険-20190301-20200229.tsv
 - data/社会保険料/健康保険-20200301-20210228.tsv
+- data/社会保険料/健康保険-20210301-20220228.tsv
 - data/社会保険料/厚生年金.tsv
 - data/社会保険料/旧健康保険.tsv
 - data/社会保険料/等級-20001001-20080831.tsv
@@ -241,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: 税金計算ライブラリ