enju_circulation 0.1.0.pre11 → 0.1.0.pre12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bfd5c7351216dfcfe77a9f0633f7f5a87468263d
+  data.tar.gz: 30b2ead9534a1a72aefcaafbe9aa1296a49e3844
+SHA512:
+  metadata.gz: 46fc0a5edfe11edb9262fba52a01e2ea43c43e0c0d016430eb5a9d7b8d5914e8a1429ebca6962e7472b485ed39681cc65d5a0cb1d5ba99dd43674610b1e04448
+  data.tar.gz: 94d674c0ef4142a6a2a624d9febf0efa0a695dc6ba0a70f1ecc9100680aa79a201d47ca7fb9d1928cd2770bbcf36fd120e6d4ab3f638faebd7c877e449e2061d

data/app/controllers/checked_items_controller.rb

@@ -57,11 +57,6 @@ class CheckedItemsController < ApplicationController
     @checked_item.librarian = current_user
 
     flash[:message] = ''
-    item_identifier = @checked_item.item_identifier.to_s.strip
-    unless item_identifier.blank?
-      item = Item.where(:item_identifier => item_identifier).first
-    end
-    @checked_item.item = item if item
 
     respond_to do |format|
       if @checked_item.save

data/app/controllers/checkins_controller.rb

@@ -66,11 +66,6 @@ class CheckinsController < ApplicationController
     @checkin.librarian = current_user
 
     flash[:message] = ''
-    item_identifier = @checkin.item_identifier.to_s.strip
-    unless item_identifier.blank?
-      item = Item.where(:item_identifier => item_identifier).first
-    end
-    @checkin.item = item if item
 
     respond_to do |format|
       if @checkin.save
@@ -92,12 +87,6 @@ class CheckinsController < ApplicationController
   # PUT /checkins/1
   # PUT /checkins/1.json
   def update
-    #@checkin = Checkin.find(params[:id])
-    @checkin.item_identifier = params[:checkin][:item_identifier] rescue nil
-    unless @checkin.item_identifier.blank?
-      item = Item.where(:item_identifier => @checkin.item_identifier.to_s.strip).first
-    end
-    @checkin.item = item
     @checkin.assign_attributes(params[:checkin])
     @checkin.librarian = current_user
 

data/app/controllers/reserves_controller.rb

@@ -7,6 +7,7 @@ class ReservesController < ApplicationController
   before_filter :store_page
   helper_method :get_manifestation
   helper_method :get_item
+  after_filter :convert_charset, :only => :index
 
   # GET /reserves
   # GET /reserves.json
@@ -22,24 +23,74 @@ class ReservesController < ApplicationController
       end
     end
 
+    search = Reserve.search
+    query = @query = params[:query].to_s.strip
+    if params[:format].to_s.downcase == 'csv'
+      page = 1
+      per_page = 65534
+    else
+      page ||= params[:page] || 1
+      per_page ||= Reserve.default_per_page
+    end
+
     if params[:mode] == 'hold' and current_user.has_role?('Librarian')
-      @reserves = Reserve.hold.order('reserves.id DESC').page(params[:page])
+      search.build do
+        with(:hold).equal_to true
+      end
     else
       if @user
+        user = @user
         if current_user.has_role?('Librarian')
-          @reserves = @user.reserves.order('reserves.id DESC').page(params[:page])
+          search.build do
+            with(:username).equal_to user.username
+          end
         else
           access_denied; return
         end
       else
-        if current_user.has_role?('Librarian')
-          @reserves = Reserve.order('reserves.id DESC').includes(:manifestation).page(params[:page])
-        else
-          @reserves = current_user.reserves.order('reserves.id DESC').includes(:manifestation).page(params[:page])
+        unless current_user.has_role?('Librarian')
+          search.build do
+            with(:username).equal_to current_user.username
+          end
         end
       end
     end
 
+    begin
+      reserved_from = Time.zone.parse(params[:reserved_from])
+      @reserved_from = params[:reserved_from].to_s.strip
+    rescue
+      reserved_from = nil
+    end
+
+    begin
+      reserved_to = Time.zone.parse(params[:reserved_to])
+      @reserved_to = params[:reserved_to].to_s.strip
+    rescue
+      reserved_to = nil
+    end
+
+    if params[:state].present?
+      state = params[:state].downcase
+    end
+
+    search.build do
+      fulltext query
+      if reserved_from
+        with(:created_at).greater_than_or_equal_to reserved_from.beginning_of_day
+      end
+      if reserved_to
+        with(:created_at).less_than reserved_to.tomorrow.beginning_of_day
+      end
+      order_by :created_at, :desc
+      with(:state).equal_to state if state
+      facet :state
+      paginate :page => page.to_i, :per_page => per_page
+    end
+
+    @reserves = search.execute.results
+    @state_facet = search.facet(:state).rows
+
     respond_to do |format|
       format.html # index.html.erb
       format.json { render :json => @reserves }
