RubyGems - tax_jp - Versions diffs - 1.2.11 → 1.3.0 - Mend

tax_jp 1.2.11 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (31) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e6b4831c607a25470da1ec4d46785ba370f754fc57ce1d4689e4609d8b25091
-  data.tar.gz: fd05da74c0187b795bfdc06adbe7fddb74f8e05481b5fdd84e0718d0ed2a9e62
+  metadata.gz: 2652469c41cff73f9aa0f9d7cc8eacba00ccc04de45ee6bf10af24b51cc5dd60
+  data.tar.gz: 1f5ddc9c8d7936425df87cafecbfaca618d53af4038c71c7ee0f1605a37ffa05
 SHA512:
-  metadata.gz: 61fabfbefec0a6b44e867b2c77261989ab48132905b747f06901a74264506d9dc5c19e84c34a08e3640abcdca390c7f85d6f81219ca48f6d24b18b265e34e708
-  data.tar.gz: 283676d087c6fa359ab6e17c386c2b4bf47de866c0e75e54c22fbaddee2510f4ab58e72b499896bc20951db6f61c316e60d4ef07da202f3c5d7831f7846f7df4
+  metadata.gz: 2699522895fbd5e6bc441c38ed0bef758f2ba5e04c2702ae2df84c6897d09920ea26657e14fa9820f90cb936b339e33ebb3a5f5297ef1ba5b0eeaf43eb0b2132
+  data.tar.gz: 23815220d9a5adfb047c46bce7589ed731d60bda4f468c3125b78770a659741979affb651f4db37a2ea00a61bf1cbb79f3781175aed735e518e1bbaeb80be71e

data/app/assets/config/tax_jp_manifest.js CHANGED Viewed

@@ -1,2 +1,3 @@
+//= link_tree ../images/tax_jp
 //= link_directory ../javascripts/tax_jp .js
 //= link_directory ../stylesheets/tax_jp .css

data/app/assets/javascripts/tax_jp/application.js CHANGED Viewed

@@ -11,11 +11,5 @@
 // about supported directives.
 //
 //= require rails-ujs
-//= require activestorage
-//= require jquery3
-//= require popper
 //= require bootstrap
-//= require moment
-//= require moment/ja.js
-//= require tempusdominus-bootstrap-4.js
 //= require_tree .

data/app/assets/javascripts/tax_jp.js CHANGED Viewed

@@ -11,5 +11,4 @@
 // about supported directives.
 //
 //= require rails-ujs
-//= require activestorage
 //= require_tree .

data/app/assets/stylesheets/tax_jp/application.css.scss CHANGED Viewed

@@ -10,11 +10,9 @@
  * files in this directory. Styles in this file should be added after the last require_* statement.
  * It is generally better to create a new file per style scope.
  *
- *= require font-awesome
  *= require_tree .
  *= require_self
  */
+@charset "UTF-8";
 @import "bootstrap";
-@import "font-awesome";
-@import "tempusdominus-bootstrap-4";

data/app/assets/stylesheets/tax_jp.css.scss ADDED Viewed

File without changes

data/app/controllers/tax_jp/bonus_withheld_taxes_controller.rb CHANGED Viewed

@@ -12,7 +12,7 @@ module TaxJp
     def preload_finder
       @finder = TaxJp::Finder.new(finder_params)
-      @finder.from ||= Date.today.strftime('%Y-%m-%d')
+      @finder.from ||= Date.today
     end
     def finder_params

data/app/controllers/tax_jp/social_insurances_controller.rb CHANGED Viewed

@@ -14,7 +14,7 @@ module TaxJp
     def preload_finder
       @finder = TaxJp::Finder.new(finder_params)
-      @finder.from ||= Date.today.strftime('%Y-%m-%d')
+      @finder.from ||= Date.today
       @finder.prefecture_code ||= '13' # 人口の多い東京都をデフォルトに
     end

data/app/controllers/tax_jp/withheld_taxes_controller.rb CHANGED Viewed

