enju_circulation 0.1.0.pre40 → 0.1.0.pre41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e28fea41163e953a23b7795ba5e2544e0b8b9499
-  data.tar.gz: 67f915f13223995b0cace199886abd1ba72753c2
+  metadata.gz: bc28894fa75205e043a65091c988180f9ec16291
+  data.tar.gz: c032ab36c6bb6973ad8c7d333cda148feb0db4c6
 SHA512:
-  metadata.gz: 65389ba2246803d37c50b8bbdfae76a4bedfe1f4026af104f759e7184dd769fe92761aaba09b596b0c7e3091108c299b46c253cb7c6f584549e6db2900786589
-  data.tar.gz: 5c741d5e09449953ea957f01be5cd2e548d63b18ba3bebb372877e772b2bb464cfd6538d4ba7a33cece9275fb606d9f00db56a73e07f8804966dbdd9b799a446
+  metadata.gz: 38f85ed8019ed31ddc51516bed7bf0fd9764445b3ba9d4a3231fa27cdaccb744d7f0723bc211be6002e394c56e7e103ccbef73ba7aa84a62bd20f9537cb34e72
+  data.tar.gz: d35cb074110a6727b25a03fb57d1f38f25132dea4844dd31b1371db40383612b4d6cacfaf2f17269b545cca4adf96fbfeb0071227c73415dc8c84516eee9957c

data/README.rdoc

