enju_circulation 0.0.69 → 0.0.70

data/app/controllers/checkouts_controller.rb

@@ -31,39 +31,79 @@ class CheckoutsController < ApplicationController
     end
 
     unless icalendar_user
-      if current_user.try(:has_role?, 'Librarian')
-        if @user
-          @checkouts = @user.checkouts.not_returned.order('checkouts.id DESC').page(params[:page]).per_page(per_page)
+      search = Checkout.search
+      if @user
+        user = @user
+        if current_user.try(:has_role?, 'Librarian')
+          search.build do
+            with(:username).equal_to user.username
+            with(:checked_in_at).equal_to nil unless user.save_checkout_history
+          end
         else
-          if @item
-            @checkouts = @item.checkouts.order('checkouts.id DESC').page(params[:page]).per_page(per_page)
+          if current_user == user
+            redirect_to checkouts_url(:format => params[:format])
+            return
           else
-            if params[:view] == 'overdue'
-              if params[:days_overdue]
-                date = params[:days_overdue].to_i.days.ago.beginning_of_day
-              else
-                date = 1.days.ago.beginning_of_day
-              end
-              @checkouts = Checkout.overdue(date).order('checkouts.id DESC').page(params[:page]).per_page(per_page)
-            else
-              @checkouts = Checkout.not_returned.order('checkouts.id DESC').page(params[:page]).per_page(per_page)
-            end
+            access_denied
+            return
           end
         end
       else
-        # 一般ユーザ
-        if current_user == @user
-          redirect_to checkouts_url(:format => params[:format])
-          return
-        else
-          if @user
-            access_denied
-            return
-          else
-            @checkouts = current_user.checkouts.not_returned.order('checkouts.id DESC').page(params[:page]).per_page(per_page)
+        unless current_user.try(:has_role?, 'Librarian')
+          search.build do
+            with(:username).equal_to current_user.username
+          end
+        end
+
+        search.build do
+          with(:checked_in_at).equal_to nil
+        end
+      end
+
+      if current_user.try(:has_role?, 'Librarian')
+        if @item
+          item = @item
+          search.build do
+            with(:item_identifier).equal_to item.item_identifier
           end
         end
+      else
+        if @item
+          access_denied; return
+        end
+      end
+
+      if params[:view] == 'overdue'
+        if params[:days_overdue]
+          date = params[:days_overdue].to_i.days.ago.beginning_of_day
+        else
+          date = 1.days.ago.beginning_of_day
+        end
+        search.build do
+          with(:due_date).less_than date
+          with(:checked_in_at).equal_to nil
+        end
+      end
+
+      if params[:reserved].present?
+        if params[:reserved] == 'true'
+          @reserved = reserved = true
+        elsif params[:reserved] == 'false'
+          @reserved = reserved = false
+        end
+        search.build do
+          with(:reserved).equal_to reserved
+        end
+      end
+
+      search.build do
+        order_by :created_at, :desc
+        facet :reserved
       end
+      page = params[:page] || 1
+      search.query.paginate(page.to_i, Checkout.per_page)
+      @checkouts = search.execute!.results
+      @checkouts_facet = search.facet(:reserved).rows
     end
 
     @days_overdue = params[:days_overdue] ||= 1

data/app/models/checkin.rb

@@ -32,7 +32,7 @@ class Checkin < ActiveRecord::Base
     message = ''
     Checkin.transaction do
       checkouts = Checkout.not_returned.where(:item_id => item_id).select(
-        [:id, :item_id, :user_id, :basket_id, :due_date, :lock_version]
+        [:id, :item_id, :user_id, :basket_id, :due_date, :lock_version, :created_at]
       )
       item.checkin!
       checkouts.each do |checkout|

data/app/models/checkout.rb

@@ -23,6 +23,26 @@ class Checkout < ActiveRecord::Base
   validate :is_not_checked?, :on => :create
   validates_date :due_date
 
+  searchable do
+    string :username do
+      user.try(:username)
+    end
+    string :user_number do
+      user.try(:user_number)
+    end
+    string :item_identifier do
+      item.item_identifier
+    end
+    time :due_date
+    time :created_at
+    time :checked_in_at do
+      checkin.try(:created_at)
+    end
+    boolean :reserved do
+      reserved?
+    end
+  end
+
   def self.per_page
     10
   end
@@ -35,20 +55,21 @@ class Checkout < ActiveRecord::Base
   end
 
   def checkout_renewable?
