tax_jp 1.1.12 → 1.2.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 405f64cdabf837c58fb21dfa11b50c82382891a0d85855e2dd622b5b876643bc
4
- data.tar.gz: a25b245f50ef276d9feaddef34b5cf5353331cf476f44eb7d3a515b16e274d6e
3
+ metadata.gz: d515746c2b5de559337c61ed86b196a509f182871e472f3946e18e37e56059f1
4
+ data.tar.gz: bb91d5759df9e6dca216b2c83dd3282760b54c0c750ef65615eff5f82209d5a3
5
5
  SHA512:
6
- metadata.gz: cffe7cc8904c8b75a53d16125ad2404e725a33763358af8e0611abc10a0afab7adf3390171260ed0fefab5876b9e6f7729a3333b3eca5adef781e0a860b9f493
7
- data.tar.gz: d6d27ed728b68ff2dd98d6a542a7ca89b4d9ba6f4301e8561476300f190b4b1cd203756ebee9e266b9357198c388afd8468ea04e34f33f400932ad02e0cf0d8b
6
+ metadata.gz: 78d961f4dbc438b16bf84ba4548e3f2675df86aa56287d37ea9894c7702da0e12dbb83e28f9936e70d735bba12498aa6ba91262520d33bf807df8a07f58f83bb
7
+ data.tar.gz: d98612fb7ef3eef13ea038fff4e885c4efedeb65cba2e38391787840a067b1f4ffcf18601e46793b14456bf8b86573f61f7b70a481db0baeb7a3790f26d62f71
@@ -1,5 +1,17 @@
1
+ html {
2
+ font-size: 87.5%;
3
+ }
4
+
1
5
  .taxjp {
2
6
  main {
3
7
  padding: 4rem 0;
4
8
  }
9
+
10
+ .table-hover tbody tr:hover td, .table-hover tbody tr:hover th {
11
+ background-color: #D7EEFF;
12
+ }
13
+
14
+ .bootstrap-datetimepicker-widget {
15
+ margin-left: 48px;
16
+ }
5
17
  }
@@ -1,6 +1,6 @@
1
- <nav class="navbar navbar-expand-sm navbar-light bg-light fixed-top">
1
+ <nav class="navbar navbar-expand-sm navbar-light bg-light fixed-top px-2">
2
2
  <span class="navbar-brand">TaxJP</span>
3
- <ul class="navbar-nav mr-auto">
3
+ <ul class="navbar-nav me-auto">
4
4
  <li class="nav-item <%= 'active' if controller_name == 'withheld_taxes' %>">
5
5
  <%= link_to '源泉徴収税', withheld_taxes_path, class: "nav-link" %>
6
6
  </li>
@@ -1,18 +1,16 @@
1
1
  <div class="container">
2
- <%= form_with model: @finder, url: {action: 'index'}, method: 'get', class: 'form form-vertical', local: true do |f| %>
3
- <div class="row">
4
- <div class="form-group m-2">
5
- <%= f.t_date_field :from %>
6
- </div>
7
- <div class="m-2">
8
- <%= f.submit '表示', class: 'btn btn-light' %>
9
- </div>
2
+ <%= form_with model: @finder, url: {action: 'index'}, method: 'get', class: 'row', local: true do |f| %>
3
+ <div class="col-auto my-auto">
4
+ <%= f.t_date_field :from %>
5
+ </div>
6
+ <div class="col-auto my-auto">
7
+ <%= f.submit '表示', class: 'btn btn-outline-primary' %>
10
8
  </div>
11
9
  <% end %>
12
10
  </div>
13
11
  <div class="py-2 px-4">
14
12
  <table class="table table-striped table-bordered table-hover table-sm">
15
- <thead class="thead-light">
13
+ <thead>
16
14
  <tr>
17
15
  <th rowspan="5" class="align-middle text-center">賞与の金額に乗ずべき率(%)</th>