@@ -90,13 +141,14 @@ class ReservesController < ApplicationController
 
   # GET /reserves/1/edit
   def edit
+    @reserve.item_identifier = @reserve.item.try(:item_identifier)
   end
 
   # POST /reserves
   # POST /reserves.json
   def create
     @reserve = Reserve.new(params[:reserve])
-    @reserve.user = User.where(:user_number => @reserve.user_number).first if @reserve.user_number.to_s.strip.present?
+    @reserve.set_user
 
     if current_user.has_role?('Librarian')
       unless @reserve.user
@@ -113,7 +165,6 @@ class ReservesController < ApplicationController
     respond_to do |format|
       if @reserve.save
         @reserve.sm_request!
-        @reserve.send_message
 
         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) }
@@ -127,24 +178,31 @@ class ReservesController < ApplicationController
   # PUT /reserves/1
   # PUT /reserves/1.json
   def update
-    @reserve.assign_attributes(params[:reserve])
-    @reserve.user = User.where(:user_number => @reserve.user_number).first if @reserve.user_number.to_s.strip.present?
-
-    unless current_user.has_role?('Librarian')
+    if current_user.has_role?('Librarian')
+      @reserve.assign_attributes(params[:reserve], :as => :admin)
+    else
       if @reserve.user != current_user
         access_denied; return
       end
+      @reserve.assign_attributes(params[:reserve], :as => :user_update)
     end
 
-    if params[:mode] == 'cancel'
-      @reserve.sm_cancel!
+    if @reserve.valid?
+      if params[:mode] == 'cancel'
+        @reserve.sm_cancel!
+      else
+        unless @reserve.retained?
+          if @reserve.item and @reserve.force_retaining == '1'
+            @reserve.sm_retain!
+          end
+        end
+      end
     end
 
     respond_to do |format|
       if @reserve.save
         if @reserve.state == 'canceled'
           flash[:notice] = t('reserve.reservation_was_canceled')
-          @reserve.send_message
         else
           flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.reserve'))
         end

data/app/helpers/reserves_helper.rb

@@ -12,6 +12,8 @@ module ReservesHelper
       t('reserve.canceled')
     when 'expired'
       t('reserve.expired')
+    when 'postponed'
+      t('reserve.postponed')
     when 'completed'
       t('reserve.completed')
     end

data/app/models/checked_item.rb

@@ -9,6 +9,7 @@ class CheckedItem < ActiveRecord::Base
   validates_uniqueness_of :item_id, :scope => :basket_id
   validate :available_for_checkout?, :on => :create
  
+  before_validation :set_item
   before_validation :set_due_date, :on => :create
   normalize_attributes :item_identifier
 
@@ -101,6 +102,14 @@ class CheckedItem < ActiveRecord::Base
     end
     return self.due_date
   end
+
+  def set_item
+    identifier = item_identifier.to_s.strip
+    if identifier.present?
+      item = Item.where(:item_identifier => identifier).first
+      self.item = item
+    end
+  end
 end
 
 # == Schema Information

data/app/models/checkin.rb

@@ -10,12 +10,17 @@ class Checkin < ActiveRecord::Base
   validates_uniqueness_of :item_id, :scope => :basket_id
   validates_presence_of :item_id, :basket_id
   validate :available_for_checkin?, :on => :create
+  before_validation :set_item
 
   attr_accessor :item_identifier
 
   paginates_per 10
 
   def available_for_checkin?
+    unless basket
+      return nil
+    end
+
     if item.blank?
       errors[:base] << I18n.t('checkin.item_not_found')
       return
@@ -69,6 +74,14 @@ class Checkin < ActiveRecord::Base
       nil
     end
   end
+
+  def set_item
+    identifier = item_identifier.to_s.strip
+    if identifier.present?
+      item = Item.where(:item_identifier => identifier).first
+      self.item = item
+    end
+  end
 end
 
 # == Schema Information

data/app/models/reserve.rb

@@ -1,15 +1,19 @@
 # -*- encoding: utf-8 -*-
 class Reserve < ActiveRecord::Base
