enju_circulation 0.1.0.pre41 → 0.1.0.pre42

data/app/models/checkout_type.rb

@@ -1,7 +1,5 @@
 class CheckoutType < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
-  default_scope { order('checkout_types.position') }
   scope :available_for_carrier_type, lambda {|carrier_type| includes(:carrier_types).where('carrier_types.name = ?', carrier_type.name).order('carrier_types.position')}
   scope :available_for_user_group, lambda {|user_group| includes(:user_groups).where('user_groups.name = ?', user_group.name).order('user_group.position')}
 

data/app/models/circulation_status.rb

@@ -1,5 +1,4 @@
 class CirculationStatus < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
 

data/app/models/demand.rb

@@ -0,0 +1,5 @@
+class Demand < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :item
+  belongs_to :message
+end

data/app/models/enju_circulation/ability.rb

@@ -19,6 +19,7 @@ module EnjuCirculation
           CheckoutStatHasManifestation,
           CheckoutStatHasUser,
           CheckoutType,
+	  Demand,
           ItemHasUseRestriction,
           ManifestationCheckoutStat,
           ManifestationReserveStat,
@@ -50,6 +51,7 @@ module EnjuCirculation
           Basket,
           CheckedItem,
           Checkin,
+	  Demand,
           ManifestationCheckoutStat,
           ManifestationReserveStat,
           Reserve

data/app/models/item_has_use_restriction.rb

@@ -1,5 +1,4 @@
 class ItemHasUseRestriction < ActiveRecord::Base
-  attr_accessible :item_id, :use_restriction_id, :use_restriction
   belongs_to :item, validate: true
   belongs_to :use_restriction, validate: true
   accepts_nested_attributes_for :use_restriction

data/app/models/lending_policy.rb

@@ -1,6 +1,4 @@
 class LendingPolicy < ActiveRecord::Base
-  attr_accessible :item_id, :user_group_id, :loan_period, :fixed_due_date,
-    :renewal, :fine, :note, :position
   default_scope { order('lending_policies.position') }
   belongs_to :item
   belongs_to :user_group

data/app/models/manifestation_checkout_stat.rb

@@ -1,7 +1,6 @@
 class ManifestationCheckoutStat < ActiveRecord::Base
-  include Statesman::Adapters::ActiveRecordModel
+  include Statesman::Adapters::ActiveRecordQueries
   include CalculateStat
-  attr_accessible :start_date, :end_date, :note, :mode
   default_scope {order('manifestation_checkout_stats.id DESC')}
   scope :not_calculated, -> {in_state(:pending)}
   has_many :checkout_stat_has_manifestations
@@ -42,6 +41,10 @@ class ManifestationCheckoutStat < ActiveRecord::Base
   def self.transition_class
     ManifestationCheckoutStatTransition
   end
+
+  def self.initial_state
+    :pending
+  end
 end
 
 # == Schema Information

data/app/models/manifestation_checkout_stat_transition.rb

@@ -3,7 +3,7 @@ class ManifestationCheckoutStatTransition < ActiveRecord::Base
 
   
   belongs_to :manifestation_cehckout_stat, inverse_of: :manifestation_checkout_stat_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/manifestation_reserve_stat.rb

@@ -1,7 +1,6 @@
 class ManifestationReserveStat < ActiveRecord::Base
-  include Statesman::Adapters::ActiveRecordModel
+  include Statesman::Adapters::ActiveRecordQueries
   include CalculateStat
-  attr_accessible :start_date, :end_date, :note, :mode
   default_scope {order('manifestation_reserve_stats.id DESC')}
   scope :not_calculated, -> {in_state(:pending)}
   has_many :reserve_stat_has_manifestations
@@ -42,6 +41,10 @@ class ManifestationReserveStat < ActiveRecord::Base
   def self.transition_class
     ManifestationReserveStatTransition
   end
+
+  def self.initial_state
+    :pending
+  end
 end
 
 # == Schema Information

data/app/models/manifestation_reserve_stat_transition.rb

@@ -3,7 +3,7 @@ class ManifestationReserveStatTransition < ActiveRecord::Base
 
   
   belongs_to :manifestation_reserve_stat, inverse_of: :manifestation_reserve_stat_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/reserve.rb

@@ -1,14 +1,6 @@
 # -*- encoding: utf-8 -*-
 class Reserve < ActiveRecord::Base
