enju_circulation 0.1.0.pre36 → 0.1.0.pre37

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.user_checkout_stat')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.user_checkout_stat')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -31,7 +31,7 @@
   <%- @stats.each do |stat| -%>
     <tr class="line<%= cycle("0", "1") -%>">
       <td>
-        <%= link_to stat.user.username, stat.user if stat.user -%>
+        <%= link_to stat.user.username, stat.user.profile if stat.user.try(:profile) -%>
       </td>
       <td><%= stat.checkouts_count -%></td>
     </tr>
@@ -46,12 +46,11 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <%= form_for(@user_checkout_stat) do |f| %>
   <ul>
-    <li><%= link_to t('page.edit'), edit_user_checkout_stat_path(@user_checkout_stat) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
   <% end %>
   <h4><%= t('page.export') -%></h4>
   <ul>
-    <li><%= link_to 'CSV', user_checkout_stat_path(@user_checkout_stat, :format => :csv, :locale => @locale.to_s) -%></li>
+    <li><%= link_to 'TSV', user_checkout_stat_path(@user_checkout_stat, format: :txt, locale: @locale.to_s) -%></li>
   </ul>
 </div>

data/app/views/user_checkout_stats/show.txt.erb

@@ -0,0 +1,4 @@
+<%= @user_checkout_stat.start_date -%>	<%= @user_checkout_stat.end_date %>
+<%- @stats.each do |stat| -%>
+"<%= stat.user.username if stat.user -%>"	"<%= stat.checkouts_count %>"<%= "\n" -%>
+<%- end -%>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.user_group_has_checkout_type')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.user_group_has_checkout_type')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@user_group_has_checkout_type) do |f| -%>
@@ -15,27 +15,27 @@
   </div>
   <div class="field">
     <%= f.label :checkout_limit -%><br />
-    <%= f.text_field :checkout_limit, :class => 'resource_integer' -%>
+    <%= f.text_field :checkout_limit, class: 'resource_integer' -%>
   </div>
 
   <div class="field">
     <%= f.label :checkout_period -%><br />
-    <%= f.text_field :checkout_period, :class => 'resource_integer' -%>
+    <%= f.text_field :checkout_period, class: 'resource_integer' -%>
   </div>
 
   <div class="field">
     <%= f.label :checkout_renewal_limit -%><br />
-    <%= f.text_field :checkout_renewal_limit, :class => 'resource_integer' -%>
+    <%= f.text_field :checkout_renewal_limit, class: 'resource_integer' -%>
   </div>
 
   <div class="field">
     <%= f.label :reservation_limit -%><br />
-    <%= f.text_field :reservation_limit, :class => 'resource_integer' -%>
+    <%= f.text_field :reservation_limit, class: 'resource_integer' -%>
   </div>
 
   <div class="field">
     <%= f.label :reservation_expired_period -%><br />
-    <%= f.text_field :reservation_expired_period, :class => 'resource_integer' -%>
+    <%= f.text_field :reservation_expired_period, class: 'resource_integer' -%>
   </div>
 
   <div class="field">
@@ -45,7 +45,7 @@
 
   <div class="field">
   <%= f.label :note -%><br />
-    <%= f.text_area :note, :class => 'resource_textarea' -%>
+    <%= f.text_area :note, class: 'resource_textarea' -%>
   </div>
   <div class="actions">
     <%= f.submit %>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.user_group_has_checkout_type')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.user_group_has_checkout_type')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -19,7 +19,7 @@
         <%= link_to t('page.edit'), edit_user_group_has_checkout_type_path(user_group_has_checkout_type) -%>
       <% end %>
       <%- if can? :delete, user_group_has_checkout_type -%>
-        <%= link_to t('page.destroy'), user_group_has_checkout_type, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), user_group_has_checkout_type, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <% end %>
     </td>
   </tr>
