enju_circulation 0.3.9 → 0.4.0.beta.1

data/app/views/checkouts/_list.html.erb

@@ -21,15 +21,8 @@
       <% end %>
       <% if checkout.shelf %>
         <%= t('activerecord.models.shelf') %>:
-        <%= link_to checkout.shelf.display_name.localize, checkout.shelf %>
-        (<%= link_to checkout.shelf.library.display_name.localize, checkout.shelf.library %>)
-      <% end %>
-      <% if checkout.item.manifestation.next_reservation %>
-        <br />
-        (<%= link_to_if(current_user.has_role?('Librarian'),
-            t('page.number_of_reservations',
-            count: Reserve.waiting.where(manifestation_id: checkout.item.manifestation.id, checked_out_at: nil).count),
-            reserves_path(query: "manifestation_id_i:#{checkout.item.manifestation.id}")) -%>)
+        <%= link_to checkout.shelf.display_name, checkout.shelf %>
+        (<%= link_to checkout.shelf.library.display_name, checkout.shelf.library %>)
       <% end %>
     </td>
     <td>

data/app/views/checkouts/index.atom.builder

@@ -2,7 +2,7 @@ atom_feed(url: checkouts_url(format: :atom)) do |feed|
   if @user
     feed.title t('checkout.user_checkout', login_name: @user.username)
   else
-    feed.title t('checkout.library_group_checkout', library_group_name: @library_group.display_name.localize)
+    feed.title t('checkout.library_group_checkout', library_group_name: @library_group.display_name)
   end
   feed.updated(@checkouts.first ? @checkouts.first.created_at : Time.zone.now)
 

data/app/views/checkouts/index.ics.erb

@@ -7,7 +7,7 @@ RiCal.Calendar do
       description checkout.item.manifestation.original_title
       dtstart checkout.due_date.to_date
       dtend checkout.due_date.to_date
-      location checkout.item.shelf.library.display_name.localize
+      location checkout.item.shelf.library.display_name
     end
   end
 end.to_s

data/app/views/checkouts/index.rss.builder

@@ -9,7 +9,7 @@ xml.rss('version' => "2.0",
       xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.permit.merge(format: :rss, only_path: true))}"
       xml.tag! "atom:link", rel: 'alternate', href: checkouts_url(user_id: @user.username)
     else
-      xml.title t('checkout.library_group_checkout', library_group_name: @library_group.display_name.localize)
+      xml.title t('checkout.library_group_checkout', library_group_name: @library_group.display_name)
       xml.link checkouts_url
       xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.permit.merge(format: :rss, only_path: true))}"
       xml.tag! "atom:link", rel: 'alternate', href: checkouts_url

data/app/views/circulation_statuses/_form.html.erb

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

data/app/views/circulation_statuses/index.html.erb

@@ -23,7 +23,7 @@
     </td>
     <td><%= circulation_status.name -%></td>
     <td>
-      <%= link_to circulation_status.display_name.localize, circulation_status -%>
+      <%= link_to circulation_status.display_name, circulation_status -%>
       <br />
       <%= circulation_status.note %>
     </td>

data/app/views/circulation_statuses/show.html.erb

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.circulation_status.display_name') -%>:</strong>
-  <%= @circulation_status.display_name.localize -%>
+  <%= @circulation_status.display_name -%>
 </p>
 
 <p>

data/app/views/item_has_use_restrictions/index.html.erb

@@ -13,7 +13,7 @@
     <td><%= link_to item_has_use_restriction.item_id, item_has_use_restriction.item -%></td>
     <td><%= link_to item_has_use_restriction.item.item_identifier, item_has_use_restriction.item -%></td>
     <td><%= link_to item_has_use_restriction.item.manifestation.original_title, item_has_use_restriction.item.manifestation -%></td>
