enju_circulation 0.1.0.pre24 → 0.1.0.pre25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fac9ff83b2344dcf7c20a1e381f24294a5dc68a0
-  data.tar.gz: 51113317a9e752e27525e37abb15aa498fca376b
+  metadata.gz: e586c12f6f5f99c3790e5cb3256326c6d1fe88e6
+  data.tar.gz: ab9630c6e9ab4d9e73435cc0bcb84eb89e39b0c2
 SHA512:
-  metadata.gz: 526ea5eedb835f1cae8d66b016b36e3c5b6b5c921f2ace78f0ab75347a039b79e1c0f84f8b4234db7143e4226f1749dcfd5f532d58c0d8eb998e3cb41552d9e0
-  data.tar.gz: 61919b852389c473f886e77f2f77a1db5494e1c1cf095beefae291c46014ff8b528756cacd531c4f818a0dbdcec92d30ae5f066ecdf82f02eeab1472700cace9
+  metadata.gz: 8e01a8153d2cb1eb1511f24fc3ad5cf3683b912414e28754ad8dd1bc9c4b44c5a18bdb381eac2d0eeb664d90d72b9db30acd4ba8c973051926864092f093126d
+  data.tar.gz: 8591508a0c7f9e479fdc258f411e83c9d8519fc0270a8030b87e85c66d7b36ec00f7913a6fdb5503931f1c05b73e7366cf649adaa2ba1194896c438c6affa81f

data/app/controllers/checkouts_controller.rb

@@ -134,27 +134,9 @@ class CheckoutsController < ApplicationController
   # PUT /checkouts/1
   # PUT /checkouts/1.json
   def update
-    if @checkout.reserved?
-      flash[:notice] = t('checkout.this_item_is_reserved')
-      redirect_to edit_checkout_url(@checkout)
-      return
-    end
-    if @checkout.over_checkout_renewal_limit?
-      flash[:notice] = t('checkout.excessed_renewal_limit')
-      redirect_to edit_checkout_url(@checkout)
-      return
-    end
-    if @checkout.overdue?
-      flash[:notice] = t('checkout.you_have_overdue_item')
-      unless current_user.has_role?('Librarian')
-        redirect_to edit_checkout_url(@checkout)
-        return
-      end
-    end
-    @checkout.reload
-    @checkout.checkout_renewal_count += 1
     @checkout.assign_attributes(params[:checkout])
     @checkout.due_date = @checkout.due_date.end_of_day
+    @checkout.checkout_renewal_count += 1
 
     respond_to do |format|
       if @checkout.save
@@ -171,6 +153,7 @@ class CheckoutsController < ApplicationController
   # DELETE /checkouts/1.json
   def destroy
     user = @checkout.user
+    @checkout.operator = current_user
     @checkout.user_id = nil
     @checkout.save!
 

data/app/models/checkin.rb

@@ -35,12 +35,13 @@ 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, :created_at]
+        [:id, :item_id, :user_id, :basket_id, :due_date, :lock_version, :created_at, :checkout_renewal_count]
       )
       item.checkin!
       checkouts.each do |checkout|
         # TODO: ILL時の処理
         checkout.checkin = self
+        checkout.operator = current_user
         unless checkout.user.try(:save_checkout_history)
           checkout.user = nil
         end

data/app/models/checkout.rb

@@ -21,6 +21,7 @@ class Checkout < ActiveRecord::Base
   validates_presence_of :item_id, :basket_id, :due_date
   validates_uniqueness_of :item_id, :scope => [:basket_id, :user_id]
   validate :is_not_checked?, :on => :create
+  validate :renewable?, :on => :update
   validates_date :due_date
 
   searchable do
@@ -43,6 +44,8 @@ class Checkout < ActiveRecord::Base
     end
   end
 
+  attr_accessor :operator
+
   paginates_per 10
 
   def is_not_checked?
@@ -52,13 +55,16 @@ class Checkout < ActiveRecord::Base
     end
   end
 
-  def checkout_renewable?
-    return false if overdue?
-    if item
-      return false if over_checkout_renewal_limit?
-      return false if reserved?
+  def renewable?
+    if !operator and overdue?
+      errors[:base] << I18n.t('checkout.you_have_overdue_item')
+    end
+    if !operator and reserved?
+      errors[:base] << I18n.t('checkout.this_item_is_reserved')
+    end
+    if !operator and over_checkout_renewal_limit?
+      errors[:base] << I18n.t('checkout.excessed_renewal_limit')
     end
-    true
   end
 
   def reserved?
@@ -67,7 +73,8 @@ class Checkout < ActiveRecord::Base
   end
 
   def over_checkout_renewal_limit?