-    return false if self.overdue?
-    if self.item
-      return false if self.over_checkout_renewal_limit?
-      return false if self.reserved?
+    return false if overdue?
+    if item
+      return false if over_checkout_renewal_limit?
+      return false if reserved?
     end
     true
   end
 
   def reserved?
-    return true if self.item.reserved?
+    return true if item.try(:reserved?)
+    false
   end
 
   def over_checkout_renewal_limit?
-    return true if self.item.checkout_status(self.user).checkout_renewal_limit <= self.checkout_renewal_count
+    return true if item.checkout_status(user).checkout_renewal_limit <= checkout_renewal_count
   end
 
   def overdue?
@@ -60,7 +81,7 @@ class Checkout < ActiveRecord::Base
   end
 
   def is_today_due_date?
-    if Time.zone.now.beginning_of_day == self.due_date.beginning_of_day
+    if Time.zone.now.beginning_of_day == due_date.beginning_of_day
       return true
     else
       return false
@@ -69,17 +90,17 @@ class Checkout < ActiveRecord::Base
 
   def get_new_due_date
     return nil unless user
-    if self.item
-      if self.checkout_renewal_count <= self.item.checkout_status(user).checkout_renewal_limit
-        new_due_date = Time.zone.now.advance(:days => self.item.checkout_status(user).checkout_period).beginning_of_day
+    if item
+      if checkout_renewal_count <= item.checkout_status(user).checkout_renewal_limit
+        new_due_date = Time.zone.now.advance(:days => item.checkout_status(user).checkout_period).beginning_of_day
       else
-        new_due_date = self.due_date
+        new_due_date = due_date
       end
     end
   end
 
   def self.manifestations_count(start_date, end_date, manifestation)
-    self.completed(start_date, end_date).where(:item_id => manifestation.items.collect(&:id)).count
+    completed(start_date, end_date).where(:item_id => manifestation.items.pluck('items.id')).count
   end
 
   def self.send_due_date_notification

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

@@ -12,7 +12,7 @@
       <%= render 'manifestations/show_index', :manifestation => checked_item.item.manifestation -%>
     </td>
     <td><%= link_to checked_item.item.item_identifier, checked_item.item -%></td>
-    <td><%= l(checked_item.due_date, :format => :only_date) -%></td>
+    <td><%= l(checked_item.due_date, :formats => :only_date) -%></td>
     <td><%= link_to t('page.destroy'), checked_item, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></td>
   </tr>
 <%- end -%>

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

@@ -14,7 +14,7 @@
         <%= render 'manifestations/holding', :manifestation => checkout.item.manifestation -%>
       </td>
       <td><%= link_to checkout.item.item_identifier, checkout.item -%></td>
-      <td><%= l(checkout.due_date, :format => :only_date) -%></td>
+      <td><%= l(checkout.due_date, :formats => :only_date) -%></td>
     </tr>
   <%- end -%>
 </table>

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

@@ -24,7 +24,7 @@
     </td>
     <td>
       <%- if checkin.checkout -%>
-        <%= l(checkin.checkout.due_date, :format => :only_date) -%>
+        <%= l(checkin.checkout.due_date, :formats => :only_date) -%>
       <%- end -%>
     </td>
     <td>

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

@@ -15,6 +15,9 @@
   <ul>
     <li><%= link_to t('checkout.my_checkout'), user_checkouts_path(current_user) -%></li>
     <li><%= link_to t('page.overdue'), checkouts_path(:view => 'overdue') -%></li>
+  </ul>
+  <%= render 'reserved_facet' %>
+  <ul>
     <li>
       <%= link_to 'RSS', checkouts_path(:format => :rss) -%>
       <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => 'RSS', :class => 'icon'), checkouts_path(:format => :rss) -%>

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

@@ -24,6 +24,7 @@
   <ul>
     <li><%= link_to t('page.back_to', :model => t('activerecord.models.checkout')), checkouts_path -%></li>
   </ul>
+  <%= render 'reserved_facet' %>
   <p>
     <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => 'RSS', :class => 'icon'), checkouts_path(:format => :rss, :view => 'overdue') -%>
     (<%= link_to 'RSS', checkouts_path(:format => :rss, :view => 'overdue') -%>)

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

@@ -20,6 +20,7 @@
       </li>
     <%- end -%>
   </ul>
+  <%= render 'reserved_facet' %>
   <ul>
     <li><%= link_to t('activerecord.models.reserve'), user_reserves_path(user) -%></li>
     <%- if current_user.has_role?('Librarian') -%>

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

@@ -21,7 +21,7 @@
       (<%= link_to checkout.item.item_identifier, checkout.item -%>)
     </td>
     <td>
