enju_library 0.1.0.pre6 → 0.1.0.pre7

data/app/controllers/accepts_controller.rb

@@ -0,0 +1,83 @@
+class AcceptsController < InheritedResources::Base
+  load_and_authorize_resource :except => :index
+  authorize_resource :only => :index
+  respond_to :html, :json
+  before_filter :get_basket, :only => [:index, :create]
+
+  # GET /accepts
+  # GET /accepts.json
+  def index
+    if params[:format] == 'csv'
+      @accepts = Accept.order('accepts.created_at DESC').page(params[:page]).per(65534)
+    else
+      if params[:accept]
+        @query = params[:accept][:item_identifier].to_s.strip
+        item = Item.where(:item_identifier => @query).first if @query.present?
+      end
+
+      if item
+        @accepts = Accept.order('accepts.created_at DESC').where(:item_id => item.id).page(params[:page])
+      else
+        if @basket
+          @accepts = @basket.accepts.page(params[:page])
+        else
+          @accepts = Accept.page(params[:page])
+        end
+      end
+    end
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render :json => @accepts }
+      format.js { @accept = Accept.new }
+      format.csv
+    end
+  end
+
+  # GET /new
+  # GET /new.json
+  def new
+    @basket = Basket.new
+    @basket.user = current_user
+    @basket.save!
+    @accept = Accept.new
+    @accepts = []
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render :json => @patron }
+    end
+  end
+
+  # POST /accepts
+  # POST /accepts.json
+  def create
+    unless @basket
+      access_denied; return
+    end
+    @accept.basket = @basket
+    @accept.librarian = current_user
+
+    flash[:message] = ''
+    if @accept.item_identifier.blank?
+      flash[:message] << t('accept.enter_item_identifier') if @accept.item_identifier.blank?
+    else
+      item = Item.where(:item_identifier => @accept.item_identifier.to_s.strip).first
+    end
+    @accept.item = item
+
+    respond_to do |format|
+      if @accept.save
+        flash[:message] << t('accept.successfully_accepted', :model => t('activerecord.models.accept'))
+        format.html { redirect_to basket_accepts_url(@basket) }
+        format.json { render :json => @accept, :status => :created, :location => @accept }
+        format.js { redirect_to basket_accepts_url(@basket, :format => :js) }
+      else
+        @accepts = @basket.accepts.page(params[:page])
+        format.html { render :action => "index" }
+        format.json { render :json => @accept.errors, :status => :unprocessable_entity }
+        format.js { render :action => "index" }
+      end
+    end
+  end
+end

data/app/models/accept.rb

@@ -0,0 +1,37 @@
+class Accept < ActiveRecord::Base
+  attr_accessible :item_identifier, :librarian_id, :item_id
+  default_scope :order => 'accepts.id DESC'
+  belongs_to :basket
+  belongs_to :item
+  belongs_to :librarian, :class_name => 'User'
+
+  validates_uniqueness_of :item_id, :message => I18n.t('accept.already_accepted')
+  validates_presence_of :item_id, :message => I18n.t('accept.item_not_found')
+  validates_presence_of :basket_id
+
+  before_save :accept!, :on => :create
+
+  attr_accessor :item_identifier
+
+  paginates_per 10
+
+  def accept!
+    if defined?(EnjuCirculation)
+      item.circulation_status = CirculationStatus.where(:name => 'Available On Shelf').first
+    end
+    item.save(:validate => false)
+  end
+end
+
+# == Schema Information
+#
+# Table name: accepts
+#
+#  id           :integer          not null, primary key
+#  basket_id    :integer
+#  item_id      :integer
+#  librarian_id :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+

data/app/models/basket.rb

@@ -0,0 +1,63 @@
+class Basket < ActiveRecord::Base
+  attr_accessible :note, :user_number
+  default_scope :order => 'baskets.id DESC'
+  scope :will_expire, lambda {|date| {:conditions => ['created_at < ?', date]}}
+  belongs_to :user, :validate => true
+  has_many :accepts
+
+  validates_associated :user, :on => :create
+  # 貸出完了後にかごのユーザidは破棄する
+  validates_presence_of :user, :on => :create
+  validate :check_suspended
+
+  attr_accessor :user_number
+
+  def check_suspended
+    if user
+      errors[:base] << I18n.t('basket.this_account_is_suspended') if user.locked_at
+    else
+      errors[:base] << I18n.t('user.not_found')
+    end
+  end
+
+  def self.expire
+    Basket.will_expire(Time.zone.now.beginning_of_day).destroy_all
+    logger.info "#{Time.zone.now} baskets expired!"
+  end
+
+  if defined?(EnjuCirculation)
+    has_many :checked_items, :dependent => :destroy
+    has_many :items, :through => :checked_items
+    has_many :checkouts
+    has_many :checkins
+
+    def basket_checkout(librarian)
+      return nil if checked_items.size == 0
+      Item.transaction do
+        checked_items.each do |checked_item|
+          checkout = user.checkouts.new
+          checkout.librarian = librarian
+          checkout.item = checked_item.item
+          checkout.basket = self
+          checkout.due_date = checked_item.due_date
+          checked_item.item.checkout!(user)
+          checkout.save!
+        end
+        CheckedItem.destroy_all(:basket_id => id)
+      end
+    end
+  end
+end
+
+# == Schema Information
+#
+# Table name: baskets
+#
+#  id           :integer          not null, primary key
+#  user_id      :integer
+#  note         :text
+#  lock_version :integer          default(0), not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+