@@ -12,7 +12,7 @@ module TaxJp
     def preload_finder
       @finder = TaxJp::Finder.new(finder_params)
-      @finder.from ||= Date.today.strftime('%Y-%m-%d')
+      @finder.from ||= Date.today
     end
     def finder_params

data/app/models/tax_jp/finder.rb CHANGED Viewed

@@ -1,6 +1,7 @@
 class TaxJp::Finder
   include ActiveModel::Model
-  attr_accessor :from
-  attr_accessor :prefecture_code
+  include ActiveModel::Attributes
+  attribute :from, :date, default: Date.today
+  attribute :prefecture_code, :string
 end

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

@@ -1,4 +1,4 @@
-<nav class="navbar navbar-expand-sm navbar-light bg-light fixed-top px-2">
+<nav class="navbar navbar-expand-sm navbar-light bg-light px-2">
   <span class="navbar-brand">TaxJP</span>
   <ul class="navbar-nav me-auto">
     <li class="nav-item <%= 'active' if controller_name == 'withheld_taxes' %>">

data/app/views/layouts/tax_jp/application.html.erb CHANGED Viewed

@@ -2,6 +2,7 @@
 <html>
 <head>
   <title>TaxJp</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>

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

@@ -1,18 +1,4 @@
-<div class="input-group date" id="datetimepicker4" data-target-input="nearest">
+<div class="input-group">
   <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 () {
-          $('#datetimepicker4').datetimepicker({
-            format: 'YYYY-MM-DD',
-            locale: 'ja',
-            buttons: {
-              showClose: true
-            }
-        });
-      });
-  </script>
+  <%= f.date_field method, class: 'form-control' %>
 </div>

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

@@ -27,14 +27,31 @@
     </thead>
     <tbody>
       <% @withheld_taxes.each do |wt| %>
-        <tr>
-          <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-end"><%= wt.__send__("dependent_#{i}").to_s(:delimited) %></td>
-          <% end %>
-          <td class="text-end"><%= wt.sub_salary.to_s(:delimited) %></td>
-        </tr>
+        <% if wt.extra_rate > 0 or wt.sub_extra_rate > 0 %>
+          <tr>
+            <td class="text-center" colspan="2"><%= wt.salary_range_from.to_s(:delimited) %></td>
+            <% 8.times do |i| %>
+              <td class="text-end"><%= wt.__send__("dependent_#{i}").to_s(:delimited) %></td>
+            <% end %>
+            <td class="text-end"><%= wt.sub_salary.to_s(:delimited) %></td>
+          </tr>
+          <tr>
+            <td colspan="2"></td>
+            <td class="text-center" colspan="8"><%= (wt.extra_rate.rationalize * 100).to_f %>％</td>
+            <td class="text-center"><%= (wt.sub_extra_rate.rationalize * 100).to_f %>％</td>
+          </tr>
+        <% else %>
+          <tr>
+            <td class="text-center"><%= wt.salary_range_from.to_s(:delimited) %></td>
+            <td class="text-center">
+              <%= wt.salary_range_to == TaxJp::INTEGER_MAX  ? '-' : wt.salary_range_to.to_s(:delimited) %>
+            </td>
+            <% 8.times do |i| %>
+              <td class="text-end"><%= wt.__send__("dependent_#{i}").to_s(:delimited) %></td>
+            <% end %>
+            <td class="text-end"><%= wt.sub_salary.to_s(:delimited) %></td>
+          </tr>
+        <% end %>
       <% end %>
     </tbody>
   </table>

data/data//346/272/220/346/263/211/345/276/264/345/217/216/347/250/216/schema_monthly.sql CHANGED Viewed

@@ -11,5 +11,7 @@ create table withheld_taxes (
   dependent_5 integer not null,
   dependent_6 integer not null,
   dependent_7 integer not null,
-  sub_salary integer not null
+  sub_salary integer not null,
+  extra_rate decimal(6,5) not null,
+  sub_extra_rate decimal(6,5) not null
 );