enju_circulation 0.1.0.pre46 → 0.1.0.pre47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbac65337fbd0c74d751430f251d7943ef5bb033
-  data.tar.gz: 2a6dc125d89d8211aeb4894b01ced7e2bda78dc2
+  metadata.gz: 42c4ad13fae4f036cd78c045f9eded59ff44a229
+  data.tar.gz: 6fd3afa71eb59716ed7dd801c6b1e07b754f8774
 SHA512:
-  metadata.gz: fc45fed8e102b392090e5127beba9375054da1dca6aaef35001a84be3bddb5f05d08ef76a7913695618b98d2f52fb53df167fd5f6ea204d9d6b1b137b3b82dd2
-  data.tar.gz: ce5d0588de1a7e09995298206cf78fecd29fd78deac88c0e3f0d3fca41de3e1026abe58ee9363e46491a944b2493bc0bdecd67e36eab152a850e4f65781a4a5f
+  metadata.gz: ac2e3cc83d35d247fdc12611241a0be61f05a0b98f58dc24bfff70182dd2f17c46cd80f390543d1971d3faf17d1912d1abf4fd7660ef1524c8fae9b7e47bbbd4
+  data.tar.gz: 0a0348e65018e54f84efa184cbdc417e17ff3884bedc622b683dcfc87fdc9b0ec1650ab72dec210ec575a0e79c3047254b39dd47410b96f6b1d4c882ae09cdfa

data/app/models/checked_item.rb

@@ -53,9 +53,7 @@ class CheckedItem < ActiveRecord::Base
     end
 
     if item.reserved?
-      if item.manifestation.next_reservation.user == basket.user
-        item.manifestation.next_reservation.transition_to!(:completed)
-      else
+      unless item.manifestation.next_reservation.user == basket.user
         errors[:base] << I18n.t('activerecord.errors.messages.checked_item.reserved_item_included')
       end
     end

data/app/models/enju_circulation/ability.rb

@@ -18,7 +18,6 @@ module EnjuCirculation
           Checkin,
           CheckoutStatHasManifestation,
           CheckoutStatHasUser,
-          CheckoutType,
 	  Demand,
           ItemHasUseRestriction,
           ManifestationCheckoutStat,
@@ -30,6 +29,10 @@ module EnjuCirculation
           UserGroupHasCheckoutType,
           UserReserveStat
         ]
+        can [:read, :create, :update], CheckoutType
+        can [:destroy, :delete], CheckoutType do |checkout_type|
+          true if checkout_type.items.empty?
+        end
         can [:read, :create, :update, :remove_all], Checkout
         can [:destroy, :delete], Checkout do |checkout|
           checkout.checkin

data/app/models/reserve.rb

@@ -320,10 +320,7 @@ class Reserve < ActiveRecord::Base
     # TODO: 「取り置き中」の状態を正しく表す
     self.assign_attributes({request_status_type: RequestStatusType.where(name: 'In Process').first, retained_at: Time.zone.now})
     Reserve.transaction do
-      if item.try(:next_reservation)
-        reservation = item.next_reservation
-        reservation.transition_to!(:postponed)
-      end
+      item.next_reservation.try(:transition_to!, :postponed)
       save!
     end
   end

data/app/models/user_group_has_checkout_type.rb

@@ -8,6 +8,11 @@ class UserGroupHasCheckoutType < ActiveRecord::Base
   validates_presence_of :user_group, :checkout_type
   validates_associated :user_group, :checkout_type
   validates_uniqueness_of :checkout_type_id, scope: :user_group_id
+  validates :checkout_limit, numericality: {only_integer: true, greater_than_or_equal_to: 0}
+  validates :checkout_period, numericality: {only_integer: true, greater_than_or_equal_to: 0}
+  validates :checkout_renewal_limit, numericality: {only_integer: true, greater_than_or_equal_to: 0}
+  validates :reservation_limit, numericality: {only_integer: true, greater_than_or_equal_to: 0}
+  validates :reservation_expired_period, numericality: {only_integer: true, greater_than_or_equal_to: 0}
   after_update :update_lending_policy
 
   acts_as_list scope: :user_group_id

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

@@ -4,7 +4,7 @@
 <%= form_for :checked_item, html: {method: :post}, url: checked_items_path(basket_id: @basket.id), remote: true do |f| -%>
   <%= f.error_messages -%>
   <p>