@@ -32,7 +32,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, UserGroupHasCheckoutType -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.user_group_has_checkout_type')), new_user_group_has_checkout_type_path -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.user_group_has_checkout_type')), new_user_group_has_checkout_type_path -%></li>
     <% end %>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.user_group_has_checkout_type')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.user_group_has_checkout_type')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@user_group_has_checkout_type) do |f| -%>
@@ -7,35 +7,35 @@
 
   <div class="field">
     <%= f.label t('activerecord.models.user_group') -%><br />
-    <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}, :include_blank => true) -%>
+    <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}, include_blank: true) -%>
   </div>
   <div class="field">
     <%= f.label t('activerecord.models.checkout_type') -%><br />
-    <%= f.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name.localize, c.id]}, :include_blank => true) -%>
+    <%= f.select(:checkout_type_id, @checkout_types.collect{|c| [c.display_name.localize, c.id]}, include_blank: true) -%>
   </div>
   <div class="field">
     <%= f.label :checkout_limit -%><br />
-    <%= f.text_field :checkout_limit, :class => 'resource_integer' -%>
+    <%= f.text_field :checkout_limit, class: 'resource_integer' -%>
   </div>
 
   <div class="field">
     <%= f.label :checkout_period -%><br />
-    <%= f.text_field :checkout_period, :class => 'resource_integer' -%>
+    <%= f.text_field :checkout_period, class: 'resource_integer' -%>
   </div>
 
   <div class="field">
     <%= f.label :checkout_renewal_limit -%><br />
-    <%= f.text_field :checkout_renewal_limit, :class => 'resource_integer' -%>
+    <%= f.text_field :checkout_renewal_limit, class: 'resource_integer' -%>
   </div>
 
   <div class="field">
     <%= f.label :reservation_limit -%><br />
-    <%= f.text_field :reservation_limit, :class => 'resource_integer' -%>
+    <%= f.text_field :reservation_limit, class: 'resource_integer' -%>
   </div>
 
   <div class="field">
     <%= f.label :reservation_expired_period -%><br />
-    <%= f.text_field :reservation_expired_period, :class => 'resource_integer' -%>
+    <%= f.text_field :reservation_expired_period, class: 'resource_integer' -%>
   </div>
 
   <div class="field">
@@ -45,7 +45,7 @@
 
   <div class="field">
     <%= f.label :note -%><br />
-    <%= f.text_area :note, :class => 'resource_textarea' -%>
+    <%= f.text_area :note, class: 'resource_textarea' -%>
   </div>
   <div class="actions">
     <%= f.submit %>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.user_group_has_checkout_type')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.user_group_has_checkout_type')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 

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

@@ -3,19 +3,19 @@
   <%= 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') %>
+    <%= 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.text_field :checkout_limit, class: 'resource_integer' %>
     <%= checkout_form.label :checkout_period -%>
-    <%= checkout_form.text_field :checkout_period, :class => 'resource_integer' %>
+    <%= 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' %>
+    <%= 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.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.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 %>

data/app/views/user_reserve_stats/_form.html.erb

@@ -15,6 +15,6 @@
   </div>
   <div class="actions">
     <%= f.hidden_field :mode, value: 'import' %>
-    <%= f.submit t('page.start_import') %>
+    <%= f.submit t('page.start_counting') %>
   </div>
 <%- end -%>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.user_reserve_stat')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.user_reserve_stat')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.user_reserve_stat')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.user_reserve_stat')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -17,8 +17,7 @@
     <td><%= localized_state(user_reserve_stat.current_state) -%></td>
     <td>
       <%= link_to t('page.show'), user_reserve_stat -%>
-      <%= link_to t('page.edit'), edit_user_reserve_stat_path(user_reserve_stat) -%>
-      <%= link_to t('page.destroy'), user_reserve_stat, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+      <%= link_to t('page.destroy'), user_reserve_stat, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
     </td>
   </tr>
 <%- end -%>