-    <td><%= link_to item_has_use_restriction.use_restriction.display_name.localize, item_has_use_restriction.use_restriction -%></td>
+    <td><%= link_to item_has_use_restriction.use_restriction.display_name, item_has_use_restriction.use_restriction -%></td>
     <td><%= link_to t('page.show'), item_has_use_restriction -%></td>
     <td><%= link_to t('page.edit'), edit_item_has_use_restriction_path(item_has_use_restriction) -%></td>
     <td><%= link_to t('page.destroy'), item_has_use_restriction, data: {confirm: t('page.are_you_sure')}, method: :delete -%></td>

data/app/views/item_has_use_restrictions/show.html.erb

@@ -15,7 +15,7 @@
 
 <p>
   <strong><%= t('activerecord.models.use_restriction') -%>:</strong>
-  <%= link_to @item_has_use_restriction.use_restriction.display_name.localize, @item_has_use_restriction.use_restriction -%>
+  <%= link_to @item_has_use_restriction.use_restriction.display_name, @item_has_use_restriction.use_restriction -%>
 </p>
 
 </div>

data/app/views/manifestation_checkout_stats/_group_by_carrier_type.html.erb

@@ -7,7 +7,7 @@
           <%= t('activerecord.models.shelf') %>
         </th>
         <% CarrierType.order(:position).each do |carrier_type| %>
-          <th><%= carrier_type.display_name.localize %></th>
+          <th><%= carrier_type.display_name %></th>
         <% end %>
         <th><%= t('page.total') %></th>
       </tr>
@@ -15,10 +15,10 @@
         <% library.shelves.order(:position).each do |shelf| %>
           <tr>
 	    <td>
-              <%= library.display_name.localize %>
+              <%= library.display_name %>
             </td>
             <td>
-              <%= shelf.display_name.localize %>
+              <%= shelf.display_name %>
             </td>
             <% CarrierType.order(:position).each do |carrier_type| %>
               <td>

data/app/views/manifestation_checkout_stats/_group_by_checkout_type.html.erb

@@ -7,7 +7,7 @@
           <%= t('activerecord.models.shelf') %>
         </th>
         <% CheckoutType.order(:position).each do |checkout_type| %>
-          <th><%= checkout_type.display_name.localize %></th>
+          <th><%= checkout_type.display_name %></th>
         <% end %>
         <th><%= t('page.total') %></th>
       </tr>
@@ -15,10 +15,10 @@
         <% library.shelves.order(:position).each do |shelf| %>
           <tr>
             <td>
-              <%= library.display_name.localize %>
+              <%= library.display_name %>
             </td>
             <td>
-              <%= shelf.display_name.localize %>
+              <%= shelf.display_name %>
             </td>
             <% CheckoutType.order(:position).each do |checkout_type| %>
               <td>

data/app/views/manifestations/_circulation_status.html.erb

@@ -1,8 +1,8 @@
 <td>
-  <%= item.circulation_status.display_name.localize if item.circulation_status -%>
+  <%= item.circulation_status.display_name if item.circulation_status -%>
   <% if item.use_restriction.name == 'Not For Loan' %>
     <br />
-    <%= item.use_restriction.display_name.localize %>
+    <%= item.use_restriction.display_name %>
   <% else %>
     <% if item.retained? %>
       <br />
@@ -12,7 +12,7 @@
       <br />
       (
         <%= t('activerecord.attributes.checkout.due_date') -%>:
-        <%= l(item.latest_checkout.due_date, format: :only_date) -%>
+        <%= l(item.latest_checkout.due_date, format: :short) -%>
       )
     <% end %>
   <% end %>

data/app/views/profiles/_submenu_checkout.html.erb

@@ -1,7 +1,7 @@
 <ul>
   <%- profile.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>
     <li>
-      <%= available_checkout_type.checkout_type.display_name.localize -%>:
+      <%= available_checkout_type.checkout_type.display_name -%>:
       <%= profile.user.checked_item_count[:"#{available_checkout_type.checkout_type.name}"] -%> / <%= available_checkout_type.checkout_limit -%>
     </li>
   <%- end -%>