@@ -1,3 +1,10 @@
-= EnjuCirculation {<img src="https://secure.travis-ci.org/nabeta/enju_circulation.png?branch=master" alt="Build Status" />}[http://travis-ci.org/nabeta/enju_circulation]
+= EnjuCirculation
+{<img src="https://secure.travis-ci.org/next-l/enju_circulation.png?branch=1.1" alt="Build Status" />}[http://travis-ci.org/next-l/enju_circulation]
+{<img src="https://coveralls.io/repos/next-l/enju_circulation/badge.png?branch=1.1" alt="Coverage Status" />}[https://coveralls.io/r/next-l/enju_circulation?branch=1.1]
+{<img src="https://hakiri.io/github/next-l/enju_circulation/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_circulation/1.1]
 
 This project rocks and uses MIT-LICENSE.
+
+== 製作者・貢献者 (Authors and contributors)
+* {TANABE, Kosuke}[https://github.com/nabeta] ({@nabeta}[https://twitter.com/nabeta])
+* {Project Next-L}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/app/controllers/checked_items_controller.rb

@@ -88,7 +88,7 @@ class CheckedItemsController < ApplicationController
 
     respond_to do |format|
       if @checked_item.update_attributes(params[:checked_item])
-        format.html { redirect_to @checked_item, notice: t('controller.successfully_updated', model: t('activerecord.models.checked_item')) }
+        format.html { redirect_to checked_item_url(@checked_item), notice: t('controller.successfully_updated', model: t('activerecord.models.checked_item')) }
         format.json { head :no_content }
       else
         format.html { render action: "edit" }

data/app/controllers/checkout_types_controller.rb

@@ -47,9 +47,6 @@ class CheckoutTypesController < ApplicationController
 
   # GET /checkout_types/1/edit
   def edit
-    if @user_group
-      @checkout_type = @user_group.checkout_types.find(params[:id])
-    end
   end
 
   # POST /checkout_types
@@ -75,10 +72,6 @@ class CheckoutTypesController < ApplicationController
   # PUT /checkout_types/1
   # PUT /checkout_types/1.json
   def update
-    if @user_group
-      @checkout_type = @user_group.checkout_types.find(params[:id])
-    end
-
     if params[:move]
       move_position(@checkout_type, params[:move])
       return

data/app/controllers/checkouts_controller.rb

@@ -10,7 +10,7 @@ class CheckoutsController < ApplicationController
   # GET /checkouts.json
   def index
     if params[:icalendar_token].present?
-      icalendar_user = Profile.where(:checkout_icalendar_token => params[:icalendar_token]).first.try(:user)
+      icalendar_user = Profile.where(checkout_icalendar_token: params[:icalendar_token]).first.try(:user)
       if icalendar_user.blank?
         raise ActiveRecord::RecordNotFound
       else

data/app/controllers/manifestation_checkout_stats_controller.rb

@@ -21,20 +21,32 @@ class ManifestationCheckoutStatsController < ApplicationController
     else
       per_page = CheckoutStatHasManifestation.default_per_page
     end
-    @stats = Checkout.where(
+
+    @carrier_type_results = Checkout.where(
       Checkout.arel_table[:created_at].gteq @manifestation_checkout_stat.start_date
     ).where(
       Checkout.arel_table[:created_at].lt @manifestation_checkout_stat.end_date
-    ).joins(item: [:manifestation]).group(:manifestation_id).merge(
+    ).joins(item: :manifestation).group(
+      'checkouts.shelf_id', :carrier_type_id
+    ).merge(
       Manifestation.where(carrier_type_id: CarrierType.pluck(:id))
-    ).order('count_id DESC').page(params[:page])
-    @breakdown = Checkout.where(
+    ).count(:id)
+
+    @checkout_type_results = Checkout.where(
+      Checkout.arel_table[:created_at].gteq @manifestation_checkout_stat.start_date
+    ).where(
+      Checkout.arel_table[:created_at].lt @manifestation_checkout_stat.end_date
+    ).joins(item: :manifestation).group(
+      'checkouts.shelf_id', :checkout_type_id
+    ).count(:id)
+
+    @stats = Checkout.where(
       Checkout.arel_table[:created_at].gteq @manifestation_checkout_stat.start_date
     ).where(
       Checkout.arel_table[:created_at].lt @manifestation_checkout_stat.end_date
-    ).joins(item: [:shelf, :manifestation]).group(:carrier_type_id).merge(
+    ).joins(item: :manifestation).group(:manifestation_id).merge(
       Manifestation.where(carrier_type_id: CarrierType.pluck(:id))
-    ).order('manifestations.carrier_type_id').count(:id)
+    ).order('count_id DESC').page(params[:page]).per(per_page)
 
     respond_to do |format|
       format.html # show.html.erb
@@ -67,8 +79,10 @@ class ManifestationCheckoutStatsController < ApplicationController
 
     respond_to do |format|
       if @manifestation_checkout_stat.save
-        Resque.enqueue(ManifestationCheckoutStatQueue, @manifestation_checkout_stat.id)
-        format.html { redirect_to @manifestation_checkout_stat, notice: t('statistic.successfully_created', model: t('activerecord.models.manifestation_checkout_stat')) }
+        @manifestation_checkout_stat.transition_to(:started)
+        @manifestation_checkout_stat.transition_to!(:completed)
+        #Resque.enqueue(ManifestationCheckoutStatQueue, @manifestation_checkout_stat.id)
+        format.html { redirect_to @manifestation_checkout_stat, notice: t('controller.successfully_created', model: t('activerecord.models.manifestation_checkout_stat')) }
         format.json { render json: @manifestation_checkout_stat, status: :created, location: @manifestation_checkout_stat }
       else
         format.html { render action: "new" }

data/app/controllers/reserves_controller.rb

@@ -3,6 +3,7 @@ class ReservesController < ApplicationController
   before_filter :store_location, only: [:index, :new]
   load_and_authorize_resource except: :index
   authorize_resource only: :index
+  before_filter :prepare_options, only: [:new, :edit]
   before_filter :get_user, only: [:index, :new]
   before_filter :store_page
   helper_method :get_manifestation
@@ -95,7 +96,7 @@ class ReservesController < ApplicationController
       order_by sort_column, order
       with(:state).equal_to state if state
       facet :state
-      paginate :page => page.to_i, :per_page => per_page
+      paginate page: page.to_i, per_page: per_page
     end
 
     @reserves = search.execute.results
@@ -122,7 +123,7 @@ class ReservesController < ApplicationController
   # GET /reserves/new
   # GET /reserves/new.json
   def new
-    @reserve = Reserve.new(params[:reserve])
+    @reserve = Reserve.new
 
     if current_user.has_role?('Librarian')
       @reserve.user = @user
@@ -157,7 +158,11 @@ class ReservesController < ApplicationController
   # POST /reserves
   # POST /reserves.json
   def create
-    @reserve = Reserve.new(params[:reserve])
+    if current_user.has_role?('Librarian')
+      @reserve = Reserve.new(params[:reserve], as: :admin)
+    else
+      @reserve = Reserve.new(params[:reserve])
+    end
     @reserve.set_user
 
     if current_user.has_role?('Librarian')
@@ -179,6 +184,7 @@ class ReservesController < ApplicationController
         format.html { redirect_to @reserve, notice: t('controller.successfully_created', model: t('activerecord.models.reserve')) }
         format.json { render json: @reserve, status: :created, location: reserve_url(@reserve) }
       else
+        prepare_options
         format.html { render action: "new" }
         format.json { render json: @reserve.errors, status: :unprocessable_entity }
       end
@@ -202,11 +208,11 @@ class ReservesController < ApplicationController
         @reserve.transition_to!(:canceled)
       else
         if @reserve.retained?
-          if @reserve.item_identifier and @reserve.force_retaining == '1'
+          if @reserve.item_identifier.present? and @reserve.force_retaining == '1'
             @reserve.transition_to!(:retained)
           end
         else
-          @reserve.transition_to!(:retained) if @reserve.item_identifier
+          @reserve.transition_to!(:retained) if @reserve.item_identifier.present?
         end
       end
     end
@@ -221,6 +227,7 @@ class ReservesController < ApplicationController
         format.html { redirect_to @reserve }
         format.json { head :no_content }
       else
+        prepare_options
         format.html { render action: "edit" }
         format.json { render json: @reserve.errors, status: :unprocessable_entity }
       end
@@ -247,4 +254,9 @@ class ReservesController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def prepare_options
+    @libraries = Library.real.order(:position)
+  end
 end

data/app/models/carrier_type_has_checkout_type.rb

@@ -22,7 +22,6 @@ end
 #  checkout_type_id :integer          not null
 #  note             :text
 #  position         :integer
-#  created_at       :datetime         not null
-#  updated_at       :datetime         not null
+#  created_at       :datetime
+#  updated_at       :datetime
 #
-

data/app/models/checked_item.rb

@@ -132,8 +132,7 @@ end
 #  item_id      :integer          not null
 #  basket_id    :integer          not null
 #  due_date     :datetime         not null
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #  librarian_id :integer
 #
-

data/app/models/checkin.rb

@@ -90,8 +90,7 @@ end
 #  item_id      :integer          not null
 #  librarian_id :integer
 #  basket_id    :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #  lock_version :integer          default(0), not null
 #
-

data/app/models/checkout.rb

@@ -13,6 +13,8 @@ class Checkout < ActiveRecord::Base
   belongs_to :checkin
   belongs_to :librarian, class_name: 'User'
   belongs_to :basket
+  belongs_to :shelf
+  belongs_to :library
 
   validates_associated :user, :item, :librarian, :checkin #, :basket
   # TODO: 貸出履歴を保存しない場合は、ユーザ名を削除する
@@ -169,6 +171,8 @@ end
 #  due_date               :datetime
 #  checkout_renewal_count :integer          default(0), not null
 #  lock_version           :integer          default(0), not null
-#  created_at             :datetime         not null
-#  updated_at             :datetime         not null
+#  created_at             :datetime
+#  updated_at             :datetime
+#  shelf_id               :integer
+#  library_id             :integer
 #

data/app/models/checkout_stat_has_manifestation.rb

@@ -18,7 +18,6 @@ end
 #  manifestation_checkout_stat_id :integer          not null
 #  manifestation_id               :integer          not null
 #  checkouts_count                :integer
-#  created_at                     :datetime         not null
-#  updated_at                     :datetime         not null
+#  created_at                     :datetime
+#  updated_at                     :datetime
 #
-

data/app/models/checkout_stat_has_user.rb

@@ -18,7 +18,6 @@ end
 #  user_checkout_stat_id :integer          not null
 #  user_id               :integer          not null
 #  checkouts_count       :integer          default(0), not null
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
+#  created_at            :datetime
+#  updated_at            :datetime
 #
-

data/app/models/checkout_type.rb

@@ -25,7 +25,6 @@ end
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/circulation_status.rb

@@ -22,7 +22,6 @@ end
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/item_has_use_restriction.rb

@@ -18,7 +18,6 @@ end
 #  id                 :integer          not null, primary key
 #  item_id            :integer          not null
 #  use_restriction_id :integer          not null
-#  created_at         :datetime         not null
-#  updated_at         :datetime         not null
+#  created_at         :datetime
+#  updated_at         :datetime
 #
-

data/app/models/lending_policy.rb

@@ -27,7 +27,6 @@ end
 #  fine           :integer          default(0), not null
 #  note           :text
 #  position       :integer
-#  created_at     :datetime         not null
-#  updated_at     :datetime         not null
+#  created_at     :datetime
+#  updated_at     :datetime
 #
-

data/app/models/manifestation_checkout_stat.rb

@@ -24,7 +24,7 @@ class ManifestationCheckoutStat < ActiveRecord::Base
     self.started_at = Time.zone.now
     Manifestation.find_each do |manifestation|
       daily_count = Checkout.manifestations_count(start_date.beginning_of_day, end_date.tomorrow.beginning_of_day, manifestation)
-      #manifestation.update_attributes({:daily_checkouts_count => daily_count, :total_count => manifestation.total_count + daily_count})
+      #manifestation.update_attributes({daily_checkouts_count: daily_count, total_count: manifestation.total_count + daily_count})
       if daily_count > 0
         self.manifestations << manifestation
         sql = ['UPDATE checkout_stat_has_manifestations SET checkouts_count = ? WHERE manifestation_checkout_stat_id = ? AND manifestation_id = ?', daily_count, id, manifestation.id]
@@ -52,8 +52,8 @@ end
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #  started_at   :datetime
 #  completed_at :datetime
 #  user_id      :integer

data/app/models/manifestation_checkout_stat_state_machine.rb

@@ -9,7 +9,7 @@ class ManifestationCheckoutStatStateMachine
 
   after_transition(to: :started) do |manifestation_checkout_stat|
     manifestation_checkout_stat.update_column(:started_at, Time.zone.now)
-    manifestation_checkout_stat.calculate_count!
+    #manifestation_checkout_stat.calculate_count!
   end
 
   after_transition(to: :completed) do |manifestation_checkout_stat|

data/app/models/manifestation_checkout_stat_transition.rb

@@ -15,6 +15,6 @@ end
 #  metadata                       :text             default("{}")
 #  sort_key                       :integer
 #  manifestation_checkout_stat_id :integer
-#  created_at                     :datetime         not null
-#  updated_at                     :datetime         not null
+#  created_at                     :datetime
+#  updated_at                     :datetime
 #

data/app/models/manifestation_reserve_stat.rb

@@ -24,7 +24,7 @@ class ManifestationReserveStat < ActiveRecord::Base
     self.started_at = Time.zone.now
     Manifestation.find_each do |manifestation|
       daily_count = manifestation.reserves.created(start_date.beginning_of_day, end_date.tomorrow.beginning_of_day).size
-      #manifestation.update_attributes({:daily_reserves_count => daily_count, :total_count => manifestation.total_count + daily_count})
+      #manifestation.update_attributes({daily_reserves_count: daily_count, total_count: manifestation.total_count + daily_count})
       if daily_count > 0
         self.manifestations << manifestation
         sql = ['UPDATE reserve_stat_has_manifestations SET reserves_count = ? WHERE manifestation_reserve_stat_id = ? AND manifestation_id = ?', daily_count, id, manifestation.id]
@@ -52,8 +52,8 @@ end
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #  started_at   :datetime
 #  completed_at :datetime
 #  user_id      :integer

data/app/models/manifestation_reserve_stat_transition.rb

@@ -15,6 +15,6 @@ end
 #  metadata                      :text             default("{}")
 #  sort_key                      :integer
 #  manifestation_reserve_stat_id :integer
-#  created_at                    :datetime         not null
-#  updated_at                    :datetime         not null
+#  created_at                    :datetime
+#  updated_at                    :datetime
 #

data/app/models/reserve.rb

@@ -1,12 +1,13 @@
 # -*- encoding: utf-8 -*-
 class Reserve < ActiveRecord::Base
   include Statesman::Adapters::ActiveRecordModel
-  attr_accessible :manifestation_id, :user_number, :expired_at
-  attr_accessible :expired_at, as: :user_update
+  attr_accessible :manifestation_id, :user_number, :expired_at,
+    :pickup_location_id
+  attr_accessible :expired_at, :pickup_location_id, as: :user_update
   attr_accessible :manifestation_id, :item_identifier, :user_number,
     :expired_at, :request_status_type, :canceled_at, :checked_out_at,
     :expiration_notice_to_patron, :expiration_notice_to_library, :item_id,
-    :retained_at, :postponed_at, :force_retaining,
+    :retained_at, :postponed_at, :force_retaining, :pickup_location_id,
     as: :admin
   scope :hold, -> { where('item_id IS NOT NULL') }
   scope :not_hold, -> { where(item_id: nil) }
@@ -18,17 +19,18 @@ class Reserve < ActiveRecord::Base
   scope :will_expire_retained, lambda {|datetime| in_state(:retained).where('checked_out_at IS NULL AND canceled_at IS NULL AND expired_at <= ?', datetime).order('expired_at')}
   scope :will_expire_pending, lambda {|datetime| in_state(:pending).where('checked_out_at IS NULL AND canceled_at IS NULL AND expired_at <= ?', datetime).order('expired_at')}
   scope :created, lambda {|start_date, end_date| where('created_at >= ? AND created_at < ?', start_date, end_date)}
-  scope :not_sent_expiration_notice_to_patron, -> {in_state(:expired).where(:expiration_notice_to_patron => false)}
-  scope :not_sent_expiration_notice_to_library, -> {in_state(:expired).where(:expiration_notice_to_library => false)}
-  scope :sent_expiration_notice_to_patron, -> {in_state(:expired).where(:expiration_notice_to_patron => true)}
-  scope :sent_expiration_notice_to_library, -> {in_state(:expired).where(:expiration_notice_to_library => true)}
-  scope :not_sent_cancel_notice_to_patron, -> {in_state(:canceled).where(:expiration_notice_to_patron => false)}
-  scope :not_sent_cancel_notice_to_library, -> {in_state(:canceled).where(:expiration_notice_to_library => false)}
+  scope :not_sent_expiration_notice_to_patron, -> {in_state(:expired).where(expiration_notice_to_patron: false)}
+  scope :not_sent_expiration_notice_to_library, -> {in_state(:expired).where(expiration_notice_to_library: false)}
+  scope :sent_expiration_notice_to_patron, -> {in_state(:expired).where(expiration_notice_to_patron: true)}
+  scope :sent_expiration_notice_to_library, -> {in_state(:expired).where(expiration_notice_to_library: true)}
+  scope :not_sent_cancel_notice_to_patron, -> {in_state(:canceled).where(expiration_notice_to_patron: false)}
+  scope :not_sent_cancel_notice_to_library, -> {in_state(:canceled).where(expiration_notice_to_library: false)}
   belongs_to :user
   belongs_to :manifestation, touch: true
   belongs_to :librarian, class_name: 'User'
   belongs_to :item, touch: true
   belongs_to :request_status_type
+  belongs_to :pickup_location, :class_name => 'Library'
 
   validates_associated :user, :librarian, :request_status_type
   validates :manifestation, associated: true #, on: :create
@@ -401,13 +403,14 @@ end
 #  item_id                      :integer
 #  request_status_type_id       :integer          not null
 #  checked_out_at               :datetime
-#  created_at                   :datetime         not null
-#  updated_at                   :datetime         not null
+#  created_at                   :datetime
+#  updated_at                   :datetime
 #  canceled_at                  :datetime
 #  expired_at                   :datetime
 #  deleted_at                   :datetime
 #  expiration_notice_to_patron  :boolean          default(FALSE)
 #  expiration_notice_to_library :boolean          default(FALSE)
+#  pickup_location_id           :integer
 #  retained_at                  :datetime
 #  postponed_at                 :datetime
 #  lock_version                 :integer          default(0), not null

data/app/models/reserve_stat_has_manifestation.rb

@@ -19,7 +19,6 @@ end
 #  manifestation_reserve_stat_id :integer          not null
 #  manifestation_id              :integer          not null
 #  reserves_count                :integer
-#  created_at                    :datetime         not null
-#  updated_at                    :datetime         not null
+#  created_at                    :datetime
+#  updated_at                    :datetime
 #
-

data/app/models/reserve_stat_has_user.rb

@@ -19,7 +19,6 @@ end
 #  user_reserve_stat_id :integer          not null
 #  user_id              :integer          not null
 #  reserves_count       :integer
-#  created_at           :datetime         not null
-#  updated_at           :datetime         not null
+#  created_at           :datetime
+#  updated_at           :datetime
 #
-

data/app/models/reserve_transition.rb

@@ -15,6 +15,6 @@ end
 #  metadata   :text             default("{}")
 #  sort_key   :integer
 #  reserve_id :integer
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  created_at :datetime
+#  updated_at :datetime
 #

data/app/models/use_restriction.rb

@@ -23,7 +23,6 @@ end
 #  display_name :text
 #  note         :text
 #  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #
-

data/app/models/user_checkout_stat.rb

@@ -51,8 +51,8 @@ end
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #  started_at   :datetime
 #  completed_at :datetime
 #  user_id      :integer

data/app/models/user_checkout_stat_transition.rb

@@ -15,6 +15,6 @@ end
 #  metadata              :text             default("{}")
 #  sort_key              :integer
 #  user_checkout_stat_id :integer
-#  created_at            :datetime         not null
-#  updated_at            :datetime         not null
+#  created_at            :datetime
+#  updated_at            :datetime
 #

data/app/models/user_group_has_checkout_type.rb

@@ -4,8 +4,8 @@ class UserGroupHasCheckoutType < ActiveRecord::Base
     :reservation_limit, :reservation_expired_period,
     :set_due_date_before_closing_day, :fixed_due_date, :note, :position,
     :user_group, :checkout_type
-  scope :available_for_item, lambda{|item| where(:checkout_type_id => item.checkout_type.id)}
-  scope :available_for_carrier_type, lambda{|carrier_type| includes(:checkout_type => :carrier_types).where('carrier_types.id' => carrier_type.id)}
+  scope :available_for_item, lambda{|item| where(checkout_type_id: item.checkout_type.id)}
+  scope :available_for_carrier_type, lambda{|carrier_type| includes(checkout_type: :carrier_types).where('carrier_types.id' => carrier_type.id)}
 
   belongs_to :user_group, validate: true
   belongs_to :checkout_type, validate: true
@@ -20,7 +20,7 @@ class UserGroupHasCheckoutType < ActiveRecord::Base
 
   def create_lending_policy
     self.checkout_type.items.find_each do |item|
-      policy = LendingPolicy.where(item_id: item.id, :user_group_id => user_group_id).select(:id).first
+      policy = LendingPolicy.where(item_id: item.id, user_group_id: user_group_id).select(:id).first
       unless policy
         sql = ['INSERT INTO lending_policies (item_id, user_group_id, loan_period, renewal, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?)', item.id, user_group_id, checkout_period, checkout_renewal_limit, Time.zone.now, Time.zone.now]
         ActiveRecord::Base.connection.execute(
@@ -44,7 +44,7 @@ class UserGroupHasCheckoutType < ActiveRecord::Base
       'SELECT count(checkouts.id) as current_checkout_count,
         profiles.user_group_id,
         items.checkout_type_id
-        FROM checkouts, profiles LEFT OUTER JOIN items
+        FROM profiles, checkouts LEFT OUTER JOIN items
         ON (checkouts.item_id = items.id)
         LEFT OUTER JOIN users
         ON (users.id = checkouts.user_id)
@@ -81,8 +81,7 @@ end
 #  fixed_due_date                  :datetime
 #  note                            :text
 #  position                        :integer
-#  created_at                      :datetime         not null
-#  updated_at                      :datetime         not null
+#  created_at                      :datetime
+#  updated_at                      :datetime
 #  current_checkout_count          :integer
 #
-

data/app/models/user_reserve_stat.rb

@@ -51,8 +51,8 @@ end
 #  start_date   :datetime
 #  end_date     :datetime
 #  note         :text
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
+#  created_at   :datetime
+#  updated_at   :datetime
 #  started_at   :datetime
 #  completed_at :datetime
 #  user_id      :integer

data/app/models/user_reserve_stat_transition.rb

@@ -15,6 +15,6 @@ end
 #  metadata             :text             default("{}")
 #  sort_key             :integer
 #  user_reserve_stat_id :integer
-#  created_at           :datetime         not null
-#  updated_at           :datetime         not null
+#  created_at           :datetime
+#  updated_at           :datetime
 #

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

@@ -21,6 +21,11 @@
         <%= render 'manifestations/show_index', manifestation: checkout.item.manifestation -%>
         (<%= link_to checkout.item.item_identifier, checkout.item -%>)
       <% 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 %>
     </td>
     <td>
       <%= l(checkout.due_date, format: :only_date) -%>

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

@@ -1,4 +1,4 @@
-xml.instruct! :xml, :version=>"1.0"
+xml.instruct! :xml, version: "1.0"
 xml.rss('version' => "2.0",
   'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
   'xmlns:atom' => "http://www.w3.org/2005/Atom"){
@@ -17,12 +17,12 @@ xml.rss('version' => "2.0",
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    #xml.tag! "atom:link", rel: 'search', :type => 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
+    #xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
     unless params[:query].blank?
       xml.tag! "opensearch:totalResults", @count[:query_result]
       xml.tag! "opensearch:startIndex", @checkouts.offset + 1
       xml.tag! "opensearch:itemsPerPage", @checkouts.per_page
-      #xml.tag! "opensearch:Query", :role => 'request', :searchTerms => params[:query], :startPage => (params[:page] || 1)
+      #xml.tag! "opensearch:Query", role: 'request', searchTerms: params[:query], startPage: (params[:page] || 1)
     end
     @checkouts.each do |checkout|
       xml.item do