@@ -30,6 +29,6 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.user_reserve_stat')), new_user_reserve_stat_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.user_reserve_stat')), new_user_reserve_stat_path -%></li>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.user_reserve_stat')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.user_reserve_stat')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.user_reserve_stat')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.user_reserve_stat')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -31,7 +31,7 @@
   <%- @stats.each do |stat| -%>
     <tr class="line<%= cycle("0", "1") -%>">
       <td>
-        <%= link_to stat.user.username, stat.user if stat.user -%>
+        <%= link_to stat.user.username, stat.user.profile if stat.user.try(:profile) -%>
       </td>
       <td><%= stat.reserves_count -%></td>
     </tr>
@@ -45,12 +45,11 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <%= form_for(@user_reserve_stat) do |f| %>
   <ul>
-    <li><%= link_to t('page.edit'), edit_user_reserve_stat_path(@user_reserve_stat) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>
   </ul>
   <% end %>
   <h4><%= t('page.export') -%></h4>
   <ul>
-    <li><%= link_to 'CSV', user_reserve_stat_path(@user_reserve_stat, :format => :csv, :locale => @locale.to_s) -%></li>
+    <li><%= link_to 'TSV', user_reserve_stat_path(@user_reserve_stat, format: :txt, locale: @locale.to_s) -%></li>
   </ul>
 </div>

data/app/views/user_reserve_stats/show.txt.erb

@@ -0,0 +1,4 @@
+<%= @user_reserve_stat.start_date -%>	<%= @user_reserve_stat.end_date %>
+<%- @stats.each do |stat| -%>
+"<%= stat.user.username if stat.user -%>"	"<%= stat.reserves_count %>"<%= "\n" -%>
+<%- end -%>

data/app/views/users/_feed_token.html.erb

@@ -1,14 +1,14 @@
 <%- if @user.checkout_icalendar_token? -%>
-  <%= checkouts_url(:icalendar_token => @user.checkout_icalendar_token, :format => :ics) -%>
+  <%= checkouts_url(icalendar_token: @user.checkout_icalendar_token, format: :ics) -%>
   <%= hidden_field_tag 'user[checkout_icalendar_token]', @user.checkout_icalendar_token -%>
 <%- end -%>
 <br />
 <%- if @user.checkout_icalendar_token? -%>
-  <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_user_path(@user, :disable => true, :mode => 'feed_token') %>'});" type="button" value="<%= t('page.delete') %>" />
+  <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_user_path(@user, disable: true, mode: 'feed_token') %>'});" type="button" value="<%= t('page.delete') %>" />
   <br />
   <%= t('user.you_have_to_save_profile_to_activate_feed_url') -%>
 <%- else -%>
-  <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_user_path(@user, :mode => 'feed_token') %>'});" type="button" value="<%= t('page.reset') %>" />
+  <input onclick="$.ajax({data:'authenticity_token=' + encodeURIComponent('<%= form_authenticity_token %>'), success:function(request){$('#feed_token').html(request);}, type:'get', url:'<%= edit_user_path(@user, mode: 'feed_token') %>'});" type="button" value="<%= t('page.reset') %>" />
   <br />
   <%= t('user.you_have_to_save_profile_to_deactivate_feed_url') -%>
 <%- end -%>

data/config/initializers/inflections.rb

@@ -0,0 +1,3 @@
+ActiveSupport::Inflector.inflections do |inflect|
+  inflect.irregular 'reserve', 'reserves'
+end

data/config/locales/translation_en.yml

@@ -119,6 +119,9 @@ en:
       item:
         checkout_type: Checkout type
         circulation_status: Circulation status
+      profile:
+        checkout_icalendar_token: Checkout iCalendar token
+        save_checkout_history: Save checkout history
 
   basket:
     this_account_is_suspended: "This account is suspended."
@@ -188,3 +191,6 @@ en:
     bibliographic_detail: "Bibliographic details"
   page:
     saving: "Saving..."
+    start_counting: "Start counting"
+  statistic:
+    successfully_created: "%{model} task was created successfully. When the task is completed, its status on the list will be updated to 'completed' and you can check the results by following the 'show' link."