-      <%= l(checkout.due_date, :format => :only_date) -%>
+      <%= l(checkout.due_date, :formats => :only_date) -%>
       <br />
       <% if checkout.checkin %>
         <strong><%= t('checkout.returned') %></strong>

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

@@ -0,0 +1,14 @@
+<h4><%= t('checkout.reserved') %></h4>
+<ul>
+  <%- @checkouts_facet.each do |facet| -%>
+    <% facet.value ? facet_reserved = true : facet_reserved = false %>
+    <li>
+      <%- if @reserved == facet_reserved -%><strong><%- end -%>
+      <%= link_to "#{localized_boolean(facet.value)} (#{facet.count})", url_for(params.merge(:page => nil, :reserved => facet.value.to_s, :view => nil, :only_path => true)) -%>
+      <%- if @reserved == facet_reserved -%></strong><%- end -%>
+    </li>
+  <%- end -%>
+  <%- unless @reserved.nil? -%>
+    <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:reserved => nil, :page => nil, :view => nil, :only_path => true)) -%></li>
+  <%- end -%>
+</ul>

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

@@ -7,7 +7,7 @@
 <h3><%= t('checkout.renewal') -%></h3>
 <%- if @checkout.checkout_renewable? -%>
   <%= form_for(@checkout) do |f| -%>
-    <%= t('checkout.new_due_date') -%>: <%= l(@new_due_date, :format => :only_date) if @new_due_date -%>
+    <%= t('checkout.new_due_date') -%>: <%= l(@new_due_date, :formats => :only_date) if @new_due_date -%>
     <%= f.hidden_field :due_date, :value => @new_due_date -%>
     <br />
     <%= f.submit %>

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

@@ -10,7 +10,7 @@
   </p>
   <p>
     <strong><%= t('activerecord.attributes.checkout.due_date') -%></strong><br />
-    <%= l(@checkout.due_date, :format => :only_date) if @checkout.due_date -%>
+    <%= l(@checkout.due_date, :formats => :only_date) if @checkout.due_date -%>
   </p>
   <%- if can? :destroy, @checkout -%>
     <p>

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

@@ -21,7 +21,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.lending_policy.fixed_due_date') -%>:</strong>
-  <%= l(@lending_policy.fixed_due_date, :format => :only_date) if @lending_policy.fixed_due_date -%>
+  <%= l(@lending_policy.fixed_due_date, :formats => :only_date) if @lending_policy.fixed_due_date -%>
 </p>
 
 <p>

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

@@ -22,7 +22,7 @@
       <%= render 'title', :reserve => reserve -%>
     </td>
     <td><%= i18n_state(reserve.state) -%></td>
-    <td><%= l(reserve.expired_at, :format => :only_date) -%></td>
+    <td><%= l(reserve.expired_at, :formats => :only_date) -%></td>
     <%- if can? :destroy, reserve -%>
       <td>
         <%= link_to t('page.edit'), edit_reserve_path(reserve) -%>

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

@@ -33,7 +33,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.reserve.expired_at') -%>:</strong>
-  <%= l(@reserve.expired_at, :format => :only_date) if @reserve.expired_at -%>
+  <%= l(@reserve.expired_at, :formats => :only_date) if @reserve.expired_at -%>
 </p>
 
 <p>

data/config/locales/translation_en.yml

@@ -143,6 +143,7 @@ en:
     returned: "Returned"
     my_checkout: "My checkout"
     remove_all_history: "Remove all checkout history"
+    reserved: "Reserved"
   checkin:
     item_not_found: "Item not found."
     enter_item_identifier: "Enter item identifier."

data/config/locales/translation_ja.yml

@@ -141,6 +141,7 @@ ja:
     returned: "返却済み"
     my_checkout: "自分の貸出"
     remove_all_history: "すべての貸出履歴を削除"
+    reserved: "予約あり"
   checkin:
     item_not_found: "資料が見つかりません。"
     enter_item_identifier: "所蔵情報番号を入力してください。"

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.0.69"
+  VERSION = "0.0.70"
 end

data/spec/controllers/checkouts_controller_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe CheckoutsController do
   fixtures :all
 
-  describe "GET index" do
+  describe "GET index", :solr => true do
     before(:each) do
       FactoryGirl.create(:admin)
     end
@@ -13,7 +13,7 @@ describe CheckoutsController do
 
       it "assigns all checkouts as @checkouts" do
         get :index
-        assigns(:checkouts).should eq(Checkout.not_returned.order('checkouts.id DESC').page(1))
+        assigns(:checkouts).should eq Checkout.not_returned.order('checkouts.id DESC').page(1)
       end
 
       it "should get other user's index" do