data/app/models/library.rb

@@ -29,8 +29,8 @@ class Library < ActiveRecord::Base
   validates_uniqueness_of :short_display_name, :case_sensitive => false
   validates_uniqueness_of :isil, :allow_blank => true
   validates :display_name, :uniqueness => true
-  validates :name, :format => {:with => /^[a-z][0-9a-z\-_]{1,254}$/}
-  validates :isil, :format => {:with => /^[A-Za-z]{1,4}-[A-Za-z0-9\/:\-]{2,11}$/}, :allow_blank => true
+  validates :name, :format => {:with => /\A[a-z][0-9a-z\-_]{1,254}\z/}
+  validates :isil, :format => {:with => /\A[A-Za-z]{1,4}-[A-Za-z0-9\/:\-]{2,11}\z/}, :allow_blank => true
   after_validation :geocode, :if => :address_changed?
   after_create :create_shelf
   after_save :clear_all_cache

data/app/models/library_group.rb

@@ -4,7 +4,6 @@ class LibraryGroup < ActiveRecord::Base
     :login_banner, :note, :country_id, :admin_networks, :url
 
   #include Singleton
-  #include Configurator
   include MasterModel
 
   has_many :libraries

data/app/models/shelf.rb

@@ -9,7 +9,7 @@ class Shelf < ActiveRecord::Base
   validates_associated :library
   validates_presence_of :library
   validates_uniqueness_of :display_name, :scope => :library_id
-  validates :name, :format => {:with => /^[a-z][0-9a-z\-_]{1,254}$/}
+  validates :name, :format => {:with => /\A[a-z][0-9a-z\-_]{1,254}\z/}
 
   acts_as_list :scope => :library
 

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

@@ -0,0 +1,11 @@
+<%= simple_form_for(@accept) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+    <%= f.input :item_id %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit %>
+  </div>
+<% end %>

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

@@ -0,0 +1,31 @@
+<div style="color: red"><%= flash[:message] -%></div>
+
+<div class="search_form">
+<%= form_for(@accept, :url => basket_accepts_path(@basket), :remote => true) do |f| %>
+  <%= f.error_messages %>
+  <p>
+    <%= label_tag :item_identifier, t('activerecord.attributes.item.item_identifier') -%>:
+    <%= f.search_field :item_identifier, :class => 'resource_item_identifier', :value => nil -%>
+    <%= f.submit t('accept.accept'), 'data-disable-with' => t('page.saving') -%>
+  </p>
+<%- end -%>
+</div>
+
+<table class="index">
+  <tr>
+    <th><%= t('activerecord.models.item') -%></th>
+  </tr>
+  <%- @accepts.each_with_index do |accept, i| -%>
+    <tr class="line<%= cycle("0", "1") -%>">
+      <td>
+        <%= render 'manifestations/show_index', :manifestation => accept.item.manifestation %>
+        <%= link_to accept.item.item_identifier, accept.item -%> / <%= accept.item.call_number %>
+        (<%= link_to accept.item.shelf.library.display_name.localize, accept.item.shelf.library %> /
+        <%= link_to accept.item.shelf.display_name.localize, accept.item.shelf %>)<br />
+        <%=l accept.created_at %>
+      </td>
+    </tr>
+  <%- end -%>
+</table>
+
+<%= javascript_tag("$('#accept_item_identifier').focus()") -%>

data/app/views/accepts/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.accept')) -%></h1>
+<div id="content_list">
+  <%= render 'form' %>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= link_to t('page.show'), @accept -%></li>
+    <li><%= link_to t('page.back'), accepts_path -%></li>
+  </ul>
+</div>

data/app/views/accepts/index.csv.erb

@@ -0,0 +1,4 @@
+item_identifier	basket_id	accepted_at
+<% @accepts.each do |accept| %>
+<%= accept.item.item_identifier %>	<%= accept.basket_id %>	<%= accept.created_at %>
+<% end %>

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