-  attr_accessible :manifestation_id, :item_identifier, :user_number, :expired_at
+  attr_accessible :manifestation_id, :user_number, :expired_at
+  attr_accessible :expired_at, :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,
+    :expiration_notice_to_patron, :expiration_notice_to_library, :item_id,
+    :retained_at, :postponed_at, :force_retaining,
     :as => :admin
   scope :hold, where('item_id IS NOT NULL')
   scope :not_hold, where(:item_id => nil)
   scope :waiting, where('canceled_at IS NULL AND expired_at > ? AND state != ?', Time.zone.now, 'completed').order('reserves.id DESC')
-  scope :completed, where('checked_out_at IS NOT NULL')
-  scope :canceled, where('canceled_at IS NOT NULL')
+  scope :retained, where('retained_at IS NOT NULL AND state = ?', 'retained')
+  scope :completed, where('checked_out_at IS NOT NULL AND state = ?', 'completed')
+  scope :canceled, where('canceled_at IS NOT NULL AND state = ?', 'canceled')
+  scope :postponed, where('postponed_at IS NOT NULL AND state = ?', 'postponed')
   scope :will_expire_retained, lambda {|datetime| {:conditions => ['checked_out_at IS NULL AND canceled_at IS NULL AND expired_at <= ? AND state = ?', datetime, 'retained'], :order => 'expired_at'}}
   scope :will_expire_pending, lambda {|datetime| {:conditions => ['checked_out_at IS NULL AND canceled_at IS NULL AND expired_at <= ? AND state = ?', datetime, 'pending'], :order => 'expired_at'}}
   scope :created, lambda {|start_date, end_date| {:conditions => ['created_at >= ? AND created_at < ?', start_date, end_date]}}
@@ -32,17 +36,45 @@ class Reserve < ActiveRecord::Base
   validates_date :expired_at, :allow_blank => true
   validate :manifestation_must_include_item
   validate :available_for_reservation?, :on => :create
-  before_validation :set_item_and_manifestation, :on => :create
-  before_validation :set_expired_at
+  validates :item_id, :presence => true, :if => Proc.new{|reserve|
+    if item_id_changed?
+      if reserve.completed? or reserve.retained?
+        unless item_id_change[0]
+          return false
+        else
+          unless item_id_change[1]
+            return false
+          else
+            return true
+          end
+        end
+      end
+    else
+      if reserve.retained?
+        return true
+      end
+    end
+  }
+  validates :item_id, :uniqueness => {:scope => :state, :allow_blank => true},
+    :if => Proc.new{|reserve|
+      return false unless reserve.state_changed?
+      return true if reserve.completed? or reserve.retained?
+    }
+  validate :valid_item?
+  validate :retained_by_other_user?
+  before_validation :set_manifestation, :on => :create
+  before_validation :set_item, :set_expired_at
+  before_validation :set_user, :on => :update
   before_validation :set_request_status, :on => :create
 
-  attr_accessor :user_number, :item_identifier
+  attr_accessor :user_number, :item_identifier, :force_retaining
 
   state_machine :initial => :pending do
     before_transition :pending => :requested, :do => :do_request
-    before_transition [:pending, :requested, :retained] => :retained, :do => :retain
-    before_transition [:pending ,:requested, :retained] => :canceled, :do => :cancel
-    before_transition [:pending, :requested, :retained] => :expired, :do => :expire
+    before_transition :retained => :postponed, :do => :postpone
+    before_transition [:pending, :requested, :retained, :postponed] => :retained, :do => :retain
+    before_transition [:pending ,:requested, :retained, :postponed] => :canceled, :do => :cancel
+    before_transition [:pending, :requested, :retained, :postponed] => :expired, :do => :expire
     before_transition :retained => :completed, :do => :checkout
     after_transition any => any do |reserve, transition|
       if Rails.env == 'production'
@@ -50,20 +82,28 @@ class Reserve < ActiveRecord::Base
       end
     end
 
+    after_transition any => [:requested, :canceled, :retained, :postponed] do |reserve, transition|
+      reserve.send_message
+    end
+
     event :sm_request do
-      transition :pending => :requested
+      transition [:pending, :requested] => :requested
     end
 
     event :sm_retain do
-      transition [:pending, :requested, :retained] => :retained
+      transition [:pending, :requested, :retained, :postponed] => :retained
     end
 
     event :sm_cancel do
-      transition [:pending, :requested, :retained] => :canceled
+      transition [:pending, :requested, :retained, :postponed] => :canceled
     end
 
     event :sm_expire do