data/spec/fixtures/checkouts.yml

@@ -41,7 +41,7 @@ checkout_00004:
   librarian_id: 1
   checkout_renewal_count: 0
   due_date: <%= 2.day.from_now.beginning_of_day %>
-  created_at: 2007-09-08 01:39:03.210081 +09:00
+  created_at: 2007-09-08 01:39:04.210081 +09:00
   basket_id: 3
 checkout_00005: 
   item_id: 5
@@ -52,7 +52,7 @@ checkout_00005:
   librarian_id: 1
   checkout_renewal_count: 0
   due_date: <%= 2.day.from_now.beginning_of_day %>
-  created_at: 2007-09-08 01:39:03.210081 +09:00
+  created_at: 2007-09-08 01:39:05.210081 +09:00
   basket_id: 4
 checkout_00006:
   item_id: 7
@@ -63,7 +63,7 @@ checkout_00006:
   librarian_id: 2
   checkout_renewal_count: 0
   due_date: 2010-09-15 00:00:00 +09:00
-  created_at: 2007-09-08 01:39:03.210081 +09:00
+  created_at: 2007-09-08 01:39:06.210081 +09:00
 checkout_00007: 
   item_id: 7
   updated_at: 2007-09-09 21:15:11.648996 +09:00
@@ -73,7 +73,7 @@ checkout_00007:
   librarian_id: 1
   checkout_renewal_count: 0
   due_date: <%= 2.day.from_now.beginning_of_day %>
-  created_at: 2007-09-08 01:39:03.210081 +09:00
+  created_at: 2007-09-08 01:39:07.210081 +09:00
   basket_id: 5
 checkout_00008: 
   item_id: 8
@@ -84,7 +84,7 @@ checkout_00008:
   librarian_id: 1
   checkout_renewal_count: 0
   due_date: <%= 2.day.from_now.beginning_of_day %>
-  created_at: 2007-09-08 01:39:03.210081 +09:00
+  created_at: 2007-09-08 01:39:08.210081 +09:00
   basket_id: 6
 checkout_00009: 
   item_id: 9
@@ -95,7 +95,7 @@ checkout_00009:
   librarian_id: 1
   checkout_renewal_count: 1
   due_date: <%= 2.day.from_now.beginning_of_day %>
-  created_at: 2007-09-08 01:39:03.210081 +09:00
+  created_at: 2007-09-08 01:39:09.210081 +09:00
   basket_id: 7
 checkout_00010: 
   item_id: 13
@@ -106,7 +106,7 @@ checkout_00010:
   librarian_id: 1
   checkout_renewal_count: 1
   due_date: <%= 2.day.from_now.beginning_of_day %>
-  created_at: 2007-09-08 01:39:03.210081 +09:00
+  created_at: 2007-09-08 01:39:10.210081 +09:00
   basket_id: 7
 checkout_00011: 
   item_id: 14
@@ -117,7 +117,7 @@ checkout_00011:
   librarian_id: 1
   checkout_renewal_count: 1
   due_date: <%= 180.days.ago.beginning_of_day %>
-  created_at: 2007-09-08 01:39:03.210081 +09:00
+  created_at: 2007-09-08 01:39:11.210081 +09:00
   basket_id: 7
 checkout_00012: 
   item_id: 6
@@ -128,7 +128,7 @@ checkout_00012:
   librarian_id: 1
   checkout_renewal_count: 1
   due_date: <%= 180.days.ago.beginning_of_day %>
-  created_at: 2007-09-08 01:39:03.210081 +09:00
+  created_at: 2007-09-08 01:39:12.210081 +09:00
   basket_id: 8
   checkin_id: 5
 checkout_00013: 
@@ -140,7 +140,7 @@ checkout_00013:
   librarian_id: 1
   checkout_renewal_count: 1
   due_date: <%= 180.days.ago.beginning_of_day %>
-  created_at: 2007-09-08 01:39:03.210081 +09:00
+  created_at: 2007-09-08 01:39:13.210081 +09:00
   basket_id: 8
   checkin_id: 4
 # == Schema Information

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.0.69
+  version: 0.0.70
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -332,6 +332,7 @@ files:
 - app/views/checkouts/_index_overdue.html.erb
 - app/views/checkouts/_index_user.html.erb
 - app/views/checkouts/_list.html.erb
+- app/views/checkouts/_reserved_facet.html.erb
 - app/views/checkouts/edit.html.erb
 - app/views/checkouts/index.atom.builder
 - app/views/checkouts/index.csv.erb