18
16
  <th colspan="16" class="align-middle text-center">甲</th>
@@ -46,16 +44,16 @@
46
44
  to = wt.__send__("dependent_#{i}_salary_to")
47
45
  infinite = to == TaxJp::INTEGER_MAX
48
46
  %>
49
- <td class="text-right"><%= from == TaxJp::INTEGER_MAX ? '-' : from.to_s(:delimited) %></td>
50
- <td class="<%= infinite ? 'text-center' : 'text-right' %>"><%= infinite ? '-' : to.to_s(:delimited) %></td>
47
+ <td class="text-end"><%= from == TaxJp::INTEGER_MAX ? '-' : from.to_s(:delimited) %></td>
48
+ <td class="<%= infinite ? 'text-center' : 'text-end' %>"><%= infinite ? '-' : to.to_s(:delimited) %></td>
51
49
  <% end %>
52
50
  <%
53
51
  from = wt.sub_salary_from
54
52
  to = wt.sub_salary_to
55
53
  infinite = to == TaxJp::INTEGER_MAX
56
54
  %>
57
- <td class="text-right"><%= from.to_s(:delimited) unless from == 0 && to == 0 %></td>
58
- <td class="<%= infinite ? 'text-center' : 'text-right' %>"><%= infinite ? '-' : to.to_s(:delimited) unless from == 0 && to == 0 %></td>
55
+ <td class="text-end"><%= from.to_s(:delimited) unless from == 0 && to == 0 %></td>
56
+ <td class="<%= infinite ? 'text-center' : 'text-end' %>"><%= infinite ? '-' : to.to_s(:delimited) unless from == 0 && to == 0 %></td>
59
57
  </tr>
60
58
  <% end %>
61
59
  </tbody>
@@ -1,8 +1,8 @@
1
1
  <div class="input-group date" id="datetimepicker4" data-target-input="nearest">
2
- <label for="datetimepicker1" class="pt-2 pr-2">年月日:</label>
3
- <%= f.text_field method, class: 'form-control datetimepicker-input', style: 'width: 7em;', data: {target: '#datetimepicker4'} %>
4
- <div class="input-group-append" data-target="#datetimepicker4" data-toggle="datetimepicker">
5
- <div class="input-group-text"><i class="fa fa-calendar"></i></div>
2
+ <label for="finder_from" class="col-form-label me-2">年月日</label>
3
+ <%= f.text_field method, class: 'form-control datetimepicker-input', data: {target: '#datetimepicker4'} %>
4
+ <div class="input-group-text" data-target="#datetimepicker4" data-toggle="datetimepicker">
5
+ <i class="fa fa-calendar"></i>
6
6
  </div>
7
7
  <script>