-  include Statesman::Adapters::ActiveRecordModel
-  attr_accessible :manifestation_id, :user_number, :expired_at,
-    :pickup_location_id
-  attr_accessible :expired_at, :pickup_location_id, 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, :item_id,
-    :retained_at, :postponed_at, :force_retaining, :pickup_location_id,
-    as: :admin
+  include Statesman::Adapters::ActiveRecordQueries
   scope :hold, -> { where('item_id IS NOT NULL') }
   scope :not_hold, -> { where(item_id: nil) }
   scope :waiting, -> {not_in_state(:completed, :expired).where('canceled_at IS NULL AND expired_at > ?', Time.zone.now).order('reserves.id DESC')}
@@ -107,6 +99,7 @@ class Reserve < ActiveRecord::Base
     string :title_transcription do
       manifestation.try(:title_transcription)
     end
+    integer :manifestation_id
   end
 
   def set_manifestation
@@ -176,58 +169,58 @@ class Reserve < ActiveRecord::Base
       when 'requested'
         message_template_to_patron = MessageTemplate.localized_template('reservation_accepted_for_patron', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_to_patron}, as: :admin)
+        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_to_patron})
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent) # 受付時は即時送信
         message_template_to_library = MessageTemplate.localized_template('reservation_accepted_for_library', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_to_library}, as: :admin)
+        request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_to_library})
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent) # 受付時は即時送信
       when 'canceled'
         message_template_to_patron = MessageTemplate.localized_template('reservation_canceled_for_patron', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_to_patron}, as: :admin)
+        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_to_patron})
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent) # キャンセル時は即時送信
         message_template_to_library = MessageTemplate.localized_template('reservation_canceled_for_library', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_to_library}, as: :admin)
+        request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_to_library})
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent) # キャンセル時は即時送信
       when 'expired'
         message_template_to_patron = MessageTemplate.localized_template('reservation_expired_for_patron', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_to_patron}, as: :admin)
+        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_to_patron})
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent)
         reload
         self.update_attribute(:expiration_notice_to_patron, true)
         message_template_to_library = MessageTemplate.localized_template('reservation_expired_for_library', sender.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_to_library}, as: :admin)
+        request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_to_library})
         request.save_message_body(manifestations: Array[manifestation], user: sender)
         request.transition_to!(:sent)
       when 'retained'
         message_template_for_patron = MessageTemplate.localized_template('item_received_for_patron', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_for_patron}, as: :admin)
+        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_for_patron})
         request.save_message_body(manifestations: Array[item.manifestation], user: user)
         request.transition_to!(:sent)
         message_template_for_library = MessageTemplate.localized_template('item_received_for_library', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_for_library}, as: :admin)
+        request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_for_library})
         request.save_message_body(manifestations: Array[item.manifestation], user: user)
         request.transition_to!(:sent)
       when 'postponed'
         message_template_for_patron = MessageTemplate.localized_template('reservation_postponed_for_patron', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_for_patron}, as: :admin)
+        request.assign_attributes({sender: sender, receiver: user, message_template: message_template_for_patron})
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent)
         message_template_for_library = MessageTemplate.localized_template('reservation_postponed_for_library', user.profile.locale)
         request = MessageRequest.new
-        request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_for_library}, as: :admin)
+        request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_for_library})
         request.save_message_body(manifestations: Array[manifestation], user: user)
         request.transition_to!(:sent)
       else
@@ -242,7 +235,7 @@ class Reserve < ActiveRecord::Base
     when 'expired'
       message_template_to_library = MessageTemplate.localized_template('reservation_expired_for_library', sender.profile.locale)
       request = MessageRequest.new
-      request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_to_library}, as: :admin)
+      request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_to_library})
       request.save_message_body(manifestations: options[:manifestations])
       self.not_sent_expiration_notice_to_library.readonly(false).each do |reserve|
         reserve.expiration_notice_to_library = true
@@ -251,7 +244,7 @@ class Reserve < ActiveRecord::Base
     #when 'canceled'
     #  message_template_to_library = MessageTemplate.localized_template('reservation_canceled_for_library', sender.locale)
     #  request = MessageRequest.new
-    #  request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_to_library}, as: :admin)
+    #  request.assign_attributes({sender: sender, receiver: sender, message_template: message_template_to_library})
     #  request.save_message_body(manifestations: self.not_sent_expiration_notice_to_library.collect(&:manifestation))
     #  self.not_sent_cancel_notice_to_library.each do |reserve|
     #    reserve.update_attribute(:expiration_notice_to_library, true)