@@ -0,0 +1,49 @@
+<div id="content_detail" class="ui-corner-all">
+<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.accept')) -%></h1>
+<div id="content_list">
+
+<div class="search_form">
+  <%= form_for(:accept, :html => {:method => :get}) do |f| %>
+    <p>
+      <%= label_tag :item_identifier, t('activerecord.attributes.item.item_identifier') -%>:
+      <%= f.search_field :item_identifier, :value => @query, :class => 'resource_item_identifier' -%>
+      <%= f.submit t('page.search') -%>
+    </p>
+  <%- end -%>
+</div>
+
+<table class="table table-striped index">
+  <tr>
+    <th><%= t('activerecord.models.item') -%></th>
+    <th></th>
+  </tr>
+  <%- @accepts.each_with_index do |accept, i| -%>
+    <tr class="line<%= cycle("0", "1") -%>">
+      <td>
+        <% if accept.item %>
+          <%= render 'manifestations/show_index', :manifestation => accept.item.manifestation %>
+          <%= link_to accept.item.item_identifier, accept.item -%> / <%= accept.item.call_number %>
+          (<%= link_to accept.item.shelf.library.display_name.localize, accept.item.shelf.library %> /
+          <%= link_to accept.item.shelf.display_name.localize, accept.item.shelf %>)<br />
+          <%=l accept.created_at %>
+        <% end %>
+      </td>
+      <td>
+        <%- if can? :destroy, accept -%>
+          <%= link_to t('page.destroy'), accept, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%- end -%>
+      </td>
+    </tr>
+  <%- end -%>
+  </table>
+  <%= javascript_tag("$('#accept_item_identifier').focus()") -%>
+
+  <%= paginate(@accepts) %>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= link_to t('page.new', :model => t('activerecord.models.accept')), new_accept_path -%></li>
+  </ul>
+</div>

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

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

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

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

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

@@ -0,0 +1,31 @@
+<div id="content_detail" class="ui-corner-all">
+<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.accept')) -%></h1>
+<div id="content_list">
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong><%= t('activerecord.models.item') -%>:</strong>
+  <% if @accept.item %>
+    <%= link_to @accept.item.item_identifier, @accept.item -%>
+    (<%= link_to @accept.item.manifestation.original_title, @accept.item.manifestation %>)
+  <% end %>
+</p>
+
+<p>
+  <strong><%= t('activerecord.models.user') -%>:</strong>
+  <%= link_to @accept.librarian.username, @accept.librarian if @accept.librarian -%>
+</p>
+
+<p>
+  <strong><%= t('page.created_at') -%>:</strong>
+  <%=l @accept.created_at %>
+</p>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all">
+  <ul>
+    <li><%= back_to_index(flash[:page_info]) -%></li>
+  </ul>
+</div>

data/config/locales/en.yml

@@ -0,0 +1,86 @@
+en:
+  activerecord:
+    models:
+      library: Library
+      library_group: Library Group
+      shelf: Shelf
+      accept: Accept
+      budget_type: Budget type
+      bookstore: Bookstore
+      subscribe: Subscribe
+      subscription: Subscription
+      request_status_type: Request status type
+      request_type: Request type
+
+    attributes:
+      library:
+        name: Name
+        display_name: Display name
+        short_display_name: Short display name
+        zip_code: Zip code
+        region: Region
+        locality: Locality
+        street: Street
+        telephone_number_1: Telephone number 1
+        telephone_number_2: Telephone number 2
+        fax_number: Fax number
+        lat: Lat
+        lng: Lng
+        note: Note
+        call_number_rows: Call number rows
+        call_number_delimiter: Call number delimiter
+        position: Position
+        deleted_at: Deleted at
+        opening_hour: Opening hour
+        isil: ISIL
+      shelf:
+        name: Name
+        display_name: Display name
+        note: Note
+        position: Position
+        deleted_at: Deleted at
+        closed: Closed
+      library_group:
+        name: Name
+        display_name: Display name
+        short_name: Short name
+        email: Email
+        my_networks: My networks
+        admin_networks: Admin networks
+        note: Note
+        login_banner: Login banner
+        post_to_union_catalog: Post to union catalog
+      bookstore:
+        name: Name
+        zip_code: Zip code
+        address: Address
+        note: Note
+        telephone_number: Telephone number
+        fax_number: Fax number
+        url: URL
+        position: Position
+        deleted_at: Deleted at
+      budget_type:
+        name: Name
+        display_name: Display name
+        note: Note
+      accept:
+        item_id: Item
+      subscribe:
+        started_on: Start on
+        ended_on: End on
+      subscription:
+        title: Title
+        note: Note
+        deleted_at: Deleted at
+        subscribes_count: Count
+      request_status_type:
+        name: Name
+        display_name: Display name
+        note: Note
+        position: Position
+      request_type:
+        name: Name
+        display_name: Display name
+        note: Note
+        position: Position