data/config/locales/translation_ja.yml

@@ -117,6 +117,9 @@ ja:
       item:
         checkout_type: 貸出種別
         circulation_status: 貸出状態
+      profile:
+        checkout_icalendar_token: 貸出iCalendarのトークン
+        save_checkout_history: 貸出の履歴を保存する
 
   basket:
     this_account_is_suspended: "このアカウントは停止されています。"
@@ -186,3 +189,6 @@ ja:
     bibliographic_detail: "書誌詳細"
   page:
     saving: "保存中..."
+    start_counting: "集計を開始"
+  statistic:
+    successfully_created: "%{model}のタスクは正常に作成されました。タスクが完了すると「%{model}の一覧」の状態が「完了」となり、「表示」リンクをたどることで結果を確認できるようになります。"

data/config/routes.rb

@@ -1,4 +1,10 @@
 Rails.application.routes.draw do
+  get "/users/:user_id/checkouts" => redirect("/checkouts?user_id=%{user_id}")
+  get "/users/:user_id/reserves" => redirect("/reserves?user_id=%{user_id}")
+  get "/users/:user_id/baskets" => redirect("/baskets?user_id=%{user_id}")
+  get "/baskets/:basket_id/checked_items" => redirect("/checked_items?basket_id=%{basket_id}")
+  get "/baskets/:basket_id/checkins" => redirect("/checkins?basket_id=%{basket_id}")
+
   resources :use_restrictions
   resources :item_has_use_restrictions
   resources :lending_policies
@@ -7,12 +13,8 @@ Rails.application.routes.draw do
     resources :checked_items
     resources :checkins
   end
-  resources :users do
-    resources :checkouts, :only => :index do
-      put :remove_all, :on => :collection
-    end
-    resources :reserves, :only => :index
-    resources :baskets, :only => :index
+  resources :checkouts, :only => :index do
+    put :remove_all, :on => :collection
   end
   resources :user_checkout_stats
   resources :user_reserve_stats
@@ -36,8 +38,4 @@ Rails.application.routes.draw do
     resources :lending_policies
     resources :checkouts
   end
-  resources :checkout_stat_has_manifestations
-  resources :checkout_stat_has_users
-  resources :reserve_stat_has_manifestations
-  resources :reserve_stat_has_users
 end

data/db/migrate/035_create_reserves.rb

@@ -10,7 +10,6 @@ class CreateReserves < ActiveRecord::Migration
       t.datetime :canceled_at
       t.datetime :expired_at
       t.datetime :deleted_at
-      t.string :state
       t.boolean :expiration_notice_to_patron, :default => false
       t.boolean :expiration_notice_to_library, :default => false
     end

data/db/migrate/20081212080038_create_manifestation_checkout_stats.rb

@@ -4,7 +4,6 @@ class CreateManifestationCheckoutStats < ActiveRecord::Migration
       t.datetime :start_date
       t.datetime :end_date
       t.text :note
-      t.string :state
 
       t.timestamps
     end

data/db/migrate/20081215094302_create_user_checkout_stats.rb

@@ -4,7 +4,6 @@ class CreateUserCheckoutStats < ActiveRecord::Migration
       t.datetime :start_date
       t.datetime :end_date
       t.text :note
-      t.string :state
 
       t.timestamps
     end

data/db/migrate/20081216190724_create_manifestation_reserve_stats.rb

@@ -4,7 +4,6 @@ class CreateManifestationReserveStats < ActiveRecord::Migration
       t.datetime :start_date
       t.datetime :end_date
       t.text :note
-      t.string :state
 
       t.timestamps
     end

data/db/migrate/20081220023628_create_user_reserve_stats.rb

@@ -4,7 +4,6 @@ class CreateUserReserveStats < ActiveRecord::Migration
       t.datetime :start_date
       t.datetime :end_date
       t.text :note
-      t.string :state
 
       t.timestamps
     end

data/db/migrate/20090321130448_add_completed_at_to_user_checkout_stat.rb