-    return true if item.checkout_status(user).checkout_renewal_limit <= checkout_renewal_count
+    return nil unless item.checkout_status(user)
+    return true if item.checkout_status(user).checkout_renewal_limit < checkout_renewal_count
   end
 
   def overdue?

data/app/views/carrier_types/_checkout_form.html.erb

@@ -0,0 +1,9 @@
+<div class="field">
+  <%= f.label t('activerecord.models.carrier_type_has_checkout_type') %><br />
+  <%= f.fields_for :carrier_type_has_checkout_types do |checkout_form| %>
+    <%= checkout_form.label :checkout_type_id -%>
+    <%= checkout_form.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name.localize, c.id]}) %>
+    <%= checkout_form.link_to_remove t('page.remove'), :confirm => t('page.are_you_sure') %>
+  <% end %>
+  <p><%= f.link_to_add t('page.add'), :carrier_type_has_checkout_types %></p>
+</div>

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

@@ -0,0 +1,23 @@
+<div class="field">
+  <%= f.label t('activerecord.models.user_group_has_checkout_type') %><br />
+  <%= f.fields_for :user_group_has_checkout_types do |checkout_form| %>
+    <%= checkout_form.label :checkout_type_id -%>
+    <%= checkout_form.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name.localize, c.id]}) %>
+    <%= checkout_form.link_to_remove t('page.remove'), :confirm => t('page.are_you_sure') %>
+    <br />
+    <%= checkout_form.label :checkout_limit -%>
+    <%= checkout_form.text_field :checkout_limit, :class => 'resource_integer' %>
+    <%= checkout_form.label :checkout_period -%>
+    <%= checkout_form.text_field :checkout_period, :class => 'resource_integer' %>
+    <%= checkout_form.label :checkout_renewal_limit -%>
+    <%= checkout_form.text_field :checkout_renewal_limit, :class => 'resource_integer' %>
+    <br />
+    <%= checkout_form.label :reservation_limit -%>
+    <%= checkout_form.text_field :reservation_limit, :class => 'resource_integer' %>
+    <%= checkout_form.label :reservation_expired_period -%>
+    <%= checkout_form.text_field :reservation_expired_period, :class => 'resource_integer' %>
+    <%= checkout_form.label :set_due_date_before_closing_day -%>
+    <%= checkout_form.check_box :set_due_date_before_closing_day %>
+  <% end %>
+  <p><%= f.link_to_add t('page.add'), :user_group_has_checkout_types %></p>
+</div>

data/config/locales/translation_en.yml

@@ -80,6 +80,7 @@ en:
       carrier_type_has_checkout_type:
         note: Note
         position: Position
+        checkout_type_id: Checkout type
       manifestation_checkout_stat:
         start_date: Start date
         end_date: End date

data/config/locales/translation_ja.yml

@@ -20,7 +20,7 @@ ja:
       reserve_stat_has_manifestation: 資料別予約統計
       reserve_stat_has_user: 利用者別予約統計
       user_group_has_checkout_type: 利用者グループと貸出区分の関係
-      carrier_type_has_checkout_type: 資料の種類と貸出区分の関係
+      carrier_type_has_checkout_type: 資料の形態と貸出区分の関係
 
     attributes:
       basket:
@@ -78,6 +78,7 @@ ja:
       carrier_type_has_checkout_type:
         note: 注記
         position: 位置
+        checkout_type_id: 貸出種別
       manifestation_checkout_stat:
         start_date: 開始日
         end_date: 終了日

data/lib/enju_circulation/user_group.rb

@@ -9,6 +9,8 @@ module EnjuCirculation
         has_many :user_group_has_checkout_types, :dependent => :destroy
         has_many :checkout_types, :through => :user_group_has_checkout_types, :order => :position
         has_many :lending_policies
+        attr_accessible :user_group_has_checkout_types_attributes
+        accepts_nested_attributes_for :user_group_has_checkout_types, :allow_destroy => true, :reject_if => :all_blank
 
         validates_numericality_of :number_of_day_to_notify_due_date,
           :number_of_day_to_notify_overdue,

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre24"
+  VERSION = "0.1.0.pre25"
 end

data/spec/controllers/checkouts_controller_spec.rb

@@ -320,8 +320,8 @@ describe CheckoutsController do
   
       it "should update checkout item that is reserved" do
         put :update, :id => 8, :checkout => { }
-        flash[:notice].should eq I18n.t('checkout.this_item_is_reserved')
-        response.should redirect_to edit_checkout_url(assigns(:checkout))
+        assigns(:checkout).errors[:base].include?(I18n.t('checkout.this_item_is_reserved')).should be_true
+        response.should be_success
       end
   
       it "should update other user's checkout" do