data/app/views/reserves/_new.html.erb

@@ -22,7 +22,7 @@
 
   <div class="field">
     <%= f.label :pickup_location_id %>
-    <%= f.select :pickup_location_id, @libraries.map{|l| [l.display_name.localize, l.id]} %>
+    <%= f.select :pickup_location_id, @libraries.map{|l| [l.display_name, l.id]} %>
   </div>
 
   <% if current_user.has_role?('Librarian') %>

data/app/views/reserves/_new_user.html.erb

@@ -34,7 +34,7 @@
 
   <div class="field">
     <%= f.label :pickup_location_id %>
-    <%= f.select :pickup_location_id, @libraries.map{|l| [l.display_name.localize, l.id]} %>
+    <%= f.select :pickup_location_id, @libraries.map{|l| [l.display_name, l.id]} %>
   </div>
 
   <div class="actions">

data/app/views/reserves/edit.html.erb

@@ -39,7 +39,7 @@
 
   <div class="field">
     <%= f.label :pickup_location_id %>
-    <%= f.select :pickup_location_id, @libraries.map{|l| [l.display_name.localize, l.id]} %>
+    <%= f.select :pickup_location_id, @libraries.map{|l| [l.display_name, l.id]} %>
   </div>
 
   <p>

data/app/views/reserves/index.atom.builder

@@ -2,7 +2,7 @@ atom_feed(url: reserves_url(format: :atom)) do |feed|
   if @user
     feed.title t('reserve.user_reserve', login_name: @user.username)
   else
-    feed.title t('reserve.library_group_reserve', library_group_name: @library_group.display_name.localize)
+    feed.title t('reserve.library_group_reserve', library_group_name: @library_group.display_name)
   end
   feed.updated(@reserves.first ? @reserves.first.created_at : Time.zone.now)
 

data/app/views/reserves/index.html.erb

@@ -51,7 +51,7 @@
       <br />
       <%= t('activerecord.attributes.reserve.expired_at') %>: <%= l(reserve.expired_at, format: :short) if reserve.expired_at? -%>
       <br />
-      <%= t('activerecord.attributes.reserve.pickup_location_id') %>: <%= link_to reserve.pickup_location.display_name.localize, reserve.pickup_location if reserve.pickup_location %>
+      <%= t('activerecord.attributes.reserve.pickup_location_id') %>: <%= link_to reserve.pickup_location.display_name, reserve.pickup_location if reserve.pickup_location %>
     </td>
     <td>
       <%= i18n_state(reserve.current_state) -%>

data/app/views/reserves/index.rss.builder

@@ -7,7 +7,7 @@ xml.rss('version' => "2.0",
       xml.title t('reserve.user_reserve', login_name: @user.username)
       xml.link reserves_url(user_id: @user.username, format: :rss)
     else
-      xml.title t('reserve.library_group_reserve', library_group_name: @library_group.display_name.localize)
+      xml.title t('reserve.library_group_reserve', library_group_name: @library_group.display_name)
       xml.link reserves_url(format: :rss)
     end
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"

data/app/views/reserves/show.html.erb

@@ -23,7 +23,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.reserve.pickup_location_id') -%>:</strong>
-  <%= link_to @reserve.pickup_location.display_name.localize, @reserve.pickup_location if @reserve.pickup_location -%>
+  <%= link_to @reserve.pickup_location.display_name, @reserve.pickup_location if @reserve.pickup_location -%>
 </p>
 
 <p>

data/app/views/use_restrictions/_form.html.erb

@@ -3,7 +3,7 @@
 
   <div class="field">
     <%= f.label :name %><br />
-    <%= f.text_field :name %>
+    <%= f.text_field :name, required: true %>
   </div>
   <div class="field">
     <%= f.label :display_name %><br />

data/app/views/use_restrictions/index.html.erb

@@ -23,7 +23,7 @@
     </td>
     <td><%= use_restriction.name -%></td>
     <td>
-      <%= link_to use_restriction.display_name.localize, use_restriction -%>
+      <%= link_to use_restriction.display_name, use_restriction -%>
       <br />
       <%= use_restriction.note %>
     </td>

data/app/views/use_restrictions/show.html.erb

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.use_restriction.display_name') -%></strong>
-  <%= @use_restriction.display_name.localize -%>
+  <%= @use_restriction.display_name -%>
 </p>
 
 <p>

data/app/views/user_group_has_checkout_types/edit.html.erb

@@ -7,11 +7,11 @@
 
   <div class="field">
     <%= f.label t('activerecord.models.user_group') -%><br />
-    <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%>
+    <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name, u.id]}) -%>
   </div>
   <div class="field">
     <%= f.label t('activerecord.models.checkout_type') -%><br />