-      transition [:pending, :requested, :retained] => :expired
+      transition [:pending, :requested, :retained, :postponed] => :expired
+    end
+
+    event :sm_postpone do
+      transition :retained => :postponed
     end
 
     event :sm_complete do
@@ -73,9 +113,63 @@ class Reserve < ActiveRecord::Base
 
   paginates_per 10
 
-  def set_item_and_manifestation
-    item = Item.where(:item_identifier => item_identifier).first
-    manifestation = item.manifestation if item
+  searchable do
+    text :username do
+      user.try(:username)
+    end
+    string :username do
+      user.try(:username)
+    end
+    string :user_number do
+      user.try(:user_number)
+    end
+    time :created_at
+    text :item_identifier do
+      manifestation.items.pluck(:item_identifier)
+    end
+    text :title do
+      manifestation.try(:titles)
+    end
+    boolean :hold do |reserve|
+      self.hold.include?(reserve)
+    end
+    string :state
+  end
+
+  def set_manifestation
+    self.manifestation = item.manifestation if item
+  end
+
+  def set_item
+    identifier = item_identifier.to_s.strip
+    if identifier.present?
+      item = Item.where(:item_identifier => identifier).first
+      self.item = item
+    end
+  end
+
+  def set_user
+    number = user_number.to_s.strip
+    if number.present?
+      user = User.where(:user_number => number).first
+      self.user = user
+    end
+  end
+
+  def valid_item?
+    if item_identifier.present?
+      item = Item.where(:item_identifier => item_identifier).first
+      errors[:base] << I18n.t('reserve.invalid_item') unless item
+    end
+  end
+
+  def retained_by_other_user?
+    return nil if force_retaining == '1'
+    if item
+      if Reserve.retained.where(:item_id => item.item_identifier).first
+        errors[:base] << I18n.t('reserve.attempt_to_update_retained_reservation')
+      end
+    end
   end
 
   def set_request_status
@@ -95,13 +189,6 @@ class Reserve < ActiveRecord::Base
     end
   end
 
-  def manifestation_must_include_item
-    unless item_id.blank?
-      item = Item.find(item_id) rescue nil
-      errors[:base] << I18n.t('reserve.invalid_item') unless manifestation.items.include?(item)
-    end
-  end
-
   def next_reservation
     if item
       Reserve.waiting.where(:manifestation_id => item.manifestation.id).first
@@ -157,6 +244,17 @@ class Reserve < ActiveRecord::Base
         request.assign_attributes({:sender => sender, :receiver => sender, :message_template => message_template_for_library}, :as => :admin)
         request.save_message_body(:manifestations => Array[item.manifestation], :user => user)
         request.sm_send_message!
+      when 'postponed'
+        message_template_for_patron = MessageTemplate.localized_template('reservation_postponed_for_patron', user.locale)
+        request = MessageRequest.new
+        request.assign_attributes({:sender => sender, :receiver => user, :message_template => message_template_for_patron}, :as => :admin)
+        request.save_message_body(:manifestations => Array[manifestation], :user => user)
+        request.sm_send_message!
+        message_template_for_library = MessageTemplate.localized_template('reservation_postponed_for_library', user.locale)
+        request = MessageRequest.new
+        request.assign_attributes({:sender => sender, :receiver => sender, :message_template => message_template_for_library}, :as => :admin)
+        request.save_message_body(:manifestations => Array[manifestation], :user => user)
+        request.sm_send_message!
       else
         raise 'status not defined'
       end
@@ -209,8 +307,18 @@ class Reserve < ActiveRecord::Base
   #  logger.info "#{Time.zone.now} expiring reservations failed!"
   end
 
+  def checked_out_now?
+    if user and manifestation
+      true if !(user.checkouts.not_returned.pluck(:item_id) & manifestation.items.pluck(:item_id)).empty?
+    end
+  end
+
   def available_for_reservation?
     if manifestation
+      if checked_out_now?
+        errors[:base] << I18n.t('reserve.this_manifestation_is_already_checked_out')
+      end
+
       if manifestation.is_reserved_by?(user)
         errors[:base] << I18n.t('reserve.this_manifestation_is_already_reserved')
       end
@@ -225,38 +333,58 @@ class Reserve < ActiveRecord::Base
     end
   end
 
+  def completed?
+    ['canceled', 'expired', 'completed'].include?(state)
+  end
+
+  def retained?
+    return true if state == 'retained'
+    false
+  end
+
   private
   def do_request