@@ -319,13 +312,13 @@ class Reserve < ActiveRecord::Base
 
   private
   def do_request
-    self.assign_attributes({request_status_type: RequestStatusType.where(name: 'In Process').first, item_id: nil, retained_at: nil}, as: :admin)
+    self.assign_attributes({request_status_type: RequestStatusType.where(name: 'In Process').first, item_id: nil, retained_at: nil})
     save!
   end
 
   def retain
     # TODO: 「取り置き中」の状態を正しく表す
-    self.assign_attributes({request_status_type: RequestStatusType.where(name: 'In Process').first, retained_at: Time.zone.now}, as: :admin)
+    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
@@ -337,7 +330,7 @@ class Reserve < ActiveRecord::Base
 
   def expire
     Reserve.transaction do
-      self.assign_attributes({request_status_type: RequestStatusType.where(name: 'Expired').first, canceled_at: Time.zone.now}, as: :admin)
+      self.assign_attributes({request_status_type: RequestStatusType.where(name: 'Expired').first, canceled_at: Time.zone.now})
       reserve = next_reservation
       if reserve
         reserve.item = item
@@ -351,7 +344,7 @@ class Reserve < ActiveRecord::Base
 
   def cancel
     Reserve.transaction do
-      self.assign_attributes({request_status_type: RequestStatusType.where(name: 'Cannot Fulfill Request').first, canceled_at: Time.zone.now}, as: :admin)
+      self.assign_attributes({request_status_type: RequestStatusType.where(name: 'Cannot Fulfill Request').first, canceled_at: Time.zone.now})
       save!
       reserve = next_reservation
       if reserve
@@ -364,7 +357,7 @@ class Reserve < ActiveRecord::Base
   end
 
   def checkout
-    self.assign_attributes({request_status_type: RequestStatusType.where(name: 'Available For Pickup').first, checked_out_at: Time.zone.now}, as: :admin)
+    self.assign_attributes({request_status_type: RequestStatusType.where(name: 'Available For Pickup').first, checked_out_at: Time.zone.now})
     save!
   end
 
@@ -374,7 +367,7 @@ class Reserve < ActiveRecord::Base
       item_id: nil,
       retained_at: nil,
       postponed_at: Time.zone.now
-    }, as: :admin)
+    })
     save!
   end
 
@@ -391,6 +384,10 @@ class Reserve < ActiveRecord::Base
   def self.transition_class
     ReserveTransition
   end
+
+  def self.initial_state
+    :pending
+  end
 end
 
 # == Schema Information

data/app/models/reserve_stat_has_manifestation.rb

@@ -1,7 +1,4 @@
 class ReserveStatHasManifestation < ActiveRecord::Base
-  attr_accessible
-  attr_accessible :manifestation_reserve_stat_id, :manifestation_id,
-    as: :admin
   belongs_to :manifestation_reserve_stat
   belongs_to :manifestation
 

data/app/models/reserve_stat_has_user.rb

@@ -1,7 +1,7 @@
 class ReserveStatHasUser < ActiveRecord::Base
-  attr_accessible
-  attr_accessible :user_reserve_stat_id, :user_id,
-    as: :admin
+  #attr_accessible
+  #attr_accessible :user_reserve_stat_id, :user_id,
+  #  as: :admin
   belongs_to :user_reserve_stat
   belongs_to :user
 

data/app/models/reserve_state_machine.rb

@@ -14,12 +14,12 @@ class ReserveStateMachine
   transition from: :requested, to: [:retained, :canceled, :expired, :completed]
 
   after_transition(to: :requested) do |reserve|
-    reserve.update_attributes({request_status_type: RequestStatusType.where(name: 'In Process').first, item_id: nil, retained_at: nil}, as: :admin)
+    reserve.update_attributes({request_status_type: RequestStatusType.where(name: 'In Process').first, item_id: nil, retained_at: nil})
   end
 
   after_transition(to: :retained) do |reserve|
     # TODO: 「取り置き中」の状態を正しく表す