@@ -2,16 +2,12 @@ class AddCompletedAtToUserCheckoutStat < ActiveRecord::Migration
   def self.up
     add_column :user_checkout_stats, :started_at, :datetime
     add_column :user_checkout_stats, :completed_at, :datetime
-    add_index :user_checkout_stats, :state
     add_column :user_reserve_stats, :started_at, :datetime
     add_column :user_reserve_stats, :completed_at, :datetime
-    add_index :user_reserve_stats, :state
     add_column :manifestation_checkout_stats, :started_at, :datetime
     add_column :manifestation_checkout_stats, :completed_at, :datetime
-    add_index :manifestation_checkout_stats, :state
     add_column :manifestation_reserve_stats, :started_at, :datetime
     add_column :manifestation_reserve_stats, :completed_at, :datetime
-    add_index :manifestation_reserve_stats, :state
   end
 
   def self.down

data/db/migrate/20140518050147_create_reserve_transitions.rb

@@ -0,0 +1,14 @@
+class CreateReserveTransitions < ActiveRecord::Migration
+  def change
+    create_table :reserve_transitions do |t|
+      t.string :to_state
+      t.text :metadata, default: "{}"
+      t.integer :sort_key
+      t.integer :reserve_id
+      t.timestamps
+    end
+
+    add_index :reserve_transitions, :reserve_id
+    add_index :reserve_transitions, [:sort_key, :reserve_id], unique: true
+  end
+end

data/db/migrate/20140810061942_add_user_id_to_user_checkout_stat.rb

@@ -0,0 +1,12 @@
+class AddUserIdToUserCheckoutStat < ActiveRecord::Migration
+  def change
+    add_column :user_checkout_stats, :user_id, :integer
+    add_column :user_reserve_stats, :user_id, :integer
+    add_column :manifestation_checkout_stats, :user_id, :integer
+    add_column :manifestation_reserve_stats, :user_id, :integer
+    add_index :user_checkout_stats, :user_id
+    add_index :user_reserve_stats, :user_id
+    add_index :manifestation_checkout_stats, :user_id
+    add_index :manifestation_reserve_stats, :user_id
+  end
+end

data/db/migrate/20140810091231_add_checkout_icalendar_token_to_profile.rb

@@ -0,0 +1,6 @@
+class AddCheckoutIcalendarTokenToProfile < ActiveRecord::Migration
+  def change
+    add_column :profiles, :checkout_icalendar_token, :string
+    add_index :profiles, :checkout_icalendar_token, :unique => true
+  end
+end

data/db/migrate/20140810091417_add_save_checkout_history_to_profile.rb

@@ -0,0 +1,5 @@
+class AddSaveCheckoutHistoryToProfile < ActiveRecord::Migration
+  def change
+    add_column :profiles, :save_checkout_history, :boolean, :default => false, :null => false
+  end
+end

data/lib/enju_circulation/engine.rb

@@ -1,11 +1,7 @@
 require "enju_biblio"
 require "enju_library"
-require "validates_timeliness"
-require "inherited_resources"
-require "state_machine"
 require "enju_message"
 require "enju_event"
-require "statesman"
 
 module EnjuCirculation
   class Engine < ::Rails::Engine

data/lib/enju_circulation/item.rb

@@ -61,7 +61,7 @@ module EnjuCirculation
 
       def checkout_status(user)
         return nil unless user
-         user.user_group.user_group_has_checkout_types.where(:checkout_type_id => self.checkout_type.id).first
+         user.profile.user_group.user_group_has_checkout_types.where(:checkout_type_id => self.checkout_type.id).first
       end
 
       def reserved?
@@ -108,14 +108,14 @@ module EnjuCirculation
           reservation = manifestation.next_reservation
           unless reservation.nil?
             reservation.item = self
-            reservation.sm_retain!
+            reservation.transition_to!(:retained)
             reservation.send_message(librarian)
           end
         end
       end
 
       def retained?