-    <%= f.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name.localize, c.id]}) -%>
+    <%= f.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name, c.id]}) -%>
   </div>
   <div class="field">
     <%= f.label :checkout_limit -%><br />
@@ -34,8 +34,8 @@
   </div>
 
   <div class="field">
-    <%= f.label :set_due_date_before_closing_day -%>
-    <%= f.check_box :set_due_date_before_closing_day -%>
+    <%= f.label :set_due_date_after_closing_day -%>
+    <%= f.check_box :set_due_date_after_closing_day -%>
   </div>
 
   <div class="field">

data/app/views/user_group_has_checkout_types/index.html.erb

@@ -11,8 +11,8 @@
 
 <%- @user_group_has_checkout_types.each do |user_group_has_checkout_type| -%>
   <tr class="line<%= cycle("0", "1") -%>">
-    <td><%= link_to user_group_has_checkout_type.user_group.display_name.localize.localize, user_group_has_checkout_type.user_group -%></td>
-    <td><%= link_to user_group_has_checkout_type.checkout_type.display_name.localize.localize, user_group_has_checkout_type.checkout_type -%></td>
+    <td><%= link_to user_group_has_checkout_type.user_group.display_name.localize, user_group_has_checkout_type.user_group -%></td>
+    <td><%= link_to user_group_has_checkout_type.checkout_type.display_name.localize, user_group_has_checkout_type.checkout_type -%></td>
     <td>
       <%= link_to t('page.show'), user_group_has_checkout_type -%>
       <%- if policy(user_group_has_checkout_type).update? -%>

data/app/views/user_group_has_checkout_types/new.html.erb

@@ -7,11 +7,11 @@
 
   <div class="field">
     <%= f.label t('activerecord.models.user_group') -%><br />
-    <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}, include_blank: true) -%>
+    <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name, u.id]}, include_blank: true) -%>
   </div>
   <div class="field">
     <%= f.label t('activerecord.models.checkout_type') -%><br />
-    <%= f.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name.localize, c.id]}, include_blank: true) -%>
+    <%= f.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name, c.id]}, include_blank: true) -%>
   </div>
   <div class="field">
     <%= f.label :checkout_limit -%><br />
@@ -34,8 +34,8 @@
   </div>
 
   <div class="field">
-    <%= f.label :set_due_date_before_closing_day -%>
-    <%= f.check_box :set_due_date_before_closing_day -%>
+    <%= f.label :set_due_date_after_closing_day -%>
+    <%= f.check_box :set_due_date_after_closing_day -%>
   </div>
 
   <div class="field">

data/app/views/user_group_has_checkout_types/show.html.erb

@@ -5,12 +5,12 @@
 
 <p>
   <strong><%= t('activerecord.models.user_group') -%>:</strong>
-  <%= link_to @user_group_has_checkout_type.user_group.display_name.localize, @user_group_has_checkout_type.user_group -%>
+  <%= link_to @user_group_has_checkout_type.user_group.display_name, @user_group_has_checkout_type.user_group -%>
 </p>
 
 <p>
   <strong><%= t('activerecord.models.checkout_type') -%>:</strong>
