enju_message 0.1.3 → 0.1.4

data/Rakefile

@@ -26,14 +26,6 @@ load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec) do |spec|
-    spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-task :default => :spec
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |t|
@@ -43,5 +35,12 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
+end
 
-task :default => :test
+
+task :default => :spec

data/app/controllers/messages_controller.rb

@@ -77,7 +77,8 @@ class MessagesController < ApplicationController
   # POST /messages
   # POST /messages.json
   def create
-    @message = current_user.sent_messages.new(params[:message])
+    @message = Message.new(params[:message])
+    @message.sender = current_user
     get_parent(@message.parent_id)
     @message.receiver = User.find(@message.recipient) rescue nil
 

data/app/models/message.rb

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 class Message < ActiveRecord::Base
+  attr_accessible :subject, :body, :recipient
   scope :unread, where(:state => 'unread')
   belongs_to :message_request
   belongs_to :sender, :class_name => 'User'

data/app/models/message_request.rb

@@ -1,5 +1,7 @@
 require 'erubis'
 class MessageRequest < ActiveRecord::Base
+  attr_accessible :body
+  attr_accessible :sender, :receiver, :message_template, :as => :admin
   scope :not_sent, where('sent_at IS NULL AND state = ?', 'pending')
   scope :sent, where(:state => 'sent')
   scope :started, where(:state => 'started')
@@ -9,7 +11,7 @@ class MessageRequest < ActiveRecord::Base
   has_many :messages
 
   validates_associated :sender, :receiver, :message_template
-  validates_presence_of :sender, :receiver, :message_template
+  validates_presence_of :sender, :receiver, :message_template, :body
 
   state_machine :initial => :pending do
     before_transition any - :sent => :sent, :do => :send_message

data/app/models/message_template.rb

@@ -1,4 +1,5 @@
 class MessageTemplate < ActiveRecord::Base
+  attr_accessible :status, :title, :body, :locale
   default_scope :order => "message_templates.position"
   has_many :message_requests
 

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

@@ -0,0 +1,30 @@
+<div id="content_detail" class="ui-corner-all">
+<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.basket')) -%></h1>
+<div id="content_list">
+
+<%= form_for(@basket) do |f| -%>
+  <%= f.error_messages -%>
+  <div class="field">
+    <%= f.label t('activerecord.models.user') -%><br />
+    <%= @basket.user.username -%>
+    <%= f.hidden_field :user_id -%>
+  </div>
+
+  <div class="field">
+    <%= f.label :note -%><br />
+    <%= f.text_area :note, :class => 'resource_textarea' -%>
+  </div>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<%- end -%>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= link_to t('page.show'), basket_path(@basket) -%></li>
+    <li><%= link_to t('page.back'), user_baskets_path(@basket.user) -%></li>
+  </ul>
+</div>

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

@@ -0,0 +1,31 @@
+<div id="content_list">
+<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.basket')) -%></h1>
+<div id="content_detail" class="ui-corner-all">
+
+<table class="index">
+  <tr>
+    <th><%= t('activerecord.models.user') -%></th>
+    <th><%= t('activerecord.attributes.basket.note') -%></th>
+    <th><%= t('page.updated_at') -%></th>
+  </tr>
+
+<%- @baskets.each do |basket| -%>
+  <tr class="line<%= cycle("0", "1") -%>">
+    <td><%= basket.user.username -%></td>
+    <td><%= basket.note -%></td>
+    <td><%= basket.updated_at -%></td>
+    <td><%= link_to t('page.show'), basket -%></td>
+  </tr>
+<%- end -%>
+</table>
+
+<%= will_paginate(@baskets) -%>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= link_to t('page.new', :model => t('activerecord.models.basket')), new_basket_path -%></li>
+  </ul>
+</div>

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

@@ -0,0 +1,29 @@
+<div id="content_detail" class="ui-corner-all">
+<h1 class="title"><%= t('page.new', :model => t('activerecord.models.basket')) -%></h1>
+<div id="content_list">
+
+<%= form_for(@basket, :html => {:name => 'basket_form'}) do |f| -%>
+  <%= f.error_messages -%>
+  <div class="field">
+    <%= f.label t('activerecord.attributes.user.user_number') -%>
+    <%= f.text_field :user_number, :class => 'resource_user_number' -%>
+
+  <!--
+  <div class="field">
+  <%= f.label :note -%><br />
+  <%= f.text_area :note, :class => 'resource_textarea' -%>
+  </div>
+  -->
+    <%= f.submit t('page.read') -%>
+  </div>
+<%- end -%>
+<%= javascript_tag("$('#basket_user_number').focus()") -%>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= link_to t('activerecord.models.checkin'), checkins_path -%></li>
+    <li><%= link_to t('page.search_resource', :model => t('activerecord.models.user')), users_path -%></li>
+  </ul>
+</div>

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