-        if manifestation.next_reservation.try(:state) == 'retained' and  manifestation.next_reservation.item == self
+        if manifestation.next_reservation.try(:current_state) == 'retained' and  manifestation.next_reservation.item == self
           return true
         else
           false
@@ -123,7 +123,7 @@ module EnjuCirculation
       end
 
       def lending_rule(user)
-        lending_policies.where(:user_group_id => user.user_group.id).first
+        lending_policies.where(:user_group_id => user.profile.user_group.id).first
       end
 
       def not_for_loan?

data/lib/enju_circulation/manifestation.rb

@@ -19,12 +19,12 @@ module EnjuCirculation
 
     module InstanceMethods
       def next_reservation
-        self.reserves.waiting.order('reserves.created_at ASC').first
+        self.reserves.waiting.order('reserves.created_at ASC').readonly(false).first
       end
 
       def available_checkout_types(user)
         if user
-          user.user_group.user_group_has_checkout_types.available_for_carrier_type(self.carrier_type)
+          user.profile.user_group.user_group_has_checkout_types.available_for_carrier_type(self.carrier_type)
         end
       end
 

data/lib/enju_circulation/profile.rb

@@ -0,0 +1,26 @@
+module EnjuCirculation
+  module EnjuProfile
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
+    module ClassMethods
+      def enju_circulation_profile_model
+        include InstanceMethods
+        attr_accessible :save_checkout_history, :checkout_icalendar_token
+        attr_accessible :save_checkout_history, :checkout_icalendar_token,
+          :as => :admin
+      end
+    end
+
+    module InstanceMethods
+      def reset_checkout_icalendar_token
+        self.checkout_icalendar_token = Devise.friendly_token
+      end
+
+      def delete_checkout_icalendar_token
+        self.checkout_icalendar_token = nil
+      end
+    end
+  end
+end

data/lib/enju_circulation/user.rb

@@ -57,7 +57,7 @@ module EnjuCirculation
       end
 
       def reached_reservation_limit?(manifestation)
-        return true if user_group.user_group_has_checkout_types.available_for_carrier_type(manifestation.carrier_type).where(:user_group_id => user_group.id).collect(&:reservation_limit).max.to_i <= reserves.waiting.size
+        return true if profile.user_group.user_group_has_checkout_types.available_for_carrier_type(manifestation.carrier_type).where(:user_group_id => profile.user_group.id).collect(&:reservation_limit).max.to_i <= reserves.waiting.size
         false
       end
     end

data/lib/enju_circulation/version.rb

@@ -1,3 +1,3 @@
 module EnjuCirculation
-  VERSION = "0.1.0.pre36"
+  VERSION = "0.1.0.pre37"
 end

data/lib/enju_circulation.rb

@@ -3,6 +3,7 @@ require "enju_circulation/manifestation"
 require "enju_circulation/item"
 require "enju_circulation/user"
 require "enju_circulation/user_group"
+require "enju_circulation/profile"
 require "enju_circulation/controller"
 require "enju_circulation/helper"
 
@@ -14,4 +15,5 @@ ActiveRecord::Base.send :include, EnjuCirculation::EnjuManifestation
 ActiveRecord::Base.send :include, EnjuCirculation::EnjuItem
 ActiveRecord::Base.send :include, EnjuCirculation::EnjuUser
 ActiveRecord::Base.send :include, EnjuCirculation::EnjuUserGroup
+ActiveRecord::Base.send :include, EnjuCirculation::EnjuProfile
 ActionView::Base.send :include, EnjuCirculation::ManifestationsHelper

data/lib/generators/enju_circulation/setup/setup_generator.rb

@@ -1,8 +1,10 @@
 class EnjuCirculation::SetupGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
+  argument :file, :type => :string, :default => "all"
 
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_circulation")
+    return if file == 'fixture'
     rake("enju_circulation_engine:install:migrations")
     rake("enju_event_engine:install:migrations")
     rake("enju_message_engine:install:migrations")