8
8
  $(function () {
@@ -2,7 +2,7 @@
2
2
  <table class="table table-striped table-bordered table-hover table-sm">
3
3
  <thead class="thead-light">
4
4
  <tr>
5
- <th rowspan="2" class="align-middle">耐用年数</th>
5
+ <th rowspan="2" class="text-center align-middle">耐用年数</th>
6
6
  <th rowspan="2" class="align-middle">定額法償却率</th>
7
7
  <th colspan="3">定率法</th>
8
8
  </tr>
@@ -15,7 +15,7 @@
15
15
  <tbody>
16
16
  <% @depreciation_rates.each do |rate| %>
17
17
  <tr>
18
- <th><%= rate.durable_years %></th>
18
+ <th class="text-center"><%= rate.durable_years %></th>
19
19
  <td><%= rate.fixed_amount_rate %></td>
20
20
  <td><%= rate.rate %></td>
21
21
  <td><%= rate.revised_rate %></td>
@@ -1,21 +1,23 @@
1
1
  <div class="container">
2
- <%= form_with model: @finder, url: {action: 'index'}, method: 'get', class: 'form form-vertical', local: true do |f| %>
3
- <div class="row">
4
- <div class="form-group m-2">
5
- <%= f.t_date_field :from %>
6
- </div>
7
- <div class="form-group form-inline m-2">
8
- <label for="finder_prefecture_code" class="pr-2">都道府県:</label>
9
- <%= f.collection_select :prefecture_code, TaxJp::Prefecture.all, :code, :name, {}, class: 'form-control' %>
10
- </div>
11
- <div class="m-2">
12
- <%= f.submit '表示', class: 'btn btn-light' %>
2
+ <%= form_with model: @finder, url: {action: 'index'}, method: 'get', class: 'row', local: true do |f| %>
3
+ <div class="col-auto my-auto">
4
+ <%= f.t_date_field :from %>
5
+ </div>
6
+ <div class="col-auto my-auto">
7
+ <div class="input-group">
8
+ <div class="col-auto my-auto">
9
+ <label for="finder_prefecture_code" class="col-form-label me-2">都道府県</label>
10
+ </div>
11
+ <%= f.collection_select :prefecture_code, TaxJp::Prefecture.all, :code, :name, {}, class: 'form-select' %>
13
12
  </div>
14
13
  </div>
14
+ <div class="col-auto my-auto">
15
+ <%= f.submit '表示', class: 'btn btn-outline-primary' %>
16
+ </div>
15
17
  <% end %>
16
18
  </div>
17
19
  <% if @social_insurances %>
18
- <div class="pl-4 pr-4">
20
+ <div class="py-2 px-4">
19
21
  <div>
20
22
  <span><%= @social_insurances.first.valid_from %></span>
21
23
  <span>~</span>
@@ -54,20 +56,20 @@
54
56
  <td class="text-center"><%= si.grade.grade %></td>
55
57
  <% end %>
56
58
 
57
- <td class="text-right"><%= si.grade.monthly_standard.to_s(:delimited) %></td>
58
- <td class="text-right"><%= si.grade.daily_standard.to_s(:delimited) %></td>
59
- <td class="text-right"><%= si.grade.salary_from.to_s(:delimited) %></td>
60
- <td class="text-right"><%= si.grade.salary_to.to_s(:delimited) if si.grade.salary_to < TaxJp::INTEGER_MAX %></td>
61
- <td class="text-right"><%= si.health_insurance.general_amount.to_s(:delimited) %></td>
62
- <td class="text-right"><%= si.health_insurance.general_amount_half.to_s(:delimited) %></td>
63
- <td class="text-right"><%= si.health_insurance.general_amount_care.to_s(:delimited) %></td>
64
- <td class="text-right"><%= si.health_insurance.general_amount_care_half.to_s(:delimited) %></td>
59
+ <td class="text-end"><%= si.grade.monthly_standard.to_s(:delimited) %></td>
60
+ <td class="text-end"><%= si.grade.daily_standard.to_s(:delimited) %></td>
61
+ <td class="text-end"><%= si.grade.salary_from.to_s(:delimited) %></td>
62
+ <td class="text-end"><%= si.grade.salary_to.to_s(:delimited) if si.grade.salary_to < TaxJp::INTEGER_MAX %></td>
63
+ <td class="text-end"><%= si.health_insurance.general_amount.to_s(:delimited) %></td>
64
+ <td class="text-end"><%= si.health_insurance.general_amount_half.to_s(:delimited) %></td>
65
+ <td class="text-end"><%= si.health_insurance.general_amount_care.to_s(:delimited) %></td>
66
+ <td class="text-end"><%= si.health_insurance.general_amount_care_half.to_s(:delimited) %></td>
65
67
 
66
68
  <% if [0, TaxJp::INTEGER_MAX].exclude?(si.grade.pension_grade) %>
67
- <td class="text-right"><%= number_to_currency(si.welfare_pension.general_amount, unit: '', precision: 2) if si.welfare_pension.general_amount > 0 %></td>
68
- <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>
69
- <td class="text-right"><%= number_to_currency(si.welfare_pension.particular_amount, unit: '', precision: 2) if si.welfare_pension.particular_amount > 0 %></td>
70
- <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>
69
+ <td class="text-end"><%= number_to_currency(si.welfare_pension.general_amount, unit: '', precision: 2) if si.welfare_pension.general_amount > 0 %></td>
70
+ <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>
71
+ <td class="text-end"><%= number_to_currency(si.welfare_pension.particular_amount, unit: '', precision: 2) if si.welfare_pension.particular_amount > 0 %></td>
72
+ <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>
71
73
  <% else %>
72
74
  <td></td>
73
75
  <td></td>
@@ -1,12 +1,10 @@
1
1
  <div class="container">
2
- <%= form_with model: @finder, url: {action: 'index'}, method: 'get', class: 'form form-vertical', local: true do |f| %>
3
- <div class="row">
4
- <div class="form-group m-2">
5
- <%= f.t_date_field :from %>
6
- </div>
7
- <div class="m-2">
8
- <%= f.submit '表示', class: 'btn btn-light' %>
9
- </div>
2
+ <%= form_with model: @finder, url: {action: 'index'}, method: 'get', class: 'row', local: true do |f| %>
3
+ <div class="col-auto my-auto">
4
+ <%= f.t_date_field :from %>
5
+ </div>
6
+ <div class="col-auto my-auto">
7
+ <%= f.submit '表示', class: 'btn btn-outline-primary' %>
10
8
  </div>
11
9
  <% end %>
12
10
  </div>
@@ -33,9 +31,9 @@
33
31
  <td class="text-center"><%= wt.salary_range_from.to_s(:delimited) %></td>
34
32
  <td class="text-center"><%= wt.salary_range_to.to_s(:delimited) %></td>
35
33
  <% 8.times do |i| %>
36
- <td class="text-right"><%= wt.__send__("dependent_#{i}").to_s(:delimited) %></td>
34
+ <td class="text-end"><%= wt.__send__("dependent_#{i}").to_s(:delimited) %></td>
37
35
  <% end %>
38
- <td class="text-right"><%= wt.sub_salary.to_s(:delimited) %></td>
36
+ <td class="text-end"><%= wt.sub_salary.to_s(:delimited) %></td>
39
37
  </tr>
40
38
  <% end %>
41
39
  </tbody>
@@ -1,3 +1,3 @@
1
1
  module TaxJp
2
- VERSION = '1.1.12'
2
+ VERSION = '1.2.0'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tax_jp
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.12
4
+ version: 1.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - ichylinux
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2021-05-02 00:00:00.000000000 Z
12
+ date: 2021-08-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bootstrap
@@ -17,20 +17,14 @@ dependencies:
17
17
  requirements:
18
18
  - - "~>"
19
19
  - !ruby/object:Gem::Version
20
- version: '4.2'
21
- - - ">="
22
- - !ruby/object:Gem::Version
23
- version: 4.2.1
20
+ version: '5.0'
24
21
  type: :runtime
25
22
  prerelease: false
26
23
  version_requirements: !ruby/object:Gem::Requirement
27
24
  requirements:
28
25
  - - "~>"
29
26
  - !ruby/object:Gem::Version
30
- version: '4.2'
31
- - - ">="
32
- - !ruby/object:Gem::Version
33
- version: 4.2.1
27
+ version: '5.0'
34
28
  - !ruby/object:Gem::Dependency
35
29
  name: bootstrap4-datetime-picker-rails
36
30
  requirement: !ruby/object:Gem::Requirement
@@ -242,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
242
236
  - !ruby/object:Gem::Version
243
237
  version: '0'
244
238
  requirements: []
245
- rubygems_version: 3.1.4
239
+ rubygems_version: 3.2.16
246
240
  signing_key:
247
241
  specification_version: 4
248
242
  summary: 税金計算ライブラリ