-    reserve.update_attributes({request_status_type: RequestStatusType.where(name: 'In Process').first, retained_at: Time.zone.now}, as: :admin)
+    reserve.update_attributes({request_status_type: RequestStatusType.where(name: 'In Process').first, retained_at: Time.zone.now})
     Reserve.transaction do
       if reserve.item and reserve.next_reservation
         reserve.item.reserves.waiting.readonly(false).map{|r|
@@ -35,7 +35,7 @@ class ReserveStateMachine
 
   after_transition(to: :canceled) do |reserve|
     Reserve.transaction do
-      reserve.update_attributes({request_status_type: RequestStatusType.where(name: 'Cannot Fulfill Request').first, canceled_at: Time.zone.now}, as: :admin)
+      reserve.update_attributes({request_status_type: RequestStatusType.where(name: 'Cannot Fulfill Request').first, canceled_at: Time.zone.now})
       next_reserve = reserve.next_reservation
       if next_reserve
         next_reserve.item = reserve.item
@@ -48,7 +48,7 @@ class ReserveStateMachine
 
   after_transition(to: :expired) do |reserve|
     Reserve.transaction do
-      reserve.update_attributes({request_status_type: RequestStatusType.where(name: 'Expired').first, canceled_at: Time.zone.now}, as: :admin)
+      reserve.update_attributes({request_status_type: RequestStatusType.where(name: 'Expired').first, canceled_at: Time.zone.now})
       next_reserve = reserve.next_reservation
       if next_reserve
         next_reserve.item = reserve.item
@@ -61,14 +61,14 @@ class ReserveStateMachine
   end
 
   after_transition(to: :postponed) do |reserve|
-    reserve.update_attributes(item_id: nil, retained_at: nil, postponed_at: Time.zone.now, force_retaining: "1", as: :admin)
+    reserve.update_attributes(item_id: nil, retained_at: nil, postponed_at: Time.zone.now, force_retaining: "1")
   end
 
   after_transition(to: :completed) do |reserve|
     reserve.update_attributes(
       request_status_type: RequestStatusType.where(name: 'Available For Pickup').first,
-      checked_out_at: Time.zone.now,
-      as: :admin)
+      checked_out_at: Time.zone.now
+    )
   end
 
   after_transition(to: :requested) do |reserve|

data/app/models/reserve_transition.rb

@@ -3,7 +3,7 @@ class ReserveTransition < ActiveRecord::Base
 
   
   belongs_to :reserve, inverse_of: :reserve_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/use_restriction.rb

@@ -1,9 +1,7 @@
 class UseRestriction < ActiveRecord::Base
-  attr_accessible :name, :display_name, :note
   include MasterModel
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
 
-  default_scope { order('use_restrictions.position') }
   scope :available, -> {where(name: ['Not For Loan', 'Limited Circulation, Normal Loan Period'])}
   has_many :item_has_use_restrictions
   has_many :items, through: :item_has_use_restrictions

data/app/models/user_checkout_stat.rb

@@ -1,7 +1,6 @@
 class UserCheckoutStat < ActiveRecord::Base
-  include Statesman::Adapters::ActiveRecordModel
+  include Statesman::Adapters::ActiveRecordQueries
   include CalculateStat
-  attr_accessible :start_date, :end_date, :note, :mode
   default_scope {order('user_checkout_stats.id DESC')}
   scope :not_calculated, -> {in_state(:pending)}
   has_many :checkout_stat_has_users
@@ -41,6 +40,10 @@ class UserCheckoutStat < ActiveRecord::Base
   def self.transition_class
     UserCheckoutStatTransition
   end
+
+  def self.initial_state
+    :pending
+  end
 end
 
 # == Schema Information

data/app/models/user_checkout_stat_transition.rb

@@ -3,7 +3,7 @@ class UserCheckoutStatTransition < ActiveRecord::Base
 
   
   belongs_to :user_checkout_stat, inverse_of: :user_checkout_stat_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

data/app/models/user_group_has_checkout_type.rb

@@ -1,9 +1,4 @@
 class UserGroupHasCheckoutType < ActiveRecord::Base
-  attr_accessible :user_group_id, :checkout_type_id,
-    :checkout_limit, :checkout_period, :checkout_renewal_limit,
-    :reservation_limit, :reservation_expired_period,
-    :set_due_date_before_closing_day, :fixed_due_date, :note, :position,
-    :user_group, :checkout_type
   scope :available_for_item, lambda{|item| where(checkout_type_id: item.checkout_type.id)}
   scope :available_for_carrier_type, lambda{|carrier_type| includes(checkout_type: :carrier_types).where('carrier_types.id' => carrier_type.id)}
 

data/app/models/user_reserve_stat.rb

@@ -1,7 +1,6 @@
 class UserReserveStat < ActiveRecord::Base
-  include Statesman::Adapters::ActiveRecordModel
+  include Statesman::Adapters::ActiveRecordQueries
   include CalculateStat