-  <%= link_to @user_group_has_checkout_type.checkout_type.display_name.localize, @user_group_has_checkout_type.checkout_type -%>
+  <%= link_to @user_group_has_checkout_type.checkout_type.display_name, @user_group_has_checkout_type.checkout_type -%>
 </p>
 
 <p>
@@ -39,8 +39,8 @@
 </p>
 
 <p>
-  <strong><%= t('activerecord.attributes.user_group_has_checkout_type.set_due_date_before_closing_day') -%>:</strong>
-  <%= localized_boolean(@user_group_has_checkout_type.set_due_date_before_closing_day) -%>
+  <strong><%= t('activerecord.attributes.user_group_has_checkout_type.set_due_date_after_closing_day') -%>:</strong>
+  <%= localized_boolean(@user_group_has_checkout_type.set_due_date_after_closing_day) -%>
 </p>
 
 <p>

data/app/views/user_groups/_user_group_has_checkout_type_fields.html.erb

@@ -8,7 +8,7 @@
   <br />
   <%= f.label :reservation_limit -%>
   <%= f.text_field :reservation_limit, class: 'resource_integer' %>
-  <%= f.label :set_due_date_before_closing_day -%>
-  <%= f.check_box :set_due_date_before_closing_day %>
+  <%= f.label :set_due_date_after_closing_day -%>
+  <%= f.check_box :set_due_date_after_closing_day %>
   <%= link_to_remove_association t('page.remove'), f, data: {confirm: t('page.are_you_sure')} %>
 </div>

data/config/locales/translation_en.yml

@@ -32,7 +32,6 @@ en:
         lock_version: Lock version
       checked_item:
         due_date: Due date
-        item: Item
       checkin:
         item_id: Item
       checkout:
@@ -73,7 +72,7 @@ en:
         checkout_renewal_limit: Checkout renewal limit
         reservation_limit: Reservation limit
         reservation_expired_period: Reservation expired period
-        set_due_date_before_closing_day: Set due date before the closing day
+        set_due_date_after_closing_day: Set due date after the closing day
         fixed_due_date: Fixed due date
         note: Note
         position: Position
@@ -125,18 +124,6 @@ en:
       profile:
         checkout_icalendar_token: Checkout iCalendar token
         save_checkout_history: Save checkout history
-    errors:
-      models:
-        item:
-          attributes:
-            circulation_status_id:
-              is_rented: Circulation status is invalid. This item is rented.
-              is_reserved: Circulation status is invalid. This item is reserved.
-        withdraw:
-          attributes:
-            item_id:
-              is_rented: is rented.
-              is_reserved: is reserved.
 
   basket:
     this_account_is_suspended: "This account is suspended."

data/config/locales/translation_ja.yml

@@ -30,7 +30,6 @@ ja:
         lock_version: ロックバージョン
       checked_item:
         due_date: 返却期限
-        item: 個別資料
       checkin:
         item_id: 個別資料
       checkout:
@@ -71,7 +70,7 @@ ja:
         checkout_renewal_limit: 貸出更新回数の上限
         reservation_limit: 予約数の上限
         reservation_expired_period: 予約の期限切れまでの期間
-        set_due_date_before_closing_day: 返却日を閉館日の前日にする
+        set_due_date_after_closing_day: 返却日を閉館日の前日にする
         fixed_due_date: 固定貸出期限
         note: 注記
         position: 位置
@@ -123,18 +122,6 @@ ja:
       profile:
         checkout_icalendar_token: 貸出iCalendarのトークン
         save_checkout_history: 貸出の履歴を保存する