data/config/locales/ja.yml

@@ -0,0 +1,86 @@
+ja:
+  activerecord:
+    models:
+      library: 図書館
+      library_group: 図書館全体の設定
+      shelf: 本棚
+      accept: 検収
+      budget_type: 予算種別
+      bookstore: 書店
+      subscribe: 購読
+      subscription: 購読
+      request_status_type: 依頼の状態の種類
+      request_type: 依頼の種類
+
+    attributes:
+      library:
+        name: 名前
+        display_name: 表示名
+        short_display_name: 短縮表示名
+        zip_code: 郵便番号
+        region: 都道府県
+        locality: 市区町村
+        street: 番地
+        telephone_number_1: 電話番号1
+        telephone_number_2: 電話番号2
+        fax_number: ファックス番号
+        lat: 緯度
+        lng: 経度
+        note: 注記
+        call_number_rows: 請求記号の列数
+        call_number_delimiter: 請求番号の区切り文字
+        position: 位置
+        deleted_at: 削除時刻
+        opening_hour: 開館時間
+        isil: ISIL
+      shelf:
+        name: 名前
+        display_name: 表示名
+        note: 注記
+        position: 位置
+        deleted_at: 削除時刻
+        closed: 閉架
+      library_group:
+        name: 名前
+        display_name: 表示名
+        short_name: 短縮名
+        email: メール
+        my_networks: LANとして扱うネットワーク
+        admin_networks: 管理用として扱うネットワーク
+        note: 注記
+        login_banner: ログイン画面でのメッセージ
+        post_to_union_catalog: 総合目録に登録する
+      bookstore:
+        name: 名前
+        zip_code: 郵便番号
+        address: 住所
+        note: 注記
+        telephone_number: 電話番号
+        fax_number: ファックス番号
+        url: URL
+        position: 位置
+        deleted_at: 削除時刻
+      budget_type:
+        name: 名称
+        display_name: 表示名
+        note: 注記
+      accept:
+        item_id: 個別資料
+      subscribe:
+        started_on: 開始日
+        ended_on: 終了日
+      subscription:
+        title: タイトル
+        note: 注記
+        deleted_at: 削除時刻
+        subscribes_count: 購読数
+      request_status_type:
+        name: 名前
+        display_name: 表示名
+        note: 注記
+        position: 位置
+      request_type:
+        name: 名前
+        display_name: 表示名
+        note: 注記
+        position: 位置

data/config/routes.rb

@@ -6,6 +6,11 @@ Rails.application.routes.draw do
     resources :picture_files
   end
 
+  resources :baskets do
+    resources :accepts, :except => [:edit, :update]
+  end
+  resources :accepts, :except => [:edit, :update]
+
   resources :bookstores
   resources :library_groups, :except => [:new, :create, :destroy]
   resources :subscriptions

data/db/migrate/080_create_library_groups.rb

@@ -8,7 +8,6 @@ class CreateLibraryGroups < ActiveRecord::Migration
       t.text :my_networks
       t.text :login_banner
       t.text :note
-      t.integer :valid_period_for_new_user, :default => 365, :null => false
       t.integer :country_id
       t.integer :position
 

data/db/migrate/120_create_baskets.rb

@@ -0,0 +1,12 @@
+class CreateBaskets < ActiveRecord::Migration
+  def change
+    create_table :baskets do |t|
+      t.integer :user_id
+      t.text :note
+      t.integer :lock_version, :default => 0, :null => false
+
+      t.timestamps
+    end
+    add_index :baskets, :user_id
+  end
+end

data/db/migrate/20120319173203_create_accepts.rb

@@ -0,0 +1,14 @@
+class CreateAccepts < ActiveRecord::Migration
+  def change
+    create_table :accepts do |t|
+      t.integer :basket_id
+      t.integer :item_id
+      t.integer :librarian_id
+
+      t.timestamps
+    end
+
+    add_index :accepts, :basket_id
+    add_index :accepts, :item_id
+  end
+end

data/lib/enju_library/engine.rb

@@ -1,6 +1,8 @@
 require 'enju_core'
 require 'inherited_resources'
+require 'mobylette'
 require 'geocoder'
+require 'ipaddr'
 
 module EnjuLibrary
   class Engine < ::Rails::Engine

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.1.0.pre6"
+  VERSION = "0.1.0.pre7"
 end