@@ -0,0 +1,23 @@
+<div id="content_list">
+<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.basket')) -%></h1>
+<div id="content_detail" class="ui-corner-all">
+<p id="notice"><%= notice %></p>
+
+  <p>
+    <strong><%= t('activerecord.models.user') -%>:</strong>
+    <%= @basket.user.username -%>
+  </p>
+
+  <p>
+    <strong><%= t('activerecord.attributes.basket.note') -%>:</strong>
+    <%= @basket.note -%>
+  </p>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= link_to t('page.edit'), edit_basket_path(@basket) -%></li>
+    <li><%= link_to t('page.back'), user_baskets_path(@basket.user) -%></li>
+  </ul>
+</div>

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

@@ -0,0 +1,19 @@
+<%= form_for(@carrier_type_has_checkout_type) do |f| -%>
+  <%= f.error_messages -%>
+
+  <div class="field">
+    <%= f.label t('activerecord.models.carrier_type') -%><br />
+    <%= f.select(:carrier_type_id, @carrier_types.collect{|m| [m.display_name.localize, m.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) -%>
+  </div>
+  <div class="field">
+    <%= f.label :note -%><br />
+    <%= f.text_area :note, :class => 'resource_textarea' -%>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<%- end -%>

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

@@ -0,0 +1,13 @@
+<div id="content_detail" class="ui-corner-all">
+<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.carrier_type_has_checkout_type')) -%></h1>
+<div id="content_list">
+  <%= render 'form' %>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= link_to t('page.show'), @carrier_type_has_checkout_type -%></li>
+    <li><%= link_to t('page.back'), carrier_type_has_checkout_types_path -%></li>
+  </ul>
+</div>

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

@@ -0,0 +1,33 @@
+<div id="content_detail" class="ui-corner-all">
+<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.carrier_type_has_checkout_type')) -%></h1>
+<div id="content_list">
+
+<table class="index">
+  <tr>
+    <th><%= t('activerecord.models.carrier_type') -%></th>
+    <th><%= t('activerecord.models.checkout_type') -%></th>
+    <th><%= t('activerecord.attributes.carrier_type_has_checkout_type.note') -%></th>
+    <th></th>
+  </tr>
+
+<%- @carrier_type_has_checkout_types.each do |carrier_type_has_checkout_type| -%>
+  <tr class="line<%= cycle("0", "1") -%>">
+    <td><%= link_to carrier_type_has_checkout_type.carrier_type.display_name.localize, carrier_type_has_checkout_type.carrier_type -%></td>
+    <td><%= link_to carrier_type_has_checkout_type.checkout_type.display_name.localize, carrier_type_has_checkout_type.checkout_type -%></td>
+    <td><%= carrier_type_has_checkout_type.note -%></td>
+    <td>
+      <%= link_to t('page.edit'), edit_carrier_type_has_checkout_type_path(carrier_type_has_checkout_type) -%>
+      <%= link_to t('page.destroy'), carrier_type_has_checkout_type, :confirm => t('page.are_you_sure'), :method => :delete -%>
+    </td>
+  </tr>
+<%- end -%>
+</table>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= link_to t('page.new', :model => t('activerecord.models.carrier_type_has_checkout_type')), new_carrier_type_has_checkout_type_path -%></li>
+  </ul>
+</div>

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

@@ -0,0 +1,12 @@
+<div id="content_detail" class="ui-corner-all">
+<h1 class="title"><%= t('page.new', :model => t('activerecord.models.carrier_type_has_checkout_type')) -%></h1>
+<div id="content_list">
+  <%= render 'form' %>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= link_to t('page.back'), carrier_type_has_checkout_types_path -%></li>
+  </ul>
+</div>

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

@@ -0,0 +1,29 @@
+<div id="content_detail" class="ui-corner-all">
+<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.carrier_type_has_checkout_type')) -%></h1>
+<div id="content_list">
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong><%= t('activerecord.models.carrier_type') -%>:</strong>
+  <%= link_to @carrier_type_has_checkout_type.carrier_type.display_name.localize, @carrier_type_has_checkout_type.carrier_type -%>
+</p>
+
+<p>
+  <strong><%= t('activerecord.models.checkout_type') -%>:</strong>
+  <%= link_to @carrier_type_has_checkout_type.checkout_type.display_name.localize, @carrier_type_has_checkout_type.checkout_type -%>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.carrier_type_has_checkout_type.note') -%>:</strong>
+  <%= @carrier_type_has_checkout_type.note -%>
+</p>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= link_to t('page.edit'), edit_carrier_type_has_checkout_type_path(@carrier_type_has_checkout_type) -%></li>
+    <li><%= back_to_index(flash[:page_info]) -%></li>
+  </ul>
+</div>

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

@@ -0,0 +1,20 @@
+<h3><%= t('checked_item.previous_checkout') -%></h3>
+
+<table class="index">
+  <tr>
+    <th class="checked_item_title"><%= t('page.title') -%></th>
+    <th><%= t('activerecord.attributes.item.item_identifier') -%></th>
+    <th><%= t('activerecord.attributes.checkout.due_date') -%></th>
+  </tr>
+
+  <%- @basket.user.checkouts.not_returned.each_with_index do |checkout, i| -%>
+    <tr class="line<%= cycle("0", "1") -%>">
+      <td>
+        <%= render 'manifestations/show_index', :manifestation => checkout.item.manifestation -%>
+        <%= 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>
+    </tr>
+  <%- end -%>
+</table>

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

@@ -0,0 +1,39 @@
+<div style="color: red"><%= flash[:message].try(:join) -%></div>
+
+<div class="search_form">
+<%= form_for :checked_item, :html => {:method => :post}, :url => basket_checked_items_path(@basket, :mode => 'list'), :remote => true do |f| -%>
+  <%= f.error_messages -%>
+  <p>
+    <%= t('activerecord.attributes.item.item_identifier') -%>: <%= f.text_field :item_identifier -%>
+    <%= t('checked_item.ignore_restriction') -%>: <%= f.check_box :ignore_restriction -%>
+    <%= submit_tag t('page.read') -%>
+  </p>
+<%- end -%>
+<%= javascript_tag("$('#checked_item_item_identifier').focus()") -%>
+</div>
+
+<table class="index">
+  <tr>
+    <th class="checked_item_title"><%= t('page.title') -%></th>
+    <th><%= t('activerecord.attributes.item.item_identifier') -%></th>
+    <th><%= t('activerecord.attributes.checkout.due_date') -%></th>
+    <th></th>
+  </tr>
+
+<%- @checked_items.each_with_index do |checked_item, i| -%>
+  <tr class="line<%= cycle("0", "1") -%>">
+    <td>
+      <%= 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><%= link_to t('page.destroy'), checked_item, :confirm => t('page.are_you_sure'), :method => :delete -%></td>
+  </tr>
+<%- end -%>
+</table>
+
+<%= form_for(:basket, :url => {:controller => 'baskets', :action => 'update', :id => @basket.id}, :html => { :method => :put }) do |f| -%>
+  <div>
+    <%= f.submit t('checked_item.checkout') -%>
+  </div>
+<%- end -%>

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

@@ -0,0 +1,21 @@
+<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.checked_item')) -%></h1>
+
+<%= form_for(@checked_item) do |f| -%>
+  <%= f.error_messages -%>
+  <div class="field">
+    <%= f.label t('activerecord.models.item') -%><br />
+    <%= f.text_field :item_id -%>
+  </div>
+
+  <div class="field">
+    <%= f.label t('activerecord.models.basket') -%><br />
+    <%= f.text_field :basket_id -%>
+  </div>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<%- end -%>
+
+<%= link_to t('page.show'), checked_item_path(@checked_item) -%> |
+<%= link_to t('page.back'), basket_checked_items_path(@checked_item.basket) -%>

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

@@ -0,0 +1,32 @@
+<div id="content_detail" class="ui-corner-all">
+<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.checked_item')) -%></h1>
+<div id="content_list">
+<p id="notice"><%= notice %></p>
+
+<div id="checked_item_list">
+  <%= render 'list' -%>
+</div>
+
+<br />
+
+<%= render 'checkouts' -%>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= link_to @basket.user.username, @basket.user -%></li>
+  </ul>
+  <ul>
+    <%- @basket.user.user_group.user_group_has_checkout_types.each do |available_checkout_type| -%>
+      <li>
+        <%= available_checkout_type.checkout_type.display_name.localize -%>:
+        <%= @basket.user.checked_item_count[:"#{available_checkout_type.checkout_type.name}"] -%> / <%= available_checkout_type.checkout_limit -%>
+      </li>
+    <%- end -%>
+  </ul>
+  <ul>
+    <li><%= link_to t('activerecord.models.checkin'), checkins_path -%></li>
+    <li><%= link_to t('activerecord.models.reserve'), user_reserves_path(@basket.user) -%></li>
+  </ul>
+</div>

data/app/views/checked_items/index.js.erb

@@ -0,0 +1 @@
+$("#checked_item_list").html("<%= escape_javascript(render('checked_items/list')) %>");

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

@@ -0,0 +1,20 @@
+<h1 class="title"><%= t('page.new', :model => t('activerecord.models.checked_item')) -%></h1>
+
+<%= form_for(@checked_item, :url => basket_checked_items_path(@basket)) do |f| -%>
+  <%= f.error_messages -%>
+  <div class="field">
+    <%= f.label t('activerecord.models.item') -%><br />
+    <%= f.text_field :item_id -%>
+  </div>
+
+  <div class="field">
+    <%= f.label t('activerecord.models.basket') -%><br />
+    <%= f.text_field :basket_id -%>
+  </div>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<%- end -%>
+
+<%= link_to t('page.back'), basket_checked_items_path(@basket) -%>