@@ -371,8 +371,8 @@ describe CheckoutsController do
   
       it "should not update checkout already renewed" do
         put :update, :id => 9, :checkout => { }
-        flash[:notice].should eq I18n.t('checkout.excessed_renewal_limit')
-        response.should redirect_to edit_checkout_url(assigns(:checkout))
+        assigns(:checkout).errors[:base].include?(I18n.t('checkout.excessed_renewal_limit')).should be_true
+        response.should be_success
       end
 
       it "should update my checkout" do

data/spec/models/checkout_spec.rb

@@ -5,9 +5,11 @@ describe Checkout do
   #pending "add some examples to (or delete) #{__FILE__}"
   fixtures :all
 
-  it "should respond to checkout_renewable?" do
-    checkouts(:checkout_00001).checkout_renewable?.should be_true
-    checkouts(:checkout_00002).checkout_renewable?.should be_false
+  it "should respond to renewable?" do
+    checkouts(:checkout_00001).save
+    checkouts(:checkout_00001).errors[:base].should eq []
+    checkouts(:checkout_00002).save
+    checkouts(:checkout_00002).errors[:base].should eq [I18n.t('checkout.this_item_is_reserved')]
   end
 
   it "should respond to reserved?" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_circulation
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre24
+  version: 0.1.0.pre25
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_core
@@ -306,6 +306,7 @@ files:
 - app/views/carrier_type_has_checkout_types/index.html.erb
 - app/views/carrier_type_has_checkout_types/new.html.erb
 - app/views/carrier_type_has_checkout_types/show.html.erb
+- app/views/carrier_types/_checkout_form.html.erb
 - app/views/checked_items/_checked_item.html.erb
 - app/views/checked_items/_checkout.html.erb
 - app/views/checked_items/_list.html.erb
@@ -416,6 +417,7 @@ files:
 - app/views/user_group_has_checkout_types/index.html.erb
 - app/views/user_group_has_checkout_types/new.html.erb
 - app/views/user_group_has_checkout_types/show.html.erb
+- app/views/user_groups/_checkout_form.html.erb
 - app/views/user_reserve_stats/_form.html.erb
 - app/views/user_reserve_stats/edit.html.erb
 - app/views/user_reserve_stats/index.html.erb
@@ -635,16 +637,16 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_1mh.fdt
-- spec/dummy/solr/data/test/index/_1mh.fdx
-- spec/dummy/solr/data/test/index/_1mh.fnm
-- spec/dummy/solr/data/test/index/_1mh.frq
-- spec/dummy/solr/data/test/index/_1mh.nrm
-- spec/dummy/solr/data/test/index/_1mh.prx
-- spec/dummy/solr/data/test/index/_1mh.tii
-- spec/dummy/solr/data/test/index/_1mh.tis
+- spec/dummy/solr/data/test/index/_1yy.fdt
+- spec/dummy/solr/data/test/index/_1yy.fdx
+- spec/dummy/solr/data/test/index/_1yy.fnm
+- spec/dummy/solr/data/test/index/_1yy.frq
+- spec/dummy/solr/data/test/index/_1yy.nrm
+- spec/dummy/solr/data/test/index/_1yy.prx
+- spec/dummy/solr/data/test/index/_1yy.tii
+- spec/dummy/solr/data/test/index/_1yy.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_391
+- spec/dummy/solr/data/test/index/segments_3xz
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb
@@ -910,16 +912,16 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_1mh.fdt
-- spec/dummy/solr/data/test/index/_1mh.fdx
-- spec/dummy/solr/data/test/index/_1mh.fnm
-- spec/dummy/solr/data/test/index/_1mh.frq
-- spec/dummy/solr/data/test/index/_1mh.nrm
-- spec/dummy/solr/data/test/index/_1mh.prx
-- spec/dummy/solr/data/test/index/_1mh.tii
-- spec/dummy/solr/data/test/index/_1mh.tis
+- spec/dummy/solr/data/test/index/_1yy.fdt
+- spec/dummy/solr/data/test/index/_1yy.fdx
+- spec/dummy/solr/data/test/index/_1yy.fnm
+- spec/dummy/solr/data/test/index/_1yy.frq
+- spec/dummy/solr/data/test/index/_1yy.nrm
+- spec/dummy/solr/data/test/index/_1yy.prx
+- spec/dummy/solr/data/test/index/_1yy.tii
+- spec/dummy/solr/data/test/index/_1yy.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_391
+- spec/dummy/solr/data/test/index/segments_3xz
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/basket.rb