-    <%= f.label :item_identifier, t('activerecord.attributes.item.item_identifier') -%>: <%= f.search_field :item_identifier -%>
+    <%= f.label :item_identifier, t('activerecord.attributes.item.item_identifier') -%>: <%= f.search_field :item_identifier, class: 'resource_item_identifier' -%>
     <%= f.submit t('page.read'), 'data-disable-with' => t('page.saving') -%><br />
     <%= f.label :due_date %>
     <%= f.text_field :due_date_string, class: 'datepicker' %>

data/config/locales/translation_en.yml

@@ -188,7 +188,7 @@ en:
     postponed: "Postponed"
     completed: "Completed"
     reserved_from: "From"
-    reserved_to: "To"
+    reserved_until: "Until"
     attempt_to_update_retained_reservation: "You are attemping to update a retained reservation."
     bibliographic_detail: "Bibliographic details"
   page:
@@ -200,3 +200,5 @@ en:
     by_carrier_type: By carrier type
     by_checkout_type: By checkout type
     by_manifestation: By manifestation
+  manifestation:
+    currently_checked_out: Currently checked out

data/config/locales/translation_ja.yml

@@ -186,7 +186,7 @@ ja:
     postponed: "取置延期"
     completed: "貸出済み"
     reserved_from: ""
-    reserved_to: "から"
+    reserved_until: "から"
     attempt_to_update_retained_reservation: "取り置き済みの予約を変更しようとしています。"
     bibliographic_detail: "書誌詳細"
   page:
@@ -198,3 +198,5 @@ ja:
     by_carrier_type: 資料の形態別
     by_checkout_type: 貸出区分別
     by_manifestation: 書誌別
+  manifestation:
+    currently_checked_out: 貸出中

data/lib/enju_circulation/item.rb

@@ -93,7 +93,7 @@ module EnjuCirculation
         self.circulation_status = CirculationStatus.where(name: 'On Loan').first
         if reserved_by_user?(user)
           manifestation.next_reservation.update_attributes(checked_out_at: Time.zone.now)
-          manifestation.next_reservation.sm_complete!
+          manifestation.next_reservation.transition_to!(:completed)
         end
         save!
       end

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre46"
+  VERSION = "0.1.0.pre47"
 end

data/spec/controllers/checked_items_controller_spec.rb

@@ -233,7 +233,7 @@ describe CheckedItemsController do
           old_count = items(:item_00021).manifestation.reserves.waiting.count
           post :create, :checked_item => {item_identifier: '00021'} , :basket_id => 11
           assigns(:checked_item).should be_valid
-          assigns(:checked_item).item.manifestation.reserves.waiting.count.should eq old_count - 1
+          assigns(:checked_item).item.manifestation.reserves.waiting.count.should eq old_count
           assigns(:checked_item).librarian.should eq users(:admin)
         end
       end

data/spec/fixtures/items.yml

@@ -244,7 +244,7 @@ item_00022:
 item_00023: 
   updated_at: 2007-08-24 23:46:20.484813 +09:00
   item_identifier: '00023'
-  circulation_status_id: 15
+  circulation_status_id: 2
   checkout_type_id: 3
   shelf_id: 2
   call_number: 

data/spec/models/basket_spec.rb

@@ -39,6 +39,18 @@ describe Basket do
     lambda{basket_2.basket_checkout(users(:librarian1))}.should raise_exception ActiveRecord::RecordInvalid
     items(:item_00011).checkouts.order('id DESC').first.user.should eq users(:admin)
   end
+
+  it "should change reservation status" do
+    basket = Basket.new
+    basket.user = users(:librarian2)
+    basket.save
+    checked_item = basket.checked_items.new
+    checked_item.item = items(:item_00023)
+    checked_item.save
+    checked_item.item.circulation_status.name.should eq 'Available On Shelf'
+    basket.basket_checkout(users(:librarian1))
+    checked_item.item.circulation_status.name.should eq 'On Loan'
+  end
 end
 
 # == Schema Information

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre46
+  version: 0.1.0.pre47
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre66
+        version: 0.1.0.pre67
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre66
+        version: 0.1.0.pre67
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre41
+        version: 0.1.0.pre42
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre41
+        version: 0.1.0.pre42
 - !ruby/object:Gem::Dependency
   name: enju_message
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre24
+        version: 0.1.14.pre25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre24
+        version: 0.1.14.pre25
 - !ruby/object:Gem::Dependency
   name: enju_event
   requirement: !ruby/object:Gem::Requirement
@@ -828,7 +828,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: enju_circulation plugin