-    self.assign_attributes({:request_status_type => RequestStatusType.where(:name => 'In Process').first}, :as => :admin)
+    self.assign_attributes({:request_status_type => RequestStatusType.where(:name => 'In Process').first, :item_id => nil, :retained_at => nil}, :as => :admin)
     save!
   end
 
   def retain
     # TODO: 「取り置き中」の状態を正しく表す
-    self.assign_attributes({:request_status_type => RequestStatusType.where(:name => 'In Process').first, :checked_out_at => Time.zone.now}, :as => :admin)
-    save!
+    self.assign_attributes({:request_status_type => RequestStatusType.where(:name => 'In Process').first, :retained_at => Time.zone.now}, :as => :admin)
+    Reserve.transaction do
+      if item.try(:next_reservation)
+        reservation = item.next_reservation
+        reservation.sm_postpone!
+      end
+      save!
+    end
   end
 
   def expire
-    self.assign_attributes({:request_status_type => RequestStatusType.where(:name => 'Expired').first, :canceled_at => Time.zone.now}, :as => :admin)
-    save!
-    logger.info "#{Time.zone.now} reserve_id #{self.id} expired!"
-    reserve = next_reservation
-    if reserve
-      reserve.item = item
-      reserve.sm_retain!
-      reserve.send_message
+    Reserve.transaction do
+      self.assign_attributes({:request_status_type => RequestStatusType.where(:name => 'Expired').first, :canceled_at => Time.zone.now}, :as => :admin)
+      reserve = next_reservation
+      if reserve
+        reserve.item = item
+        self.item = nil
+        save!
+        reserve.sm_retain!
+      end
     end
+    logger.info "#{Time.zone.now} reserve_id #{self.id} expired!"
   end
 
   def cancel
-    self.assign_attributes({:request_status_type => RequestStatusType.where(:name => 'Cannot Fulfill Request').first, :canceled_at => Time.zone.now}, :as => :admin)
-    save!
-    reserve = next_reservation
-    if reserve
-      reserve.item = item
-      reserve.sm_retain!
-      reserve.send_message
+    Reserve.transaction do
+      self.assign_attributes({:request_status_type => RequestStatusType.where(:name => 'Cannot Fulfill Request').first, :canceled_at => Time.zone.now}, :as => :admin)
+      save!
+      reserve = next_reservation
+      if reserve
+        reserve.item = item
+        self.item = nil
+        save!
+        reserve.sm_retain!
+      end
     end
   end
 
@@ -265,6 +393,22 @@ class Reserve < ActiveRecord::Base
     save!
   end
 
+  def postpone
+    self.assign_attributes({
+      :request_status_type => RequestStatusType.where(:name => 'In Process').first,
+      :item_id => nil,
+      :retained_at => nil,
+      :postponed_at => Time.zone.now
+    }, :as => :admin)
+    save!
+  end
+
+  def manifestation_must_include_item
+    unless item_id.blank?
+      errors[:base] << I18n.t('reserve.invalid_item') unless manifestation.items.include?(item)
+    end
+  end
+
   if defined?(EnjuInterLibraryLoan)
     has_one :inter_library_loan
   end

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

@@ -17,7 +17,7 @@
     <%= f.submit t('page.read') -%>
   </div>
 <%- end -%>
-<%= javascript_tag("$('#basket_user_number').focus().select();") -%>
+<%= javascript_tag("$(function(){$('#basket_user_number').focus().select()})") %>
 </div>
 </div>
 

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

@@ -10,7 +10,7 @@
   </p>
 <%- end -%>
 
-<%= javascript_tag("$('#checked_item_item_identifier').focus().select();") %>
+<%= javascript_tag("$(function(){$('#checked_item_item_identifier').focus().select()})") %>
 </div>
 
 <%= render 'checked_item' %>

data/app/views/checkins/_checkin.html.erb

@@ -36,5 +36,5 @@
 <%- end -%>
 </table>
 
-<%= javascript_tag("$('#checkin_item_identifier').focus().select();") %>
+<%= javascript_tag("$(function(){$('#checkin_item_identifier').focus().select()})") %>
 </script>

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

@@ -9,7 +9,7 @@
     <%= f.submit t('checkin.checkin'), 'data-disable-with' => t('page.saving') -%>
   </p>
 <%- end -%>
-<%= javascript_tag("$('#checkin_item_identifier').focus().select();") %>
+<%= javascript_tag("$(function(){$('#checkin_item_identifier').focus().select()})") %>
 </div>
 
 <%= render 'checkin' %>