-    errors:
-      models:
-        item:
-          attributes:
-            circulation_status_id:
-              is_rented: この貸出状態には変更できません。資料が貸し出されています。
-              is_reserved: この貸出状態には変更できません。資料が予約されています。
-        withdraw:
-          attributes:
-            item_id:
-              is_rented: は貸し出されています。
-              is_reserved: は予約されています。
 
   basket:
     this_account_is_suspended: "このアカウントは停止されています。"

data/config/routes.rb

@@ -34,7 +34,6 @@ Rails.application.routes.draw do
   resources :items do
     resources :checked_items
     resources :item_has_use_restrictions
-    resources :lending_policies
-    resources :checkouts
+      resources :checkouts
   end
 end

data/db/migrate/20110627122938_add_number_of_day_to_notify_overdue_to_user_group.rb

@@ -1,8 +1,8 @@
 class AddNumberOfDayToNotifyOverdueToUserGroup < ActiveRecord::Migration[4.2]
   def self.up
-    add_column :user_groups, :number_of_day_to_notify_overdue, :integer, default: 0, null: false
-    add_column :user_groups, :number_of_day_to_notify_due_date, :integer, default: 0, null: false
-    add_column :user_groups, :number_of_time_to_notify_overdue, :integer, default: 0, null: false
+    add_column :user_groups, :number_of_day_to_notify_overdue, :integer, default: 7, null: false
+    add_column :user_groups, :number_of_day_to_notify_due_date, :integer, default: 3, null: false
+    add_column :user_groups, :number_of_time_to_notify_overdue, :integer, default: 3, null: false
   end
 
   def self.down

data/db/migrate/20190508160525_create_retains.rb

@@ -0,0 +1,10 @@
+class CreateRetains < ActiveRecord::Migration[5.2]
+  def change
+    create_table :retains do |t|
+      t.references :reserve, foreign_key: true, null: false
+      t.references :item, foreign_key: true, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20190629134017_rename_user_group_has_checkout_type_due_date_before_to_due_date_after.rb

@@ -0,0 +1,5 @@
+class RenameUserGroupHasCheckoutTypeDueDateBeforeToDueDateAfter < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :user_group_has_checkout_types, :set_due_date_before_closing_day, :set_due_date_after_closing_day
+  end
+end

data/db/migrate/20190706052525_add_display_name_translations_to_circulation_status.rb

@@ -0,0 +1,5 @@
+class AddDisplayNameTranslationsToCirculationStatus < ActiveRecord::Migration[5.2]
+  def change
+    add_column :circulation_statuses, :display_name_translations, :jsonb, default: {}, null: false
+  end
+end

data/db/migrate/20190713114724_add_checkout_id_to_checkin.rb

@@ -0,0 +1,5 @@
+class AddCheckoutIdToCheckin < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :checkins, :checkin, foreign_key: true
+  end
+end

data/db/migrate/20190814120827_add_display_name_translations_to_checkout_type.rb

@@ -0,0 +1,5 @@
+class AddDisplayNameTranslationsToCheckoutType < ActiveRecord::Migration[5.2]
+  def change
+    add_column :checkout_types, :display_name_translations, :jsonb, default: {}, null: false
+  end
+end

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.3.9".freeze
+  VERSION = "0.4.0.beta.1"
 end

data/lib/generators/enju_circulation/setup/templates/db/fixtures/checkout_types.yml

@@ -3,20 +3,18 @@
 checkout_type_00001:
   id: 1
   name: book
-  display_name: "en: Book\r\n\
-    ja: 図書"
+  display_name_translations: {"en": "Book", "ja": "図書"}
   note: 
   position: 1
 checkout_type_00002:
   id: 2
   name: serial
-  display_name: "en: Serial\r\n\
-    ja: 定期刊行物"
+  display_name_translations: {"en": "Serial", "ja": "定期刊行物"}
   note: 
   position: 2
 checkout_type_00003:
   id: 3
   name: cd
-  display_name: CD
+  display_name_translations: {"en": "CD", "ja": "CD"}
   note: 
   position: 3