-  attr_accessible :start_date, :end_date, :note, :mode
   default_scope {order('user_reserve_stats.id DESC')}
   scope :not_calculated, -> {in_state(:pending)}
   has_many :reserve_stat_has_users
@@ -41,6 +40,10 @@ class UserReserveStat < ActiveRecord::Base
   def self.transition_class
     UserReserveStatTransition
   end
+
+  def self.initial_state
+    :pending
+  end
 end
 
 # == Schema Information

data/app/models/user_reserve_stat_transition.rb

@@ -3,7 +3,7 @@ class UserReserveStatTransition < ActiveRecord::Base
 
   
   belongs_to :user_reserve_stat, inverse_of: :user_reserve_stat_transitions
-  attr_accessible :to_state, :sort_key, :metadata
+  #attr_accessible :to_state, :sort_key, :metadata
 end
 
 # == Schema Information

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

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.checkout')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
-<%= render 'list' -%>
+<%= render 'list', checkouts: @checkouts -%>
 
 <%- if @checkouts.size == 0 -%>
   <p><%= t('checkout.no_checkout') -%></p>

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

@@ -6,7 +6,7 @@
   <h2><%= link_to item.item_identifier, item %></h2>
   <p>(<%= link_to item.manifestation.original_title, item.manifestation %>)
 
-<%= render 'list' -%>
+<%= render 'list', checkouts: @checkouts -%>
 
 <%- if @checkouts.size == 0 -%>
   <p><%= t('checkout.no_checkout') -%></p>

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

@@ -11,7 +11,7 @@
     </p>
   <%- end -%>
 
-<%= render 'list' -%>
+<%= render 'list', checkouts: @checkouts -%>
 
 <%- if @checkouts.size == 0 -%>
   <p><%= t('checkout.no_checkout') -%></p>

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

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.checkout')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
-<%= render 'list' -%>
+<%= render 'list', checkouts: @checkouts -%>
 
 <%- if @checkouts.size == 0 -%>
   <p><%= t('checkout.no_checkout') -%></p>

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

@@ -6,8 +6,7 @@
     <th></th>
   </tr>
 
-<%- if @checkouts -%>
-  <%- @checkouts.each_with_index do |checkout, i| %>
+  <%- checkouts.each_with_index do |checkout, i| %>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
       <% if checkout.user %>
@@ -46,7 +45,6 @@
     </td>
   </tr>
   <%- end -%>
-<%- end -%>
 </table>
 
-<%= paginate(@checkouts) %>
+<%= paginate(checkouts) %>

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

@@ -0,0 +1,29 @@
+<%= form_for(@demand) do |f| %>
+  <% if @demand.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@demand.errors.count, "error") %> prohibited this demand from being saved:</h2>
+
+      <ul>
+      <% @demand.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :user_id %><br>
+    <%= f.number_field :user_id %>
+  </div>
+  <div class="field">
+    <%= f.label :item_id %><br>
+    <%= f.number_field :item_id %>
+  </div>
+  <div class="field">
+    <%= f.label :message_id %><br>
+    <%= f.number_field :message_id %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

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

@@ -0,0 +1,6 @@
+<h1>Editing Demand</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @demand %> |
+<%= link_to 'Back', demands_path %>

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

@@ -0,0 +1,31 @@
+<p id="notice"><%= notice %></p>
+
+<h1>Listing Demands</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>User</th>
+      <th>Item</th>
+      <th>Message</th>
+      <th colspan="3"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @demands.each do |demand| %>
+      <tr>
+        <td><%= demand.user_id %></td>
+        <td><%= demand.item_id %></td>
+        <td><%= demand.message_id %></td>
+        <td><%= link_to 'Show', demand %></td>
+        <td><%= link_to 'Edit', edit_demand_path(demand) %></td>
+        <td><%= link_to 'Destroy', demand, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Demand', new_demand_path %>

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

@@ -0,0 +1,5 @@
+<h1>New Demand</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', demands_path %>

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

@@ -0,0 +1,19 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>User:</strong>
+  <%= @demand.user_id %>
+</p>
+
+<p>
+  <strong>Item:</strong>
+  <%= @demand.item_id %>
+</p>
+
+<p>
+  <strong>Message:</strong>
+  <%= @demand.message_id %>
+</p>
+
+<%= link_to 'Edit', edit_demand_path(@demand) %> |
+<%= link_to 'Back', demands_path %>